diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1b37ea5aa..28705e6da 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           path: |
             ~/build
-          key: ${{ runner.os }}-${{ hashFiles('wrapper', 'traits', 'test', 'src', 'hermes_shm', 'benchmarks', 'adapter') }}
+          key: ${{ runner.os }}-${{ hashFiles('wrapper', 'test', 'tasks', 'src', 'include', 'hrun', 'hermes_adapters', 'benchmark') }}
 
       - name: Install APT Dependencies
         run: |
@@ -71,9 +71,9 @@ jobs:
         if: steps.spack-cache.outputs.cache-hit != 'true'
         run: ci/install_deps.sh
 
-      - name: Build
-        if: steps.hermes-cache.outputs.cache-hit != 'true'
-        run: ci/build_hermes.sh
+#      - name: Build
+#        if: steps.hermes-cache.outputs.cache-hit != 'true'
+#        run: ci/build_hermes.sh
 #
 #      - name: Test
 #        run: bash ci/test_hermes.sh
diff --git a/.gitignore b/.gitignore
index e3ed55357..eb001e77a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+cmake*
+.idea
+*.cmd
+*.symvers
+*.cmd
+*.mod
+*.mod.c
+*.ko
+*.order
+*.o
+*.o.cmd
+*.o.d
+build
+
 build/
 benchmarks/HermesVFD
 
@@ -15,8 +29,8 @@ cmake-build-*
 .idea
 .clang-format
 __pycache__/
-/src/adapter/posix/cmake-build-debug-system/CMakeFiles/clion-log.txt
-/adapter/test/posix/Testing/Temporary/LastTest.log
+/hrun/src/hermes_adapters/posix/cmake-build-debug-system/CMakeFiles/clion-log.txt
+/hermes_adapters/test/posix/Testing/Temporary/LastTest.log
 .cache
 
 wrapper/java/out
@@ -25,7 +39,7 @@ Testing
 
 .gradle
 **/build/
-!src/**/build/
+!hrun/src/**/build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..7676f3941
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/pybind11"]
+	path = external/pybind11
+	url = https://github.com/pybind/pybind11.git
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3fe28b8d2..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-language: cpp
-os: linux
-dist: bionic
-
-addons:
-  apt:
-    update: true
-    packages:
-      - build-essential
-      - cmake
-      - libboost-dev
-      - libmpich-dev
-      - autoconf
-      - autoconf-archive
-      - automake
-      - gfortran
-      - g++-7
-      - libstdc++-7-dev
-
-before_install:   
-  - test -n $CC && unset CC
-  - test -n $CXX && unset CXX
-  - git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git
-  - (cd $HOME/spack; git describe) || git clone https://github.com/spack/spack $HOME/spack
-  - |
-    test -f $HOME/spack/etc/spack/packages.yaml || cat > $HOME/spack/etc/spack/packages.yaml << '  EOF'
-    packages:
-      all:
-        target: [x86_64]
-      boost:
-        paths:
-          boost@1.72.0: /usr
-        buildable: False
-      mpich:
-        paths:
-          mpich@3.3: /opt/mpich-3.3-intel
-        buildable: False
-      cmake:
-        paths:
-          cmake@3.10.0: /usr/local/cmake-3.10.0
-        buildable: False
-      autoconf:
-        paths:
-          autoconf@2.69: /usr
-        buildable: False
-      automake:
-        paths:
-          automake@1.15: /usr
-        buildable: False
-      libtool:
-        paths:
-          libtool@2.4.6: /usr
-        buildable: False
-      m4:
-        paths:
-          m4@4.17: /usr
-        buildable: False
-    EOF
-install:
-  - . $HOME/spack/share/spack/setup-env.sh
-  - spack install gotcha@develop && spack load gotcha@develop
-  - spack install glog@0.3.5 && spack load glog@0.3.5
-  - spack repo add sds-repo
-  - spack install mochi-thallium~cereal && spack load -r mochi-thallium~cereal
-
-script: ./ci/install_hshm.sh
-
diff --git a/CMake/HermesConfig.cmake b/CMake/HermesConfig.cmake
index f727e2f2c..a9c12a958 100644
--- a/CMake/HermesConfig.cmake
+++ b/CMake/HermesConfig.cmake
@@ -1,96 +1,103 @@
-# Find hermes header and library.
+# Find Hermes header and library.
 #
 
 # This module defines the following uncached variables:
-#  Hermes_FOUND, if false, do not try to use hermes.
-#  Hermes_INCLUDE_DIRS, where to find hermes.h.
-#  Hermes_LIBRARIES, the libraries to link against to use the hermes library
-#  Hermes_LIBRARY_DIRS, the directory where the hermes library is found.
+#  Hermes_FOUND, if false, do not try to use Hermes.
+#  Hermes_INCLUDE_DIRS, where to find Hermes.h.
+#  Hermes_LIBRARIES, the libraries to link against to use the Hermes library
+#  Hermes_LIBRARY_DIRS, the directory where the Hermes library is found.
 
-#-----------------------------------------------------------------------------
-# Version Strings
-#-----------------------------------------------------------------------------
-set(HERMES_VERSION_STRING  @HERMES_PACKAGE_VERSION@)
-set(HERMES_VERSION_MAJOR   @HERMES_VERSION_MAJOR@)
-set(HERMES_VERSION_MINOR   @HERMES_VERSION_MINOR@)
-set(HERMES_VERSION_PATCH   @HERMES_VERSION_PATCH@)
+find_path(
+  Hermes_INCLUDE_DIR
+        hermes/hermes_types.h
+)
+message("Hermes_INCLUDE_DIR: ${Hermes_INCLUDE_DIR}")
 
-#-----------------------------------------------------------------------------
-# C++ Version
-#-----------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 17)
+if( Hermes_INCLUDE_DIR )
+  get_filename_component(Hermes_DIR ${Hermes_INCLUDE_DIR} PATH)
 
-#-----------------------------------------------------------------------------
-# Find hermes.h
-#-----------------------------------------------------------------------------
-find_path(Hermes_INCLUDE_DIR hermes.h)
-if (NOT Hermes_INCLUDE_DIR)
-    set(Hermes_FOUND OFF)
-    message(SEND_ERROR "FindHermes: Could not find hermes.h")
-else()
-    #-----------------------------------------------------------------------------
-    # Find hermes install dir and hermes.so
-    #-----------------------------------------------------------------------------
-    get_filename_component(Hermes_DIR ${Hermes_INCLUDE_DIR} PATH)
-    find_library(
-            Hermes_LIBRARY
-            NAMES hermes
-    )
+  #-----------------------------------------------------------------------------
+  # Find all packages needed by Hermes
+  #-----------------------------------------------------------------------------
+  find_library(
+    Hermes_LIBRARY
+    NAMES hrun_client hrun_server
+  )
 
-    #-----------------------------------------------------------------------------
-    # Mark hermes as found
-    #-----------------------------------------------------------------------------
-    if( Hermes_LIBRARY )
-        set(Hermes_LIBRARY_DIR "")
-        get_filename_component(Hermes_LIBRARY_DIRS ${Hermes_LIBRARY} PATH)
-        # Set uncached variables as per standard.
-        set(Hermes_FOUND ON)
-        set(Hermes_INCLUDE_DIRS ${Hermes_INCLUDE_DIR})
-        set(Hermes_LIBRARIES ${Hermes_LIBRARY})
-    endif(Hermes_LIBRARY)
+  message("Hermes_LIBRARY: ${Hermes_LIBRARY}")
 
-    #-----------------------------------------------------------------------------
-    # Find all packages needed by hermes
-    #-----------------------------------------------------------------------------
-    # thallium
-    if(@HERMES_RPC_THALLIUM@)
-        find_package(thallium CONFIG REQUIRED)
-        if(thallium_FOUND)
-            message(STATUS "found thallium at ${thallium_DIR}")
-        endif()
-    endif()
+  # HermesShm
+  find_package(HermesShm CONFIG REQUIRED)
+  message(STATUS "found hermes_shm.h at ${HermesShm_INCLUDE_DIRS}")
 
-    #YAML-CPP
-    find_package(yaml-cpp REQUIRED)
-    if(yaml-cpp_FOUND)
-        message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
-    endif()
+  # YAML-CPP
+  find_package(yaml-cpp REQUIRED)
+  message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
 
-    #Cereal
-    find_package(cereal REQUIRED)
-    if(cereal)
-        message(STATUS "found cereal")
-    endif()
+  # Catch2
+  find_package(Catch2 3.0.1 REQUIRED)
+  message(STATUS "found catch2.h at ${Catch2_CXX_INCLUDE_DIRS}")
 
-    #if(HERMES_COMMUNICATION_MPI)
+  # MPICH
+  if(BUILD_MPI_TESTS)
     find_package(MPI REQUIRED COMPONENTS C CXX)
     message(STATUS "found mpi.h at ${MPI_CXX_INCLUDE_DIRS}")
-    #endif()
+  endif()
 
-    # librt
-    if(NOT APPLE)
-        find_library(LIBRT rt)
-        if(NOT LIBRT)
-            message(FATAL_ERROR "librt is required for POSIX shared memory")
-        endif()
-    endif()
+  # OpenMP
+  if(BUILD_OpenMP_TESTS)
+    find_package(OpenMP REQUIRED COMPONENTS C CXX)
+    message(STATUS "found omp.h at ${OpenMP_CXX_INCLUDE_DIRS}")
+  endif()
 
-    #-----------------------------------------------------------------------------
-    # Set all packages needed by hermes
-    #-----------------------------------------------------------------------------
+  # Cereal
+  find_package(cereal REQUIRED)
+  if(cereal)
+    message(STATUS "found cereal")
+  endif()
 
-    # Set the Hermes library dependencies
-    set(Hermes_LIBRARIES yaml-cpp thallium
-            MPI::MPI_CXX stdc++fs dl cereal::cereal
-            hermes_shm_data_structures hermes)
-endif()
+  # Boost
+  find_package(Boost REQUIRED COMPONENTS regex system filesystem fiber REQUIRED)
+  if (Boost_FOUND)
+    message(STATUS "found boost at ${Boost_INCLUDE_DIRS}")
+  endif()
+
+  # Thallium
+  find_package(thallium CONFIG REQUIRED)
+  if(thallium_FOUND)
+    message(STATUS "found thallium at ${thallium_DIR}")
+  endif()
+
+  #-----------------------------------------------------------------------------
+  # Mark hermes as found and set all needed packages
+  #-----------------------------------------------------------------------------
+  if( Hermes_LIBRARY )
+    set(Hermes_LIBRARY_DIR "")
+    get_filename_component(Hermes_LIBRARY_DIRS ${Hermes_LIBRARY} PATH)
+    # Set uncached variables as per standard.
+    set(Hermes_FOUND ON)
+    set(Hermes_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${Hermes_INCLUDE_DIR})
+    set(Hermes_LIBRARIES
+            ${HermesShm_LIBRARIES}
+            yaml-cpp
+            cereal::cereal
+            -ldl -lrt -lc -pthread
+            thallium
+            hermes
+            ${Boost_LIBRARIES} ${Hermes_LIBRARY})
+    set(Hermes_CLIENT_LIBRARIES ${Hermes_LIBRARIES})
+  endif(Hermes_LIBRARY)
+
+else(Hermes_INCLUDE_DIR)
+  message(STATUS "FindHermes: Could not find Hermes.h")
+endif(Hermes_INCLUDE_DIR)
+	    
+if(Hermes_FOUND)
+  if(NOT Hermes_FIND_QUIETLY)
+    message(STATUS "FindHermes: Found both Hermes.h and libhrun_client.so")
+  endif(NOT Hermes_FIND_QUIETLY)
+else(Hermes_FOUND)
+  if(Hermes_FIND_REQUIRED)
+    message(STATUS "FindHermes: Could not find Hermes.h and/or libhrun_client.so")
+  endif(Hermes_FIND_REQUIRED)
+endif(Hermes_FOUND)
diff --git a/CMake/UseDoxygenDoc.cmake b/CMake/UseDoxygenDoc.cmake
deleted file mode 100644
index b9601910b..000000000
--- a/CMake/UseDoxygenDoc.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-find_package(Perl REQUIRED)
-find_package(Doxygen REQUIRED)
-
-function(add_doxygen_doc)
-  set(options)
-  set(oneValueArgs BUILD_DIR DOXY_FILE TARGET_NAME COMMENT)
-  set(multiValueArgs)
-
-  cmake_parse_arguments(DOXY_DOC
-    "${options}"
-    "${oneValueArgs}"
-    "${multiValueArgs}"
-    ${ARGN}
-    )
-
-  configure_file(
-    ${DOXY_DOC_DOXY_FILE}
-    ${DOXY_DOC_BUILD_DIR}/Doxyfile
-    @ONLY
-    )
-
-  add_custom_target(${DOXY_DOC_TARGET_NAME}
-    COMMAND
-      ${DOXYGEN_EXECUTABLE} Doxyfile
-    WORKING_DIRECTORY
-      ${DOXY_DOC_BUILD_DIR}
-    COMMENT
-      "Building ${DOXY_DOC_COMMENT} with Doxygen"
-    VERBATIM
-    )
-
-  message(STATUS "Added ${DOXY_DOC_TARGET_NAME} [Doxygen] target to build documentation")
-endfunction()
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8c4391ce..37b728f66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,504 +1,219 @@
-# CMakeLists files in this project can
-# refer to the root source directory of the project as ${HERMES_SOURCE_DIR} and
-# to the root binary directory of the project as ${HERMES_BINARY_DIR}.
-cmake_minimum_required (VERSION 3.10)
-
-if(CMAKE_SIZEOF_VOID_P LESS 8)
-  message(FATAL_ERROR "Hermes currently requires a 64-bit processor")
-endif()
-
-# Set a consistent MACOSX_RPATH default across all CMake versions.
-if(NOT DEFINED CMAKE_MACOSX_RPATH)
-  set(CMAKE_MACOSX_RPATH 0)
-endif()
-
-project(HERMES)
-set(IS_HERMES_MAIN ON)
-
-#------------------------------------------------------------------------------
-# Compiler optimization
-#------------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 17)
-add_compile_options("-fPIC")
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -fPIC")
-  # Ensure that debug logging is enabled
-  # This will keep logs which have beneath priority 10
-  add_compile_definitions(HERMES_LOG_VERBOSITY=10)
-  message("This is NOT a release build: ${CMAKE_BUILD_TYPE} ${CMAKE_CXX_FLAGS}")
-elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fPIC")
-  # Ensure that debug logging is enabled
-  # This will keep logs which have beneath priority 10
-  add_compile_definitions(HERMES_LOG_VERBOSITY=10)
-  message("This IS a release + debug build: ${CMAKE_BUILD_TYPE} ${CMAKE_CXX_FLAGS}")
-else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC")
-  # Ensure that debug logging is disabled
-  # This will keep only VLOGs which have priroity 0
-  add_compile_definitions(HERMES_LOG_VERBOSITY=1)
-  message("This IS a release build: ${CMAKE_BUILD_TYPE} ${CMAKE_CXX_FLAGS}")
-endif()
-
-#------------------------------------------------------------------------------
-# Version information
-#------------------------------------------------------------------------------
-set(HERMES_VERSION_MAJOR "1")
-set(HERMES_VERSION_MINOR "0")
-set(HERMES_VERSION_PATCH "0")
-set(HERMES_PACKAGE "hermes")
-set(HERMES_PACKAGE_NAME "HERMES")
-set(HERMES_PACKAGE_VERSION "${HERMES_VERSION_MAJOR}.${HERMES_VERSION_MINOR}.${HERMES_VERSION_PATCH}")
-set(HERMES_PACKAGE_VERSION_MAJOR "${HERMES_VERSION_MAJOR}.${HERMES_VERSION_MINOR}")
-set(HERMES_PACKAGE_VERSION_MINOR "${HERMES_VERSION_PATCH}")
-set(HERMES_PACKAGE_STRING "${HERMES_PACKAGE_NAME} ${HERMES_PACKAGE_VERSION}")
-set(HERMES_PACKAGE_TARNAME "${HERMES_PACKAGE}")
-
-#set( CMAKE_VERBOSE_MAKEFILE on )
-
-#------------------------------------------------------------------------------
-# Setup install and output Directories
-#------------------------------------------------------------------------------
-if(NOT HERMES_INSTALL_BIN_DIR)
-  set(HERMES_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-endif()
-if(NOT HERMES_INSTALL_LIB_DIR)
-  set(HERMES_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-if(NOT HERMES_INSTALL_INCLUDE_DIR)
-  set(HERMES_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
-endif()
-if(NOT HERMES_INSTALL_DATA_DIR)
-  set(HERMES_INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share)
-endif()
-
-#------------------------------------------------------------------------------
-# Setup CMake Environment
-#------------------------------------------------------------------------------
-# Export compile commands for autocode generation with CLANG
-# set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-if(APPLE)
-  # We are doing a unix-style install i.e. everything will be installed in
-  # CMAKE_INSTALL_PREFIX/bin and CMAKE_INSTALL_PREFIX/lib etc. as on other unix
-  # platforms. We still need to setup CMAKE_INSTALL_NAME_DIR correctly so that
-  # the binaries point to appropriate location for the libraries.
-
-  # 1. Make CMAKE_INSTALL_PREFIX publicly accessible, if it was hidden in
-  #    previous pass
-  get_property(is_internal CACHE CMAKE_INSTALL_PREFIX PROPERTY TYPE)
-  if(is_internal STREQUAL "INTERNAL")
-    set(CMAKE_INSTALL_PREFIX ${CACHED_CMAKE_INSTALL_PREFIX} CACHE PATH "Install prefix" FORCE)
-  else()
-    set(CMAKE_INSTALL_PREFIX ${CACHED_CMAKE_INSTALL_PREFIX} CACHE PATH "Install prefix")
-  endif()
-  unset(MACOSX_APP_INSTALL_PREFIX CACHE)
-
-  set(CMAKE_INSTALL_NAME_DIR "@rpath")
-  mark_as_advanced(
-    CMAKE_OSX_ARCHITECTURES
-    CMAKE_OSX_DEPLOYMENT_TARGET
-    CMAKE_OSX_SYSROOT
-    )
-endif()
-
-if(NOT CMAKE_INSTALL_RPATH)
-  set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-  set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif()
-
-#------------------------------------------------------------------------------
-if(NOT HERMES_EXTERNALLY_CONFIGURED)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
-    ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables."
-  )
-  set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-    ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries"
-  )
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-    ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries."
-  )
-endif()
-
-set(HERMES_CMAKE_DIR "${HERMES_SOURCE_DIR}/CMake")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${HERMES_CMAKE_DIR})
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${ORTOOLS_DIR} ${ORTOOLS_ROOT})
-
-#------------------------------------------------------------------------------
-# Disallow in-source build
-#------------------------------------------------------------------------------
-if("${HERMES_SOURCE_DIR}" STREQUAL "${HERMES_BINARY_DIR}")
-  message(FATAL_ERROR
-    "HERMES requires an out of source Build. "
-    "Please create a separate binary directory and run CMake there.")
-endif()
-
-#------------------------------------------------------------------------------
-# Set a default build type if none was specified
-#------------------------------------------------------------------------------
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
-    "MinSizeRel" "RelWithDebInfo")
-endif()
-
-if(NOT "${CMAKE_CXX_STANDARD}")
-  set(CMAKE_CXX_STANDARD 17)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
 
 #-----------------------------------------------------------------------------
-# Targets built within this project are exported at Install time for use
-# by other projects.
+# Define Options
 #-----------------------------------------------------------------------------
-if(NOT HERMES_EXPORTED_TARGETS)
-  set(HERMES_EXPORTED_TARGETS "hermes-targets")
-endif()
+option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+option(BUILD_MPI_TESTS "Build tests which depend on MPI" ON)
+option(BUILD_OpenMP_TESTS "Build tests which depend on OpenMP" ON)
+option(HERMES_ENABLE_COVERAGE "Check how well tests cover code" OFF)
+option(HERMES_ENABLE_DOXYGEN "Check how well the code is documented" OFF)
 
-#------------------------------------------------------------------------------
-# Build options
-#------------------------------------------------------------------------------
-option(BUILD_SHARED_LIBS "Build with shared libraries." ON)
-option(HERMES_COMMUNICATION_MPI "Use MPI as the communication layer." ON)
-option(HERMES_ENABLE_DOXYGEN "Enable hermes documentation." OFF)
-option(HERMES_BUILD_BUFFER_POOL_VISUALIZER "Build the BufferPool visualizer" OFF)
-option(HERMES_USE_ADDRESS_SANITIZER "Enable -fsanitize=address in Debug builds" OFF)
-option(HERMES_USE_THREAD_SANITIZER "Enable -fsanitize=thread in Debug builds" OFF)
-option(HERMES_RPC_THALLIUM "Use Thallium as the RPC library." ON)
-option(HERMES_BUILD_BENCHMARKS "Build the Hermes benchmark suite." ON)
-option(HERMES_ENABLE_COVERAGE "Enable code coverage." OFF)
 option(HERMES_ENABLE_POSIX_ADAPTER "Build the Hermes POSIX adapter." ON)
 option(HERMES_ENABLE_STDIO_ADAPTER "Build the Hermes stdio adapter." ON)
 option(HERMES_ENABLE_MPIIO_ADAPTER "Build the Hermes MPI-IO adapter." ON)
-option(HERMES_ENABLE_PUBSUB_ADAPTER "Build the Hermes pub/sub adapter." ON)
+option(HERMES_ENABLE_PUBSUB_ADAPTER "Build the Hermes pub/sub adapter." OFF)
 option(HERMES_ENABLE_KVSTORE "Build the Hermes KVStore adapter." OFF)
 option(HERMES_ENABLE_VFD "Build the Hermes HDF5 Virtual File Driver" OFF)
-option(HERMES_BUILD_ADAPTER_TESTS "Enable installation of tests." ON)
-option(HERMES_INSTALL_TESTS "Enable installation of tests." OFF)
-option(HERMES_ONLY_RPC "Avoids the shared-memory case in RPC for testing" OFF)
-option(HERMES_ENABLE_PROFILING "Enables profiling of certain functions" OFF)
-option(HERMES_ENABLE_C_BINDINGS "Used for compiling java API" OFF)
-option(HERMES_ENABLE_JAVA_BINDINGS "Used for compiling java API" OFF)
-option(HERMES_ENABLE_PYTHON_BINDINGS "Used for compiling python API" OFF)
-option(BUILD_HSHM_TESTS "Build data structure tests" OFF)
-
-option(HERMES_PTHREADS_ENABLED "Support spawning pthreads" ON)
-option(HERMES_DEBUG_LOCK "Used for debugging locks" OFF)
+option(HERMES_ENABLE_PYTHON "Build the Hermes Python wrapper" ON)
 
-# Compile definitions
-if (HERMES_PTHREADS_ENABLED)
-  add_compile_definitions(HERMES_PTHREADS_ENABLED)
-endif()
-if (HERMES_RPC_THALLIUM)
-  add_compile_definitions(HERMES_RPC_THALLIUM)
-endif()
-if (HERMES_DEBUG_LOCK)
-  message("Lock debugging enabled")
-  add_compile_definitions(HERMES_DEBUG_LOCK)
-endif()
-
-# Calculate code coverage with debug mode
-if(HERMES_ENABLE_COVERAGE)
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(STATUS "Use code coverage with debug mode")
-    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "" FORCE)
-  endif()
-endif()
+message("HERMES_ENABLE_PYTHON: ${HERMES_ENABLE_PYTHON}")
 
-if(BUILD_SHARED_LIBS)
-  set(HERMES_BUILD_SHARED_LIBS 1)
-  set(HERMES_LIBTYPE SHARED)
+#-----------------------------------------------------------------------------
+# Compiler Optimization
+#-----------------------------------------------------------------------------
+set(CMAKE_CXX_STANDARD 17)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message("IN DEBUG MODE")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
+    add_compile_definitions(HERMES_LOG_VERBOSITY=10)
 else()
-  message(FATAL_ERROR "Must build hermes with shared libs")
+    message("IN RELEASE MODE")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3")
+    add_compile_definitions(HERMES_LOG_VERBOSITY=1)
 endif()
+add_compile_options(-march=native -fomit-frame-pointer)
 
-# TODO(chogan): Expose this once we have more than one communication layer
-mark_as_advanced(HERMES_COMMUNICATION_MPI)
-# TODO(chogan): Expose this once we support more than one RPC layer
-mark_as_advanced(HERMES_RPC_THALLIUM)
-
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  if (NOT "${CMAKE_CXX_FLAGS_DEBUG}" MATCHES ".*-g3.*")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3"
-        CACHE STRING "" FORCE)
-  endif()
-
-  if (HERMES_USE_ADDRESS_SANITIZER)
-    if(NOT "${CMAKE_CXX_FLAGS_DEBUG}" MATCHES ".*-fsanitize=address.*")
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address"
-        CACHE STRING "" FORCE)
-    endif()
-  else()
-    string(REPLACE
-      "-fsanitize=address" "" FLAGS_NO_SANITIZE "${CMAKE_CXX_FLAGS_DEBUG}")
-    set(CMAKE_CXX_FLAGS_DEBUG "${FLAGS_NO_SANITIZE}" CACHE STRING "" FORCE)
-  endif()
-
-  if (HERMES_USE_THREAD_SANITIZER AND HERMES_USE_ADDRESS_SANITIZER)
-    message(FATAL_ERROR "Cannont use -fsanitize=address and -fsanitize=thread "
-                        "at the same time")
-  else()
-    if (HERMES_USE_THREAD_SANITIZER)
-      if(NOT "${CMAKE_CXX_FLAGS_DEBUG}" MATCHES ".*-fsanitize=thread.*")
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=thread"
-          CACHE STRING "" FORCE)
-      endif()
-    else()
-      string(REPLACE
-        "-fsanitize=thread" "" FLAGS_NO_SANITIZE "${CMAKE_CXX_FLAGS_DEBUG}")
-      set(CMAKE_CXX_FLAGS_DEBUG "${FLAGS_NO_SANITIZE}" CACHE STRING "" FORCE)
-    endif()
-  endif()
+#-----------------------------------------------------------------------------
+# Targets built within this project are exported at Install time for use
+# by other projects.
+#-----------------------------------------------------------------------------
+if(NOT HERMES_EXPORTED_TARGETS)
+    set(HERMES_EXPORTED_TARGETS "hrun-targets")
 endif()
 
-#-------------------------------------------------------------------------------
-function(hermes_set_lib_options libtarget libname libtype)
-  if(${libtype} MATCHES "SHARED")
-    if(WIN32 AND NOT MINGW)
-      set(LIB_RELEASE_NAME "${libname}")
-      set(LIB_DEBUG_NAME "${libname}_D")
-      set(LIB_VERSION ${HERMES_PACKAGE_VERSION_MAJOR})
-    else()
-      set(LIB_RELEASE_NAME "${libname}")
-      set(LIB_DEBUG_NAME "${libname}_debug")
-      set(LIB_VERSION ${HERMES_PACKAGE_VERSION})
-    endif()
-  else()
-    if(WIN32 AND NOT MINGW)
-      set(LIB_RELEASE_NAME "lib${libname}")
-      set(LIB_DEBUG_NAME "lib${libname}_D")
-    else()
-      # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
-      if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        set(LIB_RELEASE_NAME "${libname}")
-        set(LIB_DEBUG_NAME "${libname}_debug")
-      else()
-        set(LIB_RELEASE_NAME "lib${libname}")
-        set(LIB_DEBUG_NAME "lib${libname}_debug")
-      endif()
-    endif()
-  endif()
+#-----------------------------------------------------------------------------
+# Find Packages
+#-----------------------------------------------------------------------------
 
-  set_target_properties(${libtarget}
-    PROPERTIES
-    DEBUG_OUTPUT_NAME          ${LIB_DEBUG_NAME}
-    RELEASE_OUTPUT_NAME        ${LIB_RELEASE_NAME}
-    MINSIZEREL_OUTPUT_NAME     ${LIB_RELEASE_NAME}
-    RELWITHDEBINFO_OUTPUT_NAME ${LIB_RELEASE_NAME}
-    VERSION                    ${LIB_VERSION}
-    SOVERSION                  ${LIB_VERSION}
-  )
+# HermesShm
+find_package(HermesShm CONFIG REQUIRED)
+message(STATUS "found hermes_shm.h at ${HermesShm_INCLUDE_DIRS}")
 
-  #----- Use MSVC Naming conventions for Shared Libraries
-  if(MINGW AND ${libtype} MATCHES "SHARED")
-    set_target_properties(${libtarget}
-      PROPERTIES
-      IMPORT_SUFFIX ".lib"
-      IMPORT_PREFIX ""
-      PREFIX ""
-    )
-  endif()
-endfunction()
+# YAML-CPP
+find_package(yaml-cpp REQUIRED)
+message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
 
-#-----------------------------------------------------------------------------
-# Dependencies common to all subdirectories
-#-----------------------------------------------------------------------------
-# thallium
-if(HERMES_RPC_THALLIUM)
-  find_package(thallium CONFIG REQUIRED)
-  if(thallium_FOUND)
-    message(STATUS "found thallium at ${thallium_DIR}")
-  endif()
+# Catch2
+find_package(Catch2 3.0.1 REQUIRED)
+message(STATUS "found catch2.h at ${Catch2_CXX_INCLUDE_DIRS}")
+
+# MPICH
+if(BUILD_MPI_TESTS)
+    find_package(MPI REQUIRED COMPONENTS C CXX)
+    message(STATUS "found mpi.h at ${MPI_CXX_INCLUDE_DIRS}")
 endif()
 
-#YAML-CPP
-find_package(yaml-cpp REQUIRED)
-if(yaml-cpp_FOUND)
-  message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
+# OpenMP
+if(BUILD_OpenMP_TESTS)
+    find_package(OpenMP REQUIRED COMPONENTS C CXX)
+    message(STATUS "found omp.h at ${OpenMP_CXX_INCLUDE_DIRS}")
 endif()
 
-#Cereal
+# Cereal
 find_package(cereal REQUIRED)
 if(cereal)
-  message(STATUS "found cereal")
-endif()
-
-#if(HERMES_COMMUNICATION_MPI)
-find_package(MPI REQUIRED COMPONENTS C CXX)
-message(STATUS "found mpi.h at ${MPI_CXX_INCLUDE_DIRS}")
-#endif()
-
-# librt
-if(NOT APPLE)
-  find_library(LIBRT rt)
-  if(NOT LIBRT)
-    message(FATAL_ERROR "librt is required for POSIX shared memory")
-  endif()
+    message(STATUS "found cereal")
 endif()
 
-# HDF5
-if(HERMES_ENABLE_VFD)
-  set(HERMES_REQUIRED_HDF5_VERSION 1.14.0)
-  set(HERMES_REQUIRED_HDF5_COMPONENTS C)
-  find_package(HDF5 ${HERMES_REQUIRED_HDF5_VERSION} CONFIG NAMES hdf5
-    COMPONENTS ${HERMES_REQUIRED_HDF5_COMPONENTS} shared)
-  if(HDF5_FOUND)
-    message(STATUS "found HDF5 ${HDF5_VERSION} at ${HDF5_INCLUDE_DIR}")
-    set(HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES
-      ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
-      ${HDF5_INCLUDE_DIR})
-    set(HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES
-      ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES}
-      ${HDF5_C_SHARED_LIBRARY})
-  else()
-    # Allow for HDF5 autotools builds
-    find_package(HDF5 ${HERMES_REQUIRED_HDF5_VERSION} MODULE REQUIRED
-      COMPONENTS ${HERMES_REQUIRED_HDF5_COMPONENTS})
-    if(HDF5_FOUND)
-      set(HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES
-        ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
-        ${HDF5_INCLUDE_DIRS})
-      set(HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES
-        ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES}
-        ${HDF5_LIBRARIES})
-    else()
-      message(FATAL_ERROR "Could not find HDF5, please set HDF5_DIR (1.13.0) or HDF5_ROOT (1.13.1).")
-    endif()
-  endif()
+# Pkg-Config
+find_package(PkgConfig REQUIRED)
+if(PkgConfig)
+    message(STATUS "found pkg config")
 endif()
 
-#-----------------------------------------------------------------------------
-# Coverage
-#-----------------------------------------------------------------------------
-if(HERMES_ENABLE_COVERAGE)
-  set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage" CACHE STRING
-    "Flags to the coverage program to perform coverage inspection"
-  )
-  mark_as_advanced(COVERAGE_FLAGS)
+# Zeromq
+#pkg_check_modules(ZMQ REQUIRED libzmq)
+#include_directories(${ZMQ_INCLUDE_DIRS})
+#message("Found libzmq at: ${ZMQ_INCLUDE_DIRS}")
 
-  macro(set_coverage_flags target)
-    set_target_properties(${target}
-      PROPERTIES
-        COMPILE_FLAGS ${COVERAGE_FLAGS}
-        LINK_FLAGS ${COVERAGE_FLAGS}
-    )
-  endmacro()
+# Thallium
+find_package(thallium CONFIG REQUIRED)
+if(thallium_FOUND)
+    message(STATUS "found thallium at ${thallium_DIR}")
 endif()
 
-#-----------------------------------------------------------------------------
-# Enable Testing
-#-----------------------------------------------------------------------------
-# General function used to hook ctest to python test tool lib
-function(pytest test_type test_name)
-  set(script ${CMAKE_SOURCE_DIR}/ci/py_hermes_ci/bin/run_test)
-  add_test(NAME ${test_name}
-          COMMAND ${script} ${test_type} ${test_name} ${CMAKE_BINARY_DIR} ${HERMES_USE_ADDRESS_SANITIZER})
-endfunction()
-
-include(CTest)
-
-# Add testing directory
-if(CMAKE_PROJECT_NAME STREQUAL HERMES AND BUILD_TESTING)
-  find_package(Catch2 3.0.1 REQUIRED)
-  find_program(IOR_EXE ior)
-  if(IOR_EXE)
-    message(STATUS "Found ior at ${IOR_EXE}")
-    set(HERMES_HAVE_IOR "YES")
-  else()
-    message(WARNING "Couldn't find the 'ior' executable. Some tests will be skipped.")
-    set(HERMES_HAVE_IOR "NO")
-  endif()
-  enable_testing()
+# Boost
+find_package(Boost REQUIRED COMPONENTS regex system filesystem fiber REQUIRED)
+if (Boost_FOUND)
+    message(STATUS "found boost at ${Boost_INCLUDE_DIRS}")
 endif()
+include_directories(${Boost_INCLUDE_DIRS})
+message("Boost: ${Boost_LIBRARIES}")
 
-#-----------------------------------------------------------------------------
-# Source
-#-----------------------------------------------------------------------------
-
-set(HERMES_EXPORTED_LIBS "")
-
-include_directories(${CMAKE_SOURCE_DIR}/hermes_shm/include)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
-add_subdirectory(${CMAKE_SOURCE_DIR}/hermes_shm)
-add_subdirectory(${CMAKE_SOURCE_DIR}/wrapper)
-
-add_custom_target(rpc COMMAND bash
-        ${CMAKE_SOURCE_DIR}/code_generators/code_generators/rpc/rpcgen.sh
-        "${CMAKE_SOURCE_DIR}"
-        "${CMAKE_BINARY_DIR}")
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/data_stager)
+#------------------------------------------------------------------------------
+# Setup CMake Environment
+#------------------------------------------------------------------------------
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables.")
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries.")
 
-##### ADAPTERS
-if(HERMES_ENABLE_STDIO_ADAPTER OR HERMES_ENABLE_POSIX_ADAPTER OR
-    HERMES_ENABLE_MPIIO_ADAPTER OR HERMES_ENABLE_PUBSUB_ADAPTER OR
-    HERMES_ENABLE_VFD)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/adapter)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/traits)
+#------------------------------------------------------------------------------
+# Setup install and output Directories
+#------------------------------------------------------------------------------
+if(NOT HERMES_INSTALL_BIN_DIR)
+    set(HERMES_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
 endif()
-
-#-----------------------------------------------------------------------------
-# Testing Sources
-#-----------------------------------------------------------------------------
-if(CMAKE_PROJECT_NAME STREQUAL HERMES AND BUILD_TESTING)
-  add_subdirectory(test)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/data_stager/test)
+if(NOT HERMES_INSTALL_LIB_DIR)
+    set(HERMES_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
 endif()
-
-#-----------------------------------------------------------------------------
-# Documentation
-#-----------------------------------------------------------------------------
-
-if(HERMES_ENABLE_DOXYGEN)
-  include(UseDoxygenDoc)
-
-  add_doxygen_doc(
-    BUILD_DIR
-      ${CMAKE_CURRENT_BINARY_DIR}/_build
-    DOXY_FILE
-      ${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in
-    TARGET_NAME
-      dox
-    COMMENT
-      "HTML documentation"
-    )
+if(NOT HERMES_INSTALL_INCLUDE_DIR)
+    set(HERMES_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
 endif()
-
-#-----------------------------------------------------------------------------
-# Benchmarks
+if(NOT HERMES_INSTALL_DATA_DIR)
+    set(HERMES_INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share)
+endif()
+
+#-----------------------------------------------------------------------------
+# Build Hermes Main Packages
+#-----------------------------------------------------------------------------
+# Main includes
+include_directories(${HermesShm_INCLUDE_DIRS})
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include)
+# Required Task includes
+include_directories(${CMAKE_SOURCE_DIR}/hrun/include)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required/hrun_admin/include)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required/small_message/include)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required/remote_queue/include)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required/worch_proc_round_robin/include)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required/worch_queue_round_robin/include)
+include_directories(${CMAKE_SOURCE_DIR}/hrun/tasks_required/proc_queue/include)
+# Task includes
+include_directories(${CMAKE_SOURCE_DIR}/tasks)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hermes/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/bdev/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/ram_bdev/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/posix_bdev/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hermes_mdm/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hermes_blob_mdm/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hermes_bucket_mdm/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hermes_adapters/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/data_stager/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hermes_data_op/include)
+# Test includes
+include_directories(${CMAKE_SOURCE_DIR}/test/unit)
+
+set(Hermes_CLIENT_LIBRARIES
+        ${HermesShm_LIBRARIES}
+        yaml-cpp
+        cereal::cereal
+        -ldl -lrt -lc -pthread hrun_client)
+set(Hermes_CLIENT_DEPS
+        hrun_client)
+set(Hermes_RUNTIME_LIBRARIES
+        ${Hermes_CLIENT_LIBRARIES}
+        hrun_runtime
+        ${Boost_LIBRARIES})
+set(Hermes_RUNTIME_DEPS
+        hrun_client hrun_runtime)
+
+set(TEST_MAIN ${CMAKE_SOURCE_DIR}/test/unit)
+if (HERMES_ENABLE_PYTHON)
+add_subdirectory(external/pybind11)
+endif()
+add_subdirectory(hrun)
+add_subdirectory(src)
+add_subdirectory(hermes_adapters)
+add_subdirectory(tasks)
+add_subdirectory(benchmark)
+add_subdirectory(wrapper)
+add_custom_target(lint COMMAND bash ${CMAKE_SOURCE_DIR}/ci/lint.sh ${CMAKE_SOURCE_DIR})
+
+#-----------------------------------------------------------------------------
+# Build + Enable Testing
 #-----------------------------------------------------------------------------
-if(HERMES_BUILD_BENCHMARKS)
-  message("Building benchmarks")
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/benchmarks)
-endif()
-
-install(
-  FILES
-        test/data/hermes_server.yaml
-  TYPE
-    DATA
-  RENAME
-    hermes_sample.yaml
-)
+# General function used to hook ctest to python test tool lib
+function(pytest test_type test_name)
+    set(script ${CMAKE_SOURCE_DIR}/scripts/ci/py_hermes_ci/bin/run_test)
+#    add_test(NAME ${test_name}
+#            COMMAND ${script} ${test_type} ${test_name} ${CMAKE_BINARY_DIR} ${HERMES_USE_ADDRESS_SANITIZER})
+endfunction()
 
-add_custom_target(lint
-  COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/ci/lint.sh ${CMAKE_CURRENT_SOURCE_DIR}
-)
+enable_testing()
+add_subdirectory(test)
 
 #-----------------------------------------------------------------------------
-# Install HermesConfig.cmake
+# Install Hermes Headers
 #-----------------------------------------------------------------------------
 configure_file(
-        ${HERMES_SOURCE_DIR}/CMake/HermesConfig.cmake
-        ${HERMES_BINARY_DIR}/CMakeFiles/HermesConfig.cmake @ONLY
+        ${CMAKE_CURRENT_SOURCE_DIR}/CMake/HermesConfig.cmake
+        ${PROJECT_BINARY_DIR}/CMakeFiles/HermesConfig.cmake @ONLY
 )
 
 install(
-  FILES
-    ${HERMES_BINARY_DIR}/CMakeFiles/HermesConfig.cmake
-  DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/cmake
+        FILES
+        ${PROJECT_BINARY_DIR}/CMakeFiles/HermesConfig.cmake
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/cmake
 )
+
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
\ No newline at end of file
diff --git a/COPYING b/COPYING
deleted file mode 100644
index bb9689a91..000000000
--- a/COPYING
+++ /dev/null
@@ -1,52 +0,0 @@
-Copyright Notice and License Terms for
-Hermes I/O Buffering Software Library and Utilities
-
-------------------------------------------------------------------------------
-
-Hermes I/O Buffering Software Library and Utilities
-Copyright 2018-2021, The HDF Group and Illinois Institute of Technology
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of The HDF Group, Illinois Institute of Technology, nor
-  the names of Contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-DISCLAIMER:
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-You are under no obligation whatsoever to provide any bug fixes, patches, or
-upgrades to the features, functionality or performance of the source code
-("Enhancements") to anyone; however, if you choose to make your Enhancements
-available either publicly, or directly to the copyright holders, without
-imposing a separate written license agreement for such Enhancements, then you
-hereby grant the following license: a non-exclusive, royalty-free perpetual
-license to install, use, modify, prepare derivative works, incorporate into
-other computer software, distribute, and sublicense such enhancements or
-derivative works thereof, in binary and source code form.
-
-------------------------------------------------------------------------------
-
-Hermes was developed with support from the National Science Foundation (NSF)
-under award NSF OCI-1835764.
diff --git a/README.md b/README.md
index 53d224120..dec668244 100644
--- a/README.md
+++ b/README.md
@@ -22,50 +22,28 @@ Hermes is a heterogeneous-aware, multi-tiered, dynamic, and distributed I/O buff
 
 [Spack](https://spack.io/) is the easiest way to get Hermes and all its dependencies installed.
 
-```bash
-# Install spack if you don't already have it
-SPACK_DIR=~/spack
-git clone https://github.com/spack/spack ${SPACK_DIR}
-. ${SPACK_DIR}/share/spack/setup-env.sh
-spack install hermes
-```
-
-If this doesn't work, the Hermes and Mochi spack recipes might be out of sync
-with the version of spack you're using. In that case, you can try the most
-up-to-date repos.
-
 ```bash
 # set location of hermes_file_staging
-STAGE_DIR=~/hermes_stage
-MOCHI_REPO=${STAGE_DIR}/mochi
-HERMES_REPO=${STAGE_DIR}/hermes
-git clone https://github.com/mochi-hpc/mochi-spack-packages.git ${MOCHI_REPO}
-git clone https://github.com/HDFGroup/hermes ${HERMES_REPO}
-spack repo add ${MOCHI_REPO}
+git clone https://github.com/HDFGroup/hermes
 spack repo add ${HERMES_REPO}/ci/hermes
-spack install hermes
+# The stable 1.1. development branch
+spack install hermes@hdf-1.1
+# The unstable 1.1. development branch
+spack install hermes@dev-1.1
 ```
 
 ### CMake
 
 Hermes makes use of the CMake build system and requires an out of source build.
 
-    cd /path/to/hermes
-    mkdir build
-    cd build
-    ccmake ..
-
-Type 'c' to configure until there are no errors, then generate the makefile with 'g'. The default options should suffice for most use cases. In addition, we recommend the following options.
-
-    -DCMAKE_INSTALL_PREFIX=/installation/prefix
-    -DCMAKE_PREFIX_PATH=/path/to/dependencies
-    -DCMAKE_BUILD_RPATH=/path/to/dependencies/lib
-    -DCMAKE_INSTALL_RPATH=/path/to/dependencies/lib
-    -DCMAKE_BUILD_TYPE=Release
-    -DCMAKE_CXX_COMPILER=`which mpicxx`
-    -DBUILD_SHARED_LIBS=ON
-
-After the makefile has been generated, you can type `make -j 4` or `cmake --build . -- -j 4`. Add `VERBOSE=1` to see detailed compiler output.
+```
+cd /path/to/hermes
+mkdir build
+cd build
+cmake ../ -DCMAKE_BUILD_TYPE=Relase -DCMAKE_INSTALL_PREFIX=...
+make -j8
+make install
+```
 
 ### Testing and Installation
 
diff --git a/adapter/CMakeLists.txt b/adapter/CMakeLists.txt
deleted file mode 100644
index 1f4b884f0..000000000
--- a/adapter/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# Set hermes to preload if adapter is linked.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHERMES_PRELOAD -DHERMES_RPC_THALLIUM")
-
-set(HERMES_SRC_DIR ${CMAKE_SOURCE_DIR}/src)
-set(HERMES_ADAPTER_DIR ${CMAKE_SOURCE_DIR}/adapter)
-set(HERMES_IO_CLIENT_DIR ${CMAKE_SOURCE_DIR}/io_client)
-
-include_directories(
-        ${CMAKE_SOURCE_DIR}
-        ${HERMES_SRC_DIR}
-        ${HERMES_ADAPTER_DIR}
-        ${HERMES_IO_CLIENT_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR})
-
-add_subdirectory(filesystem)
-if(HERMES_ENABLE_POSIX_ADAPTER)
-  add_subdirectory(posix)
-endif()
-if(HERMES_ENABLE_STDIO_ADAPTER)
-  add_subdirectory(stdio)
-endif()
-if(HERMES_ENABLE_MPIIO_ADAPTER)
-  add_subdirectory(mpiio)
-endif()
-if(HERMES_ENABLE_VFD)
-  add_subdirectory(vfd)
-endif()
-if(HERMES_ENABLE_KVSTORE)
-  add_subdirectory(kvstore)
-endif()
-if(HERMES_BUILD_ADAPTER_TESTS)
-  add_subdirectory(test)
-endif()
-
-#-----------------------------------------------------------------------------
-# Specify project header files to be installed
-#-----------------------------------------------------------------------------
-file(GLOB_RECURSE HERMES_HEADERS "*.h")
-
-#-----------------------------------------------------------------------------
-# Add file(s) to CMake Install
-#-----------------------------------------------------------------------------
-install(
-        FILES
-        ${HERMES_HEADERS}
-        DESTINATION
-        ${HERMES_INSTALL_INCLUDE_DIR}/adapter
-        COMPONENT
-        headers
-)
\ No newline at end of file
diff --git a/adapter/kvstore/README.md b/adapter/kvstore/README.md
deleted file mode 100644
index 96b62be0e..000000000
--- a/adapter/kvstore/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# KVStore
-
-The Hermes KVStore adapter provides a simplistic in-memory key-value store
-interface similar to that of Redis. Currently, we only provide the minimum
-functionality to benchmark KVStore over the YCSB benchmark.
-
-## Current Operation Support
-
-Below we describe the operations our KVStore currently supports:
-1. Create a table: a table contains a set of records.
-2. Create a record: a record is a <key, ARRAY(<field, value>)>. The ARRAY
-is stored as a single blob in Hermes. Updating a field in a record will
-require reading the entire blob.
-3. Update a record
-4. Get a set of fields from a record
-5. Scan a subset of records
-6. Delete a record
-7. Delete a table
\ No newline at end of file
diff --git a/adapter/kvstore/java/build.gradle b/adapter/kvstore/java/build.gradle
deleted file mode 100644
index 1c0d21482..000000000
--- a/adapter/kvstore/java/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This build file was generated by the Gradle 'init' task.
- *
- * This generated file contains a commented-out sample Java project to get you started.
- * For more details take a look at the Java Quickstart chapter in the Gradle
- * user guide available at https://docs.gradle.org/4.4.1/userguide/tutorial_java_projects.html
- */
-
-// Apply the java plugin to add support for Java
-apply plugin: 'java'
-
-// In this section you declare where to find the dependencies of your project
-repositories {
-    // Use 'jcenter' for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    jcenter()
-}
-
-// In this section you declare the dependencies for your production and test code
-dependencies {
-    // The production code uses the SLF4J logging API at compile time
-    compile 'org.slf4j:slf4j-api:1.7.25'
-
-    // Declare the dependency for your favourite test framework you want to use in your tests.
-    // TestNG is also supported by the Gradle Test task. Just change the
-    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
-    // 'test.useTestNG()' to your build script.
-    testCompile 'junit:junit:4.12'
-
-    compile files('../../../wrapper/java/build/libs/hermes-1.0.0.jar')
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir 'src/kvstore/java'
-        }
-    }
-
-    test {
-        java {
-            srcDir 'src/test/java'
-        }
-    }
-}
-
-test {
-    useJUnit()
-}
\ No newline at end of file
diff --git a/adapter/kvstore/java/gradle/wrapper/gradle-wrapper.jar b/adapter/kvstore/java/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 99340b4ad..000000000
Binary files a/adapter/kvstore/java/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/adapter/kvstore/java/gradle/wrapper/gradle-wrapper.properties b/adapter/kvstore/java/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 2c2bbe5f9..000000000
--- a/adapter/kvstore/java/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
diff --git a/adapter/kvstore/java/gradlew b/adapter/kvstore/java/gradlew
deleted file mode 100755
index cccdd3d51..000000000
--- a/adapter/kvstore/java/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/adapter/kvstore/java/gradlew.bat b/adapter/kvstore/java/gradlew.bat
deleted file mode 100644
index e95643d6a..000000000
--- a/adapter/kvstore/java/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/adapter/kvstore/java/settings.gradle b/adapter/kvstore/java/settings.gradle
deleted file mode 100644
index 371bf447f..000000000
--- a/adapter/kvstore/java/settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This settings file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/4.4.1/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
-rootProject.name = 'hermes_kvstore-1.0.0'
diff --git a/adapter/kvstore/java/src/kvstore/java/KVStore.java b/adapter/kvstore/java/src/kvstore/java/KVStore.java
deleted file mode 100644
index 8bd924830..000000000
--- a/adapter/kvstore/java/src/kvstore/java/KVStore.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package hermes_kvstore.java;
-import hermes_kvstore.java.KVTable;
-import hermes.java.Hermes;
-
-public class KVStore {
-    public static void connect() {
-        Hermes hermes = Hermes.getInstance();
-        hermes.create();
-    }
-
-    public static KVTable getTable(String table_name) {
-        return new KVTable(table_name);
-    }
-}
diff --git a/adapter/kvstore/java/src/kvstore/java/KVTable.java b/adapter/kvstore/java/src/kvstore/java/KVTable.java
deleted file mode 100644
index 596226ada..000000000
--- a/adapter/kvstore/java/src/kvstore/java/KVTable.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package hermes_kvstore.java;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import hermes.java.Hermes;
-import hermes.java.Bucket;
-import hermes.java.Blob;
-import hermes.java.MdLockType;
-import hermes.java.UniqueId;
-
-public class KVTable {
-  Bucket bkt_;
-
-  /** Emplace Constructor */
-  KVTable(String table_name) {
-    Hermes hermes = Hermes.getInstance();
-    bkt_ = hermes.getBucket(table_name);
-  }
-
-  /** Serialize a Map into a blob */
-  private <T> Blob blobSerialize(T obj) throws IOException {
-    try {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      ObjectOutputStream oos = new ObjectOutputStream(baos);
-      oos.writeObject(obj);
-      oos.close();
-      byte[] bytes = baos.toByteArray();
-      return new Blob(ByteBuffer.wrap(bytes));
-    } catch (IOException e) {
-      e.printStackTrace();
-      throw e;
-    }
-  }
-
-  /** Deserialize a Map from a blob */
-  private <T> T blobDeserialize(Blob blob) throws IOException, ClassNotFoundException {
-    try {
-      byte[] bytes = blob.array();
-      ByteArrayInputStream istream = new ByteArrayInputStream(bytes);
-      ObjectInputStream ois = new ObjectInputStream(istream);
-      T obj = (T) ois.readObject();
-      ois.close();
-      blob.close();
-      return obj;
-    } catch (IOException e) {
-      e.printStackTrace();
-      throw e;
-    } catch (ClassNotFoundException e) {
-      e.printStackTrace();
-      throw e;
-    }
-  }
-
-  public String getFieldKey(String key, String field_name) {
-    return String.format("%s-%s", key, field_name);
-  }
-
-  public String getKvMetadataKey() {
-    return "hermes-kvmetadata";
-  }
-
-  /**
-   * Insert a new record into the table
-   * */
-  public <T> void insert(String key, Map<String, T> val) throws IOException {
-    /*UniqueId md_id = bkt_.getBlobId(getKvMetadataKey());
-    if (md_id.isNull()) {
-      Set<String> keys = new HashSet<String>(val.keySet());
-      Blob md_blob = blobSerialize(keys);
-      bkt_.put(getKvMetadataKey(), md_blob);
-      md_blob.close();
-    }
-    for (Map.Entry<String, T> entry : val.entrySet()) {
-      String field_key = getFieldKey(key, entry.getKey());
-      Blob blob = blobSerialize(entry.getValue());
-      bkt_.put(field_key, blob);
-      blob.close();
-    }*/
-    Blob blob = blobSerialize(val);
-    bkt_.put(key, blob);
-    blob.close();
-  }
-
-  /**
-   * Create or insert a record into the table
-   *
-   * @param key the record key
-   * @param val the values to update in the record
-   * @return None
-   * */
-  public <T> void update(String key, Map<String, T> val) throws IOException, ClassNotFoundException {
-    /*insert(key, val);*/
-    UniqueId blob_id = bkt_.getBlobId(key);
-    if (blob_id.isNull()) {
-      insert(key, val);
-    } else {
-      bkt_.lockBlob(blob_id, MdLockType.kExternalWrite);
-      Blob orig_blob = bkt_.get(blob_id);
-      Map<String, T> old_val = blobDeserialize(orig_blob);
-      old_val.putAll(val);
-      Blob new_blob = blobSerialize(old_val);
-      bkt_.put(key, new_blob);
-      bkt_.unlockBlob(blob_id, MdLockType.kExternalWrite);
-      new_blob.close();
-    }
-  }
-
-  /**
-   * Get a subset of fields from a record
-   *
-   * @param key the record key
-   * @param field_set the field in the record to update
-   * @return The blob containing only the field's data
-   * */
-  public <T> Map<String, T> read(String key, Set<String> field_set) throws IOException, ClassNotFoundException {
-    /*HashMap<String, T> map = new HashMap<String, T>();
-    if (field_set.isEmpty()) {
-      UniqueId md_id = bkt_.getBlobId(getKvMetadataKey());
-      Blob md_blob = bkt_.get(md_id);
-      field_set = (HashSet<String>)blobDeserialize(md_blob);
-    }
-    for (String field_name : field_set) {
-      UniqueId blob_id = bkt_.getBlobId(getFieldKey(key, field_name));
-      Blob blob = bkt_.get(blob_id);
-      map.put(field_name, blobDeserialize(blob));
-    }
-    return map;*/
-
-    UniqueId blob_id = bkt_.getBlobId(key);
-    bkt_.lockBlob(blob_id, MdLockType.kExternalRead);
-    Blob orig_blob = bkt_.get(blob_id);
-    Map<String, T> old_val = blobDeserialize(orig_blob);
-    bkt_.unlockBlob(blob_id, MdLockType.kExternalRead);
-    return old_val;
-  }
-
-  public <T> Map<String, T> read(String key) throws IOException, ClassNotFoundException {
-    return read(key, new HashSet<String>());
-  }
-
-  /** Delete a record */
-  public void erase(String key) {
-    UniqueId blob_id = bkt_.getBlobId(key);
-    bkt_.destroyBlob(blob_id);
-  }
-
-  /** Destroy this table */
-  public void destroy() {
-    bkt_.destroy();
-  }
-};
diff --git a/adapter/kvstore/java/src/test/java/KvstoreJniTest.java b/adapter/kvstore/java/src/test/java/KvstoreJniTest.java
deleted file mode 100644
index 12168bf67..000000000
--- a/adapter/kvstore/java/src/test/java/KvstoreJniTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.nio.*;
-import java.util.*;
-import hermes_kvstore.java.KVStore;
-import hermes_kvstore.java.KVTable;
-
-import java.lang.management.ManagementFactory;
-
-public class KvstoreJniTest {
-    @Test
-    public void testKvPutGet() throws Exception {
-        String pid = ManagementFactory.getRuntimeMXBean().getName();
-        System.out.println(pid);
-        KVStore.connect();
-        KVTable table = KVStore.getTable("hello");/**/
-
-        HashMap<String, String> record = new HashMap<String, String>();
-        try {
-            record.put("f0", "abcde");
-            record.put("f1", "12345");
-            record.put("f2", "ABCDE");
-            table.update("0", record);
-            table.update("0", record);
-            Map<String, String> read_record = table.read("0");
-            for (Map.Entry<String, String> entry : read_record.entrySet()) {
-                assertTrue(entry.getValue().equals(record.get(entry.getKey())));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-}
diff --git a/adapter/kvstore/kvstore.cc b/adapter/kvstore/kvstore.cc
deleted file mode 100644
index a40648c15..000000000
--- a/adapter/kvstore/kvstore.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "kvstore.h"
-
-namespace hermes::adapter {
-
-/**====================================
- * KVRecord
- * ===================================*/
-
-/** Convert the record from a single array of bytes */
-KVRecord::KVRecord(hapi::Blob &blob) {
-  BlobSerializer serial(blob);
-  while (serial.off_ < blob.size()) {
-    std::string field_name;
-    hapi::Blob field_val;
-    serial >> field_name;
-    serial >> field_val;
-    record_.emplace(std::move(field_name), std::move(field_val));
-  }
-}
-
-/** Convert the record into a single array of bytes */
-hapi::Blob KVRecord::value() {
-  BlobSerializeCounter counter;
-
-  // Get the total size of the serialized blob
-  for (auto &[field_name, field_val] : record_) {
-    counter << field_name;
-    counter << field_val;
-  }
-
-  // Produce the serialized blob
-  hapi::Blob blob(counter.size_);
-  BlobSerializer serial(blob);
-  for (auto &[field_name, field_val] : record_) {
-    serial << field_name;
-    serial << field_val;
-  }
-
-  return blob;
-}
-
-/**====================================
- * KVTable
- * ===================================*/
-
-/**
- * Create or insert a record into the table
- *
- * @param key the record key
- * @param val the values to update in the record
- * @return None
- * */
-void KVTable::Update(const std::string &key, KVRecord &val) {
-  hermes::BlobId blob_id;
-  bkt_.GetBlobId(key, blob_id);
-  if (!blob_id.IsNull()) {
-    hapi::Context ctx;
-    hapi::Blob record_serial;
-    bkt_.LockBlob(blob_id, MdLockType::kExternalWrite);
-    bkt_.Get(blob_id, record_serial, ctx);
-    KVRecord orig(record_serial);
-    for (auto &[field, field_val] : val.record_) {
-      orig.record_[field] = field_val;
-    }
-    bkt_.Put(key, orig.value(), blob_id, ctx);
-    bkt_.UnlockBlob(blob_id, MdLockType::kExternalWrite);
-  } else {
-    hapi::Context ctx;
-    hapi::Blob record_serial;
-    bkt_.LockBlob(blob_id, MdLockType::kExternalWrite);
-    bkt_.Put(key, val.value(), blob_id, ctx);
-    bkt_.UnlockBlob(blob_id, MdLockType::kExternalWrite);
-  }
-}
-
-/**
- * Get a subset of fields from a record
- *
- * @param key the record key
- * @param field the field in the record to update
- * @return The blob containing only the field's data
- * */
-KVRecord KVTable::Read(const std::string &key, const KVFieldSet &field) {
-  hapi::Blob blob;
-  hermes::BlobId blob_id;
-  hapi::Context ctx;
-  bkt_.GetBlobId(key, blob_id);
-  bkt_.Get(blob_id, blob, ctx);
-  KVRecord orig_record(blob);
-  if (field.size() == 0) {
-    return orig_record;
-  }
-
-  KVRecord new_record;
-  for (const std::string &field_name : field) {
-    new_record.record_[field_name] = orig_record.record_[field_name];
-  }
-  return new_record;
-}
-
-/** Delete a record */
-void KVTable::Erase(const std::string &key) {
-  hapi::Context ctx;
-  hermes::BlobId blob_id;
-  bkt_.GetBlobId(key, blob_id);
-  bkt_.DestroyBlob(blob_id, ctx);
-}
-
-/** Destroy this table */
-void KVTable::Destroy() {
-  bkt_.Destroy();
-}
-
-/**====================================
- * KVStore
- * ===================================*/
-
-/** Connect to Hermes */
-void KVStore::Connect() {
-  HERMES->Create(hermes::HermesType::kClient);
-}
-
-/** Get or create a table */
-KVTable KVStore::GetTable(const std::string table_name) {
-  return KVTable(HERMES->GetBucket(table_name));
-}
-
-}  // namespace hermes::adapter
diff --git a/adapter/kvstore/kvstore.h b/adapter/kvstore/kvstore.h
deleted file mode 100644
index b914e9bb0..000000000
--- a/adapter/kvstore/kvstore.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_ADAPTER_KVSTORE_KVSTORE_H_
-#define HERMES_ADAPTER_KVSTORE_KVSTORE_H_
-
-#include <string>
-#include <unordered_map>
-#include "hermes.h"
-
-namespace hermes::adapter {
-
-/** Denotes the set of fields for a record */
-typedef std::unordered_set<std::string> KVFieldSet;
-
-/** Measure the serialized size */
-struct BlobSerializeCounter {
-  size_t size_;
-
-  /** Constructor */
-  BlobSerializeCounter() : size_(0) {}
-
-  /** Serialize std::string into blob */
-  BlobSerializeCounter& operator<<(const std::string &data) {
-    (*this) << data.size();
-    size_ += data.size();
-    return *this;
-  }
-
-  /** Serialize blob into blob */
-  BlobSerializeCounter& operator<<(const hapi::Blob &data) {
-    (*this) << data.size();
-    size_ += data.size();
-    return *this;
-  }
-
-  /** Serialize size_t into blob */
-  BlobSerializeCounter& operator<<(const size_t &data) {
-    size_ += sizeof(size_t);
-    return *this;
-  }
-};
-
-/** Serialize data into and out of blob */
-struct BlobSerializer {
-  hapi::Blob &blob_;
-  size_t off_;
-
-  /** Constructor */
-  explicit BlobSerializer(hapi::Blob &blob) : blob_(blob), off_(0) {}
-
-  /** Serialize a string type */
-  template<typename StringT>
-  void SerializeString(const StringT &data) {
-    (*this) << data.size();
-    memcpy(blob_.data() + off_, data.data(), data.size());
-    off_ += data.size();
-  }
-
-  /** Deserialize a string type */
-  template<typename StringT>
-  void DeserializeString(StringT &data) {
-    size_t size;
-    (*this) >> size;
-    data.resize(size);
-    memcpy(data.data(), blob_.data() + off_, data.size());
-    off_ += data.size();
-  }
-
-  /** Serialize std::string into blob */
-  BlobSerializer& operator<<(const std::string &data) {
-    SerializeString<std::string>(data);
-    return *this;
-  }
-
-  /** Deserialize std::string from blob */
-  BlobSerializer& operator>>(std::string &data) {
-    DeserializeString<std::string>(data);
-    return *this;
-  }
-
-  /** Serialize blob into blob */
-  BlobSerializer& operator<<(const hapi::Blob &data) {
-    SerializeString<hapi::Blob>(data);
-    return *this;
-  }
-
-  /** Deserialize blob from blob */
-  BlobSerializer& operator>>(hapi::Blob &data) {
-    DeserializeString<hapi::Blob>(data);
-    return *this;
-  }
-
-  /** Serialize size_t into blob */
-  BlobSerializer& operator<<(const size_t &data) {
-    memcpy(blob_.data() + off_, &data, sizeof(size_t));
-    off_ += sizeof(size_t);
-    return *this;
-  }
-
-  /** Deserialize size_t from blob */
-  BlobSerializer& operator>>(size_t &data) {
-    memcpy(&data, blob_.data() + off_, sizeof(size_t));
-    off_ += sizeof(size_t);
-    return *this;
-  }
-};
-
-/** Denotes a record to place in a table */
-struct KVRecord {
-  std::unordered_map<std::string, hapi::Blob> record_;
-
-  /** Default constructor */
-  KVRecord() = default;
-
-  /** Convert the record from a single array of bytes */
-  explicit KVRecord(hapi::Blob &blob);
-
-  /** Convert the record into a single array of bytes */
-  hapi::Blob value();
-};
-
-/** Denotes a set of records */
-class KVTable {
- public:
-  hapi::Bucket bkt_;
-
-  /** Emplace Constructor */
-  explicit KVTable(const hapi::Bucket &bkt) : bkt_(bkt) {}
-
-  /**
-   * Create or insert a record into the table
-   *
-   * @param key the record key
-   * @param val the values to update in the record
-   * @return None
-   * */
-  void Update(const std::string &key, KVRecord &val);
-
-  /**
-   * Get a subset of fields from a record
-   *
-   * @param key the record key
-   * @param field the field in the record to update
-   * @return The blob containing only the field's data
-   * */
-  KVRecord Read(const std::string &key, const KVFieldSet &field);
-
-  /** Delete a record */
-  void Erase(const std::string &key);
-
-  /** Destroy this table */
-  void Destroy();
-};
-
-/** The key-value store instance */
-class KVStore {
- public:
-  /** Connect to Hermes */
-  void Connect();
-
-  /** Get or create a table */
-  KVTable GetTable(const std::string table_name);
-};
-
-}  // namespace hermes::adapter
-
-#endif  // HERMES_ADAPTER_KVSTORE_KVSTORE_H_
diff --git a/adapter/kvstore/tests.py b/adapter/kvstore/tests.py
deleted file mode 100644
index e5718b51b..000000000
--- a/adapter/kvstore/tests.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from py_hermes_ci.test_manager import TestManager
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo
-
-
-class KvstoreTestManager(TestManager):
-    def spawn_all_nodes(self):
-        return self.spawn_info()
-
-    def set_paths(self):
-        self.KVSTORE_CMD = f"./gradlew test"
-        self.disable_testing = False
-
-    def test_hermes_kvstore_java(self):
-        return
-        spawn_info = self.spawn_info(nprocs=1,
-                                     hermes_conf='hermes_server',
-                                     cwd=f"{self.MY_DIR}/java")
-        self.start_daemon(spawn_info)
-        node = Exec(self.KVSTORE_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
diff --git a/adapter/mapper/balanced_mapper.cc b/adapter/mapper/balanced_mapper.cc
deleted file mode 100644
index 3afece24e..000000000
--- a/adapter/mapper/balanced_mapper.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "balanced_mapper.h"
-#include "api/hermes.h"
-
-namespace hermes::adapter {
-
-/**
- * Convert a range defined by \a off and \a size into specific
- * blob placements.
- */
-void BalancedMapper::map(size_t off, size_t size,
-                         size_t page_size,
-                         BlobPlacements &ps) {
-  HILOG(kDebug, "Mapping File with offset {} and size {}", off, size);
-  size_t kPageSize = page_size;
-  size_t size_mapped = 0;
-  while (size > size_mapped) {
-    BlobPlacement p;
-    p.bucket_off_ = off + size_mapped;
-    p.page_ = p.bucket_off_ / kPageSize;
-    p.page_size_ = page_size;
-    p.blob_off_ = p.bucket_off_ % kPageSize;
-    auto left_size_page = kPageSize - p.blob_off_;
-    p.blob_size_ = left_size_page < size - size_mapped ? left_size_page
-      : size - size_mapped;
-    ps.emplace_back(p);
-    size_mapped += p.blob_size_;
-  }
-}
-
-
-}  // namespace hermes::adapter
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
new file mode 100644
index 000000000..ee640a1ae
--- /dev/null
+++ b/benchmark/CMakeLists.txt
@@ -0,0 +1,66 @@
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
+
+set(CMAKE_CXX_STANDARD 17)
+
+#------------------------------------------------------------------------------
+# Build Tests
+#------------------------------------------------------------------------------
+
+add_executable(test_performance_exec
+        ${TEST_MAIN}/main.cc
+        test_init.cc
+        test_latency.cc)
+add_dependencies(test_performance_exec
+        ${Hermes_RUNTIME_DEPS} hermes)
+target_link_libraries(test_performance_exec
+        ${Hermes_RUNTIME_LIBRARIES} hermes Catch2::Catch2
+        MPI::MPI_CXX)
+
+#add_executable(test_performance_exec
+#        ${TEST_MAIN}/main.cc
+#        test_init.cc
+#        test_latency.cc
+#        test_zmq.cc
+#)
+#add_dependencies(test_performance_exec
+#        ${Hermes_CLIENT_DEPS} hermes)
+#target_link_libraries(test_performance_exec
+#        ${Hermes_CLIENT_LIBRARIES} hermes Catch2::Catch2
+#        MPI::MPI_CXX ${ZMQ_LIBRARIES})
+
+add_executable(hermes_api_bench
+        hermes_api_bench.cc)
+add_dependencies(hermes_api_bench
+        ${Hermes_CLIENT_DEPS} hermes)
+target_link_libraries(hermes_api_bench
+        ${Hermes_CLIENT_LIBRARIES} hermes
+        Catch2::Catch2 MPI::MPI_CXX)
+
+#------------------------------------------------------------------------------
+# Test Cases
+#------------------------------------------------------------------------------
+
+# STRING TESTS
+#add_test(NAME test_performance COMMAND
+#        ${CMAKE_BINARY_DIR}/bin/test_performance_exec "TestIpc")
+
+#------------------------------------------------------------------------------
+# Install Targets
+#------------------------------------------------------------------------------
+install(TARGETS
+        test_performance_exec
+        hermes_api_bench
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
+
+#-----------------------------------------------------------------------------
+# Coverage
+#-----------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(test_performance_exec)
+    set_coverage_flags(test_hermes_api)
+endif()
diff --git a/benchmark/hermes_api_bench.cc b/benchmark/hermes_api_bench.cc
new file mode 100644
index 000000000..19ba38889
--- /dev/null
+++ b/benchmark/hermes_api_bench.cc
@@ -0,0 +1,296 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <iostream>
+#include <hermes_shm/util/timer_mpi.h>
+#include <mpi.h>
+#include "hermes/hermes.h"
+#include "hermes/bucket.h"
+#include "hrun/work_orchestrator/affinity.h"
+
+namespace hapi = hermes;
+using hshm::MpiTimer;
+
+/** Gather times per-process */
+void GatherTimes(std::string test_name, size_t io_size, MpiTimer &t) {
+  t.Collect();
+  if (t.rank_ == 0) {
+    double max = t.GetSec();
+    double mbps = io_size / t.GetUsec();
+    HIPRINT("{}: Time: {} sec, MBps (or MOps): {}, Count: {}, Nprocs: {}\n",
+            test_name, max, mbps, io_size, t.nprocs_);
+  }
+}
+
+/** Each process PUTS into the same bucket, but with different blob names */
+void PutTest(int nprocs, int rank,
+             int repeat, size_t blobs_per_rank, size_t blob_size) {
+  MpiTimer t(MPI_COMM_WORLD);
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello", ctx);
+  hermes::Blob blob(blob_size);
+  t.Resume();
+  for (int j = 0; j < repeat; ++j) {
+    for (size_t i = 0; i < blobs_per_rank; ++i) {
+      size_t blob_name_int = rank * blobs_per_rank + i;
+      std::string name = std::to_string(blob_name_int);
+      bkt.AsyncPut(name, blob, ctx);
+    }
+  }
+  t.Pause();
+  HILOG(kInfo, "Finished PUT")
+  GatherTimes("Put", nprocs * blobs_per_rank * blob_size * repeat, t);
+}
+
+/**
+ * Each process GETS from the same bucket, but with different blob names
+ * MUST run PutTest first.
+ * */
+void GetTest(int nprocs, int rank,
+             int repeat, size_t blobs_per_rank, size_t blob_size) {
+  MpiTimer t(MPI_COMM_WORLD);
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello", ctx);
+  t.Resume();
+  for (int j = 0; j < repeat; ++j) {
+    for (size_t i = 0; i < blobs_per_rank; ++i) {
+      hermes::Blob ret(blob_size);
+      size_t blob_name_int = rank * blobs_per_rank + i;
+      std::string name = std::to_string(blob_name_int);
+      bkt.Get(name, ret, ctx);
+    }
+  }
+  t.Pause();
+  GatherTimes("Get", nprocs * blobs_per_rank * blob_size * repeat, t);
+}
+
+/** Each process PUTs then GETs */
+void PutGetTest(int nprocs, int rank, int repeat,
+                size_t blobs_per_rank, size_t blob_size) {
+  PutTest(nprocs, rank, repeat, blobs_per_rank, blob_size);
+  MPI_Barrier(MPI_COMM_WORLD);
+  GetTest(nprocs, rank, repeat, blobs_per_rank, blob_size);
+}
+
+/** Each process PUTS into the same bucket, but with different blob names */
+void PartialPutTest(int nprocs, int rank,
+                    int repeat, size_t blobs_per_rank,
+                    size_t blob_size, size_t part_size) {
+  MpiTimer t(MPI_COMM_WORLD);
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello", ctx);
+  hermes::Blob blob(blob_size);
+  t.Resume();
+  for (int j = 0; j < repeat; ++j) {
+    for (size_t i = 0; i < blobs_per_rank; ++i) {
+      size_t blob_name_int = rank * blobs_per_rank + i;
+      std::string name = std::to_string(blob_name_int);
+      for (size_t cur_size = 0; cur_size < blob_size; cur_size += part_size) {
+        bkt.PartialPut(name, blob, cur_size, ctx);
+      }
+    }
+  }
+  t.Pause();
+  GatherTimes("PartialPut", nprocs * blobs_per_rank * blob_size * repeat, t);
+}
+
+/**
+ * Each process GETS from the same bucket, but with different blob names
+ * MUST run PutTest first.
+ * */
+void PartialGetTest(int nprocs, int rank,
+                    int repeat, size_t blobs_per_rank,
+                    size_t blob_size, size_t part_size) {
+  MpiTimer t(MPI_COMM_WORLD);
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello", ctx);
+  t.Resume();
+  for (int j = 0; j < repeat; ++j) {
+    for (size_t i = 0; i < blobs_per_rank; ++i) {
+      size_t blob_name_int = rank * blobs_per_rank + i;
+      std::string name = std::to_string(blob_name_int);
+      hermes::Blob ret(blob_size);
+      for (size_t cur_size = 0; cur_size < blob_size; cur_size += part_size) {
+        bkt.PartialGet(name, ret, cur_size, ctx);
+      }
+    }
+  }
+  t.Pause();
+  GatherTimes("PartialGet", nprocs * blobs_per_rank * blob_size * repeat, t);
+}
+
+/** Each process PUTs then GETs */
+void PartialPutGetTest(int nprocs, int rank, int repeat,
+                       size_t blobs_per_rank, size_t blob_size,
+                       size_t part_size) {
+  PartialPutTest(nprocs, rank, repeat, blobs_per_rank, blob_size, part_size);
+  MPI_Barrier(MPI_COMM_WORLD);
+  PartialGetTest(nprocs, rank, repeat, blobs_per_rank, blob_size, part_size);
+}
+
+/** Each process creates a set of buckets */
+void CreateBucketTest(int nprocs, int rank,
+                      size_t bkts_per_rank) {
+  MpiTimer t(MPI_COMM_WORLD);
+  t.Resume();
+  hapi::Context ctx;
+  std::unordered_map<std::string, std::string> mdm_;
+  for (size_t i = 0; i < bkts_per_rank; ++i) {
+    int bkt_name_int = rank * bkts_per_rank + i;
+    std::string bkt_name = std::to_string(bkt_name_int);
+    hermes::Bucket bkt(bkt_name, ctx);
+  }
+  t.Pause();
+  GatherTimes("CreateBucket", bkts_per_rank * nprocs, t);
+}
+
+/** Each process gets existing buckets */
+void GetBucketTest(int nprocs, int rank,
+                   size_t bkts_per_rank) {
+  // Initially create the buckets
+  hapi::Context ctx;
+  for (size_t i = 0; i < bkts_per_rank; ++i) {
+    int bkt_name = rank * bkts_per_rank + i;
+    hermes::Bucket bkt(std::to_string(bkt_name), ctx);
+  }
+
+  // Get existing buckets
+  MpiTimer t(MPI_COMM_WORLD);
+  t.Resume();
+  for (size_t i = 0; i < bkts_per_rank; ++i) {
+    int bkt_name = rank * bkts_per_rank + i;
+    hapi::Bucket bkt(std::to_string(bkt_name), ctx);
+  }
+  t.Pause();
+  GatherTimes("GetBucket", bkts_per_rank * nprocs, t);
+}
+
+/** Each process deletes a number of buckets */
+void DeleteBucketTest(int nprocs, int rank,
+                      size_t bkt_per_rank,
+                      size_t blobs_per_bucket) {
+  MpiTimer t(MPI_COMM_WORLD);
+  hapi::Context ctx;
+
+  // Create the buckets
+  for (size_t i = 0; i < bkt_per_rank; ++i) {
+    hapi::Bucket bkt(hshm::Formatter::format("DeleteBucket{}", rank), ctx);
+    hapi::Blob blob;
+    for (size_t j = 0; j < blobs_per_bucket; ++j) {
+      std::string name = std::to_string(j);
+      bkt.Put(name, blob,  ctx);
+    }
+  }
+
+  // Delete the buckets
+  t.Resume();
+  for (size_t i = 0; i < bkt_per_rank; ++i) {
+    hapi::Bucket bkt(hshm::Formatter::format("DeleteBucket{}", rank), ctx);
+    bkt.Destroy();
+  }
+  t.Pause();
+  GatherTimes("DeleteBucket", nprocs * bkt_per_rank * blobs_per_bucket, t);
+}
+
+/** Each process deletes blobs from a single bucket */
+void DeleteBlobOneBucket(int nprocs, int rank,
+                         size_t blobs_per_rank) {
+}
+
+
+#define REQUIRE_ARGC_GE(N) \
+  if (argc < (N)) { \
+    HIPRINT("Requires fewer than {} params\n", N); \
+    help(); \
+  }
+
+#define REQUIRE_ARGC(N) \
+  if (argc != (N)) { \
+    HIPRINT("Requires exactly {} params\n", N); \
+    help(); \
+  }
+
+void help() {
+  printf("USAGE: ./api_bench [mode] ...\n");
+  printf("USAGE: ./api_bench put [blob_size (K/M/G)] [blobs_per_rank]\n");
+  printf("USAGE: ./api_bench putget [blob_size (K/M/G)] [blobs_per_rank]\n");
+  printf("USAGE: ./api_bench pputget [blob_size (K/M/G)] [part_size (K/M/G)] [blobs_per_rank]\n");
+  printf("USAGE: ./api_bench create_bkt [bkts_per_rank]\n");
+  printf("USAGE: ./api_bench get_bkt [bkts_per_rank]\n");
+  printf("USAGE: ./api_bench create_blob_1bkt [blobs_per_rank]\n");
+  printf("USAGE: ./api_bench create_blob_Nbkt [blobs_per_rank]\n");
+  printf("USAGE: ./api_bench del_bkt [bkt_per_rank] [blobs_per_bkt]\n");
+  printf("USAGE: ./api_bench del_blobs [blobs_per_rank]\n");
+  exit(1);
+}
+
+int main(int argc, char **argv) {
+  int rank, nprocs;
+  MPI_Init(&argc, &argv);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+  TRANSPARENT_HRUN();
+  HERMES->ClientInit();
+
+  // Get mode
+  REQUIRE_ARGC_GE(2)
+  std::string mode = argv[1];
+
+  // Set CPU affinity
+  // TODO(logan): remove
+  ProcessAffiner::SetCpuAffinity(getpid(), 8);
+
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  HIPRINT("Beginning {}\n", mode)
+
+  // Run tests
+  try {
+    if (mode == "put") {
+      REQUIRE_ARGC(4)
+      size_t blob_size = hshm::ConfigParse::ParseSize(argv[2]);
+      size_t blobs_per_rank = atoi(argv[3]);
+      PutTest(nprocs, rank, 1, blobs_per_rank, blob_size);
+    } else if (mode == "putget") {
+      REQUIRE_ARGC(4)
+      size_t blob_size = hshm::ConfigParse::ParseSize(argv[2]);
+      size_t blobs_per_rank = atoi(argv[3]);
+      PutGetTest(nprocs, rank, 1, blobs_per_rank, blob_size);
+    } else if (mode == "pputget") {
+      REQUIRE_ARGC(5)
+      size_t blob_size = hshm::ConfigParse::ParseSize(argv[2]);
+      size_t part_size = hshm::ConfigParse::ParseSize(argv[3]);
+      size_t blobs_per_rank = atoi(argv[4]);
+      PartialPutGetTest(nprocs, rank, 1, blobs_per_rank, blob_size, part_size);
+    } else if (mode == "create_bkt") {
+      REQUIRE_ARGC(3)
+      size_t bkts_per_rank = atoi(argv[2]);
+      CreateBucketTest(nprocs, rank, bkts_per_rank);
+    } else if (mode == "get_bkt") {
+      REQUIRE_ARGC(3)
+      size_t bkts_per_rank = atoi(argv[2]);
+      GetBucketTest(nprocs, rank, bkts_per_rank);
+    } else if (mode == "del_bkt") {
+      REQUIRE_ARGC(4)
+      size_t bkt_per_rank = atoi(argv[2]);
+      size_t blobs_per_bkt = atoi(argv[3]);
+      DeleteBucketTest(nprocs, rank, bkt_per_rank, blobs_per_bkt);
+    } else if (mode == "del_blobs") {
+      REQUIRE_ARGC(4)
+      size_t blobs_per_rank = atoi(argv[2]);
+      DeleteBlobOneBucket(nprocs, rank, blobs_per_rank);
+    }
+  } catch (hshm::Error &err) {
+    HELOG(kFatal, "Error: {}", err.what());
+  }
+  MPI_Finalize();
+}
diff --git a/hermes_shm/benchmark/lock/test_init.cc b/benchmark/test_init.cc
similarity index 94%
rename from hermes_shm/benchmark/lock/test_init.cc
rename to benchmark/test_init.cc
index 0fe134776..1757fe387 100644
--- a/hermes_shm/benchmark/lock/test_init.cc
+++ b/benchmark/test_init.cc
@@ -10,6 +10,9 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+
+#include "hrun/api/hrun_client.h"
+#include "basic_test.h"
 #include "test_init.h"
 
 void MainPretest() {
diff --git a/hermes_shm/test/unit/thread/test_init.cc b/benchmark/test_init.h
similarity index 85%
rename from hermes_shm/test/unit/thread/test_init.cc
rename to benchmark/test_init.h
index 82bac123b..cb3b36df7 100644
--- a/hermes_shm/test/unit/thread/test_init.cc
+++ b/benchmark/test_init.h
@@ -11,8 +11,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
-#include "basic_test.h"
+#ifndef HRUN_TEST_UNIT_IPC_TEST_INIT_H_
+#define HRUN_TEST_UNIT_IPC_TEST_INIT_H_
 
-void MainPretest() {}
+#include "hrun/hrun_types.h"
 
-void MainPosttest() {}
+#endif  // HRUN_TEST_UNIT_IPC_TEST_INIT_H_
diff --git a/benchmark/test_latency.cc b/benchmark/test_latency.cc
new file mode 100644
index 000000000..a3ecba432
--- /dev/null
+++ b/benchmark/test_latency.cc
@@ -0,0 +1,391 @@
+//
+// Created by llogan on 7/1/23.
+//
+
+#include <thread>
+#include "basic_test.h"
+#include "hrun/api/hrun_client.h"
+#include "hrun_admin/hrun_admin.h"
+#include "small_message/small_message.h"
+#include "hermes_shm/util/timer.h"
+#include "hrun/work_orchestrator/affinity.h"
+#include "hermes/hermes.h"
+#include "hrun/work_orchestrator/worker.h"
+#include "hrun/api/hrun_runtime.h"
+
+/** The performance of getting a queue */
+TEST_CASE("TestGetQueue") {
+  /*hrun::QueueId qid(0, 3);
+  HRUN_ADMIN->CreateQueueRoot(hrun::DomainId::GetLocal(), qid,
+                                 16, 16, 256,
+                                 hshm::bitfield32_t(0));
+  HRUN_CLIENT->GetQueue(qid);
+
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+  for (size_t i = 0; i < ops; ++i) {
+    hrun::MultiQueue *queue = HRUN_CLIENT->GetQueue(qid);
+    REQUIRE(queue->id_ == qid);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());*/
+}
+
+/** Single-thread performance of allocating + freeing tasks */
+TEST_CASE("TestHshmAllocateFree") {
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+  size_t count = (1 << 8);
+  size_t reps = ops / count;
+  for (size_t i = 0; i < reps; ++i) {
+    std::vector<hrun::Task*> tasks(count);
+    for (size_t j = 0; j < count; ++j) {
+      tasks[j] = HRUN_CLIENT->NewTaskRoot<hrun::Task>().ptr_;
+    }
+    for (size_t j = 0; j < count; ++j) {
+      HRUN_CLIENT->DelTask(tasks[j]);
+    }
+  }
+  t.Pause();
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Single-thread performance of emplacing, and popping a mpsc_ptr_queue */
+TEST_CASE("TestPointerQueueEmplacePop") {
+  size_t ops = (1 << 20);
+  auto queue_ptr = hipc::make_uptr<hipc::mpsc_ptr_queue<hipc::Pointer>>(ops);
+  auto queue = queue_ptr.get();
+  hipc::Pointer p;
+
+  hshm::Timer t;
+  t.Resume();
+  for (size_t i = 0; i < ops; ++i) {
+    queue->emplace(p);
+    queue->pop(p);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Single-thread performance of empacling + popping vec<mpsc_ptr_queue> */
+TEST_CASE("TestPointerQueueVecEmplacePop") {
+  auto queues_ptr = hipc::make_uptr<hipc::vector<hipc::mpsc_ptr_queue<hipc::Pointer>>>(16);
+  auto queues = queues_ptr.get();
+  hipc::Pointer p;
+
+  hshm::Timer t;
+  size_t ops = (1 << 20);
+  for (size_t i = 0; i < ops; ++i) {
+    t.Resume();
+    auto &queue = (*queues)[0];
+    queue.emplace(p);
+    queue.pop(p);
+    t.Pause();
+  }
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Single-thread performance of getting, emplacing, and popping a queue */
+TEST_CASE("TestHshmQueueEmplacePop") {
+  hrun::QueueId qid(0, 3);
+  u32 ops = (1 << 20);
+  std::vector<PriorityInfo> queue_info = {
+      {16, 16, ops, 0}
+  };
+  auto queue = hipc::make_uptr<hrun::MultiQueue>(
+      qid, queue_info);
+  hrun::LaneData entry;
+  auto task = HRUN_CLIENT->NewTaskRoot<hrun::Task>();
+  entry.p_ = task.shm_;
+
+  hshm::Timer t;
+  t.Resume();
+  hrun::Lane &lane = queue->GetLane(0, 0);
+  for (size_t i = 0; i < ops; ++i) {
+    queue->Emplace(0, 0, entry);
+    lane.pop();
+  }
+  t.Pause();
+
+  HRUN_CLIENT->DelTask(task);
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Single-thread performance of getting a lane from a queue */
+TEST_CASE("TestHshmQueueGetLane") {
+  hrun::QueueId qid(0, 3);
+  std::vector<PriorityInfo> queue_info = {
+      {16, 16, 256, 0}
+  };
+  auto queue = hipc::make_uptr<hrun::MultiQueue>(
+      qid, queue_info);
+  hrun::LaneGroup group = queue->GetGroup(0);
+
+  hshm::Timer t;
+  size_t ops = (1 << 20);
+  t.Resume();
+  for (size_t i = 0; i < ops; ++i) {
+    queue->GetLane(0, i % group.num_lanes_);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Single-thread performance of getting, emplacing, and popping a queue */
+TEST_CASE("TestHshmQueueAllocateEmplacePop") {
+  hrun::QueueId qid(0, 3);
+  std::vector<PriorityInfo> queue_info = {
+      {16, 16, 256, 0}
+  };
+  auto queue = hipc::make_uptr<hrun::MultiQueue>(
+      qid, queue_info);
+  hrun::Lane &lane = queue->GetLane(0, 0);
+
+  hshm::Timer t;
+  size_t ops = (1 << 20);
+  t.Resume();
+  for (size_t i = 0; i < ops; ++i) {
+    hrun::LaneData entry;
+    auto task = HRUN_CLIENT->NewTaskRoot<hrun::Task>();
+    entry.p_ = task.shm_;
+    queue->Emplace(0, 0, entry);
+    lane.pop();
+    HRUN_CLIENT->DelTask(task);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Time to spawn and join a thread */
+TEST_CASE("TestSpawnJoinThread") {
+  hshm::Timer t;
+  t.Resume();
+  size_t count = 16 * (1 << 10);
+  for (int i = 0; i < count; ++i) {
+    std::thread thread([]() { });
+    thread.join();
+  }
+  t.Pause();
+  HILOG(kInfo, "Latency: {} MOps", count / t.GetUsec());
+}
+
+/** Time to spawn and join a thread */
+TEST_CASE("TestSpawnJoinArgoThread") {
+  hshm::Timer t;
+  t.Resume();
+  ABT_xstream xstream;
+  ABT_thread tl_thread_;
+  size_t count = 16 * (1 << 10);
+  ABT_init(0, nullptr);
+  int ret = ABT_xstream_create(ABT_SCHED_NULL, &xstream);
+  if (ret != ABT_SUCCESS) {
+    HELOG(kFatal, "Could not create argobots xstream");
+  }
+  for (int i = 0; i < count; ++i) {
+    int ret = ABT_thread_create_on_xstream(xstream,
+                                           [](void *args) { }, nullptr,
+                                           ABT_THREAD_ATTR_NULL, &tl_thread_);
+    if (ret != ABT_SUCCESS) {
+      HELOG(kFatal, "Couldn't spawn worker");
+    }
+    ABT_thread_join(tl_thread_);
+  }
+  t.Pause();
+  HILOG(kInfo, "Latency: {} MOps", count / t.GetUsec());
+}
+
+void TestWorkerIterationLatency(u32 num_queues, u32 num_lanes) {
+  HRUN_RUNTIME->Create();
+
+  hrun::Worker worker(0);
+  std::vector<hipc::uptr<hrun::MultiQueue>> queues;
+  for (u32 i = 0; i < num_queues; ++i) {
+    hrun::QueueId qid(0, i + 1);
+    std::vector<PriorityInfo> queue_info = {
+        {num_lanes, num_lanes, 256, 0}
+    };
+    auto queue = hipc::make_uptr<hrun::MultiQueue>(
+        qid, queue_info);
+    queues.emplace_back(std::move(queue));
+    for (u32 j = 0; j < num_lanes; ++j) {
+      worker.PollQueues({{0, j, queue.get()}});
+    }
+  }
+
+  hrun::small_message::Client client;
+  HRUN_ADMIN->RegisterTaskLibRoot(hrun::DomainId::GetLocal(), "small_message");\
+  client.CreateRoot(hrun::DomainId::GetLocal(), "ipc_test");
+
+  hshm::Timer t;
+  t.Resume();
+  // size_t ops = (1 << 20);
+  size_t ops = 256;
+  for (size_t i = 0; i < ops; ++i) {
+    hipc::LPointer<hrun::small_message::MdPushTask> task;
+    hrun::TaskNode task_node(hrun::TaskId((u32)0, (u64)i));
+    task = client.AsyncMdPushEmplace(queues[num_queues - 1].get(),
+                                     task_node,
+                                     hrun::DomainId::GetLocal());
+    worker.Run();
+    HRUN_CLIENT->DelTask(task);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Time for worker to process a request */
+TEST_CASE("TestWorkerLatency") {
+  TRANSPARENT_HRUN();
+  TestWorkerIterationLatency(1, 16);
+  TestWorkerIterationLatency(5, 16);
+  TestWorkerIterationLatency(10, 16);
+  TestWorkerIterationLatency(15, 16);
+}
+
+/** Time to process a request */
+TEST_CASE("TestRoundTripLatency") {
+  TRANSPARENT_HRUN();
+  HERMES->ClientInit();
+  hrun::small_message::Client client;
+  HRUN_ADMIN->RegisterTaskLibRoot(hrun::DomainId::GetLocal(), "small_message");
+//  int count = 25;
+//  for (int i = 0; i < count; ++i) {
+//    hrun::small_message::Client client2;
+//    client2.CreateRoot(hrun::DomainId::GetLocal(), "ipc_test" + std::to_string(i));
+//  }
+  client.CreateRoot(hrun::DomainId::GetLocal(), "ipc_test");
+  hshm::Timer t;
+
+  int pid = getpid();
+  ProcessAffiner::SetCpuAffinity(pid, 8);
+
+  t.Resume();
+  size_t ops = (1 << 20);
+  // size_t ops = 1024;
+  for (size_t i = 0; i < ops; ++i) {
+    client.MdPushRoot(hrun::DomainId::GetLocal());
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+TEST_CASE("TestTimespecLatency") {
+  size_t ops = (1 << 20);
+  hshm::Timer t;
+
+  t.Resume();
+  for (size_t i = 0; i < ops; ++i) {
+    struct timespec ts;
+    timespec_get(&ts, TIME_UTC);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+TEST_CASE("TestTimerLatency") {
+  size_t ops = (1 << 20);
+  hshm::Timer t, tmp;
+
+  t.Resume();
+  double usec;
+  for (size_t i = 0; i < ops; ++i) {
+    usec = tmp.GetUsecFromStart();
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps (usec={})", ops / t.GetUsec(), usec);
+}
+
+TEST_CASE("TestTimepointLatency") {
+  size_t ops = (1 << 20);
+  hshm::Timer t;
+  hshm::Timepoint tmp;
+
+  t.Resume();
+  double usec;
+  for (size_t i = 0; i < ops; ++i) {
+    usec = tmp.GetUsecFromStart();
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps (usec={})", ops / t.GetUsec(), usec);
+}
+
+/** Time to process a request */
+//TEST_CASE("TestHermesGetBlobIdLatency") {
+//  HERMES->ClientInit();
+//  hshm::Timer t;
+//
+//  int pid = getpid();
+//  ProcessAffiner::SetCpuAffinity(pid, 8);
+//  hermes::Bucket bkt = HERMES_FILESYSTEM_API->Open("/home/lukemartinlogan/hi.txt");
+//
+//  t.Resume();
+//  size_t ops = (1 << 20);
+//  hermes::Context ctx;
+//  std::string data(ctx.page_size_, 0);
+//  for (size_t i = 0; i < ops; ++i) {
+//    bkt.GetBlobId(std::to_string(i));
+//  }
+//  t.Pause();
+//
+//  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+//}
+//
+///** Time to process a request */
+//TEST_CASE("TestHermesFsWriteLatency") {
+//  HERMES->ClientInit();
+//  hshm::Timer t;
+//
+//  int pid = getpid();
+//  ProcessAffiner::SetCpuAffinity(pid, 8);
+//  hermes::Bucket bkt = HERMES_FILESYSTEM_API->Open("/home/lukemartinlogan/hi.txt");
+//
+//  t.Resume();
+//  size_t ops = 150;
+//  hermes::Context ctx;
+//  ctx.page_size_ = 4096;
+//  std::string data(ctx.page_size_, 0);
+//  for (size_t i = 0; i < ops; ++i) {
+//    HERMES_FILESYSTEM_API->Write(bkt, data.data(), i * ctx.page_size_, data.size(), false, rctx);
+//  }
+//  t.Pause();
+//
+//  HILOG(kInfo, "Latency: {} MBps", ops * 4096 / t.GetUsec());
+//}
+//
+///** Time to process a request */
+//TEST_CASE("TestHermesFsReadLatency") {
+//  HERMES->ClientInit();
+//  hshm::Timer t;
+//
+//  int pid = getpid();
+//  ProcessAffiner::SetCpuAffinity(pid, 8);
+//  hermes::Bucket bkt = HERMES_FILESYSTEM_API->Open("/home/lukemartinlogan/hi.txt");
+//
+//  size_t ops = 1024;
+//  hermes::Context ctx;
+//  ctx.page_size_ = 4096;
+//  std::string data(ctx.page_size_, 0);
+//  for (size_t i = 0; i < ops; ++i) {
+//    HERMES_FILESYSTEM_API->Write(bkt, data.data(), i * ctx.page_size_, data.size(), false, rctx);
+//  }
+//
+//  t.Resume();
+//  for (size_t i = 0; i < ops; ++i) {
+//    HERMES_FILESYSTEM_API->Read(bkt, data.data(), i * ctx.page_size_, data.size(), false, rctx);
+//  }
+//  t.Pause();
+//
+//  HILOG(kInfo, "Latency: {} MBps", ops * 4096 / t.GetUsec());
+//}
\ No newline at end of file
diff --git a/benchmark/test_zmq.cc b/benchmark/test_zmq.cc
new file mode 100644
index 000000000..1de149bcf
--- /dev/null
+++ b/benchmark/test_zmq.cc
@@ -0,0 +1,72 @@
+//
+// Created by lukemartinlogan on 8/25/23.
+//
+
+#include <zmq.hpp>
+#include "basic_test.h"
+#include "hrun/api/hrun_client.h"
+#include "hrun_admin/hrun_admin.h"
+#include "small_message/small_message.h"
+#include "hermes_shm/util/timer.h"
+#include "hrun/work_orchestrator/affinity.h"
+
+/** ZeroMQ allocate + free request */
+TEST_CASE("TestZeromqAllocateFree") {
+  zmq::context_t context(1);
+
+  // Create a PUSH socket to push requests
+  zmq::socket_t pushSocket(context, ZMQ_PUSH);
+
+  // Bind the PUSH socket to a specific address
+  pushSocket.bind("ipc:///tmp/shared_memory");
+
+  // Create a PULL socket to receive requests
+  zmq::socket_t pullSocket(context, ZMQ_PULL);
+
+  // Connect the PULL socket to the same address
+  pullSocket.connect("ipc:///tmp/shared_memory");
+
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+  for (size_t i = 0; i < ops; ++i) {
+    zmq::message_t message(sizeof(hrun::Task));
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+/** Single-thread performance of zeromq */
+TEST_CASE("TestZeromqAllocateEmplacePop") {
+  zmq::context_t context(1);
+
+  // Create a PUSH socket to push requests
+  zmq::socket_t pushSocket(context, ZMQ_PUSH);
+
+  // Bind the PUSH socket to a specific address
+  pushSocket.bind("ipc:///tmp/shared_memory");
+
+  // Create a PULL socket to receive requests
+  zmq::socket_t pullSocket(context, ZMQ_PULL);
+
+  // Connect the PULL socket to the same address
+  pullSocket.connect("ipc:///tmp/shared_memory");
+
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+  for (size_t i = 0; i < ops; ++i) {
+    // Send a request
+    zmq::message_t message(sizeof(hrun::Task));
+    pushSocket.send(message, zmq::send_flags::none);
+
+    // Receive the request
+    zmq::message_t receivedMessage;
+    zmq::recv_result_t result = pullSocket.recv(receivedMessage);
+    REQUIRE(receivedMessage.size() == sizeof(hrun::Task));
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
\ No newline at end of file
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
deleted file mode 100644
index faae961b1..000000000
--- a/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}
-  ${PROJECT_SOURCE_DIR}/src/api
-  ${PROJECT_SOURCE_DIR}/test
-  ${PROJECT_SOURCE_DIR}/io_client
-)
-
-set(BENCHMARKS
-        api_bench
-        memcpy_bench
-        reorganize)
-
-foreach(benchmark ${BENCHMARKS})
-  message("Building ${benchmark}")
-  add_executable(${benchmark} ${benchmark}.cc)
-  add_dependencies(${benchmark} hermes hermes_prefetcher_trait)
-  target_link_libraries(${benchmark} hermes hermes_prefetcher_trait
-          MPI::MPI_CXX
-          $<$<BOOL:${HERMES_RPC_THALLIUM}>:thallium>)
-endforeach()
diff --git a/benchmarks/api_bench.cc b/benchmarks/api_bench.cc
deleted file mode 100644
index 3cdd40c91..000000000
--- a/benchmarks/api_bench.cc
+++ /dev/null
@@ -1,301 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <iostream>
-#include <hermes_shm/util/timer.h>
-#include <mpi.h>
-#include "hermes.h"
-#include "bucket.h"
-
-namespace hapi = hermes::api;
-using Timer = hshm::HighResMonotonicTimer;
-
-/** Gather times per-process */
-void GatherTimes(std::string test_name, size_t io_size, Timer &t) {
-  MPI_Barrier(MPI_COMM_WORLD);
-  int rank, nprocs;
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  double time = t.GetSec(), max;
-  MPI_Reduce(&time, &max,
-             1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-  if (rank == 0) {
-    double mbps = io_size / (max * 1000000);
-    HIPRINT("{}: Time: {} sec, MBps (or MOps): {}, Count: {}, Nprocs: {}\n",
-            test_name, max, mbps, io_size, nprocs);
-  }
-}
-
-/** Each process PUTS into the same bucket, but with different blob names */
-void PutTest(hapi::Hermes *hermes,
-             int nprocs, int rank,
-             int repeat, size_t blobs_per_rank, size_t blob_size) {
-  Timer t;
-  auto bkt = hermes->GetBucket("hello");
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  hermes::Blob blob(blob_size);
-  t.Resume();
-  for (int j = 0; j < repeat; ++j) {
-    for (size_t i = 0; i < blobs_per_rank; ++i) {
-      size_t blob_name_int = rank * blobs_per_rank + i;
-      std::string name = std::to_string(blob_name_int);
-      bkt.Put(name, blob, blob_id, ctx);
-    }
-  }
-  t.Pause();
-  GatherTimes("Put", nprocs * blobs_per_rank * blob_size * repeat, t);
-}
-
-/**
- * Each process GETS from the same bucket, but with different blob names
- * MUST run PutTest first.
- * */
-void GetTest(hapi::Hermes *hermes,
-             int nprocs, int rank,
-             int repeat, size_t blobs_per_rank, size_t blob_size) {
-  Timer t;
-  auto bkt = hermes->GetBucket("hello");
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  t.Resume();
-  for (int j = 0; j < repeat; ++j) {
-    for (size_t i = 0; i < blobs_per_rank; ++i) {
-      size_t blob_name_int = rank * blobs_per_rank + i;
-      std::string name = std::to_string(blob_name_int);
-      hermes::Blob ret;
-      bkt.GetBlobId(name, blob_id);
-      bkt.Get(blob_id, ret, ctx);
-    }
-  }
-  t.Pause();
-  GatherTimes("Get", nprocs * blobs_per_rank * blob_size * repeat, t);
-}
-
-/** Each process PUTs then GETs */
-void PutGetTest(hapi::Hermes *hermes,
-                int nprocs, int rank, int repeat,
-                size_t blobs_per_rank, size_t blob_size) {
-  PutTest(hermes, nprocs, rank, repeat, blobs_per_rank, blob_size);
-  MPI_Barrier(MPI_COMM_WORLD);
-  GetTest(hermes, nprocs, rank, repeat, blobs_per_rank, blob_size);
-}
-
-/** Each process creates a set of buckets */
-void CreateBucketTest(hapi::Hermes *hermes, int nprocs, int rank,
-                      size_t bkts_per_rank) {
-  Timer t;
-  t.Resume();
-  for (size_t i = 0; i < bkts_per_rank; ++i) {
-    int bkt_name = rank * bkts_per_rank + i;
-    hapi::Bucket bkt = hermes->GetBucket(std::to_string(bkt_name));
-  }
-  t.Pause();
-  GatherTimes("CreateBucket", bkts_per_rank * nprocs, t);
-}
-
-/** Each process gets existing buckets */
-void GetBucketTest(hapi::Hermes *hermes, int nprocs, int rank,
-                   size_t bkts_per_rank) {
-  // Initially create the buckets
-  for (size_t i = 0; i < bkts_per_rank; ++i) {
-    int bkt_name = rank * bkts_per_rank + i;
-    hapi::Bucket bkt = hermes->GetBucket(std::to_string(bkt_name));
-  }
-
-  // Get existing buckets
-  Timer t;
-  t.Resume();
-  for (size_t i = 0; i < bkts_per_rank; ++i) {
-    int bkt_name = rank * bkts_per_rank + i;
-    hapi::Bucket bkt = hermes->GetBucket(std::to_string(bkt_name));
-  }
-  t.Pause();
-  GatherTimes("CreateBucket", bkts_per_rank * nprocs, t);
-}
-
-/** Each process creates (no data) a blob in a single bucket */
-void CreateBlobOneBucketTest(hapi::Hermes *hermes,
-                             int nprocs, int rank,
-                             size_t blobs_per_rank) {
-  Timer t;
-  hapi::Bucket bkt = hermes->GetBucket("CreateBlobOneBucket");
-  hapi::Context ctx;
-  hermes::BlobId blob_id;
-
-  t.Resume();
-  for (size_t i = 0; i < blobs_per_rank; ++i) {
-    size_t blob_name_int = rank * blobs_per_rank + i;
-    std::string name = std::to_string(blob_name_int);
-    bkt.TryCreateBlob(name, blob_id, ctx);
-  }
-  t.Pause();
-  GatherTimes("CreateBlobOneBucket", blobs_per_rank * nprocs, t);
-}
-
-/** Each process creates (no data) a blob in a process-specific bucket */
-void CreateBlobPerBucketTest(hapi::Hermes *hermes,
-                             int nprocs, int rank,
-                             size_t blobs_per_rank) {
-  Timer t;
-  hapi::Bucket bkt = hermes->GetBucket(
-      hshm::Formatter::format("CreateBlobPerBucket{}", rank));
-  hapi::Context ctx;
-  hermes::BlobId blob_id;
-
-  t.Resume();
-  for (size_t i = 0; i < blobs_per_rank; ++i) {
-    size_t blob_name_int = rank * blobs_per_rank + i;
-    std::string name = std::to_string(blob_name_int);
-    bkt.TryCreateBlob(name, blob_id, ctx);
-  }
-  t.Pause();
-  GatherTimes("CreateBlobPerBucket", nprocs * blobs_per_rank, t);
-}
-
-/** Each process deletes a number of buckets */
-void DeleteBucketTest(hapi::Hermes *hermes,
-                      int nprocs, int rank,
-                      size_t bkt_per_rank,
-                      size_t blobs_per_bucket) {
-  Timer t;
-  hapi::Context ctx;
-  hermes::BlobId blob_id;
-
-  // Create the buckets
-  for (size_t i = 0; i < bkt_per_rank; ++i) {
-    hapi::Bucket bkt = hermes->GetBucket(
-        hshm::Formatter::format("DeleteBucket{}", rank));
-    for (size_t j = 0; j < blobs_per_bucket; ++j) {
-      std::string name = std::to_string(j);
-      bkt.TryCreateBlob(name, blob_id, ctx);
-    }
-  }
-
-  // Delete the buckets
-  t.Resume();
-  for (size_t i = 0; i < bkt_per_rank; ++i) {
-    hapi::Bucket bkt = hermes->GetBucket(
-        hshm::Formatter::format("DeleteBucket{}", rank));
-    size_t blob_name_int = rank * bkt_per_rank + i;
-    std::string name = std::to_string(blob_name_int);
-    bkt.TryCreateBlob(name, blob_id, ctx);
-  }
-  t.Pause();
-  GatherTimes("DeleteBucket", nprocs * bkt_per_rank * blobs_per_bucket, t);
-}
-
-/** Each process deletes blobs from a single bucket */
-void DeleteBlobOneBucket(hapi::Hermes *hermes,
-                         int nprocs, int rank,
-                         size_t blobs_per_rank) {
-  Timer t;
-  CreateBlobOneBucketTest(hermes, nprocs, rank, blobs_per_rank);
-  MPI_Barrier(MPI_COMM_WORLD);
-  hapi::Bucket bkt = hermes->GetBucket("CreateBlobOneBucket");
-  hermes::BlobId blob_id;
-  hapi::Context ctx;
-
-  // Delete blobs from a bucket
-  t.Resume();
-  for (size_t i = 0; i < blobs_per_rank; ++i) {
-    size_t blob_name_int = rank * blobs_per_rank + i;
-    std::string name = std::to_string(blob_name_int);
-    bkt.GetBlobId(name, blob_id);
-    bkt.DestroyBlob(blob_id, ctx);
-  }
-  t.Pause();
-  GatherTimes("CreateBlobOneBucket", nprocs * blobs_per_rank, t);
-}
-
-
-#define REQUIRE_ARGC_GE(N) \
-  if (argc < (N)) { \
-    HIPRINT("Requires fewer than {} params\n", N); \
-    help(); \
-  }
-
-#define REQUIRE_ARGC(N) \
-  if (argc != (N)) { \
-    HIPRINT("Requires exactly {} params\n", N); \
-    help(); \
-  }
-
-void help() {
-  printf("USAGE: ./api_bench [mode] ...\n");
-  printf("USAGE: ./api_bench put [blob_size (K/M/G)] [blobs_per_rank]\n");
-  printf("USAGE: ./api_bench putget [blob_size (K/M/G)] [blobs_per_rank]\n");
-  printf("USAGE: ./api_bench create_bkt [bkts_per_rank]\n");
-  printf("USAGE: ./api_bench get_bkt [bkts_per_rank]\n");
-  printf("USAGE: ./api_bench create_blob_1bkt [blobs_per_rank]\n");
-  printf("USAGE: ./api_bench create_blob_Nbkt [blobs_per_rank]\n");
-  printf("USAGE: ./api_bench del_bkt [bkt_per_rank] [blobs_per_bkt]\n");
-  printf("USAGE: ./api_bench del_blobs [blobs_per_rank]\n");
-  exit(1);
-}
-
-int main(int argc, char **argv) {
-  int rank, nprocs;
-  MPI_Init(&argc, &argv);
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  auto hermes = hapi::Hermes::Create(hermes::HermesType::kClient);
-
-  // Get mode
-  REQUIRE_ARGC_GE(2)
-  std::string mode = argv[1];
-
-  MPI_Barrier(MPI_COMM_WORLD);
-
-  HIPRINT("Beginning {}\n", mode)
-
-  // Run tests
-  if (mode == "put") {
-    REQUIRE_ARGC(4)
-    size_t blob_size = hshm::ConfigParse::ParseSize(argv[2]);
-    size_t blobs_per_rank = atoi(argv[3]);
-    PutTest(hermes, nprocs, rank, 1, blobs_per_rank, blob_size);
-  } else if (mode == "putget") {
-    REQUIRE_ARGC(4)
-    size_t blob_size = hshm::ConfigParse::ParseSize(argv[2]);
-    size_t blobs_per_rank = atoi(argv[3]);
-    PutGetTest(hermes, nprocs, rank, 1, blobs_per_rank, blob_size);
-  } else if (mode == "create_bkt") {
-    REQUIRE_ARGC(3)
-    size_t bkts_per_rank = atoi(argv[2]);
-    CreateBucketTest(hermes, nprocs, rank, bkts_per_rank);
-  } else if (mode == "get_bkt") {
-    REQUIRE_ARGC(3)
-    size_t bkts_per_rank = atoi(argv[2]);
-    GetBucketTest(hermes, nprocs, rank, bkts_per_rank);
-  } else if (mode == "create_blob_1bkt") {
-    REQUIRE_ARGC(3)
-    size_t blobs_per_rank = atoi(argv[2]);
-    CreateBlobOneBucketTest(hermes, nprocs, rank, blobs_per_rank);
-  } else if (mode == "create_blob_Nbkt") {
-    REQUIRE_ARGC(3)
-    size_t blobs_per_rank = atoi(argv[2]);
-    CreateBlobPerBucketTest(hermes, nprocs, rank, blobs_per_rank);
-  } else if (mode == "del_bkt") {
-    REQUIRE_ARGC(4)
-    size_t bkt_per_rank = atoi(argv[2]);
-    size_t blobs_per_bkt = atoi(argv[3]);
-    DeleteBucketTest(hermes, nprocs, rank, bkt_per_rank, blobs_per_bkt);
-  } else if (mode == "del_blobs") {
-    REQUIRE_ARGC(4)
-    size_t blobs_per_rank = atoi(argv[2]);
-    DeleteBlobOneBucket(hermes, nprocs, rank, blobs_per_rank);
-  }
-
-  hermes->Finalize();
-  MPI_Finalize();
-}
diff --git a/benchmarks/memcpy_bench.cc b/benchmarks/memcpy_bench.cc
deleted file mode 100644
index 267439cb6..000000000
--- a/benchmarks/memcpy_bench.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// #define HERMES_ENABLE_PROFILING 1
-
-#include "mpi.h"
-#include <stdlib.h>
-#include "hermes.h"
-#include "hermes_shm/memory/backend/posix_shm_mmap.h"
-#include <hermes_shm/util/timer.h>
-
-using hshm::ipc::PosixShmMmap;
-using Timer = hshm::HighResMonotonicTimer;
-hipc::MemoryBackend *backend;
-
-void GatherTimes(const std::string &backend_type,
-                 const std::string &test_name,
-                 size_t size_per_rank, Timer &t) {
-  MPI_Barrier(MPI_COMM_WORLD);
-  int nprocs, rank;
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  double time = t.GetSec(), max;
-  MPI_Reduce(&time, &max,
-             1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-  if (rank == 0) {
-    HIPRINT("{} {} {}: MBps: {}\n",
-            nprocs, backend_type, test_name,
-            size_per_rank * nprocs / t.GetUsec())
-  }
-}
-
-template<bool SHM>
-size_t GetBlobOff(int rank, size_t i,
-                  size_t blobs_per_rank, size_t blob_size) {
-  if constexpr(SHM) {
-    return (rank * blobs_per_rank + i) * blob_size;
-  } else {
-    return i * blob_size;
-  }
-}
-
-template<bool SHM>
-void PutTest(const std::string &backend_type, int rank, int repeat,
-             size_t blobs_per_rank, size_t blob_size) {
-  Timer t;
-  std::vector<char> data(blob_size);
-  t.Resume();
-  for (int j = 0; j < repeat; ++j) {
-    for (size_t i = 0; i < blobs_per_rank; ++i) {
-      size_t blob_off = GetBlobOff<SHM>(rank, i, blobs_per_rank, blob_size);
-      memcpy(backend->data_ + blob_off, data.data(), data.size());
-    }
-  }
-  t.Pause();
-  GatherTimes(backend_type, "Put", blobs_per_rank * blob_size * repeat, t);
-}
-
-template<bool SHM>
-void GetTest(const std::string &backend_type, int rank, int repeat,
-             size_t blobs_per_rank, size_t blob_size) {
-  Timer t;
-  std::vector<char> data(blob_size);
-  t.Resume();
-  for (int j = 0; j < repeat; ++j) {
-    for (size_t i = 0; i < blobs_per_rank; ++i) {
-      size_t blob_off = GetBlobOff<SHM>(rank, i, blobs_per_rank, blob_size);
-      memcpy(data.data(), backend->data_ + blob_off, data.size());
-    }
-  }
-  t.Pause();
-  GatherTimes(backend_type, "Get", blobs_per_rank * blob_size * repeat, t);
-}
-
-template<typename BackendT, bool SHM>
-void MemcpyBench(int nprocs, int rank,
-                 size_t blob_size,
-                 size_t blobs_per_rank) {
-  std::string shm_url = "test_mem_backend";
-  std::string backend_type;
-  size_t backend_size;
-  hipc::MemoryBackendType type = hipc::MemoryBackendType::kPosixShmMmap;
-
-  if constexpr(std::is_same_v<BackendT, hipc::PosixShmMmap>) {
-    backend_type = "kPosixShmMmap";
-    type = hipc::MemoryBackendType::kPosixShmMmap;
-    backend_size = nprocs * blob_size * blobs_per_rank;
-  } else if constexpr(std::is_same_v<BackendT, hipc::PosixMmap>) {
-    backend_type = "kPosixMmap";
-    type = hipc::MemoryBackendType::kPosixMmap;
-    backend_size = blob_size * blobs_per_rank;
-  } else {
-    HELOG(kFatal, "Invalid backend type");
-  }
-
-  // Create the backend
-  try {
-    if constexpr(std::is_same_v<BackendT, hipc::PosixShmMmap>) {
-      MPI_Barrier(MPI_COMM_WORLD);
-      if (rank == 0) {
-        backend = HERMES_MEMORY_MANAGER->
-            CreateBackend<BackendT>(backend_size, shm_url);
-      }
-      MPI_Barrier(MPI_COMM_WORLD);
-      if (rank != 0) {
-        backend = HERMES_MEMORY_MANAGER->AttachBackend(type, shm_url);
-      }
-      MPI_Barrier(MPI_COMM_WORLD);
-    } else if constexpr(std::is_same_v<BackendT, hipc::PosixMmap>) {
-      MPI_Barrier(MPI_COMM_WORLD);
-      backend = HERMES_MEMORY_MANAGER->
-          CreateBackend<BackendT>(backend_size, shm_url);
-      MPI_Barrier(MPI_COMM_WORLD);
-    }
-  } catch (std::exception &e) {
-    HELOG(kFatal, "{}\n", e.what());
-  }
-
-  if (backend == nullptr) {
-    HELOG(kFatal, "Backend was null: {}", backend_type)
-  }
-
-  PutTest<SHM>(backend_type, rank, 1, blobs_per_rank, blob_size);
-  MPI_Barrier(MPI_COMM_WORLD);
-  GetTest<SHM>(backend_type, rank, 1, blobs_per_rank, blob_size);
-}
-
-int main(int argc, char **argv) {
-  int rank, nprocs;
-  MPI_Init(&argc, &argv);
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  if (argc != 3) {
-    printf("USAGE: ./memcpy_bench [blob_size (K/M/G)] [blobs_per_rank]\n");
-    exit(1);
-  }
-  size_t blob_size = hshm::ConfigParse::ParseSize(argv[1]);
-  size_t blobs_per_rank = atoi(argv[2]);
-
-  MemcpyBench<hipc::PosixMmap, false>(nprocs, rank, blob_size, blobs_per_rank);
-  MemcpyBench<hipc::PosixShmMmap, true>(nprocs, rank,
-                                        blob_size, blobs_per_rank);
-
-  MPI_Finalize();
-}
diff --git a/benchmarks/reorganize.cc b/benchmarks/reorganize.cc
deleted file mode 100644
index 785f0fbe3..000000000
--- a/benchmarks/reorganize.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// #define HERMES_ENABLE_PROFILING 1
-
-#include "mpi.h"
-#include <stdlib.h>
-#include "hermes.h"
-#include "hermes_shm/memory/backend/posix_shm_mmap.h"
-#include <hermes_shm/util/timer.h>
-#include "traits/prefetcher/prefetcher_trait.h"
-
-using hshm::ipc::PosixShmMmap;
-using Timer = hshm::HighResMonotonicTimer;
-hipc::MemoryBackend *backend;
-const char *kBucketName = "/tmp/test_hermes/hi.txt";
-
-void GatherTimes(const std::string &test_name,
-                 size_t total_size,
-                 Timer &t, Timer &io_t) {
-  MPI_Barrier(MPI_COMM_WORLD);
-  int nprocs, rank;
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  double time = t.GetUsec(), max_runtime;
-  MPI_Reduce(&time, &max_runtime,
-             1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-  double io_time = t.GetUsec(), max_io_time;
-  MPI_Reduce(&io_time, &max_io_time,
-             1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-  if (rank == 0) {
-    HIPRINT("{} {}: MBps: {}, Time: {}\n",
-            nprocs, test_name,
-            total_size / max_io_time,
-            max_runtime)
-  }
-}
-
-/** Each process PUTS into the same bucket, but with different blob names */
-void PutTest(int nprocs, int rank,
-             size_t blobs_per_checkpt,
-             size_t num_checkpts,
-             size_t blob_size,
-             int compute_sec) {
-  Timer t, io_t;
-  auto bkt = HERMES->GetBucket(kBucketName);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  hermes::Blob blob(blob_size);
-  t.Resume();
-
-  size_t blobs_per_rank = blobs_per_checkpt * num_checkpts;
-  size_t cur_blob = 0;
-  for (size_t i = 0; i < num_checkpts; ++i) {
-    io_t.Resume();
-    for (size_t j = 0; j < blobs_per_checkpt; ++j) {
-      size_t blob_name_int = rank * blobs_per_rank + cur_blob;
-      std::string name = std::to_string(blob_name_int);
-      bkt.Put(name, blob, blob_id, ctx);
-      ++cur_blob;
-    }
-    io_t.Pause();
-    sleep(compute_sec);
-  }
-  t.Pause();
-  GatherTimes("Put", nprocs * blobs_per_rank * blob_size, t, io_t);
-}
-
-/**
- * Each process GETS from the same bucket, but with different blob names
- * MUST run PutTest first.
- * */
-void GetTest(int nprocs, int rank,
-             size_t blobs_per_checkpt,
-             size_t num_checkpts,
-             size_t blob_size,
-             int compute_sec) {
-  Timer t, io_t;
-  auto bkt = HERMES->GetBucket(kBucketName);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  t.Resume();
-  size_t blobs_per_rank = blobs_per_checkpt * num_checkpts;
-  size_t cur_blob = 0;
-  for (size_t i = 0; i < num_checkpts; ++i) {
-    io_t.Resume();
-    for (size_t j = 0; j < blobs_per_checkpt; ++j) {
-      size_t blob_name_int = rank * blobs_per_rank + cur_blob;
-      std::string name = std::to_string(blob_name_int);
-      hermes::Blob ret;
-      bkt.GetBlobId(name, blob_id);
-      bkt.Get(blob_id, ret, ctx);
-      ++cur_blob;
-    }
-    io_t.Pause();
-    sleep(compute_sec);
-  }
-  t.Pause();
-  GatherTimes("Get", nprocs * blobs_per_rank * blob_size, t, io_t);
-}
-
-int main(int argc, char **argv) {
-  int rank, nprocs;
-  MPI_Init(&argc, &argv);
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  if (argc != 7) {
-    printf("USAGE: ./reorganize [prefetch] [blob_size (K/M/G)] "
-           "[blobs_per_checkpt] [num_checkpts] "
-           "[compute_put (sec)] [compute_get (sec)]\n");
-    exit(1);
-  }
-  int with_prefetch = atoi(argv[1]);
-  size_t blob_size = hshm::ConfigParse::ParseSize(argv[2]);
-  size_t blobs_per_checkpt = atoi(argv[3]);
-  size_t num_checkpts = atoi(argv[4]);
-  int compute_put = atoi(argv[5]);
-  int compute_get = atoi(argv[6]);
-
-  // Start Hermes
-  HERMES->Create(hermes::HermesType::kClient);
-
-  // Register the Apriori trait
-  hermes::TraitId apriori_trait =
-    HERMES->RegisterTrait<hermes::PrefetcherTrait>(
-      "apriori", hermes::PrefetcherType::kApriori);
-  if (with_prefetch) {
-    auto bkt = HERMES->GetBucket(kBucketName);
-    bkt.AttachTrait(apriori_trait);
-  }
-
-  PutTest(nprocs, rank, blobs_per_checkpt, num_checkpts,
-          blob_size, compute_put);
-  MPI_Barrier(MPI_COMM_WORLD);
-  GetTest(nprocs, rank, blobs_per_checkpt, num_checkpts,
-          blob_size, compute_get);
-
-  // Finalize
-  HERMES->Finalize();
-  MPI_Finalize();
-}
diff --git a/ci/jarvis-util/jarvis_util/introspect/__init__.py b/ci/__init__.py
similarity index 100%
rename from ci/jarvis-util/jarvis_util/introspect/__init__.py
rename to ci/__init__.py
diff --git a/ci/build_hermes.sh b/ci/build_hermes.sh
index ae1a9b563..a13d3c167 100755
--- a/ci/build_hermes.sh
+++ b/ci/build_hermes.sh
@@ -1,47 +1,43 @@
 #!/bin/bash
 
+# CD into git workspace
+cd ${GITHUB_WORKSPACE}
+
 set -x
 set -e
 set -o pipefail
 
+# Set spack env
 INSTALL_DIR="${HOME}"
-INSTALL_PREFIX="${HOME}/install"
-mkdir -p "${INSTALL_PREFIX}"
-
-# This will build our small python library for running unit tests
-pushd ci/jarvis-util
-python3 -m pip install -r requirements.txt
-python3 -m pip install -e .
-popd
-
-mkdir build
-pushd build
-
-# Load hermes dependencies via spack
-# Copy from install_deps.sh
 SPACK_DIR=${INSTALL_DIR}/spack
-set +x
 . ${SPACK_DIR}/share/spack/setup-env.sh
-set -x
-spack load --only dependencies hermes
 
-# Build hermes
-# export CXXFLAGS="${CXXFLAGS} -std=c++17 -Werror -Wall -Wextra"
-cmake                                                      \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}               \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo                      \
-    -DBUILD_SHARED_LIBS=ON                                 \
-    -DHERMES_ENABLE_COVERAGE=ON                            \
-    -DHERMES_BUILD_BENCHMARKS=OFF                          \
-    -DHERMES_BUILD_BUFFER_POOL_VISUALIZER=OFF              \
-    -DHERMES_USE_ADDRESS_SANITIZER=OFF                     \
-    -DHERMES_USE_THREAD_SANITIZER=OFF                      \
-    -DHERMES_RPC_THALLIUM=ON                               \
-    -DBUILD_TESTING=ON                                     \
-    -DHERMES_ENABLE_VFD=ON                                 \
-    -DHERMES_DEBUG_LOCK=OFF                                \
-    ..
+mkdir -p "${HOME}/install"
+mkdir build
+cd build
+spack load hermes_shm
+cmake ../ \
+-DCMAKE_BUILD_TYPE=Debug \
+-DCMAKE_INSTALL_PREFIX="${HOME}/install"
 make -j8
 make install
 
-popd
+export CXXFLAGS=-Wall
+ctest -VV
+
+# Set proper flags for cmake to find Hermes
+INSTALL_PREFIX="${HOME}/install"
+export LIBRARY_PATH="${INSTALL_PREFIX}/lib:${LIBRARY_PATH}"
+export LD_LIBRARY_PATH="${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}"
+export LDFLAGS="-L${INSTALL_PREFIX}/lib:${LDFLAGS}"
+export CFLAGS="-I${INSTALL_PREFIX}/include:${CFLAGS}"
+export CPATH="${INSTALL_PREFIX}/include:${CPATH}"
+export CMAKE_PREFIX_PATH="${INSTALL_PREFIX}:${CMAKE_PREFIX_PATH}"
+export CXXFLAGS="-I${INSTALL_PREFIX}/include:${CXXFLAGS}"
+
+# Run make install unit test
+cd test/unit/external
+mkdir build
+cd build
+cmake ../
+make -j8
diff --git a/ci/cluster/Dockerfile b/ci/cluster/Dockerfile
deleted file mode 100644
index d3600723a..000000000
--- a/ci/cluster/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-FROM ubuntu:20.04
-
-ENV USER mpirun
-
-ENV DEBIAN_FRONTEND=noninteractive \
-    HOME=/home/${USER}
-
-RUN apt-get update -y && \
-  apt-get install -y --no-install-recommends \
-  sudo \
-  apt-utils \
-  && apt-get install -y --no-install-recommends \
-  openssh-server \
-  gcc \
-  g++ \
-  libfabric-dev \
-  mpich \
-  binutils \
-  libjson-c-dev \
-  libunwind-dev \
-  && apt-get clean && apt-get purge && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN mkdir /var/run/sshd
-RUN echo 'root:${USER}' | chpasswd
-RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-# SSH login fix. Otherwise user is kicked off after login
-RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-
-ENV NOTVISIBLE "in users profile"
-RUN echo "export VISIBLE=now" >> /etc/profile
-
-# ------------------------------------------------------------
-# Add an 'mpirun' user
-# ------------------------------------------------------------
-
-ARG USER_ID
-ARG GROUP_ID
-
-RUN addgroup --gid ${GROUP_ID} ${USER}
-RUN adduser --disabled-password --gecos "" --uid ${USER_ID} --gid ${GROUP_ID} ${USER} && \
-    echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
-# ------------------------------------------------------------
-# Set-Up SSH with our Github deploy key
-# ------------------------------------------------------------
-
-ENV SSHDIR ${HOME}/.ssh/
-
-RUN mkdir -p ${SSHDIR}
-RUN echo "StrictHostKeyChecking no" > ${SSHDIR}/config
-
-RUN chmod -R 600 ${SSHDIR}* && \
-    chown -R ${USER}:${USER} ${SSHDIR}
-
-CMD ["/usr/sbin/sshd", "-D"]
diff --git a/ci/cluster/cluster_down.sh b/ci/cluster/cluster_down.sh
deleted file mode 100755
index 71377a9bf..000000000
--- a/ci/cluster/cluster_down.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-. cluster_utils.sh
-hermes_cluster_down
diff --git a/ci/cluster/cluster_test.sh b/ci/cluster/cluster_test.sh
deleted file mode 100755
index 6ec34caaf..000000000
--- a/ci/cluster/cluster_test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-. cluster_utils.sh
-hermes_cluster_test ${1:-}
diff --git a/ci/cluster/cluster_up.sh b/ci/cluster/cluster_up.sh
deleted file mode 100755
index ce7ef43bf..000000000
--- a/ci/cluster/cluster_up.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-. cluster_utils.sh
-hermes_cluster_up
diff --git a/ci/cluster/cluster_utils.sh b/ci/cluster/cluster_utils.sh
deleted file mode 100644
index b1a388034..000000000
--- a/ci/cluster/cluster_utils.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -x -e
-
-node_names=($(awk '/hostname:/ {print $2}' docker-compose.yml))
-docker_user=mpirun
-docker_home=/home/${docker_user}
-script_dir="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
-hermes_dir=${script_dir}/../..
-cluster_conf=${hermes_dir}/test/data/hermes_server_ci.yaml
-hermes_build_dir=${hermes_dir}/build
-project_name="$(basename ${script_dir})"
-host1=${project_name}_${node_names[0]}_1
-host2=${project_name}_${node_names[1]}_1
-
-
-# Build images and start a cluster
-function hermes_cluster_up() {
-    local num_workers=${1:-1}
-
-    # Build the images, passing our user id and group id so the container user can
-    # modify the .gcda coverage files
-    for n in "${node_names[@]}"; do
-        docker-compose build --build-arg GROUP_ID=$(id -g) --build-arg USER_ID=$(id -u) ${n}
-    done
-
-    docker-compose up -d --scale ${node_names[0]}=1 --scale ${node_names[1]}=${num_workers} --no-recreate
-
-    for h in ${host1} ${host2}; do
-        # Create the hosts file
-        docker exec --user ${docker_user} -w ${hermes_build_dir} ${h} \
-               bash -c "echo -e \"${host1}\n${host2}\n\" > hermes_hosts"
-        # Copy ssh keys to ${docker_home}/.ssh
-        docker exec ${h} bash -c "cp ${HOME}/.ssh/id_rsa ${docker_home}/.ssh/id_rsa"
-        docker exec ${h} bash -c "cp ${HOME}/.ssh/id_rsa.pub ${docker_home}/.ssh/id_rsa.pub"
-        docker exec ${h} bash -c "cp ${HOME}/.ssh/id_rsa.pub ${docker_home}/.ssh/authorized_keys"
-        docker exec ${h} chown -R ${docker_user}:${docker_user} ${docker_home}/.ssh
-        # Create the data directory
-        docker exec ${h} bash -c "mkdir /tmp/test_hermes"
-    done
-}
-
-function hermes_cluster_test() {
-    local allocate_tty=${1:-}
-    local hosts=${host1},${host2}
-
-    docker-compose exec ${allocate_tty}                                \
-                   -e GLOG_vmodule=rpc_thallium=1                      \
-                   -e LSAN_OPTIONS=suppressions=../test/data/asan.supp \
-                   --user ${docker_user}                               \
-                   -w ${hermes_build_dir}                              \
-                   ${node_names[0]}                                    \
-                   echo `mpirun -n 2 -ppn 1 -hosts ${hosts} bin/hermes_daemon ${cluster_conf} &` \
-                   && sleep 3 \
-                   && mpirun -n 4 -ppn 2 -hosts ${hosts} -genv ${cluster_conf} bin/test_multinode_put_get
-}
-
-# Stop the cluster
-function hermes_cluster_down() {
-    docker-compose down
-}
diff --git a/ci/cluster/docker-compose.yml b/ci/cluster/docker-compose.yml
deleted file mode 100644
index 389c73c45..000000000
--- a/ci/cluster/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3"
-
-services:
-  node1:
-    build: .
-    links: 
-      - node2
-    networks:
-      - net
-    volumes:
-      - $HOME:$HOME
-    hostname: node1
-
-  node2:
-    build: .
-    networks:
-      - net
-    volumes:
-      - $HOME:$HOME
-    hostname: node2
-
-networks:
-  net:
-    driver: bridge
diff --git a/ci/cluster/multi_node_ci_test.sh b/ci/cluster/multi_node_ci_test.sh
deleted file mode 100755
index 5fcfe0238..000000000
--- a/ci/cluster/multi_node_ci_test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -x -e
-
-if [[ "${CI}" != "true" ]]; then
-    echo "This script is only meant to be run within Github actions"
-    exit 1
-fi
-
-echo "TODO(llogan): Add back. disabling for now"
-exit 0
-
-. cluster_utils.sh
-
-# Create ssh keys for the cluster to use
-echo -e 'y\n' | ssh-keygen -q -t rsa -N "" -f ~/.ssh/id_rsa
-
-# Start a two node cluster
-hermes_cluster_up
-
-# Run the Hermes tests on the cluster (without allocating a tty)
-hermes_cluster_test "-T"
-
-# Shutdown the cluster
-hermes_cluster_down
diff --git a/ci/coverage.sh b/ci/coverage.sh
index c6b27ad2c..59e8dbd01 100644
--- a/ci/coverage.sh
+++ b/ci/coverage.sh
@@ -8,3 +8,15 @@ lcov --remove "${COVERAGE_DIR}/tmp.info" \
               "*/spack/*" \
               -o "${COVERAGE_DIR}/lcov.info"
 genhtml "${COVERAGE_DIR}/lcov.info" --output-directory coverage_report
+
+echo "Placed coverage info in ${COVERAGE_DIR}/lcov.info"
+cd ${COVERAGE_DIR}
+`pwd`
+ls
+
+#lcov -c -d . -o "tmp.info"
+#lcov --remove "tmp.info" \
+#              "/usr/*" \
+#              "*/spack/*" \
+#              -o "lcov.info"
+#genhtml "lcov.info" --output-directory coverage_report
diff --git a/hermes_shm/scripts/docs.sh b/ci/docs.sh
similarity index 100%
rename from hermes_shm/scripts/docs.sh
rename to ci/docs.sh
diff --git a/ci/external/CMakeLists.txt b/ci/external/CMakeLists.txt
deleted file mode 100644
index 826f316b6..000000000
--- a/ci/external/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(UNIT_TESTS)
-cmake_minimum_required (VERSION 3.10)
-
-set(CMAKE_MESSAGE_LOG_LEVEL "VERBOSE")
-find_package(Hermes CONFIG REQUIRED)
-message("Found Hermes at ${Hermes_INCLUDE_DIR} ${Hermes_LIBRARIES}")
-add_executable(test_hermes_install  test_install.cc)
-target_link_libraries(test_hermes_install ${Hermes_LIBRARIES})
\ No newline at end of file
diff --git a/ci/jarvis-util/jarvis_util/serialize/__init__.py b/ci/hermes/__init__.py
similarity index 100%
rename from ci/jarvis-util/jarvis_util/serialize/__init__.py
rename to ci/hermes/__init__.py
diff --git a/ci/jarvis-util/jarvis_util/shell/__init__.py b/ci/hermes/packages/hermes/__init__.py
similarity index 100%
rename from ci/jarvis-util/jarvis_util/shell/__init__.py
rename to ci/hermes/packages/hermes/__init__.py
diff --git a/ci/hermes/packages/hermes/package.py b/ci/hermes/packages/hermes/package.py
index 0a3462f95..138b1818e 100644
--- a/ci/hermes/packages/hermes/package.py
+++ b/ci/hermes/packages/hermes/package.py
@@ -4,44 +4,50 @@ class Hermes(CMakePackage):
     homepage = "http://www.cs.iit.edu/~scs/assets/projects/Hermes/Hermes.html"
     url = "https://github.com/HDFGroup/hermes/tarball/master"
     git = "https://github.com/HDFGroup/hermes.git"
-    version('master', branch='master')
-    version('pnnl', branch='pnnl')
-    version('dev-priv', git='https://github.com/lukemartinlogan/hermes.git', branch='dev')
+
+    version('master',
+            branch='master', submodules=True)
+    version('pnnl',
+            branch='pnnl', submodules=True)
+    version('dev-priv', git='https://github.com/lukemartinlogan/hermes.git',
+            branch='dev', submodules=True)
+    version('dev-1.1', git='https://github.com/lukemartinlogan/hermes.git',
+            branch='hermes-1.1', submodules=True)
+    version('hdf-1.1', git='https://github.com/HDFGroup/hermes.git',
+            branch='hermes-1.1', submodules=True)
+
     variant('vfd', default=False, description='Enable HDF5 VFD')
     variant('ares', default=False, description='Enable full libfabric install')
     variant('debug', default=False, description='Enable debug mode')
-    depends_on('mochi-thallium~cereal@0.8.3')
+    variant('zmq', default=False, description='Build ZeroMQ tests')
+
+    depends_on('mochi-thallium~cereal@0.10.1')
     depends_on('cereal')
-    depends_on('catch2@3.0.1')
-    depends_on('mpich@3.3.2:')
+    # depends_on('catch2@3.0.1')
+    depends_on('catch2')
+    depends_on('mpich@3.3.2')
     depends_on('yaml-cpp')
     depends_on('boost@1.7:')
-    # TODO(): we need to figure out how to add a python library as a dependency
-    # depends_on('py-jarvis-util')
-    depends_on('libfabric@1.14.1 fabrics=mlx,rxd,rxm,shm,sockets,tcp,udp,verbs,xpmem',
-               when='+ares')
-    depends_on('hdf5@1.14.0:', when='+vfd')
+    depends_on('hermes_shm')
+    depends_on('libzmq', '+zmq')
 
     def cmake_args(self):
-        args = ['-DCMAKE_INSTALL_PREFIX={}'.format(self.prefix),
-                '-DHERMES_RPC_THALLIUM=ON',
-                '-DHERMES_INSTALL_TESTS=ON',
-                '-DBUILD_TESTING=ON']
+        args = ['-DCMAKE_INSTALL_PREFIX={}'.format(self.prefix)]
         if '+debug' in self.spec:
             args.append('-DCMAKE_BUILD_TYPE=Debug')
-        if '+vfd' in self.spec:
-            args.append(self.define('HERMES_ENABLE_VFD', 'ON'))
+        else:
+            args.append('-DCMAKE_BUILD_TYPE=Release')
         return args
 
     def set_include(self, env, path):
         env.append_flags('CFLAGS', '-I{}'.format(path))
         env.append_flags('CXXFLAGS', '-I{}'.format(path))
+        env.prepend_path('INCLUDE', '{}'.format(path))
         env.prepend_path('CPATH', '{}'.format(path))
-        env.prepend_path('CMAKE_PREFIX_PATH', '{}'.format(path))
 
     def set_lib(self, env, path):
+        env.prepend_path('LIBRARY_PATH', path)
         env.prepend_path('LD_LIBRARY_PATH', path)
-        env.prepend_path('LIBRARY_PATH', '{}'.format(path))
         env.append_flags('LDFLAGS', '-L{}'.format(path))
 
     def set_flags(self, env):
@@ -49,6 +55,7 @@ def set_flags(self, env):
         self.set_include(env, '{}/include'.format(self.prefix))
         self.set_lib(env, '{}/lib'.format(self.prefix))
         self.set_lib(env, '{}/lib64'.format(self.prefix))
+        env.prepend_path('CMAKE_PREFIX_PATH', '{}/cmake'.format(self.prefix))
 
     def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
         self.set_flags(spack_env)
diff --git a/ci/jarvis-util/jarvis_util/util/__init__.py b/ci/hermes/packages/hermes_shm/__init__.py
similarity index 100%
rename from ci/jarvis-util/jarvis_util/util/__init__.py
rename to ci/hermes/packages/hermes_shm/__init__.py
diff --git a/hermes_shm/scripts/hermes_shm/packages/hermes_shm/package.py b/ci/hermes/packages/hermes_shm/package.py
similarity index 52%
rename from hermes_shm/scripts/hermes_shm/packages/hermes_shm/package.py
rename to ci/hermes/packages/hermes_shm/package.py
index 36fd17ec6..0ba3d2b1c 100644
--- a/hermes_shm/scripts/hermes_shm/packages/hermes_shm/package.py
+++ b/ci/hermes/packages/hermes_shm/package.py
@@ -4,21 +4,40 @@ class HermesShm(CMakePackage):
     homepage = "https://github.com/lukemartinlogan/hermes_shm/wiki"
     git = "https://github.com/lukemartinlogan/hermes_shm.git"
     version('master', branch='master')
-    depends_on('mochi-thallium~cereal@0.8.3')
+    variant('ares', default=False, description='Enable full libfabric install')
+    variant('only_verbs', default=False, description='Only verbs')
+
+    depends_on('mochi-thallium~cereal@0.10.1')
     depends_on('catch2@3.0.1')
-    depends_on('mpich@3.3.2:')
+    # depends_on('mpi')
+    depends_on('mpich@3.3.2')
+    depends_on('boost@1.7: +context +fiber')
+    depends_on('cereal')
     depends_on('yaml-cpp')
-    depends_on('boost@1.7:')
     depends_on('doxygen@1.9.3')
+    depends_on('libfabric fabrics=sockets,tcp,udp,rxm,rxd,verbs',
+               when='+ares')
+    depends_on('libfabric fabrics=verbs',
+               when='+only_verbs')
+
+    variant('debug', default=False, description='Build shared libraries')
 
     def cmake_args(self):
-        return []
+        args = []
+        if '+debug' in self.spec:
+            args.append('-DCMAKE_BUILD_TYPE=Debug')
+        else:
+            args.append('-DCMAKE_BUILD_TYPE=Release')
+        return args
 
     def set_include(self, env, path):
         env.append_flags('CFLAGS', '-I{}'.format(path))
         env.append_flags('CXXFLAGS', '-I{}'.format(path))
+        env.prepend_path('INCLUDE', '{}'.format(path))
+        env.prepend_path('CPATH', '{}'.format(path))
 
     def set_lib(self, env, path):
+        env.prepend_path('LIBRARY_PATH', path)
         env.prepend_path('LD_LIBRARY_PATH', path)
         env.append_flags('LDFLAGS', '-L{}'.format(path))
 
@@ -27,6 +46,7 @@ def set_flags(self, env):
         self.set_include(env, '{}/include'.format(self.prefix))
         self.set_lib(env, '{}/lib'.format(self.prefix))
         self.set_lib(env, '{}/lib64'.format(self.prefix))
+        env.prepend_path('CMAKE_PREFIX_PATH', '{}/cmake'.format(self.prefix))
 
     def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
         self.set_flags(spack_env)
diff --git a/ci/hermes/repo.yaml b/ci/hermes/repo.yaml
index fdd6f5fb9..039fd3384 100644
--- a/ci/hermes/repo.yaml
+++ b/ci/hermes/repo.yaml
@@ -1,2 +1,2 @@
 repo:
-  namespace: hermes 
+  namespace: 'hermes'
diff --git a/ci/install_deps.sh b/ci/install_deps.sh
index 45e6be4c4..03958f316 100755
--- a/ci/install_deps.sh
+++ b/ci/install_deps.sh
@@ -1,25 +1,30 @@
 #!/bin/bash
 
+# CD into git workspace
+cd ${GITHUB_WORKSPACE}
+
+# This script will build and install them via Spack from source
+# because Hermes requires a very specific version and configuration options
+# for each package.
+
 set -x
 set -e
 set -o pipefail
 
-sudo apt-get install -y pkg-config
-
-# Where to install data
+# Change this especially when your $HOME doesn't have enough disk space. 
 INSTALL_DIR="${HOME}"
-INSTALL_PREFIX="${HOME}/install"
 SPACK_DIR=${INSTALL_DIR}/spack
 SPACK_VERSION=0.18.1
 
-# Install spack
 echo "Installing dependencies at ${INSTALL_DIR}"
 mkdir -p ${INSTALL_DIR}
+
+# Load Spack
 git clone https://github.com/spack/spack ${SPACK_DIR}
-pushd ${SPACK_DIR}
+cd ${SPACK_DIR}
 git checkout v${SPACK_VERSION}
-popd
 
+# Set spack env
 set +x
 . ${SPACK_DIR}/share/spack/setup-env.sh
 set -x
@@ -27,17 +32,10 @@ set -x
 # This will allow Spack to skip building some packages that are directly
 # available from the system. For example, autoconf, cmake, m4, etc.
 # Modify ci/pckages.yaml to skip building compilers or build tools via Spack.
+cd ${GITHUB_WORKSPACE}
 cp ci/packages.yaml ${SPACK_DIR}/etc/spack/packages.yaml
 
-# This will override Spack's default package repository to allow building
-# a custom package when the same package is available from Spack.
-spack repo add ./ci/hermes
-
-# This will build our small python library for running unit tests
-cd ci/jarvis-util
-python3 -m pip install -r requirements.txt
-python3 -m pip install -e .
-
-# NOTE(llogan): Modify version string per release.
-HERMES_VERSION=1.0.0
-spack install hermes +vfd
+# Install hermes_shm (needed for dependencies)
+#
+spack repo add ci/hermes
+spack install hermes_shm
diff --git a/ci/install_docs.sh b/ci/install_docs.sh
index 38d213025..63f912bd8 100755
--- a/ci/install_docs.sh
+++ b/ci/install_docs.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-# set -x
-# set -e
-# set -o pipefail
+# CD into git workspace
+cd ${GITHUB_WORKSPACE}
 
+# Make build directory
 mkdir build
-pushd build
+cd build
 
-#LOCAL=local
-INSTALL_PREFIX="${HOME}/${LOCAL}"
+INSTALL_PREFIX="${HOME}"
 
 export CXXFLAGS="${CXXFLAGS} -std=c++17 -Werror -Wall -Wextra"
 cmake                                                      \
@@ -17,25 +16,12 @@ cmake                                                      \
     -DCMAKE_BUILD_RPATH=${INSTALL_PREFIX}/lib              \
     -DCMAKE_INSTALL_RPATH=${INSTALL_PREFIX}/lib            \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                       \
-    -DCMAKE_CXX_COMPILER=`which mpicxx`                    \
-    -DCMAKE_C_COMPILER=`which mpicc`                       \
     -DBUILD_SHARED_LIBS=ON                                 \
     -DHERMES_ENABLE_DOXYGEN=ON                             \
     -DHERMES_ENABLE_COVERAGE=ON                            \
-    -DHERMES_BUILD_BENCHMARKS=ON                           \
-    -DHERMES_COMMUNICATION_MPI=ON                          \
-    -DHERMES_BUILD_BUFFER_POOL_VISUALIZER=ON               \
-    -DORTOOLS_DIR=${INSTALL_PREFIX}                        \
-    -DHERMES_USE_ADDRESS_SANITIZER=ON                      \
-    -DHERMES_USE_THREAD_SANITIZER=OFF                      \
-    -DHERMES_RPC_THALLIUM=ON                               \
-    -DHERMES_ENABLE_VFD=ON                                 \
-    -DBUILD_TESTING=ON                                     \
     ..
 make dox >& out.txt
 # cat out.txt | grep warning | grep -v "ignoring unsupported tag"
-popd
 rec="$( grep warning build/out.txt | grep -v "ignoring unsupported tag" |  wc -l )"
 echo "$rec"
 exit "$rec"
-
diff --git a/ci/install_hermes.sh b/ci/install_hermes.sh
deleted file mode 100755
index b34a3aa40..000000000
--- a/ci/install_hermes.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. ci/build_hermes.sh
-pushd build
-ctest -VV
-popd
diff --git a/ci/jarvis-util/.coveragerc b/ci/jarvis-util/.coveragerc
deleted file mode 100644
index f1db9952b..000000000
--- a/ci/jarvis-util/.coveragerc
+++ /dev/null
@@ -1,4 +0,0 @@
-# .coveragerc
-[run]
-source = .
-omit = *test*
\ No newline at end of file
diff --git a/ci/jarvis-util/.gitignore b/ci/jarvis-util/.gitignore
deleted file mode 100644
index 80ced04e4..000000000
--- a/ci/jarvis-util/.gitignore
+++ /dev/null
@@ -1,139 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-.idea
-hostfile.txt
-lcov.info
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-/.idea/jarvis-cd.iml
-/.idea/misc.xml
-/.idea/modules.xml
-/.idea/inspectionProfiles/profiles_settings.xml
-/.idea/inspectionProfiles/Project_Default.xml
-/.idea/vcs.xml
-/.idea/deployment.xml
diff --git a/ci/jarvis-util/LICENSE b/ci/jarvis-util/LICENSE
deleted file mode 100644
index 5db7c2cc8..000000000
--- a/ci/jarvis-util/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022-present Luke Logan and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/ci/jarvis-util/README.md b/ci/jarvis-util/README.md
deleted file mode 100644
index 711a1466e..000000000
--- a/ci/jarvis-util/README.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# Jarvis UTIL
-
-Jarvis-util is a library which contains various utilities to aid with
-creating shell scripts within Python. This library contains wrappers
-for executing shell commands locally, SSH, SCP, MPI, argument parsing, 
-and various other random utilities.
-
-![Build](https://github.com/lukemartinlogan/jarvis-util/workflows/GitHub%20Actions/badge.svg)
-
-[![Coverage Status](https://coveralls.io/repos/github/lukemartinlogan/jarvis-util/badge.svg?branch=master)](https://coveralls.io/github/lukemartinlogan/jarvis-util?branch=master)
-
-## Installation
-
-For now, we only consider manual installation
-```bash
-cd jarvis-util
-python3 -m pip install -r requirements.txt
-python3 -m pip install -e .
-```
-
-## Executing a program
-
-The following code will execute a command on the local machine.
-The output will NOT be collected into an in-memory buffer.
-The output will be printed to the terminal as it occurs.
-
-```python
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo 
-
-node = Exec('echo hello', LocalExecInfo(collect_output=False))
-```
-
-Programs can also be executed asynchronously:
-```python
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo 
-
-node = Exec('echo hello', LocalExecInfo(collect_output=False,
-                                        exec_async=True))
-node.wait()
-```
-
-Various examples of outputs:
-```python
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo 
-
-# Will ONLY print to the terminal
-node = Exec('echo hello', LocalExecInfo(collect_output=False))
-# Will collect AND print to the terminal
-node = Exec('echo hello', LocalExecInfo(collect_output=True))
-# Will collect BUT NOT print to the terminal
-node = Exec('echo hello', LocalExecInfo(collect_output=True,
-                                        hide_output=True))
-# Will collect, pipe to file, and print to terminal
-node = Exec('echo hello', LocalExecInfo(collect_output=True,
-                                        pipe_stdout='/tmp/stdout.txt',
-                                        pipe_stderr='/tmp/stderr.txt'))
-```
-
-This is useful if you have a program which runs using a daemon mode.
-
-## Executing an MPI program
-
-The following code will execute the "hostname" command on the local
-machine 24 times using MPI.
-
-```python
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.mpi_exec import MpiExecInfo 
-
-node = Exec('hostname', MpiExecInfo(hostfile=None,
-                                    nprocs=24,
-                                    ppn=None,
-                                    collect_output=False))
-```
-
-## Executing an SSH program
-
-The following code will execute the "hostname" command on all machines
-in the hostfile
-
-```python
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.pssh_exec import PsshExecInfo 
-
-node = Exec('hostname', PsshExecInfo(hostfile="/tmp/hostfile.txt",
-                                     collect_output=False))
-```
-
-## The contents of a hostfile
-
-A hostfile can have the following syntax:
-```
-ares-comp-01
-ares-comp-[02-04]
-ares-comp-[05-09,11,12-14]-40g
-```
-
-These will be expanded internally by PSSH and MPI.
-
-# Unit tests
-
-We run our unit tests in a docker container, which is located underneath
-the CI directory. This is because we need to test multi-node functionality,
-without having multiple nodes. To setup unit testing, perform the following:
-
-1. Install Docker
-2. Setup our "ci" container
-3. Run the unit tests
-
-```
-```
-
-# Contributing
-
-We use the Google Python Style guide (pylintrc).
\ No newline at end of file
diff --git a/ci/jarvis-util/bin/jarvis-imports b/ci/jarvis-util/bin/jarvis-imports
deleted file mode 100755
index 25fc19a9a..000000000
--- a/ci/jarvis-util/bin/jarvis-imports
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python3
-
-from jarvis_util.util.import_all import *
-import pathlib
-import os
-
-
-build_global_import_from_bin('jarvis_util')
diff --git a/ci/jarvis-util/ci/cluster/Dockerfile b/ci/jarvis-util/ci/cluster/Dockerfile
deleted file mode 100644
index 548937e02..000000000
--- a/ci/jarvis-util/ci/cluster/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Install ubuntu 20.04
-FROM ubuntu:20.04
-LABEL maintainer="llogan@hawk.iit.edu"
-LABEL version="0.0"
-LABEL description="An example docker image"
-
-# Disable Prompt During Packages Installation
-ARG DEBIAN_FRONTEND=noninteractive
-
-# Update ubuntu
-RUN apt update && apt install
-
-# Install some basic packages
-RUN apt install -y \
-    openssh-server \
-    sudo git nano vim \
-    docker \
-    mpich \
-    gcc \
-    g++ \
-    gfortran \
-    libtool \
-    libtool-bin \
-    automake \
-    autoconf
-
-# Create a new user
-RUN useradd -m sshuser
-RUN usermod -aG sudo sshuser
-RUN passwd -d sshuser
-
-# Copy the host's SSH keys
-# Docker requires COPY be relative to the current working
-# directory. We cannot pass ~/.ssh/id_rsa unfortunately...
-ENV SSHDIR=/home/sshuser/.ssh
-RUN sudo -u sshuser mkdir ${SSHDIR}
-COPY id_rsa ${SSHDIR}/id_rsa
-COPY id_rsa.pub ${SSHDIR}/id_rsa.pub
-
-# Authorize host SSH keys
-RUN sudo -u sshuser touch ${SSHDIR}/authorized_keys
-RUN cat ${SSHDIR}/id_rsa.pub >> ${SSHDIR}/authorized_keys
-
-# Set SSH permissions
-RUN chmod 700 ${SSHDIR}
-RUN chmod 644 ${SSHDIR}/id_rsa.pub
-RUN chmod 600 ${SSHDIR}/id_rsa
-RUN chmod 600 ${SSHDIR}/authorized_keys
-
-# Enable passwordless SSH
-RUN sed -i 's/#PermitEmptyPasswords no/PermitEmptyPasswords yes/' /etc/ssh/sshd_config
-
-# Start SSHD and wait forever
-RUN mkdir /run/sshd
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/ci/jarvis-util/ci/cluster/docker-compose.yml b/ci/jarvis-util/ci/cluster/docker-compose.yml
deleted file mode 100644
index aa7477089..000000000
--- a/ci/jarvis-util/ci/cluster/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3"
-
-services:
-  node1:
-    build: .
-    links:
-      - node2
-    networks:
-      - net
-    hostname: node1
-    stdin_open: true
-    tty: true
-
-  node2:
-    build: .
-    networks:
-      - net
-    hostname: node2
-    stdin_open: true
-    tty: true
-
-networks:
-  net:
-    driver: bridge
\ No newline at end of file
diff --git a/ci/jarvis-util/ci/install_deps.sh b/ci/jarvis-util/ci/install_deps.sh
deleted file mode 100644
index 0d1f0447d..000000000
--- a/ci/jarvis-util/ci/install_deps.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-sudo apt update
-sudo apt install -y \
-docker \
-mpich \
-gcc \
-g++ \
-gfortran \
-libtool \
-libtool-bin \
-automake \
-autoconf
\ No newline at end of file
diff --git a/ci/jarvis-util/ci/install_jarvis.sh b/ci/jarvis-util/ci/install_jarvis.sh
deleted file mode 100644
index 58aa283c0..000000000
--- a/ci/jarvis-util/ci/install_jarvis.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-python3 -m pip install -r requirements.txt
-python3 -m pip install -e .
diff --git a/ci/jarvis-util/ci/install_spack.sh b/ci/jarvis-util/ci/install_spack.sh
deleted file mode 100644
index 0d1f0447d..000000000
--- a/ci/jarvis-util/ci/install_spack.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-sudo apt update
-sudo apt install -y \
-docker \
-mpich \
-gcc \
-g++ \
-gfortran \
-libtool \
-libtool-bin \
-automake \
-autoconf
\ No newline at end of file
diff --git a/ci/jarvis-util/ci/lint.sh b/ci/jarvis-util/ci/lint.sh
deleted file mode 100644
index a1af3ff48..000000000
--- a/ci/jarvis-util/ci/lint.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-pylint "${PWD}"/jarvis_util
\ No newline at end of file
diff --git a/ci/jarvis-util/ci/run_tests.sh b/ci/jarvis-util/ci/run_tests.sh
deleted file mode 100644
index abd4e290a..000000000
--- a/ci/jarvis-util/ci/run_tests.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-coverage run -m pytest
-rm -rf "*.pyc"
-coverage report
-coverage-lcov
\ No newline at end of file
diff --git a/ci/jarvis-util/jarvis_util/__init__.py b/ci/jarvis-util/jarvis_util/__init__.py
deleted file mode 100644
index 1019dd213..000000000
--- a/ci/jarvis-util/jarvis_util/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""Import all modules"""
-from jarvis_util.util.expand_env import *
-from jarvis_util.util.naming import *
-from jarvis_util.util.hostfile import *
-from jarvis_util.util.size_conv import *
-from jarvis_util.util.import_all import *
-from jarvis_util.util.import_mod import *
-from jarvis_util.util.argparse import *
-from jarvis_util.serialize.ini_file import *
-from jarvis_util.serialize.yaml_file import *
-from jarvis_util.serialize.text_file import *
-from jarvis_util.serialize.serializer import *
-from jarvis_util.serialize.pickle import *
-from jarvis_util.shell.filesystem import *
-from jarvis_util.shell.exec import *
-from jarvis_util.shell.exec_info import *
-from jarvis_util.shell.ssh_exec import *
-from jarvis_util.shell.pssh_exec import *
-from jarvis_util.shell.process import *
-from jarvis_util.shell.pscp import *
-from jarvis_util.shell.scp import *
-from jarvis_util.shell.mpi_exec import *
-from jarvis_util.shell.local_exec import *
-from jarvis_util.introspect.system_info import *
-from jarvis_util.jutil_manager import *
diff --git a/ci/jarvis-util/jarvis_util/introspect/system_info.py b/ci/jarvis-util/jarvis_util/introspect/system_info.py
deleted file mode 100644
index 5a9d94482..000000000
--- a/ci/jarvis-util/jarvis_util/introspect/system_info.py
+++ /dev/null
@@ -1,635 +0,0 @@
-"""
-This module provides methods for querying the information of the host
-system. This can be used to make scripts more portable.
-"""
-
-import re
-import platform
-from jarvis_util.shell.exec import Exec
-from jarvis_util.util.size_conv import SizeConv
-from jarvis_util.serialize.yaml_file import YamlFile
-import json
-import pandas as pd
-import numpy as np
-from enum import Enum
-import shlex
-
-# pylint: disable=C0121
-
-class SystemInfo:
-    """
-    This class queries information about the host machine, such as OS,
-    CPU, and kernel
-    """
-
-    instance_ = None
-
-    @staticmethod
-    def get_instance():
-        if SystemInfo.instance_ is None:
-            SystemInfo.instance_ = SystemInfo()
-        return SystemInfo.instance_
-
-    def __init__(self):
-        with open('/etc/os-release', 'r', encoding='utf-8') as fp:
-            lines = fp.read().splitlines()
-            self.os = self._detect_os_type(lines)
-            self.os_like = self._detect_os_like_type(lines)
-            self.os_version = self._detect_os_version(lines)
-        self.ksemantic = platform.platform()
-        self.krelease = platform.release()
-        self.ktype = platform.system()
-        self.cpu = platform.processor()
-        self.cpu_family = platform.machine()
-
-    def _detect_os_type(self, lines):
-        for line in lines:
-            if 'ID=' in line:
-                if 'ubuntu' in line:
-                    return 'ubuntu'
-                elif 'centos' in line:
-                    return 'centos'
-                elif 'debian' in line:
-                    return 'debian'
-
-    def _detect_os_like_type(self, lines):
-        for line in lines:
-            if 'ID_LIKE=' in line:
-                if 'ubuntu' in line:
-                    return 'ubuntu'
-                elif 'centos' in line:
-                    return 'centos'
-                elif 'debian' in line:
-                    return 'debian'
-
-    def _detect_os_version(self, lines):
-        for line in lines:
-            grp = re.match('VERSION_ID=\"(.*)\"', line)
-            if grp:
-                return grp.group(1)
-
-    def __hash__(self):
-        return hash(str([self.os, self.os_like,
-                         self.os_version, self.ksemantic,
-                         self.krelease, self.ktype,
-                         self.cpu, self.cpu_family]))
-
-    def __eq__(self, other):
-        return (
-            (self.os == other.os) and
-            (self.os_like == other.os_like) and
-            (self.os_version == other.os_version) and
-            (self.ksemantic == other.ksemantic) and
-            (self.krelease == other.krelease) and
-            (self.cpu == other.cpu) and
-            (self.cpu_family == other.cpu_family)
-        )
-
-
-class Lsblk(Exec):
-    """
-    List all block devices in the system per-node. Lsblk will return
-    a JSON output
-
-    A table is stored per-host:
-        parent: the parent device of the partition (e.g., /dev/sda or NaN)
-        device: the name of the partition (e.g., /dev/sda1)
-        size: total size of the partition (bytes)
-        mount: where the partition is mounted (if anywhere)
-        model: the exact model of the device
-        tran: the transport of the device (e.g., /dev/nvme)
-        rota: whether or not the device is rotational
-        host: the host this record corresponds to
-    """
-
-    def __init__(self, exec_info):
-        cmd = 'lsblk -o NAME,SIZE,MODEL,TRAN,MOUNTPOINT,ROTA -J -s'
-        super().__init__(cmd, exec_info.mod(collect_output=True))
-        self.exec_async = exec_info.exec_async
-        self.graph = {}
-        if not self.exec_async:
-            self.wait()
-
-    def wait(self):
-        super().wait()
-        for host, stdout in self.stdout.items():
-            lsblk_data = json.loads(stdout)['blockdevices']
-            partitions = []
-            devs = {}
-            for partition in lsblk_data:
-                dev = partition['children'][0]
-                partitions.append({
-                    'parent': f'/dev/{dev["name"]}',
-                    'device': f'/dev/{partition["name"]}',
-                    'size': SizeConv.to_int(partition['size']),
-                    'mount': partition['mountpoint'],
-                    'host': host
-                })
-                devs[dev['name']] = {
-                    'parent': f'/dev/{dev["name"]}',
-                    'size': SizeConv.to_int(dev['size']),
-                    'model': dev['model'],
-                    'tran': dev['tran'].lower(),
-                    'mount': dev['mountpoint'],
-                    'rota': dev['rota'],
-                    'host': host
-                }
-            devs = list(devs.values())
-        part_df = pd.DataFrame(partitions)
-        dev_df = pd.DataFrame(devs)
-        total_df = pd.merge(part_df,
-                            dev_df[['parent', 'model', 'tran', 'host']],
-                            on=['parent', 'host'])
-        dev_df = dev_df.rename(columns={'parent': 'device'})
-        total_df = pd.concat([total_df, dev_df])
-        self.df = total_df
-
-
-class Blkid(Exec):
-    """
-    List all filesystems (even those unmounted) and their properties
-
-    Stores a per-host table with the following:
-        device: the device (or partition) which stores the data (e.g., /dev/sda)
-        fs_type: the type of filesystem (e.g., ext4)
-        uuid: filesystem-levle uuid from the FS metadata
-        partuuid: the partition-lable UUID for the partition
-        host: the host this entry corresponds to
-    """
-    def __init__(self, exec_info):
-        cmd = 'blkid'
-        super().__init__(cmd, exec_info.mod(collect_output=True))
-        self.exec_async = exec_info.exec_async
-        self.graph = {}
-        if not self.exec_async:
-            self.wait()
-
-    def wait(self):
-        super().wait()
-        for host, stdout in self.stdout.items():
-            devices = stdout.splitlines()
-            dev_list = []
-            for dev in devices:
-                dev_dict = {}
-                toks = shlex.split(dev)
-                dev_name = toks[0].split(':')[0]
-                dev_dict['device'] = dev_name
-                dev_dict['host'] = host
-                for tok in toks[1:]:
-                    keyval = tok.split('=')
-                    key = keyval[0].lower()
-                    val = ' '.join(keyval[1:])
-                    dev_dict[key] = val
-                dev_list.append(dev_dict)
-        df = pd.DataFrame(dev_list)
-        df = df.rename(columns={'type': 'fs_type'})
-        self.df = df
-
-
-class ListFses(Exec):
-    """
-    List all mounted filesystems
-
-    Will store a per-host dictionary containing:
-        device: the device which contains the filesystem
-        fs_size: total size of the filesystem
-        used: total nubmer of bytes used
-        avail: total number of bytes remaining
-        use%: the percent of capacity used
-        fs_mount: where the filesystem is mounted
-        host: the host this entry corresponds to
-    """
-
-    def __init__(self, exec_info):
-        cmd = 'df -h'
-        super().__init__(cmd, exec_info.mod(collect_output=True))
-        self.exec_async = exec_info.exec_async
-        self.graph = {}
-        if not self.exec_async:
-            self.wait()
-
-    def wait(self):
-        super().wait()
-        for host, stdout in self.stdout.items():
-            lines = stdout.strip().splitlines()
-            columns = ['device', 'fs_size', 'used',
-                       'avail', 'use%', 'fs_mount', 'host']
-            rows = [line.split() + [host] for line in lines[1:]]
-            df = pd.DataFrame(rows, columns=columns)
-            # pylint: disable=W0108
-            df.loc[:, 'fs_size'] = df['fs_size'].apply(
-                lambda x : SizeConv.to_int(x))
-            df.loc[:, 'used'] = df['used'].apply(
-                lambda x: SizeConv.to_int(x))
-            df.loc[:, 'avail'] = df['avail'].apply(
-                lambda x : SizeConv.to_int(x))
-            # pylint: enable=W0108
-            self.df = df
-
-
-class FiInfo(Exec):
-    """
-    List all networks and their information
-        provider: network protocol (e.g., sockets, tcp, ib)
-        fabric: IP address
-        domain: network domain
-        version: network version
-        type: packet type (e.g., DGRAM)
-        protocol: protocol constant
-        host: the host this network corresponds to
-    """
-    def __init__(self, exec_info):
-        super().__init__('fi_info', exec_info.mod(collect_output=True))
-        self.exec_async = exec_info.exec_async
-        self.graph = {}
-        if not self.exec_async:
-            self.wait()
-
-    def wait(self):
-        super().wait()
-        for host, stdout in self.stdout.items():
-            lines = stdout.strip().splitlines()
-            providers = []
-            for line in lines:
-                if 'provider' in line:
-                    providers.append({
-                        'provider': line.split(':')[1],
-                        'host': host
-                    })
-                else:
-                    splits = line.split(':')
-                    key = splits[0].strip()
-                    val = splits[1].strip()
-                    if 'fabric' in key:
-                        val = val.split('/')[0]
-                    providers[-1][key] = val
-        self.df = pd.DataFrame(providers)
-
-
-class StorageDeviceType(Enum):
-    PMEM='pmem'
-    NVME='nvme'
-    SSD='ssd'
-    HDD='hdd'
-
-
-class ResourceGraph:
-    """
-    Stores helpful information about storage and networking info for machines.
-
-    Two tables are stored to make decisions on application deployment.
-    fs:
-        parent: the parent device of the partition (e.g., /dev/sda or NaN)
-        device: the name of the device (e.g., /dev/sda1 or /dev/sda)
-        size: total size of the device (bytes)
-        mount: where the device is mounted (if anywhere)
-        model: the exact model of the device
-        rota: whether the device is rotational or not
-        tran: the transport of the device (e.g., /dev/nvme)
-        fs_type: the type of filesystem (e.g., ext4)
-        uuid: filesystem-levle uuid from the FS metadata
-        fs_size: total size of the filesystem
-        avail: total number of bytes remaining
-        shared: whether the this is a shared service or not
-        host: the host this record corresponds to
-    net:
-        provider: network protocol (e.g., sockets, tcp, ib)
-        fabric: IP address
-        domain: network domain
-        host: the host this network corresponds to
-
-    TODO: Need to verify on more than ubuntu20.04
-    TODO: Can we make this work for windows?
-    TODO: Can we make this work even when hosts have different OSes?
-    """
-
-    def __init__(self):
-        self.lsblk = None
-        self.blkid = None
-        self.list_fs = None
-        self.fi_info = None
-        self.fs_columns = [
-            'parent', 'device', 'size', 'mount', 'model', 'rota',
-            'tran', 'fs_type', 'uuid', 'fs_size',
-            'avail', 'shared', 'host'
-        ]
-        self.net_columns = [
-            'provider', 'fabric', 'domain', 'host'
-        ]
-        self.all_fs = pd.DataFrame(columns=self.fs_columns)
-        self.all_net = pd.DataFrame(columns=self.net_columns)
-        self.fs_settings = {
-            'register': [],
-            'filter_mounts': {}
-        }
-        self.net_settings = {
-            'register': [],
-            'track_ips': {}
-        }
-        self.hosts = None
-
-    def build(self, exec_info, introspect=True):
-        """
-        Build a resource graph.
-
-        :param exec_info: Where to collect resource information
-        :param introspect: Whether to introspect system info, or rely solely
-        on admin-defined settings
-        :return: self
-        """
-        if introspect:
-            self._introspect(exec_info)
-        self.apply()
-        return self
-
-    def _introspect(self, exec_info):
-        """
-        Introspect the cluster for resources.
-
-        :param exec_info: Where to collect resource information
-        :return: None
-        """
-        self.lsblk = Lsblk(exec_info)
-        self.blkid = Blkid(exec_info)
-        self.list_fs = ListFses(exec_info)
-        self.fi_info = FiInfo(exec_info)
-        self.hosts = exec_info.hostfile.hosts
-        self.all_fs = pd.merge(self.lsblk.df,
-                               self.blkid.df,
-                               on=['device', 'host'],
-                               how='outer')
-        self.all_fs['shared'] = False
-        self.all_fs = pd.merge(self.all_fs,
-                               self.list_fs.df,
-                               on=['device', 'host'],
-                               how='outer')
-        self.all_fs['shared'].fillna(True, inplace=True)
-        self.all_fs.drop(['used', 'use%', 'fs_mount', 'partuuid'],
-                         axis=1, inplace=True)
-        self.all_fs['mount'].fillna(value='', inplace=True)
-        net_df = self.fi_info.df
-        net_df['speed'] = np.nan
-        net_df.drop(['version', 'type', 'protocol'],
-                    axis=1, inplace=True)
-        self.all_net = net_df
-
-    def save(self, path):
-        """
-        Save the resource graph YAML file
-
-        :param path: the path to save the file
-        :return: None
-        """
-        graph = {
-            'hosts': self.hosts,
-            'fs': self.all_fs.to_dict('records'),
-            'net': self.all_net.to_dict('records'),
-            'fs_settings': self.fs_settings,
-            'net_settings': self.net_settings
-        }
-        YamlFile(path).save(graph)
-
-    def load(self, path):
-        """
-        Load resource graph from storage.
-
-        :param path: The path to the resource graph YAML file
-        :return: self
-        """
-        graph = YamlFile(path).load()
-        self.hosts = graph['hosts']
-        self.all_fs = pd.DataFrame(graph['fs'])
-        self.all_net = pd.DataFrame(graph['net'])
-        self.fs = None
-        self.net = None
-        self.fs_settings = graph['fs_settings']
-        self.net_settings = graph['net_settings']
-        self.apply()
-        return self
-
-    def set_hosts(self, hosts):
-        """
-        Set the set of hosts this resource graph covers
-
-        :param hosts: Hostfile()
-        :return: None
-        """
-        self.hosts = hosts.hosts_ip
-
-    def add_storage(self, hosts, **kwargs):
-        """
-        Register a storage device record
-
-        :param hosts: Hostfile() indicating set of hosts to make record for
-        :param kwargs: storage record
-        :return: None
-        """
-        for host in hosts.hosts:
-            record = kwargs.copy()
-            record['host'] = host
-            self.fs_settings['register'].append(record)
-
-    def add_net(self, hosts, **kwargs):
-        """
-        Register a network record
-
-        :param hosts: Hostfile() indicating set of hosts to make record for
-        :param kwargs: net record
-        :return: None
-        """
-        for host, ip in zip(hosts.hosts, hosts.hosts_ip):
-            record = kwargs.copy()
-            record['fabric'] = ip
-            record['host'] = host
-            self.net_settings['register'].append(record)
-
-    def filter_fs(self, mount_re,
-                  mount_suffix=None, tran=None):
-        """
-        Track all filesystems + devices matching the mount regex.
-
-        :param mount_re: The regex to match a set of mountpoints
-        :param mount_suffix: After the mount_re is matched, append this path
-        to the mountpoint to indicate where users can access data. A typical
-        value for this is /${USER}, indicating the mountpoint has a subdirectory
-        per-user where they can access data.
-        :param shared: Whether this mount point is shared
-        :param tran: The transport of this device
-        :return: self
-        """
-        self.fs_settings['filter_mounts']['mount_re'] = {
-            'mount_re': mount_re,
-            'mount_suffix': mount_suffix,
-            'tran': tran
-        }
-        return self
-
-    def filter_ip(self, ip_re, speed=None):
-        """
-        Track all IPs matching the regex. The IPs with this regex all have
-        a certain speed.
-
-        :param ip_re: The regex to match
-        :param speed: The speed of the fabric
-        :return: self
-        """
-        self.net_settings['track_ips'][ip_re] = {
-            'ip_re': ip_re,
-            'speed': SizeConv.to_int(speed) if speed is not None else speed
-        }
-        return self
-
-    def filter_hosts(self, hosts, speed=None):
-        """
-        Track all ips matching the hostnames.
-
-        :param hosts: Hostfile() of the hosts to filter for
-        :param speed: Speed of the interconnect (e.g., 1gbps)
-        :return: self
-        """
-        for host in hosts.hosts_ip:
-            self.filter_ip(host, speed)
-        return self
-
-    def apply(self):
-        """
-        Apply fs and net settings to the resource graph
-
-        :return: self
-        """
-        self._apply_fs_settings()
-        self._apply_net_settings()
-        # self.fs.size = self.fs.size.fillna(0)
-        # self.fs.avail = self.fs.avail.fillna(0)
-        # self.fs.fs_size = self.fs.fs_size.fillna(0)
-        return self
-
-    def _apply_fs_settings(self):
-        if len(self.fs_settings) == 0:
-            self.fs = self.all_fs
-            return
-        df = self.all_fs
-        self.fs = pd.DataFrame(columns=self.all_net.columns)
-        for fs_set in self.fs_settings['filter_mounts'].values():
-            mount_re = fs_set['mount_re']
-            mount_suffix = fs_set['mount_suffix']
-            tran = fs_set['tran']
-            with_mount = df[df.mount.str.contains(mount_re)]
-            if mount_suffix is not None:
-                with_mount['mount'] += mount_suffix
-            if tran is not None:
-                with_mount['tran'] = tran
-            self.fs = pd.concat([self.fs, with_mount])
-        admin_df = pd.DataFrame(self.fs_settings['register'],
-                                columns=self.fs_columns)
-        self.fs = pd.concat([self.fs, admin_df])
-
-    def _apply_net_settings(self):
-        if len(self.net_settings) == 0:
-            self.net = self.all_net
-            return
-        self.net = pd.DataFrame(columns=self.all_net.columns)
-        df = self.all_net
-        for net_set in self.net_settings['track_ips'].values():
-            ip_re = net_set['ip_re']
-            speed = net_set['speed']
-            with_ip = df[df['fabric'].str.contains(ip_re)]
-            with_ip['speed'] = speed
-            self.net = pd.concat([self.net, with_ip])
-        admin_df = pd.DataFrame(self.net_settings['register'],
-                                columns=self.net_columns)
-        self.net = pd.concat([self.net, admin_df])
-
-    def find_shared_storage(self):
-        """
-        Find the set of shared storage services
-
-        :return: Dataframe
-        """
-        df = self.fs
-        return df[df.shared == True]
-
-    def find_storage(self,
-                     dev_types=None,
-                     is_mounted=True,
-                     common=False,
-                     count_per_node=None,
-                     count_per_dev=None,
-                     min_cap=None,
-                     min_avail=None):
-        """
-        Find a set of storage devices.
-
-        :param dev_types: Search for devices of type in order. Either a list
-        or a string.
-        :param is_mounted: Search only for mounted devices
-        :param common: Remove mount points that are not common across all hosts
-        :param count_per_node: Choose only a subset of devices matching query
-        :param count_per_dev: Choose only a subset of devices matching query
-        :param min_cap: Remove devices with too little overall capacity
-        :param min_avail: Remove devices with too little available space
-        :return: Dataframe
-        """
-        df = self.fs
-        # Remove pfs
-        df = df[df.shared == False]
-        # Filter devices by whether or not a mount is needed
-        if is_mounted:
-            df = df[df.mount.notna()]
-        # Find devices of a particular type
-        if dev_types is not None:
-            matching_devs = pd.DataFrame(columns=df.columns)
-            if isinstance(dev_types, str):
-                dev_types = [dev_types]
-            for dev_type in dev_types:
-                if dev_type == StorageDeviceType.HDD:
-                    devs = df[(df.tran == 'sata') & (df.rota == True)]
-                elif dev_type == StorageDeviceType.SSD:
-                    devs = df[(df.tran == 'sata') & (df.rota == False)]
-                elif dev_type == StorageDeviceType.NVME:
-                    devs = df[(df.tran == 'nvme')]
-                matching_devs = pd.concat([matching_devs, devs])
-            df = matching_devs
-        # Get the set of mounts common between all hosts
-        if common:
-            df = df.groupby(['mount']).filter(
-                lambda x: len(x) == len(self.hosts)).reset_index(drop=True)
-        # Remove storage with too little capacity
-        if min_cap is not None:
-            df = df[df.size >= min_cap]
-        # Remove storage with too little available space
-        if min_avail is not None:
-            df = df[df.avail >= min_avail]
-        # Take a certain number of each device per-host
-        if count_per_dev is not None:
-            df = df.groupby(['tran', 'rota', 'host']).\
-                head(count_per_dev).reset_index(drop=True)
-        # Take a certain number of matched devices per-host
-        if count_per_node is not None:
-            df = df.groupby('host').head(count_per_node).reset_index(drop=True)
-        return df
-
-    def find_net_info(self, hosts,
-                      providers=None):
-        """
-        Find the set of networks common between each host.
-
-        :param hosts: A Hostfile() data structure containing the set of
-        all hosts to find network information for
-        :param providers: The network protocols to search for.
-        :return: Dataframe
-        """
-        df = self.net
-        # Get the set of fabrics corresponding to these hosts
-        df = df[df.fabric.isin(hosts.hosts_ip)]
-        # Filter out protocols which are not common between these hosts
-        df = df.groupby('provider').filter(
-           lambda x: len(x) == len(hosts)).reset_index(drop=True)
-        # Choose only a subset of providers
-        if providers is not None:
-            if isinstance(providers, str):
-                providers = [providers]
-            df = df[df.provider.isin(providers)]
-        return df
-
-# pylint: enable=C0121
diff --git a/ci/jarvis-util/jarvis_util/jutil_manager.py b/ci/jarvis-util/jarvis_util/jutil_manager.py
deleted file mode 100644
index c229b2445..000000000
--- a/ci/jarvis-util/jarvis_util/jutil_manager.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-This file contains properties which are globally accessible to all
-jarvis-util modules. This can be used to configure various aspects
-of jarvis, such as output.
-"""
-
-
-class JutilManager:
-    """
-    A singleton which stores various properties that can be queried by
-    internally by jutil modules. This includes properties such output
-    management.
-    """
-
-    instance_ = None
-
-    @staticmethod
-    def get_instance():
-        if JutilManager.instance_ is None:
-            JutilManager.instance_ = JutilManager()
-        return JutilManager.instance_
-
-    def __init__(self):
-        self.collect_output = False
-        self.hide_output = False
-        self.debug_mpi_exec = False
-        self.debug_local_exec = False
-
diff --git a/ci/jarvis-util/jarvis_util/serialize/ini_file.py b/ci/jarvis-util/jarvis_util/serialize/ini_file.py
deleted file mode 100644
index 8da174ff1..000000000
--- a/ci/jarvis-util/jarvis_util/serialize/ini_file.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-This module contains methods to serialize and deserialize data from
-a human-readable ini file.
-"""
-import configparser
-from jarvis_util.serialize.serializer import Serializer
-
-
-class IniFile(Serializer):
-    """
-    This class contains methods to serialize and deserialize data from
-    a human-readable ini file.
-    """
-    def __init__(self, path):
-        self.path = path
-
-    def load(self):
-        config = configparser.ConfigParser()
-        config.read(self.path)
-        return config
-
-    def save(self, data):
-        with open(self.path, 'w', encoding='utf-8') as fp:
-            data.write(fp)
diff --git a/ci/jarvis-util/jarvis_util/serialize/pickle.py b/ci/jarvis-util/jarvis_util/serialize/pickle.py
deleted file mode 100644
index a90ae12de..000000000
--- a/ci/jarvis-util/jarvis_util/serialize/pickle.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-This module contains methods to serialize and deserialize data from
-a pickle file.
-"""
-
-import pickle as pkl
-from jarvis_util.serialize.serializer import Serializer
-
-
-class PickleFile(Serializer):
-    """
-    This class serializes and deserializes data from a pickle file
-    """
-
-    def __init__(self, path):
-        self.path = path
-
-    def load(self):
-        with open(self.path, 'rb') as fp:
-            return pkl.load(fp)
-
-    def save(self, data):
-        with open(self.path, 'wb') as fp:
-            pkl.dump(data, fp)
diff --git a/ci/jarvis-util/jarvis_util/serialize/serializer.py b/ci/jarvis-util/jarvis_util/serialize/serializer.py
deleted file mode 100644
index 8647945a7..000000000
--- a/ci/jarvis-util/jarvis_util/serialize/serializer.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-This module contains an abstract class used to define classes which
-serialize data to a file.
-"""
-
-from abc import ABC, abstractmethod
-
-
-class Serializer(ABC):
-    """
-    An abstract class which loads serialized data from a file and
-    saves serialized data to a file.
-    """
-
-    @abstractmethod
-    def load(self):
-        pass
-
-    @abstractmethod
-    def save(self, data):
-        pass
diff --git a/ci/jarvis-util/jarvis_util/serialize/text_file.py b/ci/jarvis-util/jarvis_util/serialize/text_file.py
deleted file mode 100644
index 214c6bb9f..000000000
--- a/ci/jarvis-util/jarvis_util/serialize/text_file.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-This module stores data into a file in a human-readable way
-"""
-from jarvis_util.serialize.serializer import Serializer
-
-
-class TextFile(Serializer):
-    """
-    This class stores data directly into a file using str() as the
-    serialization method. The data is intended to be human-readable.
-    """
-    def __init__(self, path):
-        self.path = path
-
-    def load(self):
-        with open(self.path, 'r', encoding='utf-8') as fp:
-            data = fp.read()
-        return data
-
-    def save(self, data):
-        with open(self.path, 'w', encoding='utf-8') as fp:
-            fp.write(data)
diff --git a/ci/jarvis-util/jarvis_util/serialize/yaml_file.py b/ci/jarvis-util/jarvis_util/serialize/yaml_file.py
deleted file mode 100644
index 5892f6bca..000000000
--- a/ci/jarvis-util/jarvis_util/serialize/yaml_file.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-This module contains methods to serialize and deserialize data from
-a human-readable YAML file.
-"""
-from jarvis_util.serialize.serializer import Serializer
-import yaml
-
-
-class YamlFile(Serializer):
-    """
-    This class contains methods to serialize and deserialize data from
-    a human-readable YAML file.
-    """
-    def __init__(self, path):
-        self.path = path
-
-    def load(self):
-        with open(self.path, 'r', encoding='utf-8') as fp:
-            return yaml.load(fp, Loader=yaml.FullLoader)
-        return None
-
-    def save(self, data):
-        with open(self.path, 'w', encoding='utf-8') as fp:
-            yaml.dump(data, fp)
diff --git a/ci/jarvis-util/jarvis_util/shell/exec.py b/ci/jarvis-util/jarvis_util/shell/exec.py
deleted file mode 100644
index f9fef066d..000000000
--- a/ci/jarvis-util/jarvis_util/shell/exec.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-This module provides mechanisms to execute binaries either locally or
-remotely.
-"""
-
-from .local_exec import LocalExec
-from .pssh_exec import PsshExec
-from .pssh_exec import SshExec
-from .mpi_exec import MpiExec
-from .exec_info import ExecInfo, ExecType, Executable
-
-
-class Exec(Executable):
-    """
-    This class is a factory which wraps around various shell command
-    execution stragies, such as MPI and SSH.
-    """
-
-    def __init__(self, cmd, exec_info=None):
-        """
-        Execute a command or list of commands
-
-        :param cmd: list of commands or a single command string
-        :param exec_info: Info needed to execute processes locally
-        """
-        super().__init__()
-        if exec_info is None:
-            exec_info = ExecInfo()
-        if exec_info.exec_type == ExecType.LOCAL:
-            self.exec_ = LocalExec(cmd, exec_info)
-        elif exec_info.exec_type == ExecType.SSH:
-            self.exec_ = SshExec(cmd, exec_info)
-        elif exec_info.exec_type == ExecType.PSSH:
-            self.exec_ = PsshExec(cmd, exec_info)
-        elif exec_info.exec_type == ExecType.MPI:
-            self.exec_ = MpiExec(cmd, exec_info)
-        self.set_exit_code()
-        self.set_output()
-
-    def wait(self):
-        self.exec_.wait()
-        self.set_output()
-        self.set_exit_code()
-        return self.exit_code
-
-    def set_output(self):
-        self.stdout = self.exec_.stdout
-        self.stderr = self.exec_.stderr
-        if isinstance(self.stdout, str):
-            if hasattr(self.exec_, 'addr'):
-                host = self.exec_.addr
-            else:
-                host = 'localhost'
-            self.stdout = {host: self.stdout}
-            self.stderr = {host: self.stderr}
-
-    def set_exit_code(self):
-        self.exec_.set_exit_code()
-        self.exit_code = self.exec_.exit_code
diff --git a/ci/jarvis-util/jarvis_util/shell/exec_info.py b/ci/jarvis-util/jarvis_util/shell/exec_info.py
deleted file mode 100644
index 2b28246ae..000000000
--- a/ci/jarvis-util/jarvis_util/shell/exec_info.py
+++ /dev/null
@@ -1,216 +0,0 @@
-"""
-This module contains data structures for determining how to execute
-a subcommand. This includes information such as storing SSH keys,
-passwords, working directory, etc.
-"""
-
-from enum import Enum
-from jarvis_util.util.hostfile import Hostfile
-import os
-from abc import ABC, abstractmethod
-
-
-class ExecType(Enum):
-    """
-    Different program execution methods.
-    """
-
-    LOCAL = 'LOCAL'
-    SSH = 'SSH'
-    PSSH = 'PSSH'
-    MPI = 'MPI'
-
-
-class ExecInfo:
-    """
-    Contains all information needed to execute a program. This includes
-    parameters such as the path to key-pairs, the hosts to run the program
-    on, number of processes, etc.
-    """
-    def __init__(self,  exec_type=ExecType.LOCAL, nprocs=None, ppn=None,
-                 user=None, pkey=None, port=None,
-                 hostfile=None, hosts=None, env=None,
-                 sleep_ms=0, sudo=False, cwd=None,
-                 collect_output=None, pipe_stdout=None, pipe_stderr=None,
-                 hide_output=None, exec_async=False, stdin=None):
-        """
-
-        :param exec_type: How to execute a program. SSH, MPI, Local, etc.
-        :param nprocs: Number of processes to spawn. E.g., MPI uses this
-        :param ppn: Number of processes per node. E.g., MPI uses this
-        :param user: The user to execute command under. E.g., SSH, PSSH
-        :param pkey: The path to the private key. E.g., SSH, PSSH
-        :param port: The port to use for connection. E.g., SSH, PSSH
-        :param hostfile: The hosts to launch command on. E.g., PSSH, MPI
-        :param hosts: A list (or single string) of host names to run command on.
-        :param env: The environment variables to use for command.
-        :param sleep_ms: Sleep for a period of time AFTER executing
-        :param sudo: Execute command with root privilege. E.g., SSH, PSSH
-        :param cwd: Set current working directory. E.g., SSH, PSSH
-        :param collect_output: Collect program output in python buffer
-        :param pipe_stdout: Pipe STDOUT into a file. (path string)
-        :param pipe_stderr: Pipe STDERR into a file. (path string)
-        :param hide_output: Whether to print output to console
-        :param exec_async: Whether to execute program asynchronously
-        :param stdin: Any input needed by the program. Only local
-        """
-
-        self.exec_type = exec_type
-        self.nprocs = nprocs
-        self.user = user
-        self.pkey = pkey
-        self.port = port
-        self.ppn = ppn
-        self.hostfile = hostfile
-        self._set_hostfile(hostfile=hostfile, hosts=hosts)
-        self.env = env
-        self.basic_env = {}
-        self._set_env(env)
-        self.cwd = cwd
-        self.sudo = sudo
-        self.sleep_ms = sleep_ms
-        self.collect_output = collect_output
-        self.pipe_stdout = pipe_stdout
-        self.pipe_stderr = pipe_stderr
-        self.hide_output = hide_output
-        self.exec_async = exec_async
-        self.stdin = stdin
-        self.keys = ['exec_type', 'nprocs', 'ppn', 'user', 'pkey', 'port',
-                     'hostfile', 'env', 'sleep_ms', 'sudo',
-                     'cwd', 'hosts', 'collect_output',
-                     'pipe_stdout', 'pipe_stderr', 'hide_output',
-                     'exec_async', 'stdin']
-
-    def _set_env(self, env):
-        if env is None:
-            self.env = {}
-        else:
-            self.env = env
-        basic_env = [
-            'PATH', 'LD_LIBRARY_PATH', 'LIBRARY_PATH', 'CMAKE_PREFIX_PATH',
-            'PYTHON_PATH', 'CPATH', 'INCLUDE', 'JAVA_HOME'
-        ]
-        self.basic_env = {}
-        for key in basic_env:
-            if key not in os.environ:
-                continue
-            self.basic_env[key] = os.getenv(key)
-        for key, val in self.basic_env.items():
-            if key not in self.env:
-                self.env[key] = val
-        self.basic_env.update(self.env)
-        if 'LD_PRELOAD' in self.basic_env:
-            del self.basic_env['LD_PRELOAD']
-
-    def _set_hostfile(self, hostfile=None, hosts=None):
-        if hostfile is not None:
-            if isinstance(hostfile, str):
-                self.hostfile = Hostfile(hostfile=hostfile)
-            elif isinstance(hostfile, Hostfile):
-                self.hostfile = hostfile
-            else:
-                raise Exception('Hostfile is neither string nor Hostfile')
-        if hosts is not None:
-            if isinstance(hosts, list):
-                self.hostfile = Hostfile(all_hosts=hosts)
-            elif isinstance(hosts, str):
-                self.hostfile = Hostfile(all_hosts=[hosts])
-            elif isinstance(hosts, Hostfile):
-                self.hostfile = hosts
-            else:
-                raise Exception('Host set is neither str, list or Hostfile')
-
-        if hosts is not None and hostfile is not None:
-            raise Exception('Must choose either hosts or hostfile, not both')
-
-        if self.hostfile is None:
-            self.hostfile = Hostfile()
-
-    def mod(self, **kwargs):
-        self._mod_kwargs(kwargs)
-        return ExecInfo(**kwargs)
-
-    def _mod_kwargs(self, kwargs):
-        for key in self.keys:
-            if key not in kwargs and hasattr(self, key):
-                kwargs[key] = getattr(self, key)
-
-    def copy(self):
-        return self.mod()
-
-
-class Executable(ABC):
-    """
-    An abstract class representing a class which is intended to run
-    shell commands. This includes SSH, MPI, etc.
-    """
-
-    def __init__(self):
-        self.exit_code = None
-        self.stdout = ''
-        self.stderr = ''
-
-    def failed(self):
-        return self.exit_code != 0
-
-    @abstractmethod
-    def set_exit_code(self):
-        pass
-
-    @abstractmethod
-    def wait(self):
-        pass
-
-    def smash_cmd(self, cmds):
-        """
-        Convert a list of commands into a single command for the shell
-        to execute.
-
-        :param cmds: A list of commands or a single command string
-        :return:
-        """
-        if isinstance(cmds, list):
-            return ' && '.join(cmds)
-        elif isinstance(cmds, str):
-            return cmds
-        else:
-            raise Exception('Command must be either list or string')
-
-    def wait_list(self, nodes):
-        for node in nodes:
-            node.wait()
-
-    def smash_list_outputs(self, nodes):
-        """
-        Combine the outputs of a set of nodes into a single output.
-        For example, used if executing multiple commands in sequence.
-
-        :param nodes:
-        :return:
-        """
-        self.stdout = '\n'.join([node.stdout for node in nodes])
-        self.stderr = '\n'.join([node.stderr for node in nodes])
-
-    def per_host_outputs(self, nodes):
-        """
-        Convert the outputs of a set of nodes to a per-host dictionary.
-        Used if sending commands to multiple hosts
-
-        :param nodes:
-        :return:
-        """
-        self.stdout = {}
-        self.stderr = {}
-        self.stdout = {node.addr: node.stdout for node in nodes}
-        self.stderr = {node.addr: node.stderr for node in nodes}
-
-    def set_exit_code_list(self, nodes):
-        """
-        Set the exit code from a set of nodes.
-
-        :param nodes: The set of execution nodes that have been executed
-        :return:
-        """
-        for node in nodes:
-            if node.exit_code:
-                self.exit_code = node.exit_code
diff --git a/ci/jarvis-util/jarvis_util/shell/filesystem.py b/ci/jarvis-util/jarvis_util/shell/filesystem.py
deleted file mode 100644
index a5cb2b55e..000000000
--- a/ci/jarvis-util/jarvis_util/shell/filesystem.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""
-This module contains various wrappers over typical filesystem commands seen
-in shell scripts. This includes operations such as creating directories,
-changing file permissions, etc.
-"""
-from .exec import Exec
-
-
-class Mkdir(Exec):
-    """
-    Create directories + subdirectories.
-    """
-
-    def __init__(self, paths, exec_info=None):
-        """
-        Create directories + subdirectories. Does not fail if the dirs
-        already exist.
-
-        :param paths: A list of paths or a single path string.
-        :param exec_info: Info needed to execute the mkdir command
-        """
-
-        if isinstance(paths, str):
-            paths = [paths]
-        path = ' '.join(paths)
-        super().__init__(f'mkdir -p {path}', exec_info)
-
-
-class Rm(Exec):
-    """
-    Remove a file and its subdirectories
-    """
-
-    def __init__(self, paths, exec_info=None):
-        """
-        Execute file or directory remove.
-
-        :param paths: Either a list of paths or a single path string
-        :param exec_info: Information needed to execute rm
-        """
-
-        if isinstance(paths, str):
-            paths = [paths]
-        path = ' '.join(paths)
-        super().__init__(f'rm -rf {path}', exec_info)
-
-
-class Chmod(Exec):
-    """
-    Change the mode of a file
-    """
-
-    def __init__(self, path=None, mode=None, modes=None, exec_info=None):
-        """
-        Change the mode of a file
-
-        :param path: path to file to mode change
-        :param mode: the mode to change to
-        :param modes: A list of tuples [(Path, Mode)]
-        :param exec_info: How to execute commands
-        """
-        cmds = []
-        if path is not None and mode is not None:
-            cmds.append(f'chmod {mode} {path}')
-        if modes is not None:
-            cmds += [f'chmod {mode[1]} {mode[0]}' for mode in modes]
-        if len(cmds) == 0:
-            raise Exception('Must set either path+mode or modes')
-        super().__init__(cmds, exec_info)
diff --git a/ci/jarvis-util/jarvis_util/shell/local_exec.py b/ci/jarvis-util/jarvis_util/shell/local_exec.py
deleted file mode 100644
index c5487fe1e..000000000
--- a/ci/jarvis-util/jarvis_util/shell/local_exec.py
+++ /dev/null
@@ -1,103 +0,0 @@
-"""
-Provides methods for executing a program or workflow locally. This class
-is intended to be called from Exec, not by general users.
-"""
-
-import time
-import subprocess
-import os
-import sys
-import io
-import threading
-from jarvis_util.jutil_manager import JutilManager
-from .exec_info import ExecInfo, ExecType, Executable
-
-
-class LocalExec(Executable):
-    """
-    Provides methods for executing a program or workflow locally.
-    """
-
-    def __init__(self, cmd, exec_info):
-        """
-        Execute a program or workflow
-
-        :param cmd: list of commands or a single command string
-        :param exec_info: Info needed to execute processes locally
-        """
-
-        super().__init__()
-        jutil = JutilManager.get_instance()
-        cmd = self.smash_cmd(cmd)
-
-        # Managing console output and collection
-        self.collect_output = exec_info.collect_output
-        self.pipe_stdout = exec_info.pipe_stdout
-        self.pipe_stderr = exec_info.pipe_stderr
-        self.pipe_stdout_fp = None
-        self.pipe_stderr_fp = None
-        self.hide_output = exec_info.hide_output
-        # pylint: disable=R1732
-        if self.collect_output is None:
-            self.collect_output = jutil.collect_output
-        if self.hide_output is None:
-            self.hide_output = jutil.hide_output
-        # pylint: enable=R1732
-        self.stdout = io.StringIO()
-        self.stderr = io.StringIO()
-        self.last_stdout_size = 0
-        self.last_stderr_size = 0
-        self.executing_ = True
-        self.exit_code = 0
-
-        # Copy ENV
-        self.env = exec_info.env.copy()
-        for key, val in os.environ.items():
-            if key not in self.env:
-                self.env[key] = val
-
-        # Managing command execution
-        self.cmd = cmd
-        self.sudo = exec_info.sudo
-        self.stdin = exec_info.stdin
-        self.exec_async = exec_info.exec_async
-        self.sleep_ms = exec_info.sleep_ms
-        if exec_info.cwd is None:
-            self.cwd = os.getcwd()
-        else:
-            self.cwd = exec_info.cwd
-        if jutil.debug_local_exec:
-            print(cmd)
-        self._start_bash_processes()
-
-    def _start_bash_processes(self):
-        if self.sudo:
-            self.cmd = f'sudo {self.cmd}'
-        time.sleep(self.sleep_ms)
-        # pylint: disable=R1732
-        self.proc = subprocess.Popen(self.cmd,
-                                     cwd=self.cwd,
-                                     env=self.env,
-                                     shell=True)
-        # pylint: enable=R1732
-        if not self.exec_async:
-            self.wait()
-
-    def wait(self):
-        self.proc.wait()
-        self.set_exit_code()
-        return self.exit_code
-
-    def set_exit_code(self):
-        self.exit_code = self.proc.returncode
-
-    def get_pid(self):
-        if self.proc is not None:
-            return self.proc.pid
-        else:
-            return None
-
-
-class LocalExecInfo(ExecInfo):
-    def __init__(self, **kwargs):
-        super().__init__(exec_type=ExecType.LOCAL, **kwargs)
diff --git a/ci/jarvis-util/jarvis_util/shell/mpi_exec.py b/ci/jarvis-util/jarvis_util/shell/mpi_exec.py
deleted file mode 100644
index e104bf50f..000000000
--- a/ci/jarvis-util/jarvis_util/shell/mpi_exec.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-This module provides methods to execute a process in parallel using the
-Message Passing Interface (MPI). This module assumes MPI is installed
-on the system. This class is intended to be called from Exec,
-not by general users.
-"""
-
-from jarvis_util.jutil_manager import JutilManager
-from jarvis_util.shell.local_exec import LocalExec
-from .exec_info import ExecInfo, ExecType
-
-
-class MpiExec(LocalExec):
-    """
-    This class contains methods for executing a command in parallel
-    using MPI.
-    """
-
-    def __init__(self, cmd, exec_info):
-        """
-        Execute a command using MPI
-
-        :param cmd: A command (string) to execute
-        :param exec_info: Information needed by MPI
-        """
-
-        self.cmd = cmd
-        self.nprocs = exec_info.nprocs
-        self.ppn = exec_info.ppn
-        self.hostfile = exec_info.hostfile
-        self.mpi_env = exec_info.env
-        super().__init__(self.mpicmd(),
-                         exec_info.mod(env=exec_info.basic_env))
-
-    def mpicmd(self):
-        params = [f"mpirun -n {self.nprocs}"]
-        if self.ppn is not None:
-            params.append(f"-ppn {self.ppn}")
-        if len(self.hostfile):
-            if self.hostfile.is_subset() or self.hostfile.path is None:
-                params.append(f"--host {','.join(self.hostfile.hosts)}")
-            else:
-                params.append(f"--hostfile {self.hostfile.path}")
-        params += [f"-genv {key}={val}" for key, val in self.mpi_env.items()]
-        params.append(self.cmd)
-        cmd = " ".join(params)
-        jutil = JutilManager.get_instance()
-        if jutil.debug_mpi_exec:
-            print(cmd)
-        return cmd
-
-
-class MpiExecInfo(ExecInfo):
-    def __init__(self, **kwargs):
-        super().__init__(exec_type=ExecType.MPI, **kwargs)
diff --git a/ci/jarvis-util/jarvis_util/shell/process.py b/ci/jarvis-util/jarvis_util/shell/process.py
deleted file mode 100644
index 7aba2f0fc..000000000
--- a/ci/jarvis-util/jarvis_util/shell/process.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-This module provides various wrappers for methods which manage processes
-in the cluster. Examples include killing processes, determining whether
-or not a process exists, etc.
-"""
-
-from .exec import Exec
-
-
-class Kill(Exec):
-    """
-    Kill all processes which match the name regex.
-    """
-
-    def __init__(self, cmd, exec_info):
-        """
-        Kill all processes which match the name regex.
-
-        :param cmd: A regex for the command to kill
-        :param exec_info: Info needed to execute the command
-        """
-        super().__init__(f"pkill {cmd}", exec_info)
diff --git a/ci/jarvis-util/jarvis_util/shell/pscp.py b/ci/jarvis-util/jarvis_util/shell/pscp.py
deleted file mode 100644
index f74da34d0..000000000
--- a/ci/jarvis-util/jarvis_util/shell/pscp.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-This module provides methods to distribute a command among multiple
-nodes using SSH. This class is intended to be called from Exec,
-not by general users.
-"""
-
-from .scp import Scp
-from .exec_info import Executable
-
-
-class Pscp(Executable):
-    """
-    Execute commands on multiple hosts using SSH.
-    """
-
-    def __init__(self, paths, exec_info):
-        """
-        Copy files to a set of remote hosts via rsync.
-
-        Case 1: Paths is a single file:
-        paths = '/tmp/hi.txt'
-        '/tmp/hi.txt' will be copied to user@host:/tmp/hi.txt
-
-        Case 2: Paths is a list of files:
-        paths = ['/tmp/hi1.txt', '/tmp/hi2.txt']
-        Repeat Case 1 twice.
-
-        Case 3: Paths is a list of tuples of files:
-        paths = [('/tmp/hi.txt', '/tmp/remote_hi.txt')]
-        '/tmp/hi.txt' will be copied to user@host:'/tmp/remote_hi.txt'
-
-        :param paths: Either a path to a file, a list of files, or a list of
-        tuples of files.
-        :param exec_info: Connection information for SSH
-        """
-        super().__init__()
-        self.exec_async = exec_info.exec_async
-        self.hosts = exec_info.hostfile.hosts
-        self.scp_nodes = []
-        self.stdout = {}
-        self.stderr = {}
-        self.hosts = exec_info.hostfile.hosts
-        for host in self.hosts:
-            ssh_exec_info = exec_info.mod(hostfile=None,
-                                          hosts=host,
-                                          exec_async=True)
-            self.scp_nodes.append(Scp(paths, ssh_exec_info))
-        if self.exec_async:
-            self.wait()
-
-    def wait(self):
-        self.wait_list(self.scp_nodes)
-        self.per_host_outputs(self.scp_nodes)
-        self.set_exit_code()
-
-    def set_exit_code(self):
-        self.set_exit_code_list(self.scp_nodes)
-
diff --git a/ci/jarvis-util/jarvis_util/shell/pssh_exec.py b/ci/jarvis-util/jarvis_util/shell/pssh_exec.py
deleted file mode 100644
index 720869391..000000000
--- a/ci/jarvis-util/jarvis_util/shell/pssh_exec.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-This module provides methods to distribute a command among multiple
-nodes using SSH. This class is intended to be called from Exec,
-not by general users.
-"""
-
-from .ssh_exec import SshExec
-from .local_exec import LocalExec
-from .exec_info import ExecInfo, ExecType, Executable
-
-
-class PsshExec(Executable):
-    """
-    Execute commands on multiple hosts using SSH.
-    """
-
-    def __init__(self, cmd, exec_info):
-        """
-        Execute commands on multiple hosts.
-
-        :param cmd: A list of commands or a single command string
-        :param exec_info: Info needed to execute command with SSH
-        """
-        super().__init__()
-        self.cmd = self.smash_cmd(cmd)
-        self.exec_async = exec_info.exec_async
-        self.hosts = exec_info.hostfile.hosts
-        self.execs_ = []
-        self.stdout = {}
-        self.stderr = {}
-        if len(self.hosts):
-            for host in self.hosts:
-                ssh_exec_info = exec_info.mod(hostfile=None,
-                                              hosts=host,
-                                              exec_async=True)
-                self.execs_.append(SshExec(cmd, ssh_exec_info))
-        else:
-            self.execs_.append(
-                LocalExec(cmd, exec_info))
-            return
-        if not self.exec_async:
-            self.wait()
-
-    def wait(self):
-        self.wait_list(self.execs_)
-        self.per_host_outputs(self.execs_)
-        self.set_exit_code()
-
-    def set_exit_code(self):
-        self.set_exit_code_list(self.execs_)
-
-
-class PsshExecInfo(ExecInfo):
-    def __init__(self, **kwargs):
-        super().__init__(exec_type=ExecType.PSSH, **kwargs)
-
diff --git a/ci/jarvis-util/jarvis_util/shell/scp.py b/ci/jarvis-util/jarvis_util/shell/scp.py
deleted file mode 100644
index 8b39301e6..000000000
--- a/ci/jarvis-util/jarvis_util/shell/scp.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""
-This module provides methods to execute a single command remotely using SSH.
-This class is intended to be called from Exec, not by general users.
-"""
-from .local_exec import LocalExec
-from .exec_info import Executable
-
-
-class _Scp(LocalExec):
-    """
-    This class provides methods to copy data over SSH using the "rsync"
-    command utility in Linux
-    """
-
-    def __init__(self, src_path, dst_path, exec_info):
-        """
-        Copy a file or directory from source to destination via rsync
-
-        :param src_path: The path to the file on the host
-        :param dst_path: The desired file path on the remote host
-        :param exec_info: Info needed to execute command with SSH
-        """
-
-        self.addr = exec_info.hostfile.hosts[0]
-        self.src_path = src_path
-        self.dst_path = dst_path
-        self.user = exec_info.user
-        self.pkey = exec_info.pkey
-        self.port = exec_info.port
-        self.sudo = exec_info.sudo
-        super().__init__(self.rsync_cmd(src_path, dst_path),
-                         exec_info.mod(env=exec_info.basic_env))
-
-    def rsync_cmd(self, src_path, dst_path):
-        lines = ['rsync -ha']
-        if self.pkey is not None or self.port is not None:
-            ssh_lines = ['ssh']
-            if self.pkey is not None:
-                ssh_lines.append(f'-i {self.pkey}')
-            if self.port is not None:
-                ssh_lines.append(f'-p {self.port}')
-            ssh_cmd = ' '.join(ssh_lines)
-            lines.append(f'-e \'{ssh_cmd}\'')
-        lines.append(src_path)
-        if self.user is not None:
-            lines.append(f'{self.user}@{self.addr}:{dst_path}')
-        else:
-            lines.append(f'{self.addr}:{dst_path}')
-        rsync_cmd = ' '.join(lines)
-        return rsync_cmd
-
-
-class Scp(Executable):
-    """
-    Secure copy data between two hosts.
-    """
-
-    def __init__(self, paths, exec_info):
-        """
-        Copy files via rsync.
-
-        Case 1: Paths is a single file:
-        paths = '/tmp/hi.txt'
-        '/tmp/hi.txt' will be copied to user@host:/tmp/hi.txt
-
-        Case 2: Paths is a list of files:
-        paths = ['/tmp/hi1.txt', '/tmp/hi2.txt']
-        Repeat Case 1 twice.
-
-        Case 3: Paths is a list of tuples of files:
-        paths = [('/tmp/hi.txt', '/tmp/remote_hi.txt')]
-        '/tmp/hi.txt' will be copied to user@host:'/tmp/remote_hi.txt'
-
-        :param paths: Either a path to a file, a list of files, or a list of
-        tuples of files.
-        :param exec_info: Connection information for SSH
-        """
-
-        super().__init__()
-        self.paths = paths
-        self.exec_info = exec_info
-        self.scp_nodes = []
-        if isinstance(paths, str):
-            self._exec_single_path(paths)
-        if isinstance(paths, list):
-            if len(paths) == 0:
-                raise Exception('Must have at least one path to scp')
-            elif isinstance(paths[0], str):
-                self._exec_many_paths(paths)
-            elif isinstance(paths[0], tuple):
-                self._exec_many_paths_tuple(paths)
-            elif isinstance(paths[0], list):
-                self._exec_many_paths_tuple(paths)
-        if not self.exec_info.exec_async:
-            self.wait()
-
-    def _exec_single_path(self, path):
-        self.scp_nodes.append(_Scp(path, path, self.exec_info))
-
-    def _exec_many_paths(self, paths):
-        for path in paths:
-            self.scp_nodes.append(_Scp(path, path, self.exec_info))
-
-    def _exec_many_paths_tuple(self, path_tlist):
-        for src, dst in path_tlist:
-            self.scp_nodes.append(_Scp(src, dst, self.exec_info))
-
-    def wait(self):
-        self.wait_list(self.scp_nodes)
-        self.smash_list_outputs(self.scp_nodes)
-        self.set_exit_code()
-        return self.exit_code
-
-    def set_exit_code(self):
-        self.set_exit_code_list(self.scp_nodes)
diff --git a/ci/jarvis-util/jarvis_util/shell/ssh_exec.py b/ci/jarvis-util/jarvis_util/shell/ssh_exec.py
deleted file mode 100644
index bd9b85135..000000000
--- a/ci/jarvis-util/jarvis_util/shell/ssh_exec.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-This module provides methods to execute a single command remotely using SSH.
-This class is intended to be called from Exec, not by general users.
-"""
-from .local_exec import LocalExec
-from .exec_info import ExecInfo, ExecType
-
-
-class SshExec(LocalExec):
-    """
-    This class provides methods to execute a command via SSH.
-    """
-
-    def __init__(self, cmd, exec_info):
-        """
-        Execute a command remotely via SSH
-
-        :param cmd: A list of commands or a single command string
-        :param exec_info: Info needed to execute command with SSH
-        """
-
-        cmd = self.smash_cmd(cmd)
-        self.addr = exec_info.hostfile.hosts[0]
-        self.user = exec_info.user
-        self.pkey = exec_info.pkey
-        self.port = exec_info.port
-        self.sudo = exec_info.sudo
-        self.ssh_env = exec_info.env
-        super().__init__(self.ssh_cmd(cmd),
-                         exec_info.mod(env=exec_info.basic_env))
-
-    def ssh_cmd(self, cmd):
-        lines = ['ssh']
-        if self.pkey is not None:
-            lines.append(f'-i {self.pkey}')
-        if self.port is not None:
-            lines.append(f'-p {self.port}')
-        if self.user is not None:
-            lines.append(f'{self.user}@{self.addr}')
-        else:
-            lines.append(f'{self.addr}')
-        ssh_cmd = ' '.join(lines)
-
-        cmd_lines = []
-        if self.ssh_env is not None:
-            for key, val in self.ssh_env.items():
-                cmd_lines.append(f'{key}={val}')
-        cmd_lines.append(cmd)
-        env_cmd = ' '.join(cmd_lines)
-        real_cmd = f'{ssh_cmd} \"{env_cmd}\"'
-        return real_cmd
-
-
-class SshExecInfo(ExecInfo):
-    def __init__(self, **kwargs):
-        super().__init__(exec_type=ExecType.SSH, **kwargs)
diff --git a/ci/jarvis-util/jarvis_util/util/argparse.py b/ci/jarvis-util/jarvis_util/util/argparse.py
deleted file mode 100644
index e58486be5..000000000
--- a/ci/jarvis-util/jarvis_util/util/argparse.py
+++ /dev/null
@@ -1,454 +0,0 @@
-"""
-This module contains an argument parser which defines
-"""
-
-import sys
-import os
-from abc import ABC, abstractmethod
-import shlex
-from tabulate import tabulate
-
-
-class ArgParse(ABC):
-    """
-    A class for parsing command line arguments.
-        Parsed menu name stored in self.menu_name
-        Parsed menu arguments stored in self.kwargs
-        Parsed remaining arguments stored in self.remainder
-    """
-
-    def __init__(self, args=None, exit_on_fail=True):
-        if args is None:
-            args = sys.argv[1:]
-        elif isinstance(args, str):
-            args = shlex.split(args)
-        args = ' '.join(args)
-        self.binary_name = os.path.basename(sys.argv[0])
-        self.orig_args = shlex.split(args)
-        self.args = self.orig_args
-        self.error = None
-        self.exit_on_fail = exit_on_fail
-        self.menus = []
-        self.vars = {}
-        self.remainder = None
-        self.pos_required = False
-        self.use_remainder = False
-
-        self.menu = None
-        self.menu_name = None
-        self.kwargs = {}
-        self.define_options()
-        self._parse()
-
-    @abstractmethod
-    def define_options(self):
-        """
-        User-defined options menu
-
-        :return:
-        """
-        pass
-
-    def process_args(self):
-        """
-        After args have been parsed, can call this function to process
-        the arguments. Assumes that derived ArgParse class has a function
-        for each menu option.
-
-        :return:
-        """
-
-        func_name = self.menu_name.replace(' ', '_')
-        func = getattr(self, func_name)
-        func(self)
-
-    def add_menu(self, name=None, msg=None,
-                 use_remainder=False):
-        """
-        A menu is a container of arguments.
-
-        :param name: The name that appears in the CLI to trigger the menu.
-        Spaces indicate menu nesting. E.g., 'repo add' will trigger the
-        menu argparser only if 'repo' and 'add' appear next to each other
-        in the argument list.
-        :param msg: The message to print if the user selects an improper menu
-        in the CLI.
-        :param use_remainder: Whether or not the menu should store all remaining
-        arguments for further use later.
-        :return:
-        """
-
-        toks = []
-        if name is not None:
-            toks = name.split()
-        self.menus.append({
-            'name_str': ' '.join(toks),
-            'name': toks,
-            'msg': msg,
-            'num_required': 0,
-            'pos_opts': [],
-            'kw_opts': {},
-            'use_remainder': use_remainder
-        })
-        self.pos_required = False
-        self.menu = self.menus[-1]
-
-    def start_required(self):
-        """
-        Define a set of required positional arguments.
-
-        :return: None
-        """
-        self.pos_required = True
-
-    def end_required(self):
-        """
-        Finish the set of required positional arguments.
-
-        :return: None
-        """
-        self.pos_required = False
-
-    def add_arg(self,
-                name,
-                argtype=str,
-                choices=None,
-                default=None,
-                msg=None,
-                action=None,
-                aliases=None):
-        """
-        Append an argument to a menu.
-        Arguments can either be positional or key-value.
-            Positional arguments do NOT start with a dash
-            Key-value arguments are separated by dashes
-
-        :param name: The name of the argument. If name starts with a dash,
-        it will be interpreted as a positional arg
-        :param argtype: The type of the argument being stored.
-        :param choices: The set of acceptable inputs as a list
-        :param default: The default value to store
-        :param msg: The help message to print if there is a problem
-        :param action: An action to execute if the argument exists
-        :param aliases: Other names for the same thing (list)
-        :return:
-        """
-
-        # Add all aliases
-        if aliases is not None:
-            for alias in aliases:
-                if '-' in alias:
-                    self.add_arg(alias, argtype, choices, default, msg, action)
-                else:
-                    raise f"Can't have a non-keyword alias: {alias}"
-        # Handle the specific boolean argument case
-        is_kwarg = '-' in name
-        if is_kwarg and argtype == bool:
-            self._add_bool_kw_arg(name, default, msg)
-            return
-        # Add general argument
-        menu = self.menu
-        arg = {
-            'name': name,
-            'dict_name': self._get_opt_name(name),
-            'type': argtype,
-            'choices': choices,
-            'default': default,
-            'action': action,
-            'msg': msg,
-            'required': self.pos_required,
-            'has_input': True
-        }
-        if is_kwarg:
-            self.pos_required = False
-            menu['kw_opts'][name] = arg
-        else:
-            if self.pos_required:
-                menu['num_required'] += 1
-            menu['pos_opts'].append(arg)
-        self.kwargs[arg['dict_name']] = default
-
-    def _add_bool_kw_arg(self,
-                         name,
-                         default,
-                         msg=None,
-                         is_other=False,
-                         dict_name=None):
-        """
-        Boolean arguments can be indicated using a +-.
-        + indicates true, - indicates false.
-
-        :param name: The name of the boolean arg
-        :param default: Default value of the boolean arg
-        :param msg: Help message
-        :param is_other: Indicates this is an alias of the +- syntax.
-        :param dict_name: Name to make the argument in final kwargs
-        :return: None
-        """
-        menu = self.menu
-        if dict_name is None:
-            dict_name = self._get_opt_name(name, True)
-        arg = {
-            'name': name,
-            'dict_name': dict_name,
-            'type': bool,
-            'choices': None,
-            'default': default,
-            'action': None,
-            'msg': msg,
-            'required': False,
-            'has_input': not is_other
-        }
-        if not is_other:
-            self._add_bool_kw_arg('--with-' + name.strip('-'),
-                                 True, msg, True, dict_name)
-            self._add_bool_kw_arg('--no-' + name.strip('-'),
-                                 False, msg, True, dict_name)
-        self.pos_required = False
-        menu['kw_opts'][name] = arg
-
-    def _parse(self):
-        """
-        Parse the CLI arguments.
-            Will modify self.menu to indicate which menu is used
-            Will modify self.args to create a key-value store of arguments
-
-        :return: None.
-        """
-        self.menus.sort(key=lambda x: len(x['name']), reverse=True)
-        self._parse_menu()
-
-    def _parse_menu(self):
-        """
-        Determine which menu is used in the CLI.
-
-        :return: Modify self.menu. No return value.
-        """
-
-        self.menu = None
-        for menu in self.menus:
-            menu_name = menu['name']
-            if len(menu_name) > len(self.args):
-                continue
-            if menu_name == self.args[0:len(menu_name)]:
-                self.menu = menu
-                break
-        if self.menu is None:
-            self._invalid_menu()
-        self.menu_name = self.menu['name_str']
-        self.add_arg('-h',
-                     default=None,
-                     msg='print help message',
-                     action=self._print_help,
-                     aliases=['--help'])
-        menu_name = self.menu['name']
-        self.use_remainder = self.menu['use_remainder']
-        self.args = self.args[len(menu_name):]
-        self._parse_args()
-
-    def _parse_args(self):
-        self._set_defaults()
-        i = self._parse_pos_args()
-        self._parse_kw_args(i)
-
-    def _set_defaults(self):
-        all_opts = self.menu['pos_opts'] + list(self.menu['kw_opts'].values())
-        for opt_info in all_opts:
-            if opt_info['default'] is None:
-                continue
-            self.__dict__[opt_info['dict_name']] = opt_info['default']
-
-    def _parse_pos_args(self):
-        """
-        Parse positional arguments
-            Modify the self.kwargs dictionary
-
-        :return:
-        """
-
-        i = 0
-        args = self.args
-        menu = self.menu
-        while i < len(menu['pos_opts']):
-            # Get the positional arg info
-            opt_name = menu['pos_opts'][i]['name']
-            opt_dict_name = menu['pos_opts'][i]['dict_name']
-            opt_type = menu['pos_opts'][i]['type']
-            opt_choices = menu['pos_opts'][i]['choices']
-            if i >= len(args):
-                if i >= menu['num_required']:
-                    break
-                else:
-                    self._missing_positional(opt_name)
-
-            # Get the arg value
-            arg = args[i]
-            if arg in menu['kw_opts']:
-                break
-            arg = self._convert_opt(opt_name, opt_type, opt_choices, arg)
-
-            # Set the argument
-            self.kwargs[opt_dict_name] = arg
-            i += 1
-        return i
-
-    def _parse_kw_args(self, i):
-        """
-        Parse key-word arguments.
-            Modify the self.kwargs dictionary
-
-        :param i: The starting index in the self.args list where kv pairs start
-        :return:
-        """
-
-        menu = self.menu
-        args = self.args
-        while i < len(args):
-            # Get argument name
-            opt_name = args[i]
-            if opt_name not in menu['kw_opts']:
-                if self.use_remainder:
-                    self.remainder = ' '.join(args[i:])
-                    return
-                else:
-                    self._invalid_kwarg(opt_name)
-
-            # Get argument type
-            opt = menu['kw_opts'][opt_name]
-            opt_has_input = opt['has_input']
-            opt_dict_name = opt['dict_name']
-            opt_type = opt['type']
-            opt_default = opt['default']
-            opt_action = opt['action']
-            opt_choices = opt['choices']
-            if not opt_has_input:
-                arg = opt_default
-                i += 1
-            elif opt_action is not None:
-                opt_action()
-                arg = None
-                i += 1
-            elif self._next_is_kw_value(i):
-                arg = args[i + 1]
-                i += 2
-            elif opt_default is not None:
-                arg = opt_default
-                i += 1
-            else:
-                arg = None
-                self._invalid_kwarg_default(opt_name)
-
-            # Convert argument to type
-            arg = self._convert_opt(opt_name, opt_type, opt_choices, arg)
-
-            # Set the argument
-            self.kwargs[opt_dict_name] = arg
-
-    def _convert_opt(self, opt_name, opt_type, opt_choices, arg):
-        if opt_type is not None:
-            # pylint: disable=W0702
-            try:
-                arg = opt_type(arg)
-                if opt_choices is not None:
-                    if arg not in opt_choices:
-                        self._invalid_choice(opt_name, arg)
-            except:
-                self._invalid_type(opt_name, opt_type)
-            # pylint: enable=W0702
-        return arg
-
-    def _next_is_kw_value(self, i):
-        if i + 1 >= len(self.args):
-            return False
-        return self.args[i + 1] not in self.menu['kw_opts']
-
-    def _get_opt_name(self, opt_name, is_bool_arg=False):
-        """
-        Normalize option names
-            '-' are converted into '_'
-            '--with-' and '--no-' are removed
-            '+' and '-' for boolean args are removed
-
-        :param opt_name: The menu option name
-        :param is_bool_arg: Whether the arg is a boolean arg
-        :return:
-        """
-
-        if not is_bool_arg:
-            return opt_name.strip('-').replace('-', '_')
-        else:
-            return opt_name.replace('--with-', '', 1)\
-                .replace('--no-', '', 1).\
-                strip('-').replace('-', '_')
-
-    def _invalid_menu(self):
-        self._print_error('Could not find a menu')
-
-    def _invalid_choice(self, opt_name, arg):
-        self._print_menu_error(f'{opt_name}={arg} is not a valid choice')
-
-    def _missing_positional(self, opt_name):
-        self._print_menu_error(f'{opt_name} was required, but not defined')
-
-    def _invalid_kwarg(self, opt_name):
-        self._print_menu_error(f'{opt_name} is not a valid key-word argument')
-
-    def _invalid_kwarg_default(self, opt_name):
-        self._print_menu_error(
-            f'{opt_name} was not given a value, but requires one')
-
-    def _invalid_type(self, opt_name, opt_type):
-        self._print_menu_error(f'{opt_name} was not of type {opt_type}')
-
-    def _print_menu_error(self, msg):
-        self._print_error(f'{self.menu["name_str"]} {msg}')
-
-    def _print_error(self, msg):
-        print(f'{msg}')
-        self._print_help()
-        if self.exit_on_fail:
-            sys.exit(1)
-        else:
-            raise Exception(msg)
-
-    def _print_help(self):
-        if self.menu is not None:
-            self._print_menu_help()
-        else:
-            self._print_menus()
-
-    def _print_menus(self):
-        for menu in self.menus:
-            self.menu = menu
-            self._print_menu_help(True)
-
-    def _print_menu_help(self, only_usage=False):
-        pos_args = []
-        for arg in self.menu['pos_opts']:
-            if arg['required']:
-                pos_args.append(f'[{arg["name"]}]')
-            else:
-                pos_args.append(f'[{arg["name"]} (opt)]')
-        pos_args = ' '.join(pos_args)
-        menu_str = self.menu['name_str']
-        print(f'USAGE: {self.binary_name} {menu_str} {pos_args} ...')
-        if self.menu['msg'] is not None:
-            print(self.menu['msg'])
-        print()
-        if only_usage:
-            return
-
-        headers = ['Name', 'Default', 'Type', 'Description']
-        table = []
-        all_opts = self.menu['pos_opts'] + list(self.menu['kw_opts'].values())
-        for arg in all_opts:
-            default = arg['default']
-            if self._is_bool_arg(arg):
-                default = None
-            table.append(
-                [arg['name'], default, arg['type'], arg['msg']])
-        print(tabulate(table, headers=headers))
-
-    def _is_bool_arg(self, arg):
-        return arg['type'] == bool and (arg['name'].startswith('--with-') or
-                                        arg['name'].startswith('--no-'))
diff --git a/ci/jarvis-util/jarvis_util/util/expand_env.py b/ci/jarvis-util/jarvis_util/util/expand_env.py
deleted file mode 100644
index a9d8aefa7..000000000
--- a/ci/jarvis-util/jarvis_util/util/expand_env.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-This module contains functions for expanding environment variables for
-dictionaries
-"""
-
-import os
-
-
-def expand_env(data):
-    """
-    Expand environment variables for dictionaries
-
-    :param data: A dict where strings may contain environment variables to
-    expand
-    :return:
-    """
-    if isinstance(data, str):
-        return os.path.expandvars(data)
-    if isinstance(data, dict):
-        for key, val in data.items():
-            data[key] = expand_env(val)
-    if isinstance(data, (list, tuple)):
-        for i, val in enumerate(data):
-            data[i] = expand_env(val)
-    return data
diff --git a/ci/jarvis-util/jarvis_util/util/hostfile.py b/ci/jarvis-util/jarvis_util/util/hostfile.py
deleted file mode 100644
index 4d22ae233..000000000
--- a/ci/jarvis-util/jarvis_util/util/hostfile.py
+++ /dev/null
@@ -1,216 +0,0 @@
-"""
-This module contains methods for parsing hostfiles and storing hosts
-"""
-
-import os
-import socket
-import re
-import itertools
-
-
-class Hostfile:
-    """
-    Parse a hostfile or store a set of hosts passed in manually.
-    """
-
-    def __init__(self, hostfile=None, all_hosts=None, all_hosts_ip=None,
-                 text=None, find_ips=True):
-        """
-        Constructor. Parse hostfile or store existing host list.
-
-        :param hostfile: The path to the hostfile
-        :param all_hosts: a list of strings representing all hostnames
-        :param all_hosts_ip: a list of strings representing all host IPs
-        :param text: Text of a hostfile
-        :param find_ips: Whether to construct host_ip and all_host_ip fields
-        """
-        self.hosts_ip = []
-        self.hosts = []
-        self.all_hosts = []
-        self.all_hosts_ip = []
-        self.path = hostfile
-        self.find_ips = find_ips
-
-        # Set the host ips directly
-        if all_hosts_ip is not None:
-            self.all_hosts_ip = all_hosts_ip
-            self.hosts_ip = all_hosts_ip
-            self.find_ips = False
-
-        # Direct constructor
-        if all_hosts is not None:
-            self._set_hosts(all_hosts)
-
-        # From hostfile path
-        elif hostfile is not None:
-            self._load_hostfile(self.path)
-
-        # From hostfile text
-        elif text is not None:
-            self.parse(text)
-
-        # Both hostfile and hosts are None
-        else:
-            self._set_hosts(['localhost'])
-
-    def _load_hostfile(self, path):
-        """
-        Expand a hostfile
-
-        :param path: the path to the hostfile
-        :return:
-        """
-        if not os.path.exists(path):
-            raise Exception('hostfile not found')
-        self.path = path
-        with open(path, 'r', encoding='utf-8') as fp:
-            text = fp.read()
-            self.parse(text)
-        return self
-
-    def parse(self, text):
-        """
-        Parse a hostfile text.
-
-        :param text: Hostfile text
-        :param set_hosts: Whether or not to set hosts
-        :return: None
-        """
-
-        lines = text.strip().splitlines()
-        hosts = []
-        for line in lines:
-            self._expand_line(hosts, line)
-        self._set_hosts(hosts)
-
-    def _expand_line(self, hosts, line):
-        """
-        Will expand brackets in a host declaration.
-        E.g., host-[0-5,...]-name
-
-        :param hosts: the current set of hosts
-        :param line: the line to parse
-        :return: None
-        """
-        toks = re.split(r'[\[\]]', line)
-        brkts = [tok for i, tok in enumerate(toks) if i % 2 == 1]
-        num_set = []
-
-        # Get the expanded set of numbers for each bracket
-        for i, brkt in enumerate(brkts):
-            num_set.append([])
-            self._expand_set(num_set[-1], brkt)
-
-        # Expand the host string
-        host_nums = self._product(num_set)
-        for host_num in host_nums:
-            host = []
-            for i, tok in enumerate(toks):
-                if i % 2 == 1:
-                    host.append(host_num[int(i/2)])
-                else:
-                    host.append(tok)
-            hosts.append(''.join(host))
-
-    def _expand_set(self, num_set, brkt):
-        """
-        Expand a bracket set.
-        The bracket initially has notation: [0-5,0-9,...]
-        """
-
-        rngs = brkt.split(',')
-        for rng in rngs:
-            self._expand_range(num_set, rng)
-
-    def _expand_range(self, num_set, brkt):
-        """
-        Expand a range.
-        The range has notation: A-B or A
-
-        :param num_set: the numbers in the range
-        :param brkt:
-        :return:
-        """
-        if len(brkt) == 0:
-            return
-        if '-' in brkt:
-            min_max = brkt.split('-')
-            if len(min_max[0]) == len(min_max[1]):
-                nums = range(int(min_max[0]), int(min_max[1]) + 1)
-                num_set += [str(num).zfill(len(min_max[0])) for num in nums]
-            else:
-                nums = range(int(min_max[0]), int(min_max[1]) + 1)
-                num_set += [str(num) for num in nums]
-        else:
-            num_set.append(brkt)
-
-    def _product(self, num_set):
-        """
-        Return the cartesian product of the number set
-
-        :param num_set: The numbers to product
-        :return:
-        """
-        return list(itertools.product(*num_set))
-
-    def _set_hosts(self, all_hosts):
-        self.all_hosts = all_hosts
-        if self.find_ips:
-            self.all_hosts_ip = [socket.gethostbyname(host)
-                                 for host in all_hosts]
-        self.hosts = self.all_hosts
-        if self.find_ips:
-            self.hosts_ip = self.all_hosts_ip
-        return self
-
-    def subset(self, count):
-        sub = Hostfile()
-        sub.path = self.path
-        sub.all_hosts = self.all_hosts
-        sub.all_hosts_ip = self.all_hosts_ip
-        sub.hosts = self.hosts[:count]
-        sub.hosts_ip = self.hosts_ip[:count]
-        return sub
-
-    def is_subset(self):
-        return len(self.hosts) != len(self.all_hosts)
-
-    def save(self, path):
-        self.all_hosts = self.hosts
-        self.all_hosts_ip = self.hosts_ip
-        self.path = path
-        with open(path, 'w', encoding='utf-8') as fp:
-            fp.write('\n'.join(self.all_hosts))
-        return self
-
-    def ip_list(self):
-        return self.hosts_ip
-
-    def hostname_list(self):
-        return self.hosts
-
-    def enumerate(self):
-        return enumerate(self.hosts)
-
-    def host_str(self, sep=','):
-        return sep.join(self.hosts)
-
-    def ip_str(self, sep=','):
-        return sep.join(self.hosts_ip)
-
-    def __len__(self):
-        return len(self.hosts)
-
-    def __getitem__(self, idx):
-        return self.hosts[idx]
-
-    def __str__(self):
-        return str(self.hosts)
-
-    def __repr__(self):
-        return str(self)
-
-    def __eq__(self, other):
-        return (self.hosts == other.hosts and
-                self.all_hosts == other.all_hosts)
-
diff --git a/ci/jarvis-util/jarvis_util/util/import_all.py b/ci/jarvis-util/jarvis_util/util/import_all.py
deleted file mode 100644
index 8a10e6125..000000000
--- a/ci/jarvis-util/jarvis_util/util/import_all.py
+++ /dev/null
@@ -1,72 +0,0 @@
-"""
-This file contains methods to automate large import __init__.py files
-"""
-
-import pathlib
-import os
-
-
-def _import_recurse(root_path, root, stmts):
-    """
-    Identify the set of files in the current "root" directory
-
-    :param root_path: The path to the root of the python package
-    :param root: The current subdirectory of the python package
-    :param stmts: The current set of import statements
-    :return:
-    """
-    for file in os.listdir(root):
-        file = os.path.join(root, file)
-        if os.path.isfile(file):
-            file = os.path.relpath(file, root_path)
-            ext = file.split('.')
-            if ext[-1] == 'py':
-                toks = ext[0].split('/')
-                if toks[-1] == '__init__':
-                    continue
-                import_stmt = '.'.join(toks)
-                stmts.append(f'from {import_stmt} import *')
-        elif os.path.isdir(file):
-            _import_recurse(root_path, file, stmts)
-    return stmts
-
-
-def import_all(root_path, root):
-    """
-    Create all import statement to do: from root import *.
-
-    :param root_path: The root of the python repo
-    :param root: The current directory we are in within the repo
-    :return:
-    """
-    stmts = []
-    _import_recurse(root_path, root, stmts)
-    return '\"\"\"Import all modules\"\"\"\n' + '\n'.join(stmts) + '\n'
-
-
-def build_global_import_file(root_path, pkg_name):
-    """
-    Build a file to be able to do: from pkg_name import *
-
-    :param root_path: The path to the python package's root directory
-    :param pkg_name: The name of the python package
-    :return:
-    """
-    path = os.path.join(root_path, pkg_name)
-    imports = import_all(root_path, path)
-    with open(os.path.join(path, '__init__.py'), 'w',
-              encoding='utf-8') as fp:
-        fp.write(imports)
-
-
-def build_global_import_from_bin(pkg_name):
-    """
-    Build a file to be able to do: from pkg_name import *
-    This function is assumed to be called in the "bin" directory
-    of the main python repo
-
-    :param pkg_name: The name of the python package being built
-    :return:
-    """
-    root_path = str(pathlib.Path(__file__).parent.parent.parent.resolve())
-    build_global_import_file(root_path, pkg_name)
diff --git a/ci/jarvis-util/jarvis_util/util/import_mod.py b/ci/jarvis-util/jarvis_util/util/import_mod.py
deleted file mode 100644
index 9c55c508d..000000000
--- a/ci/jarvis-util/jarvis_util/util/import_mod.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-This file contains helper methods to load a class dynamically from a file
-"""
-
-import sys
-
-# NOTE(llogan): To get the path of the directory this file is in, use
-# str(pathlib.Path(__file__).parent.resolve())
-
-
-def load_class(import_str, path, class_name):
-    """
-    Loads a class from a python file.
-
-    :param import_str: A python import string. E.g., for "myrepo.dir1.pkg"
-    :param path: The absolute path to the directory which contains the
-    beginning of the import statement. Let's say you have a git repo located
-    at "/home/hello/myrepo". The git repo has a subdirectory called "myrepo",
-    so "/home/hello/myrepo/myrepo". In this case, path would be
-    "/home/hello/myrepo". The import string "myrepo.dir1.pkg" will find
-    the "myrepo" part of the import string at "/home/hello/myrepo/myrepo".
-    :param class_name: The name of the class in the file
-    :return:
-    """
-    sys.path.insert(0, path)
-    module = __import__(import_str, fromlist=[class_name])
-    sys.path.pop(0)
-    return getattr(module, class_name)
diff --git a/ci/jarvis-util/jarvis_util/util/naming.py b/ci/jarvis-util/jarvis_util/util/naming.py
deleted file mode 100644
index af6505633..000000000
--- a/ci/jarvis-util/jarvis_util/util/naming.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-This module contains methods to create strings which follow a particular
-naming convention.
-"""
-
-import re
-
-
-def to_camel_case(string):
-    """
-    Convert a string in snake case to camel case
-
-    :param string:
-    :return:
-    """
-    if string is None:
-        return
-    words = re.sub(r'(_|-)+', ' ', string).split()
-    words = [word.capitalize() for word in words]
-    return ''.join(words)
-
-
-def to_snake_case(string):
-    """
-    Convert a string in CamelCase to snake case
-    :param string:
-    :return:
-    """
-    if string is None:
-        return
-    words = re.split('([A-Z][a-z0-9_]*)', string)
-    words = [word for word in words if len(word)]
-    string = '_'.join(words)
-    return string.lower()
diff --git a/ci/jarvis-util/jarvis_util/util/size_conv.py b/ci/jarvis-util/jarvis_util/util/size_conv.py
deleted file mode 100644
index 266959bf0..000000000
--- a/ci/jarvis-util/jarvis_util/util/size_conv.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-This module provides methods to convert a semantic size string to an integer.
-"""
-
-
-class SizeConv:
-    """
-    A class which provides methods to convert a semantic size string to an int.
-    """
-
-    @staticmethod
-    def to_int(text):
-        text = text.lower()
-        if 'k' in text:
-            return SizeConv.kb(text)
-        if 'm' in text:
-            return SizeConv.mb(text)
-        if 'g' in text:
-            return SizeConv.gb(text)
-        if 't' in text:
-            return SizeConv.tb(text)
-        if 'p' in text:
-            return SizeConv.pb(text)
-        return int(text)
-
-    @staticmethod
-    def kb(num):
-        return int(float(num.split('k')[0]) * (1 << 10))
-
-    @staticmethod
-    def mb(num):
-        return int(float(num.split('m')[0]) * (1 << 20))
-
-    @staticmethod
-    def gb(num):
-        return int(float(num.split('g')[0]) * (1 << 30))
-
-    @staticmethod
-    def tb(num):
-        return int(float(num.split('t')[0]) * (1 << 40))
-
-    @staticmethod
-    def pb(num):
-        return int(float(num.split('p')[0]) * (1 << 50))
diff --git a/ci/jarvis-util/pylintrc b/ci/jarvis-util/pylintrc
deleted file mode 100644
index 5371019ba..000000000
--- a/ci/jarvis-util/pylintrc
+++ /dev/null
@@ -1,429 +0,0 @@
-# This Pylint rcfile contains a best-effort configuration to uphold the
-# best-practices and style described in the Google Python style guide:
-#   https://google.github.io/styleguide/pyguide.html
-#
-# Its canonical open-source location is:
-#   https://google.github.io/styleguide/pylintrc
-
-[MASTER]
-
-# Files or directories to be skipped. They should be base names, not paths.
-ignore=third_party
-
-# Files or directories matching the regex patterns are skipped. The regex
-# matches against base names, not paths.
-ignore-patterns=
-
-# Pickle collected data for later comparisons.
-persistent=no
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Use multiple processes to speed up Pylint.
-jobs=4
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-#enable=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-disable=abstract-method,
-        apply-builtin,
-        arguments-differ,
-        attribute-defined-outside-init,
-        backtick,
-        bad-option-value,
-        basestring-builtin,
-        buffer-builtin,
-        c-extension-no-member,
-        consider-using-enumerate,
-        cmp-builtin,
-        cmp-method,
-        coerce-builtin,
-        coerce-method,
-        delslice-method,
-        div-method,
-        duplicate-code,
-        eq-without-hash,
-        execfile-builtin,
-        file-builtin,
-        filter-builtin-not-iterating,
-        fixme,
-        getslice-method,
-        global-statement,
-        hex-method,
-        idiv-method,
-        implicit-str-concat,
-        import-error,
-        import-self,
-        import-star-module-level,
-        inconsistent-return-statements,
-        input-builtin,
-        intern-builtin,
-        invalid-str-codec,
-        locally-disabled,
-        long-builtin,
-        long-suffix,
-        map-builtin-not-iterating,
-        misplaced-comparison-constant,
-        missing-function-docstring,
-        metaclass-assignment,
-        next-method-called,
-        next-method-defined,
-        no-absolute-import,
-        no-else-break,
-        no-else-continue,
-        no-else-raise,
-        no-else-return,
-        no-init,  # added
-        no-member,
-        no-name-in-module,
-        no-self-use,
-        nonzero-method,
-        oct-method,
-        old-division,
-        old-ne-operator,
-        old-octal-literal,
-        old-raise-syntax,
-        parameter-unpacking,
-        print-statement,
-        raising-string,
-        range-builtin-not-iterating,
-        raw_input-builtin,
-        rdiv-method,
-        reduce-builtin,
-        relative-import,
-        reload-builtin,
-        round-builtin,
-        setslice-method,
-        signature-differs,
-        standarderror-builtin,
-        suppressed-message,
-        sys-max-int,
-        too-few-public-methods,
-        too-many-ancestors,
-        too-many-arguments,
-        too-many-boolean-expressions,
-        too-many-branches,
-        too-many-instance-attributes,
-        too-many-locals,
-        too-many-nested-blocks,
-        too-many-public-methods,
-        too-many-return-statements,
-        too-many-statements,
-        trailing-newlines,
-        unichr-builtin,
-        unicode-builtin,
-        unnecessary-pass,
-        unpacking-in-except,
-        useless-else-on-loop,
-        useless-object-inheritance,
-        useless-suppression,
-        using-cmp-argument,
-        wrong-import-order,
-        xrange-builtin,
-        zip-builtin-not-iterating,
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html. You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-
-[BASIC]
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=main,_
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
-
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-property-classes=abc.abstractproperty,cached_property.cached_property,cached_property.threaded_cached_property,cached_property.cached_property_with_ttl,cached_property.threaded_cached_property_with_ttl
-
-# Regular expression matching correct function names
-function-rgx=^(?:(?P<exempt>setUp|tearDown|setUpModule|tearDownModule)|(?P<camel_case>_?[A-Z][a-zA-Z0-9]*)|(?P<snake_case>_?[a-z][a-z0-9_]*))$
-
-# Regular expression matching correct variable names
-variable-rgx=^[a-z][a-z0-9_]*$
-
-# Regular expression matching correct constant names
-const-rgx=^(_?[A-Z][A-Z0-9_]*|__[a-z0-9_]+__|_?[a-z][a-z0-9_]*)$
-
-# Regular expression matching correct attribute names
-attr-rgx=^_{0,2}[a-z][a-z0-9_]*$
-
-# Regular expression matching correct argument names
-argument-rgx=^[a-z][a-z0-9_]*$
-
-# Regular expression matching correct class attribute names
-class-attribute-rgx=^(_?[A-Z][A-Z0-9_]*|__[a-z0-9_]+__|_?[a-z][a-z0-9_]*)$
-
-# Regular expression matching correct inline iteration names
-inlinevar-rgx=^[a-z][a-z0-9_]*$
-
-# Regular expression matching correct class names
-class-rgx=^_?[A-Z][a-zA-Z0-9]*$
-
-# Regular expression matching correct module names
-module-rgx=^(_?[a-z][a-z0-9_]*|__init__)$
-
-# Regular expression matching correct method names
-method-rgx=(?x)^(?:(?P<exempt>_[a-z0-9_]+__|runTest|setUp|tearDown|setUpTestCase|tearDownTestCase|setupSelf|tearDownClass|setUpClass|(test|assert)_*[A-Z0-9][a-zA-Z0-9_]*|next)|(?P<camel_case>_{0,2}[A-Z][a-zA-Z0-9_]*)|(?P<snake_case>_{0,2}[a-z][a-z0-9_]*))$
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=(__.*__|main|test.*|.*test|.*Test)$
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=10
-
-
-[TYPECHECK]
-
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager,contextlib2.contextmanager
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
-
-
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=80
-
-# TODO(https://github.com/PyCQA/pylint/issues/3352): Direct pylint to exempt
-# lines made too long by directives to pytype.
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=(?x)(
-  ^\s*(\#\ )?<?https?://\S+>?$|
-  ^\s*(from\s+\S+\s+)?import\s+.+$)
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=yes
-
-# Maximum number of lines in a module
-max-module-lines=99999
-
-# String used as indentation unit.  The internal Google style guide mandates 2
-# spaces.  Google's externaly-published style guide says 4, consistent with
-# PEP 8.  Here, we use 2 spaces, for conformity with many open-sourced Google
-# projects (like TensorFlow).
-indent-string='    '
-
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=TODO
-
-
-[STRING]
-
-# This flag controls whether inconsistent-quotes generates a warning when the
-# character used as a quote delimiter is used inconsistently within a module.
-check-quote-consistency=yes
-
-
-[VARIABLES]
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=^\*{0,2}(_$|unused_|dummy_)
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,_cb
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six,six.moves,past.builtins,future.builtins,functools
-
-
-[LOGGING]
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging,absl.logging,tensorflow.io.logging
-
-
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=no
-
-
-[SPELLING]
-
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,
-                   TERMIOS,
-                   Bastion,
-                   rexec,
-                   sets
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant, absl
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,
-                      __new__,
-                      setUp
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,
-                  _fields,
-                  _replace,
-                  _source,
-                  _make
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls,
-                            class_
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=StandardError,
-                       Exception,
-                       BaseException
diff --git a/ci/jarvis-util/requirements.txt b/ci/jarvis-util/requirements.txt
deleted file mode 100644
index 70849fea6..000000000
--- a/ci/jarvis-util/requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-pyyaml
-pylint==2.15.0
-coverage==5.5
-# coverage
-coverage-lcov==0.2.4
-# coverage-lcov
-pytest==6.2.5
-pandas
-tabulate
\ No newline at end of file
diff --git a/ci/jarvis-util/test/unit/argparse_main.py b/ci/jarvis-util/test/unit/argparse_main.py
deleted file mode 100644
index 7b636ca60..000000000
--- a/ci/jarvis-util/test/unit/argparse_main.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from jarvis_util.util.argparse import ArgParse
-
-if __name__ == 'main':
-    args = ArgParse()
\ No newline at end of file
diff --git a/ci/jarvis-util/test/unit/print5s.py b/ci/jarvis-util/test/unit/print5s.py
deleted file mode 100644
index a6581b31c..000000000
--- a/ci/jarvis-util/test/unit/print5s.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-NOTE: this is a helper utility for test_local_exec
-"""
-
-import time
-import sys
-
-
-for i in range(5):
-    sys.stdout.write(f"COUT: {i}\n")
-    sys.stderr.write(f"CERR: {i}\n")
-    time.sleep(1)
\ No newline at end of file
diff --git a/ci/jarvis-util/test/unit/printNone.py b/ci/jarvis-util/test/unit/printNone.py
deleted file mode 100644
index cf728ec39..000000000
--- a/ci/jarvis-util/test/unit/printNone.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from jarvis_util.shell.local_exec import LocalExec, LocalExecInfo
-
-spawn_info = LocalExecInfo(hide_output=True)
-LocalExec("echo hello", spawn_info)
diff --git a/ci/jarvis-util/test/unit/test_argparse.py b/ci/jarvis-util/test/unit/test_argparse.py
deleted file mode 100644
index 3c3f3d32f..000000000
--- a/ci/jarvis-util/test/unit/test_argparse.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from jarvis_util.util.argparse import ArgParse
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo
-import pathlib
-from unittest import TestCase
-
-
-class TestArgparse(TestCase):
-    def test_argparse_main(self):
-        pass
\ No newline at end of file
diff --git a/ci/jarvis-util/test/unit/test_hostfile.py b/ci/jarvis-util/test/unit/test_hostfile.py
deleted file mode 100644
index 47bd7c853..000000000
--- a/ci/jarvis-util/test/unit/test_hostfile.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from jarvis_util.util.hostfile import Hostfile
-import pathlib
-from unittest import TestCase
-
-
-class TestHostfile(TestCase):
-    def test_no_expand_int(self):
-        host = Hostfile(text='0', find_ips=False)
-        self.assertTrue(len(host.hosts) == 1)
-        self.assertTrue(host.hosts[0] == '0')
-
-    def test_no_expand(self):
-        host = Hostfile(text='ares-comp-01', find_ips=False)
-        self.assertTrue(len(host.hosts) == 1)
-        self.assertTrue(host.hosts[0] == 'ares-comp-01')
-
-    def test_expand_set(self):
-        host = Hostfile(text='ares-comp-[01-04]-40g', find_ips=False)
-        self.assertTrue(len(host.hosts) == 4)
-        self.assertTrue(host.hosts[0] == 'ares-comp-01-40g')
-        self.assertTrue(host.hosts[1] == 'ares-comp-02-40g')
-        self.assertTrue(host.hosts[2] == 'ares-comp-03-40g')
-        self.assertTrue(host.hosts[3] == 'ares-comp-04-40g')
-
-    def test_expand_two_sets(self):
-        host = Hostfile(text='ares-comp-[01-02]-40g-[01-02]', find_ips=False)
-        self.assertTrue(len(host.hosts) == 4)
-        self.assertTrue(host.hosts[0] == 'ares-comp-01-40g-01')
-        self.assertTrue(host.hosts[1] == 'ares-comp-01-40g-02')
-        self.assertTrue(host.hosts[2] == 'ares-comp-02-40g-01')
-        self.assertTrue(host.hosts[3] == 'ares-comp-02-40g-02')
-
-    def test_subset(self):
-        host = Hostfile(text='ares-comp-[01-02]-40g-[01-02]', find_ips=False)
-        host = host.subset(3)
-        self.assertTrue(len(host.hosts) == 3)
-        self.assertTrue(host.is_subset())
-        self.assertTrue(host.hosts[0] == 'ares-comp-01-40g-01')
-        self.assertTrue(host.hosts[1] == 'ares-comp-01-40g-02')
-        self.assertTrue(host.hosts[2] == 'ares-comp-02-40g-01')
-
-    def test_read_hostfile(self):
-        HERE = str(pathlib.Path(__file__).parent.resolve())
-        hf = Hostfile(hostfile=f'{HERE}/test_hostfile.txt', find_ips=False)
-        print(hf.hosts)
-        self.assertEqual(len(hf), 15)
-
-    def test_save_hostfile(self):
-        HERE = str(pathlib.Path(__file__).parent.resolve())
-        hf = Hostfile(hostfile=f'{HERE}/test_hostfile.txt', find_ips=False)
-        hf_sub = hf.subset(4)
-        self.assertEqual(len(hf_sub), 4)
-        hf_sub.save('/tmp/test_hostfile.txt')
-        hf_sub_reload = Hostfile(hostfile=f'/tmp/test_hostfile.txt',
-                                 find_ips=False)
-        self.assertEqual(len(hf_sub_reload), 4)
-        self.assertEqual(hf_sub, hf_sub_reload)
diff --git a/ci/jarvis-util/test/unit/test_hostfile.txt b/ci/jarvis-util/test/unit/test_hostfile.txt
deleted file mode 100644
index 7ecc164e9..000000000
--- a/ci/jarvis-util/test/unit/test_hostfile.txt
+++ /dev/null
@@ -1 +0,0 @@
-ares-comp-[01-10,11,12-15]-40g
\ No newline at end of file
diff --git a/ci/jarvis-util/test/unit/test_local_exec.py b/ci/jarvis-util/test/unit/test_local_exec.py
deleted file mode 100644
index c0ced8c3b..000000000
--- a/ci/jarvis-util/test/unit/test_local_exec.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import pathlib
-import os
-from jarvis_util.shell.local_exec import LocalExec, LocalExecInfo
-from jarvis_util.shell.exec import Exec
-from unittest import TestCase
-
-
-class TestLocalExec(TestCase):
-    def _setup_files(self):
-        self.stdout = '/tmp/test_out.log'
-        self.stderr = '/tmp/test_err.log'
-        try:
-            os.remove(self.stdout)
-        except OSError:
-            pass
-        try:
-            os.remove(self.stderr)
-        except:
-            pass
-
-    def test_default(self):
-        ret = Exec("echo hello")
-        self.assertEqual(ret.exit_code, 0)
-        self.assertEqual(len(ret.stdout['localhost']), 0)
-
-    def test_pipe_stdout(self):
-        self._setup_files()
-        spawn_info = LocalExecInfo(pipe_stdout=self.stdout,
-                                   pipe_stderr=self.stderr,
-                                   collect_output=True)
-        ret = Exec("echo hello", spawn_info)
-        self.assertEqual(ret.stdout['localhost'].strip(), "hello")
-        self.assertEqual(ret.stderr['localhost'].strip(), "")
-        self.assertFile(self.stdout, "hello")
-        self.assertFile(self.stderr, "")
-
-    def test_hide_stdout(self):
-        HERE = str(pathlib.Path(__file__).parent.resolve())
-        PRINTNONE = os.path.join(HERE, 'printNone.py')
-        spawn_info = LocalExecInfo(collect_output=True)
-        ret = Exec(f"python3 {PRINTNONE}", spawn_info)
-        self.assertEqual(ret.stdout['localhost'].strip(), "")
-        self.assertEqual(ret.stderr['localhost'].strip(), "")
-
-    def test_periodic_print(self):
-        self._setup_files()
-        HERE = str(pathlib.Path(__file__).parent.resolve())
-        PRINT5s = os.path.join(HERE, 'print5s.py')
-        ret = Exec(f"python3 {PRINT5s}",
-                   LocalExecInfo(pipe_stdout=self.stdout,
-                                 pipe_stderr=self.stderr))
-        stdout_data = "\n".join([f"COUT: {i}" for i in range(5)])
-        stderr_data = "\n".join([f"CERR: {i}" for i in range(5)])
-        self.assertFile(self.stdout, stdout_data)
-        self.assertFile(self.stderr, stderr_data)
-
-    def assertFile(self, path, data, strip=True):
-        self.assertTrue(os.path.exists(path))
-        with open(path, 'r') as fp:
-            if strip:
-                data = data.strip()
-                file_data = fp.read().strip()
-            else:
-                file_data = fp.read()
-        self.assertEqual(data, file_data)
diff --git a/ci/jarvis-util/test/unit/test_system_info.py b/ci/jarvis-util/test/unit/test_system_info.py
deleted file mode 100644
index a9b6c9d91..000000000
--- a/ci/jarvis-util/test/unit/test_system_info.py
+++ /dev/null
@@ -1,137 +0,0 @@
-from jarvis_util.util.argparse import ArgParse
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo
-from jarvis_util.util.hostfile import Hostfile
-from jarvis_util.introspect.system_info import Lsblk, \
-    ListFses, FiInfo, Blkid, ResourceGraph, StorageDeviceType
-from jarvis_util.util.size_conv import SizeConv
-import pathlib
-import itertools
-from unittest import TestCase
-
-
-class TestSystemInfo(TestCase):
-    def test_lsblk(self):
-        Lsblk(LocalExecInfo(hide_output=True))
-
-    def test_list_fses(self):
-        ListFses(LocalExecInfo(hide_output=True))
-
-    def test_fi_info(self):
-        FiInfo(LocalExecInfo(hide_output=True))
-
-    def test_blkid(self):
-        Blkid(LocalExecInfo(hide_output=True))
-
-    def test_resource_graph(self):
-        rg = ResourceGraph()
-        rg.build(LocalExecInfo(hide_output=True))
-        rg.save('/tmp/resource_graph.yaml')
-        rg.load('/tmp/resource_graph.yaml')
-        rg.filter_fs(r'/$', '/${USER}', 'NVME')
-        rg.filter_hosts(Hostfile(), '1gbps')
-        rg.save('/tmp/resource_graph.yaml')
-
-    def test_custom_resource_graph(self):
-        rg = ResourceGraph()
-        all_hosts = ['host1', 'host2', 'host3']
-        all_hosts_ip = ['192.168.1.0', '192.168.1.1', '192.168.1.2']
-        providers = ['tcp', 'ib', 'roce']
-        hosts = Hostfile(all_hosts=all_hosts, all_hosts_ip=all_hosts_ip)
-
-        # Add networks for each node
-        rg.set_hosts(hosts)
-        for provider in providers:
-            rg.add_net(hosts,
-                       provider=provider)
-        rg.add_net(hosts.subset(1),
-                   provider='uncommon')
-
-        # Add common storage for each node
-        rg.add_storage(hosts,
-                       device='/dev/sda1',
-                       mount='/',
-                       tran='sata',
-                       rota=True,
-                       size=SizeConv.to_int('10g'),
-                       shared=False)
-        rg.add_storage(hosts,
-                       device='/dev/sda2',
-                       mount='/mnt/hdd/$USER',
-                       tran='sata',
-                       rota=True,
-                       size=SizeConv.to_int('200g'),
-                       shared=False)
-        rg.add_storage(hosts,
-                       device='/dev/sdb1',
-                       mount='/mnt/ssd/$USER',
-                       tran='sata',
-                       rota=False,
-                       size=SizeConv.to_int('50g'),
-                       shared=False)
-        rg.add_storage(hosts,
-                       device='/dev/nvme0n1',
-                       mount='/mnt/nvme/$USER',
-                       tran='nvme',
-                       rota=False,
-                       size=SizeConv.to_int('100g'),
-                       shared=False)
-        rg.add_storage(hosts.subset(1),
-                       device='/dev/nvme0n2',
-                       mount='/mnt/nvme2/$USER',
-                       tran='nvme',
-                       rota=False,
-                       size=SizeConv.to_int('10g'),
-                       shared=False)
-        rg.add_storage(hosts,
-                       device='/dev/nvme0n3',
-                       tran='nvme',
-                       rota=False,
-                       size=SizeConv.to_int('100g'),
-                       shared=False)
-
-        # Filter only mounts in '/mnt'
-        rg.filter_fs('/mnt/*')
-
-        # Apply changes
-        rg.apply()
-
-        # Find all mounted NVMes
-        df = rg.find_storage([StorageDeviceType.NVME])
-        self.assertTrue(len(df[df.tran == 'nvme']) == 4)
-        self.assertTrue(len(df[df.tran == 'sata']) == 0)
-        self.assertTrue(len(df) == 4)
-
-        # Find all mounted & common NVMes and SSDs
-        df = rg.find_storage([StorageDeviceType.NVME,
-                              StorageDeviceType.SSD],
-                             common=True)
-        self.assertTrue(len(df[df.tran == 'nvme']) == 3)
-        self.assertTrue(len(df[df.tran == 'sata']) == 3)
-        self.assertTrue(len(df) == 6)
-
-        # Select a single nvme per-node
-        df = rg.find_storage([StorageDeviceType.NVME,
-                              StorageDeviceType.SSD],
-                             common=True,
-                             count_per_node=1)
-        self.assertTrue(len(df[df.tran == 'nvme']) == 3)
-        self.assertTrue(len(df[df.tran == 'sata']) == 0)
-        self.assertTrue(len(df) == 3)
-
-        # Select a single nvme and ssd per-node
-        df = rg.find_storage([StorageDeviceType.NVME,
-                              StorageDeviceType.SSD],
-                             common=True,
-                             count_per_dev=1)
-        self.assertTrue(len(df[df.tran == 'nvme']) == 3)
-        self.assertTrue(len(df[df.tran == 'sata']) == 3)
-        self.assertTrue(len(df) == 6)
-
-        # Find common networks between hosts
-        df = rg.find_net_info(hosts)
-        self.assertTrue(len(df) == 9)
-
-        # Find common tcp networks
-        df = rg.find_net_info(hosts, providers='tcp')
-        self.assertTrue(len(df) == 3)
diff --git a/ci/lint.sh b/ci/lint.sh
index 63ecafd32..9e40817ad 100644
--- a/ci/lint.sh
+++ b/ci/lint.sh
@@ -1,12 +1,8 @@
 #!/bin/bash
-HERMES_ROOT=$1
-ADAPTER=${HERMES_ROOT}/adapter
 
+HRUN_ROOT=$1
+
+echo "RUNNING CPPLINT"
 cpplint --recursive \
---exclude="${HERMES_ROOT}/src/config_server_default.h" \
---exclude="${HERMES_ROOT}/src/config_client_default.h" \
---exclude="${ADAPTER}/posix/posix_api.h" \
---exclude="${ADAPTER}/stdio/stdio_api.h" \
---exclude="${ADAPTER}/mpiio/mpiio_api.h" \
-"${HERMES_ROOT}/adapter" "${HERMES_ROOT}/benchmarks" "${HERMES_ROOT}/data_stager" \
-"${HERMES_ROOT}/src" "${HERMES_ROOT}/test"
+"${HRUN_ROOT}/src" "${HRUN_ROOT}/include" "${HRUN_ROOT}/test" \
+--exclude="${HRUN_ROOT}/test/unit/external"
\ No newline at end of file
diff --git a/ci/py_hermes_ci/bin/run_test b/ci/py_hermes_ci/bin/run_test
index 0427ac0fd..51383167f 100755
--- a/ci/py_hermes_ci/bin/run_test
+++ b/ci/py_hermes_ci/bin/run_test
@@ -17,10 +17,8 @@ if __name__ == '__main__':
         address_sanitizer = False
     # The root of Hermes
     HERMES_ROOT = str(pathlib.Path(__file__).parent.
-                      parent.parent.parent.resolve())
-    ADAPTER_TEST_ROOT = f"{HERMES_ROOT}/adapter/test"
-    # Ensure that all calls beneath know how to resolve jarvis_util
-    sys.path.insert(0, f"{HERMES_ROOT}/ci/jarvis-util")
+                      parent.parent.parent.parent.resolve())
+    ADAPTER_TEST_ROOT = f"{HERMES_ROOT}/test/unit/hermes_adapters"
     # Ensure subsequent classes know how to resolve py_hermes_ci package
     sys.path.insert(0, f"{HERMES_ROOT}/ci/py_hermes_ci")
     # Choose which unit test file to load
@@ -35,9 +33,9 @@ if __name__ == '__main__':
     elif test_type == 'native':
         pkg_dir = f"{HERMES_ROOT}/test"
     elif test_type == 'data_stager':
-        pkg_dir = f"{HERMES_ROOT}/data_stager/test"
+        pkg_dir = f"{HERMES_ROOT}data_stager/test"
     elif test_type == 'kvstore':
-        pkg_dir = f"{HERMES_ROOT}/adapter/kvstore"
+        pkg_dir = f"{HERMES_ROOT}/hermes_adapters/kvstore"
     elif test_type == 'java_wrapper':
         pkg_dir = f"{HERMES_ROOT}/wrapper/java"
     else:
diff --git a/ci/test_hermes.sh b/ci/test_hermes.sh
deleted file mode 100644
index e31c7714e..000000000
--- a/ci/test_hermes.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Run main unit tests
-pushd build
-ctest -VV -R test_hermes_posix_basic_small
-popd build
-
-# Set proper flags for cmake to find Hermes
-INSTALL_PREFIX="${HOME}/install"
-export LIBRARY_PATH="${INSTALL_PREFIX}/lib:${LIBRARY_PATH}"
-export LD_LIBRARY_PATH="${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}"
-export LDFLAGS="-L${INSTALL_PREFIX}/lib:${LDFLAGS}"
-export CFLAGS="-I${INSTALL_PREFIX}/include:${CFLAGS}"
-export CPATH="${INSTALL_PREFIX}/include:${CPATH}"
-export CMAKE_PREFIX_PATH="${INSTALL_PREFIX}:${CMAKE_PREFIX_PATH}"
-export CXXFLAGS="-I${INSTALL_PREFIX}/include:${CXXFLAGS}"
-
-# Run make install unit test
-cd ci/external
-mkdir build
-cd build
-cmake ../
-make -j8
-
diff --git a/code_generators/hermes_config.py b/code_generators/hermes_config.py
deleted file mode 100644
index f6e770ef7..000000000
--- a/code_generators/hermes_config.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-USAGE:
-    cd code_generators/bin
-    python3 hermes_config.py
-
-OUTPUT:
-    ${HERMES}/src/config_client_default.h (if client)
-    ${HERMES}/src/config_server_default.h (if server)
-"""
-
-from code_generators.hermes_config.generator import create_config
-from code_generators.util.paths import HERMES_ROOT
-
-create_config(
-    path=f"{HERMES_ROOT}/config/hermes_client_default.yaml",
-    var_name="kClientDefaultConfigStr",
-    config_path=f"{HERMES_ROOT}/src/config_client_default.h",
-    macro_name="CLIENT"
-)
-
-create_config(
-    path=f"{HERMES_ROOT}/config/hermes_server_default.yaml",
-    var_name="kServerDefaultConfigStr",
-    config_path=f"{HERMES_ROOT}/src/config_server_default.h",
-    macro_name="SERVER"
-)
\ No newline at end of file
diff --git a/code_generators/code_generators/hermes_config/generator.py b/codegen/codegen/hrun_config/generator.py
similarity index 55%
rename from code_generators/code_generators/hermes_config/generator.py
rename to codegen/codegen/hrun_config/generator.py
index a59951050..76ea0562e 100644
--- a/code_generators/code_generators/hermes_config/generator.py
+++ b/codegen/codegen/hrun_config/generator.py
@@ -1,12 +1,19 @@
 import sys, os
 
+def print_macro(path, macro_name):
+    with open(path) as fp:
+        lines = fp.read().splitlines()
+    macro_def = f'#define {macro_name}\\\n'
+    macro_body = '\\\n'.join(lines)
+    print(f'{macro_def}{macro_body}')
+
 def create_config(path, var_name, config_path, macro_name):
     with open(path) as fp:
         yaml_config_lines = fp.read().splitlines()
 
     # Create the hermes config string
     string_lines = []
-    string_lines.append(f"const char* {var_name} = ")
+    string_lines.append(f"const inline char* {var_name} = ")
     for line in yaml_config_lines:
         line = line.replace('\"', '\\\"')
         line = line.replace('\'', '\\\'')
@@ -15,10 +22,10 @@ def create_config(path, var_name, config_path, macro_name):
 
     # Create the configuration
     config_lines = []
-    config_lines.append(f"#ifndef HERMES_SRC_CONFIG_{macro_name}_DEFAULT_H_")
-    config_lines.append(f"#define HERMES_SRC_CONFIG_{macro_name}_DEFAULT_H_")
+    config_lines.append(f"#ifndef HRUN_SRC_CONFIG_{macro_name}_DEFAULT_H_")
+    config_lines.append(f"#define HRUN_SRC_CONFIG_{macro_name}_DEFAULT_H_")
     config_lines += string_lines
-    config_lines.append(f"#endif  // HERMES_SRC_CONFIG_{macro_name}_DEFAULT_H_")
+    config_lines.append(f"#endif  // HRUN_SRC_CONFIG_{macro_name}_DEFAULT_H_")
 
     # Persist
     config = "\n".join(config_lines)
diff --git a/code_generators/code_generators/util/conv.py b/codegen/codegen/util/conv.py
similarity index 100%
rename from code_generators/code_generators/util/conv.py
rename to codegen/codegen/util/conv.py
diff --git a/code_generators/code_generators/util/naming.py b/codegen/codegen/util/naming.py
similarity index 100%
rename from code_generators/code_generators/util/naming.py
rename to codegen/codegen/util/naming.py
diff --git a/code_generators/code_generators/util/paths.py b/codegen/codegen/util/paths.py
similarity index 82%
rename from code_generators/code_generators/util/paths.py
rename to codegen/codegen/util/paths.py
index 2052c3aab..90ce03e41 100644
--- a/code_generators/code_generators/util/paths.py
+++ b/codegen/codegen/util/paths.py
@@ -8,4 +8,5 @@ def GetHermesRoot():
     hermes_path = os.path.dirname(code_generators_path)
     return hermes_path
 
-HERMES_ROOT=GetHermesRoot()
\ No newline at end of file
+HERMES_ROOT = GetHermesRoot()
+HRUN_ROOT = f'{HERMES_ROOT}/hrun'
diff --git a/codegen/hermes_config b/codegen/hermes_config
new file mode 100755
index 000000000..54b36cced
--- /dev/null
+++ b/codegen/hermes_config
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+"""
+USAGE:
+    cd code_generators/bin
+    python3 hermes_config.py
+
+OUTPUT:
+    ${HERMES}/src/config_client_default.h (if client)
+    ${HERMES}/src/config_server_default.h (if server)
+"""
+
+from codegen.hrun_config.generator import create_config
+from codegen.util.paths import HERMES_ROOT
+
+create_config(
+    path=f"{HERMES_ROOT}/config/hermes_client_default.yaml",
+    var_name="kHermesClientDefaultConfigStr",
+    config_path=f"{HERMES_ROOT}/include/hermes/config_client_default.h",
+    macro_name="HERMES_CLIENT"
+)
+
+create_config(
+    path=f"{HERMES_ROOT}/config/hermes_server_default.yaml",
+    var_name="kHermesServerDefaultConfigStr",
+    config_path=f"{HERMES_ROOT}/include/hermes/config_server_default.h",
+    macro_name="HERMES_SERVER"
+)
diff --git a/codegen/hrun_config b/codegen/hrun_config
new file mode 100755
index 000000000..9882e8321
--- /dev/null
+++ b/codegen/hrun_config
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+"""
+USAGE:
+    cd codegen/bin
+    python3 hrun_config.py
+
+OUTPUT:
+    ${HRUN}/src/config_client_default.h (if client)
+    ${HRUN}/src/config_server_default.h (if server)
+"""
+
+from codegen.hrun_config.generator import create_config
+from codegen.util.paths import HRUN_ROOT
+
+create_config(
+    path=f"{HRUN_ROOT}/config/hrun_client_default.yaml",
+    var_name="kHrunClientDefaultConfigStr",
+    config_path=f"{HRUN_ROOT}/include/hrun/config/config_client_default.h",
+    macro_name="HRUN_CLIENT"
+)
+
+create_config(
+    path=f"{HRUN_ROOT}/config/hrun_server_default.yaml",
+    var_name="kHrunServerDefaultConfigStr",
+    config_path=f"{HRUN_ROOT}/include/hrun/config/config_server_default.h",
+    macro_name="HRUN_SERVER"
+)
\ No newline at end of file
diff --git a/codegen/make_macro b/codegen/make_macro
new file mode 100755
index 000000000..24490af05
--- /dev/null
+++ b/codegen/make_macro
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+"""
+USAGE: ./make_macro [PATH]
+"""
+
+import os
+import sys
+from codegen.hrun_config.generator import print_macro
+
+PATH = sys.argv[1]
+MACRO_NAME = os.path.basename(PATH).upper().split('.')[0]
+print_macro(PATH, MACRO_NAME)
diff --git a/codegen/make_task b/codegen/make_task
new file mode 100755
index 000000000..6a54f2fb8
--- /dev/null
+++ b/codegen/make_task
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+"""
+USAGE: ./make_task [TASK_ROOT]
+"""
+
+import os
+import sys
+from codegen.util.paths import HRUN_ROOT
+
+def copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, rel_path, TASK_NAME):
+    with open(f'{TASK_TEMPL_ROOT}/{rel_path}') as fp:
+        text = fp.read()
+    text = text.replace('TASK_NAME', TASK_NAME)
+    rel_path = rel_path.replace('TASK_NAME', TASK_NAME)
+    with open(f'{TASK_ROOT}/{rel_path}', 'w') as fp:
+        fp.write(text)
+
+TASK_ROOT = sys.argv[1]
+TASK_NAME = os.path.basename(TASK_ROOT)
+TASK_TEMPL_ROOT = f'{HRUN_ROOT}/tasks_required/TASK_NAME'
+
+os.makedirs(f'{TASK_ROOT}/src', exist_ok=True)
+os.makedirs(f'{TASK_ROOT}/include/{TASK_NAME}', exist_ok=True)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'CMakeLists.txt', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'src/CMakeLists.txt', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'src/TASK_NAME.cc', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'include/TASK_NAME/TASK_NAME.h', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'include/TASK_NAME/TASK_NAME_lib_exec.h', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'include/TASK_NAME/TASK_NAME_tasks.h', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'include/TASK_NAME/TASK_NAME_methods.h', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'include/TASK_NAME/TASK_NAME_methods.yaml', TASK_NAME)
diff --git a/code_generators/preamble.py b/codegen/preamble.py
similarity index 96%
rename from code_generators/preamble.py
rename to codegen/preamble.py
index b55ea20d1..9813b2826 100644
--- a/code_generators/preamble.py
+++ b/codegen/preamble.py
@@ -2,7 +2,7 @@
 Prepends the preabmle to all files in the repo
 
 USAGE:
-    python3 scripts/preamble.py ${HERMES_ROOT}
+    python3 scripts/preamble.py ${HRUN_ROOT}
 """
 
 import sys,os,re
@@ -36,7 +36,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 """.strip()
 
-labstor_preamble = """
+hrun_preamble = """
 /*
  * Copyright (C) 2022  SCS Lab <scslab@iit.edu>,
  * Luke Logan <llogan@hawk.iit.edu>,
@@ -69,7 +69,7 @@ def PrependPreamble(path):
         text = fp.read()
         text = text.replace(hermes_preamble, "")
         text = text.replace(preamble2, "")
-        text = text.replace(labstor_preamble, "")
+        text = text.replace(hrun_preamble, "")
         text = re.sub("//\n// Created by [^\n]*\n//\n", "", text)
         text = text.strip()
         text = hermes_preamble + "\n\n" + text + "\n"
diff --git a/codegen/refresh_methods b/codegen/refresh_methods
new file mode 100755
index 000000000..cad1bfac4
--- /dev/null
+++ b/codegen/refresh_methods
@@ -0,0 +1,229 @@
+#!/usr/bin/env python3
+
+"""
+USAGE: ./referesh_methods [TASK_DIR]
+"""
+
+import yaml
+import os
+import sys
+from codegen.util.paths import HRUN_ROOT
+
+def refresh_methods(TASK_ROOT):
+    if not os.path.exists(f'{TASK_ROOT}/include'):
+        return
+    TASK_NAME = os.path.basename(TASK_ROOT)
+    METHODS_H = f'{TASK_ROOT}/include/{TASK_NAME}/{TASK_NAME}_methods.h'
+    METHODS_YAML = f'{TASK_ROOT}/include/{TASK_NAME}/{TASK_NAME}_methods.yaml'
+    LIB_EXEC_H = f'{TASK_ROOT}/include/{TASK_NAME}/{TASK_NAME}_lib_exec.h'
+    METHOD_MACRO = f'HRUN_{TASK_NAME.upper()}_METHODS_H_'
+    LIB_EXEC_MACRO = f'HRUN_{TASK_NAME.upper()}_LIB_EXEC_H_'
+
+    with open(METHODS_YAML) as fp:
+        methods = yaml.load(fp, Loader=yaml.FullLoader)
+    if methods is None:
+        methods = {}
+    if 'kLast' in methods:
+        del methods['kLast']
+    methods = sorted(methods.items(), key=lambda x: x[1])
+    if TASK_NAME != 'hrun_admin':
+        methods.insert(0, ('kConstruct', -2))
+        methods.insert(1, ('kDestruct', -1))
+
+    # Produce the TASK_NAME_methods.h file
+    lines = []
+    lines += [f'#ifndef {METHOD_MACRO}',
+              f'#define {METHOD_MACRO}',
+              '',
+              '/** The set of methods in the admin task */',
+              'struct Method : public TaskMethod {']
+    for method_enum_name, method_off in methods:
+        if method_enum_name == 'kConstruct':
+            continue
+        if method_enum_name == 'kDestruct':
+            continue
+        lines += f'  TASK_METHOD_T {method_enum_name} = kLast + {method_off};',
+    lines += ['};', '', f'#endif  // {METHOD_MACRO}']
+    with open(METHODS_H, 'w') as fp:
+        fp.write('\n'.join(lines))
+
+
+    # Produce the TASK_NAME_lib_exec.h file
+    lines = []
+    lines += [f'#ifndef {LIB_EXEC_MACRO}',
+              f'#define {LIB_EXEC_MACRO}',
+              '']
+    ## Create the Run method
+    lines += ['/** Execute a task */',
+              'void Run(u32 method, Task *task, RunContext &rctx) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      {method_name}(reinterpret_cast<{task_name} *>(task), rctx);',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Create the Del method
+    lines += ['/** Delete a task */',
+              'void Del(u32 method, Task *task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      HRUN_CLIENT->DelTask(reinterpret_cast<{task_name} *>(task));',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Create the Dup method
+    lines += ['/** Duplicate a task */',
+              'void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      hrun::CALL_DUPLICATE(reinterpret_cast<{task_name}*>(orig_task), dups);',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Register a duplicate's output
+    lines += ['/** Register the duplicate output with the origin task */',
+              'void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        task_cast = f'reinterpret_cast<{task_name}*>'
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      hrun::CALL_DUPLICATE_END(replica, {task_cast}(orig_task), {task_cast}(dup_task));',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Create the ReplicateStart method
+    lines += ['/** Ensure there is space to store replicated outputs */',
+              'void ReplicateStart(u32 method, u32 count, Task *task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      hrun::CALL_REPLICA_START(count, reinterpret_cast<{task_name}*>(task));',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Create the ReplicateEnd method
+    lines += ['/** Determine success and handle failures */',
+              'void ReplicateEnd(u32 method, Task *task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      hrun::CALL_REPLICA_END(reinterpret_cast<{task_name}*>(task));',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Create the SaveStart Method
+    lines += ['/** Serialize a task when initially pushing into remote */',
+              'std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      ar << *reinterpret_cast<{task_name}*>(task);',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['  return ar.Get();']
+    lines += ['}']
+
+    ## Create the LoadStart Method
+    lines += ['/** Deserialize a task when popping from remote queue */',
+              'TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {',
+              '  TaskPointer task_ptr;',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<{task_name}>(task_ptr.shm_);',
+                  f'      ar >> *reinterpret_cast<{task_name}*>(task_ptr.ptr_);',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['  return task_ptr;']
+    lines += ['}']
+
+    ## Create the SaveEnd Method
+    lines += ['/** Serialize a task when returning from remote queue */',
+              'std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      ar << *reinterpret_cast<{task_name}*>(task);',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['  return ar.Get();']
+    lines += ['}']
+
+    ## Create the LoadEnd Method
+    lines += ['/** Deserialize a task when returning from remote queue */',
+              'void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      ar.Deserialize(replica, *reinterpret_cast<{task_name}*>(task));',
+                  f'      break;',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['}']
+
+    ## Create the CheckIfConcurrent Method
+    lines += ['/** Get the grouping of the task */',
+              'u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {',
+              '  switch (method) {']
+    for method_enum_name, method_off in methods:
+        method_name = method_enum_name.replace('k', '', 1)
+        task_name = method_name + "Task"
+        lines += [f'    case Method::{method_enum_name}: {{',
+                  f'      return reinterpret_cast<{task_name}*>(task)->GetGroup(group);',
+                  f'    }}']
+    lines += ['  }']
+    lines += ['  return -1;']
+    lines += ['}']
+
+    ## Finish the file
+    lines += ['', f'#endif  // {METHOD_MACRO}']
+
+    ## Write TASK_NAME_lib_exec.h
+    with open(LIB_EXEC_H, 'w') as fp:
+        fp.write('\n'.join(lines))
+
+TASK_DIR = sys.argv[1]
+TASK_ROOTS = [os.path.join(TASK_DIR, item) for item in os.listdir(TASK_DIR)]
+for TASK_ROOT in TASK_ROOTS:
+    try:
+        refresh_methods(TASK_ROOT)
+    except:
+        pass
diff --git a/codegen/update_task b/codegen/update_task
new file mode 100755
index 000000000..3445a239c
--- /dev/null
+++ b/codegen/update_task
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+"""
+USAGE: ./make_task [TASK_ROOT]
+"""
+
+import os
+import sys
+from codegen.util.paths import HRUN_ROOT
+
+def copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, rel_path, TASK_NAME):
+    with open(f'{TASK_TEMPL_ROOT}/{rel_path}') as fp:
+        text = fp.read()
+    text = text.replace('TASK_NAME', TASK_NAME)
+    rel_path = rel_path.replace('TASK_NAME', TASK_NAME)
+    with open(f'{TASK_ROOT}/{rel_path}', 'w') as fp:
+        fp.write(text)
+
+TASK_ROOT = sys.argv[1]
+TASK_NAME = os.path.basename(TASK_ROOT)
+TASK_TEMPL_ROOT = f'{HRUN_ROOT}/tasks_required/TASK_NAME
+
+os.makedirs(f'{TASK_ROOT}/src', exist_ok=True)
+os.makedirs(f'{TASK_ROOT}/include/{TASK_NAME}', exist_ok=True)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'CMakeLists.txt', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'src/CMakeLists.txt', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'src/TASK_NAME.cc', TASK_NAME)
+copy_replace(TASK_ROOT, TASK_TEMPL_ROOT, 'include/TASK_NAME/TASK_NAME.h', TASK_NAME)
diff --git a/config/hermes_server_default.yaml b/config/hermes_server_default.yaml
index 5d88d855b..9741de8dd 100644
--- a/config/hermes_server_default.yaml
+++ b/config/hermes_server_default.yaml
@@ -82,32 +82,6 @@ devices:
 # any amount of memory
 max_memory: 0g
 
-### Define properties of RPCs
-rpc:
-  # A path to a file containing a list of server names, 1 per line. If your
-  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
-  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
-  # option is not empty, it will override anything in `rpc_server_base_name`.
-  host_file: ""
-
-  # Host names can be defined using the following syntax:
-  # ares-comp-[0-9]-40g will convert to ares-comp-0-40g, ares-comp-1-40g, ...
-  # ares-comp[00-09] will convert to ares-comp-00, ares-comp-01, ...
-  host_names: ["localhost"]
-
-  # The RPC protocol. This must come from the documentation of the specific RPC
-  # library in use.
-  protocol: "ofi+sockets"
-
-  # RPC domain name for verbs transport. Blank for tcp.
-  domain: ""
-
-  # Desired RPC port number.
-  port: 8080
-
-  # The number of handler threads for each RPC server.
-  num_threads: 4
-
 ### Define properties of the BORG
 buffer_organizer:
   # The number of threads used in the background organization of internal Hermes buffers.
@@ -161,17 +135,63 @@ mdm:
   est_bucket_count: 100000
   est_num_traits: 256
 
-# The shared memory prefix for the hermes shared memory segment. A username
-# will be automatically appended.
-shmem_name: "/hermes_shm_"
-
 # The interval in milliseconds at which to update the global system view.
 system_view_state_update_interval_ms: 1000
 
-### Define the names of the traits to search LD_LIBRARY_PATH for
-traits:
-  - "hermes_posix_io_client"
-  - "hermes_stdio_io_client"
-  - "hermes_mpiio_io_client"
-  - "hermes_example_trait"
-  - "hermes_prefetcher_trait"
+### Runtime orchestration settings
+work_orchestrator:
+  # The number of worker threads to spawn
+  max_workers: 4
+
+### Queue Manager settings
+queue_manager:
+  # The default depth of allocated queues
+  queue_depth: 256
+  # The maximum number of lanes per queue
+  max_lanes: 16
+  # The maximum number of queues
+  max_queues: 1024
+  # The shared memory allocator to use
+  shm_allocator: kScalablePageAllocator
+  # The name of the shared memory region to create
+  shm_name: "hrun_shm"
+  # The size of the shared memory region to allocate for general data structures
+  shm_size: 0g
+  # The size of the shared memory to allocate for data buffers
+
+### Define properties of RPCs
+rpc:
+  # A path to a file containing a list of server names, 1 per line. If your
+  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
+  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
+  # option is not empty, it will override anything in `rpc_server_base_name`.
+  host_file: ""
+
+  # Host names can be defined using the following syntax:
+  # ares-comp-[0-9]-40g will convert to ares-comp-0-40g, ares-comp-1-40g, ...
+  # ares-comp[00-09] will convert to ares-comp-00, ares-comp-01, ...
+  host_names: ["localhost"]
+
+  # The RPC protocol. This must come from the documentation of the specific RPC
+  # library in use.
+  protocol: "ofi+sockets"
+
+  # RPC domain name for verbs transport. Blank for tcp.
+  domain: ""
+
+  # Desired RPC port number.
+  port: 8080
+
+  # The number of handler threads for each RPC server.
+  num_threads: 4
+
+### Task Registry
+task_registry: [
+  'hermes_mdm',
+  'hermes_blob_mdm',
+  'hermes_bucket_mdm',
+  'hermes_data_op',
+  'data_stager',
+  'posix_bdev',
+  'ram_bdev'
+]
\ No newline at end of file
diff --git a/data_stager/CMakeLists.txt b/data_stager/CMakeLists.txt
deleted file mode 100644
index 3fc1b9008..000000000
--- a/data_stager/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-#-----------------------------------------------------------------------------
-# Build Stage In
-#-----------------------------------------------------------------------------
-include_directories(
-        ${CMAKE_SOURCE_DIR}
-        ${CMAKE_SOURCE_DIR}/adapter
-        ${CMAKE_CURRENT_SOURCE_DIR})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHERMES_RPC_THALLIUM")
-
-add_library(hermes_data_stager SHARED
-        ${CMAKE_CURRENT_SOURCE_DIR}/stagers/posix_stager.cc)
-add_dependencies(hermes_data_stager hermes_posix_io_client)
-target_link_libraries(hermes_data_stager hermes_posix_io_client)
-
-add_executable(stage_in ${CMAKE_CURRENT_SOURCE_DIR}/stage_in.cc)
-add_dependencies(stage_in hermes_data_stager)
-target_link_libraries(stage_in hermes_data_stager)
-
-add_executable(stage_out ${CMAKE_CURRENT_SOURCE_DIR}/stage_out.cc)
-add_dependencies(stage_out hermes_data_stager)
-target_link_libraries(stage_out hermes_data_stager)
-
-#-----------------------------------------------------------------------------
-# Add file(s) to CMake Install
-#-----------------------------------------------------------------------------
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${HERMES_INSTALL_INCLUDE_DIR}
-        FILES_MATCHING PATTERN "*.h")
-
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
-install(
-        TARGETS
-        hermes_data_stager
-        stage_in
-        stage_out
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
-)
\ No newline at end of file
diff --git a/data_stager/data_stager.h b/data_stager/data_stager.h
deleted file mode 100644
index 3c9f09622..000000000
--- a/data_stager/data_stager.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_DATA_STAGER_STAGE_IN_H_
-#define HERMES_DATA_STAGER_STAGE_IN_H_
-
-#include <hermes.h>
-#include <mpi.h>
-
-#include "hermes_types.h"
-#include "posix/posix_io_client.h"
-
-namespace hermes {
-
-enum class DataStagerType {
-  kPosix,
-  kHdf5
-};
-
-class DataStagerTypeConv {
- public:
-  static DataStagerType from_url(const std::string &url) {
-    if (url.rfind("h5::", 0) != std::string::npos) {
-      return DataStagerType::kHdf5;
-    } else {
-      return DataStagerType::kPosix;
-    }
-  }
-};
-
-class DataStager {
- public:
-  virtual void StageIn(std::string url, hapi::PlacementPolicy dpe) = 0;
-  virtual void StageIn(std::string url, off_t off, size_t size,
-                       hapi::PlacementPolicy dpe) = 0;
-  virtual void StageOut(std::string url) = 0;
-
- protected:
-  void DivideRange(off_t off, size_t size, off_t &new_off, size_t &new_size) {
-    int nprocs = 1;
-    int rank = 0;
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-    int ranks_for_io = nprocs;
-
-    // Ensure that all ranks perform at least 32MB of I/O
-    size_t min_io_per_rank = MEGABYTES(32);
-    if (size < nprocs * min_io_per_rank) {
-      ranks_for_io = size / min_io_per_rank;
-      if (size % min_io_per_rank) {
-        ranks_for_io += 1;
-      }
-    }
-
-    new_size = size / ranks_for_io;
-    new_off = off + new_size * rank;
-    if (rank == ranks_for_io - 1) {
-      new_size += size % ranks_for_io;
-    }
-  }
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_DATA_STAGER_STAGE_IN_H_
diff --git a/data_stager/stage_in.cc b/data_stager/stage_in.cc
deleted file mode 100644
index 75a321d3d..000000000
--- a/data_stager/stage_in.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <string>
-#include "hermes_types.h"
-#include <hermes.h>
-#include "data_stager_factory.h"
-#include <stdlib.h>
-
-using hermes::api::PlacementPolicyConv;
-using hermes::api::PlacementPolicy;
-using hermes::DataStager;
-using hermes::DataStagerFactory;
-
-int main(int argc, char **argv) {
-  if (argc != 5) {
-    std::cout << "Usage: mpirun -n [nprocs]" <<
-        " ./stage_in [url] [offset] [size] [dpe]" << std::endl;
-    exit(1);
-  }
-  MPI_Init(&argc, &argv);
-  HERMES->Create(hermes::HermesType::kClient);
-  std::string url = argv[1];
-  off_t off = (off_t) hshm::ConfigParse::ParseSize(argv[2]);
-  size_t size = hshm::ConfigParse::ParseSize(argv[3]);
-  PlacementPolicy dpe = PlacementPolicyConv::to_enum(argv[4]);
-  auto stager = DataStagerFactory::Get(url);
-  if (size == 0) {
-    HILOG(kInfo, "Full stage-in")
-    stager->StageIn(url, dpe);
-  } else {
-    HILOG(kInfo, "Partial stage-in")
-    stager->StageIn(url, off, size, dpe);
-  }
-  HERMES->Finalize();
-  MPI_Finalize();
-}
diff --git a/data_stager/stage_out.cc b/data_stager/stage_out.cc
deleted file mode 100644
index b99db66e3..000000000
--- a/data_stager/stage_out.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <string>
-#include "posix/posix_io_client.h"
-#include "hermes_types.h"
-#include <hermes.h>
-#include "data_stager_factory.h"
-
-using hermes::api::PlacementPolicyConv;
-using hermes::api::PlacementPolicy;
-using hermes::DataStager;
-using hermes::DataStagerFactory;
-
-int main(int argc, char **argv) {
-  if (argc != 1) {
-    std::cout << "Usage: ./stage_out" << std::endl;
-    exit(1);
-  }
-  HERMES->Create(hermes::HermesType::kClient);
-  HERMES->Flush();
-  HERMES->Finalize();
-  MPI_Finalize();
-}
diff --git a/data_stager/stagers/posix_stager.cc b/data_stager/stagers/posix_stager.cc
deleted file mode 100644
index d1d1254f5..000000000
--- a/data_stager/stagers/posix_stager.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "posix_stager.h"
-
-
-using hermes::api::PlacementPolicyConv;
-using hermes::api::PlacementPolicy;
-using hermes::adapter::fs::AdapterStat;
-using hermes::adapter::fs::IoStatus;
-using hermes::adapter::fs::File;
-using hermes::adapter::fs::FsIoOptions;
-namespace stdfs = std::filesystem;
-
-namespace hermes {
-
-void PosixStager::StageIn(std::string path, PlacementPolicy dpe) {
-  if (stdfs::is_directory(path)) {
-    DirectoryStageIn(path, dpe);
-  } else if (stdfs::is_regular_file(path)) {
-    FileStageIn(path, dpe);
-  } else {
-    HELOG(kError, "{} is neither directory or file", path);
-  }
-}
-
-void PosixStager::FileStageIn(std::string path, PlacementPolicy dpe) {
-  off_t per_proc_off;
-  size_t per_proc_size;
-  DivideRange(0, stdfs::file_size(path), per_proc_off, per_proc_size);
-  FileStageIn(path, per_proc_off, per_proc_size, dpe);
-}
-
-void PosixStager::DirectoryStageIn(std::string path, PlacementPolicy dpe) {
-  HILOG(kInfo, "Staging in the directory {}", path)
-  for (auto &file_path : stdfs::directory_iterator(path)) {
-    FileStageIn(file_path.path(), dpe);
-  }
-}
-
-void PosixStager::StageIn(std::string path, off_t off,
-                          size_t size, PlacementPolicy dpe) {
-  if (stdfs::is_directory(path)) {
-    HELOG(kError, "Posix stage-in with offset is "
-                  "not supported for directories")
-  } else if (stdfs::is_regular_file(path)) {
-    FileStageIn(path, off, size, dpe);
-  } else {
-    HELOG(kError, "{} is neither directory or file", path);
-  }
-}
-
-void PosixStager::FileStageIn(std::string path,
-                             off_t off, size_t size, PlacementPolicy dpe) {
-  auto fs_api = HERMES_POSIX_FS;
-  std::vector<char> buf(size);
-  AdapterStat stat;
-  bool stat_exists;
-  IoStatus io_status;
-  HILOG(kInfo, "Staging in {}", path)
-  File f = fs_api->Open(stat, path);
-  fs_api->Read(f, stat, buf.data(), off, size,
-              io_status, FsIoOptions::WithDpe(dpe));
-  fs_api->Close(f, stat_exists);
-}
-
-void PosixStager::StageOut(std::string path) {
-  if (stdfs::is_regular_file(path)) {
-    FileStageOut(path);
-  } else if (stdfs::is_directory(path)) {
-    DirectoryStageOut(path);
-  } else {
-    HILOG(kDebug, "Posix stage-out is neither a file or directory")
-  }
-}
-
-void PosixStager::FileStageOut(std::string path) {
-  HILOG(kInfo, "Staging out the file {}", path)
-  auto fs_api = HERMES_POSIX_FS;
-  AdapterStat stat;
-  bool stat_exists;
-  File f = fs_api->Open(stat, path);
-  if (!f.status_) {
-    HELOG(kError, "Couldn't open file: {}", path)
-    return;
-  }
-  fs_api->Close(f, stat_exists);
-}
-
-void PosixStager::DirectoryStageOut(std::string path) {
-  HILOG(kInfo, "Staging out the directory {}", path)
-  for (auto &file_path : stdfs::directory_iterator(path)) {
-    FileStageOut(file_path.path());
-  }
-}
-
-}  // namespace hermes
diff --git a/data_stager/stagers/posix_stager.h b/data_stager/stagers/posix_stager.h
deleted file mode 100644
index 234ac8be1..000000000
--- a/data_stager/stagers/posix_stager.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_DATA_STAGER_STAGERS_POSIX_STAGE_H
-#define HERMES_DATA_STAGER_STAGERS_POSIX_STAGE_H
-
-#include "../data_stager.h"
-#include "posix/posix_fs_api.h"
-#include "posix/posix_api.h"
-
-namespace hermes {
-
-class PosixStager : public DataStager {
- public:
-  void StageIn(std::string url, hapi::PlacementPolicy dpe) override;
-  void FileStageIn(std::string path, hapi::PlacementPolicy dpe);
-  void DirectoryStageIn(std::string path, hapi::PlacementPolicy dpe);
-
-  void StageIn(std::string url, off_t off, size_t size,
-               hapi::PlacementPolicy dpe) override;
-  void FileStageIn(std::string path, off_t off, size_t size,
-                   hapi::PlacementPolicy dpe);
-
-  void StageOut(std::string url) override;
-  void FileStageOut(std::string path);
-  void DirectoryStageOut(std::string path);
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_DATA_STAGER_STAGERS_POSIX_STAGE_H
diff --git a/data_stager/test/CMakeLists.txt b/data_stager/test/CMakeLists.txt
deleted file mode 100644
index 20b66297c..000000000
--- a/data_stager/test/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-pytest(data_stager test_data_stager_posix_large_aligned)
-pytest(data_stager test_data_stager_posix_large_unaligned)
-pytest(data_stager test_data_stager_posix_small_misaligned)
-pytest(data_stager test_data_stager_directory)
\ No newline at end of file
diff --git a/data_stager/test/tests.py b/data_stager/test/tests.py
deleted file mode 100644
index 834484f26..000000000
--- a/data_stager/test/tests.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from py_hermes_ci.test_manager import TestManager
-from jarvis_util.shell.exec import Exec
-from jarvis_util.shell.local_exec import LocalExecInfo
-from jarvis_util.util.size_conv import SizeConv
-import os
-
-
-class DataStagerTestManager(TestManager):
-    def spawn_all_nodes(self):
-        return self.spawn_info()
-
-    def set_paths(self):
-        self.TEST_STAGE_IN_CMD = f"{self.CMAKE_BINARY_DIR}/bin/stage_in"
-
-    def test_data_stager_posix_large_aligned(self):
-        path = '/tmp/test_hermes/test_data_stager_posix_large_aligned.bin'
-        self._make_file(path, '128m')
-        spawn_info = self.spawn_info(nprocs=4,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(f"{self.TEST_STAGE_IN_CMD} {path} 0 128m kMinimizeIoTime",
-                    spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_data_stager_posix_large_unaligned(self):
-        path = '/tmp/test_hermes/test_data_stager_posix_large_unaligned.bin'
-        self._make_file(path, '128m')
-        spawn_info = self.spawn_info(nprocs=4,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(f"{self.TEST_STAGE_IN_CMD} {path} .5m 127.5m "
-                    f"kMinimizeIoTime",
-                    spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_data_stager_posix_small_aligned(self):
-        path = '/tmp/test_hermes/test_data_stager_posix_small_aligned.bin'
-        self._make_file(path, '64m')
-        spawn_info = self.spawn_info(nprocs=4,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(f"{self.TEST_STAGE_IN_CMD} {path} 0 64m kMinimizeIoTime",
-                    spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_data_stager_posix_small_misaligned(self):
-        path = '/tmp/test_hermes/test_data_stager_posix_small_misaligned.bin'
-        self._make_file(path, '64m')
-        spawn_info = self.spawn_info(nprocs=4,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(f"{self.TEST_STAGE_IN_CMD} {path} .5m 63.5m kMinimizeIoTime",
-                    spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_data_stager_directory(self):
-        os.makedirs('/tmp/test_hermes/a', exist_ok=True)
-        path = '/tmp/test_hermes/a/test_data_stager_posix_small_misaligned.bin'
-        self._make_file(path + "0", '64m')
-        self._make_file(path + "1", '128m')
-        self._make_file(path + "2", '4k')
-        self._make_file(path + "3", '16k')
-        spawn_info = self.spawn_info(nprocs=4,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(f"{self.TEST_STAGE_IN_CMD} {path} 0 0 kMinimizeIoTime",
-                    spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def _make_file(self, path, size):
-        size = SizeConv.to_int(size)
-        with open(path, 'w') as fp:
-            fp.write("\0" * size)
\ No newline at end of file
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
deleted file mode 100644
index 0f405154e..000000000
--- a/doc/Doxyfile.in
+++ /dev/null
@@ -1,2685 +0,0 @@
-# Doxyfile 1.9.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-#
-# Note:
-#
-# Use doxygen to compare the used configuration file with the template
-# configuration file:
-# doxygen -x [configFile]
-# Use doxygen to compare the used configuration file with the template
-# configuration file without replacing the environment variables or CMake type
-# replacement variables:
-# doxygen -x_noenv [configFile]
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the configuration
-# file that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = Hermes
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 1.0.0-beta
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Hierarchical Distributed I/O Buffering System"
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
-# sub-directories (in 2 levels) under the output directory of each output format
-# and will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
-# control the number of sub-directories.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# Controls the number of sub-directories that will be created when
-# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
-# level increment doubles the number of directories, resulting in 4096
-# directories at level 8 which is the default and also the maximum value. The
-# sub-directories are organized in 2 levels, the first level always has a fixed
-# numer of 16 directories.
-# Minimum value: 0, maximum value: 8, default value: 8.
-# This tag requires that the tag CREATE_SUBDIRS is set to YES.
-
-CREATE_SUBDIRS_LEVEL   = 8
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
-# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
-# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
-# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
-# English messages), Korean, Korean-en (Korean with English messages), Latvian,
-# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
-# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
-# Swedish, Turkish, Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
-# such as
-# /***************
-# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
-# Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
-# The default value is: NO.
-
-JAVADOC_BANNER         = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# By default Python docstrings are displayed as preformatted text and doxygen's
-# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
-# doxygen's special commands can be used and the contents of the docstring
-# documentation blocks is shown as doxygen documentation.
-# The default value is: YES.
-
-PYTHON_DOCSTRING       = YES
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:^^"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". Note that you cannot put \n's in the value part of an alias
-# to insert newlines (in the resulting output). You can put ^^ in the value part
-# of an alias to insert a newline as if a physical newline was in the original
-# file. When you need a literal { or } or , in the value part of an alias you
-# have to escape them by means of a backslash (\), this can lead to conflicts
-# with the commands \{ and \} for these it is advised to use the version @{ and
-# @} or use a double escape (\\{ and \\})
-
-ALIASES                = "status=A Status object." \
-                         "ctx{1}=ctx The Context for this \1." \
-                         "bool{1}=true if \1, otherwise false."
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
-# sources only. Doxygen will then generate output that is more tailored for that
-# language. For instance, namespaces will be presented as modules, types will be
-# separated into more groups, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_SLICE  = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
-# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
-# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
-# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
-# as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen. When specifying no_extension you should add
-# * to the FILE_PATTERNS.
-#
-# Note see also the list of default file extension mappings.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See https://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 5
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
-# during processing. When set to 0 doxygen will based this on the number of
-# cores available in the system. You can set it explicitly to a value larger
-# than 0 to get more control over the balance between CPU load and processing
-# speed. At this moment only the input processing can be done using multiple
-# threads. Since this is still an experimental feature the default is set to 1,
-# which effectively disables parallel processing. Please report any issues you
-# encounter. Generating dot graphs in parallel is controlled by the
-# DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 32, default value: 1.
-
-NUM_PROC_THREADS       = 1
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
-# methods of a class will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIV_VIRTUAL   = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If this flag is set to YES, the name of an unnamed parameter in a declaration
-# will be determined by the corresponding definition. By default unnamed
-# parameters remain unnamed in the output.
-# The default value is: YES.
-
-RESOLVE_UNNAMED_PARAMS = YES
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
-# documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
-# able to match the capabilities of the underlying filesystem. In case the
-# filesystem is case sensitive (i.e. it supports files in the same directory
-# whose names only differ in casing), the option must be set to YES to properly
-# deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be set to NO to properly deal with
-# output files written for symbols that only differ in casing, such as for two
-# classes, one named CLASS and the other named Class, and to also support
-# references to files without having to specify the exact matching casing. On
-# Windows (including Cygwin) and MacOS, users should typically set this option
-# to NO, whereas on Linux or other Unix flavors it should typically be set to
-# YES.
-# Possible values are: SYSTEM, NO and YES.
-# The default value is: SYSTEM.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
-# will show which file needs to be included to use the class.
-# The default value is: YES.
-
-SHOW_HEADERFILE        = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file. See also section "Changing the
-# layout of pages" for information.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as documenting some parameters in
-# a documented function twice, or documenting parameters that don't exist or
-# using markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
-# function parameter documentation. If set to NO, doxygen will accept that some
-# parameters have no documentation without warning.
-# The default value is: YES.
-
-WARN_IF_INCOMPLETE_DOC = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong parameter
-# documentation, but not about the absence of documentation. If EXTRACT_ALL is
-# set to YES then this flag will automatically be disabled. See also
-# WARN_IF_INCOMPLETE_DOC
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
-# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
-# at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# See also: WARN_LINE_FORMAT
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# In the $text part of the WARN_FORMAT command it is possible that a reference
-# to a more specific place is given. To make it easier to jump to this place
-# (outside of doxygen) the user can define a custom "cut" / "paste" string.
-# Example:
-# WARN_LINE_FORMAT = "'vi $file +$line'"
-# See also: WARN_FORMAT
-# The default value is: at line $line of file $file.
-
-WARN_LINE_FORMAT       = "at line $line of file $file"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr). In case the file specified cannot be opened for writing the
-# warning and error messages are written to standard error. When as file - is
-# specified the warning and error messages are written to standard output
-# (stdout).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = @PROJECT_SOURCE_DIR@/adapter \
-                         @PROJECT_SOURCE_DIR@/gotcha_intercept \
-                         @PROJECT_SOURCE_DIR@/src
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see:
-# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
-# See also: INPUT_FILE_ENCODING
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
-# character encoding on a per file pattern basis. Doxygen will compare the file
-# name with each pattern and apply the encoding instead of the default
-# INPUT_ENCODING) if there is a match. The character encodings are a list of the
-# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
-# "INPUT_ENCODING" for further information on supported encodings.
-
-INPUT_FILE_ENCODING    =
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# Note the list of default checked file patterns might differ from the list of
-# default file extension mappings.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
-# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
-# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
-
-FILE_PATTERNS          = *.h \
-                         *.cc
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = @PROJECT_SOURCE_DIR@/src/stb_ds.h
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# ANamespace::AClass, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that doxygen will use the data processed and written to standard output
-# for further processing, therefore nothing else, like debug statements or used
-# commands (so in case of a Windows batch file always use @echo OFF), should be
-# written to standard output.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = front_page.md
-
-# The Fortran standard specifies that for fixed formatted Fortran code all
-# characters from position 72 are to be considered as comment. A common
-# extension is to allow longer lines before the automatic comment starts. The
-# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
-# be processed before the automatic comment starts.
-# Minimum value: 7, maximum value: 10000, default value: 72.
-
-FORTRAN_COMMENT_AFTER  = 72
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# entity all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see https://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
-# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
-# enables light output unless the user preference is dark output. Other options
-# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
-# default to dark mode unless the user prefers light mode, and TOGGLE to let the
-# user toggle between dark and light mode via a button.
-# Possible values are: LIGHT Always generate light output., DARK Always generate
-# dark output., AUTO_LIGHT Automatically set the mode according to the user
-# preference, use light mode if no preference is set (the default)., AUTO_DARK
-# Automatically set the mode according to the user preference, use dark mode if
-# no preference is set. and TOGGLE Allow to user to switch between light and
-# dark mode via a button..
-# The default value is: AUTO_LIGHT.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE        = AUTO_LIGHT
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a color-wheel, see
-# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use gray-scales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
-# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
-# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
-# like the Qt help browser.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_MENUS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see:
-# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
-# create a documentation set, doxygen will generate a Makefile in the HTML
-# output directory. Running make will produce the docset in that directory and
-# running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
-# genXcode/_index.html for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag determines the URL of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDURL         =
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# on Windows. In the beginning of 2021 Microsoft took the original page, with
-# a.o. the download links, offline the HTML help workshop was already many years
-# in maintenance mode). You can download the HTML help workshop from the web
-# archives at Installation executable (see:
-# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
-# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the main .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location (absolute path
-# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
-# run qhelpgenerator on the generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine tune the look of the index (see "Fine-tuning the output"). As an
-# example, the default style sheet generated by doxygen has an example that
-# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
-# Since the tree basically has the same information as the tab index, you could
-# consider setting DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
-# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
-# area (value NO) or if it should extend to the full height of the window (value
-# YES). Setting this to YES gives a layout similar to
-# https://docs.readthedocs.io with more room for contents, but less room for the
-# project logo, title, and description. If either GENERATE_TREEVIEW or
-# DISABLE_INDEX is set to NO, this option has no effect.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FULL_SIDEBAR           = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
-# addresses.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-OBFUSCATE_EMAILS       = YES
-
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
-# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
-# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
-# the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png (the default) and svg (looks nicer but requires the
-# pdf2svg or inkscape tool).
-# The default value is: png.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FORMULA_FORMAT    = png
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
-# to create new LaTeX commands to be used in formulas as building blocks. See
-# the section "Including formulas" for details.
-
-FORMULA_MACROFILE      =
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
-# Note that the different versions of MathJax have different requirements with
-# regards to the different settings, so it is possible that also other MathJax
-# settings have to be changed when switching between the different MathJax
-# versions.
-# Possible values are: MathJax_2 and MathJax_3.
-# The default value is: MathJax_2.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_VERSION        = MathJax_2
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. For more details about the output format see MathJax
-# version 2 (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
-# (see:
-# http://docs.mathjax.org/en/latest/web/components/output.html).
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility. This is the name for Mathjax version 2, for MathJax version 3
-# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
-# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
-# is the name for Mathjax version 3, for MathJax version 2 this will be
-# translated into HTML-CSS) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment. The default value is:
-# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
-# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# for MathJax version 2 (see
-# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# For example for MathJax version 3 (see
-# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
-# MATHJAX_EXTENSIONS = ams
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/). See the section "External Indexing and Searching" for
-# details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when not enabling USE_PDFLATEX the default is latex when enabling
-# USE_PDFLATEX the default is pdflatex and when in the later case latex is
-# chosen this is overwritten by pdflatex. For specific output languages the
-# default can have been set differently, this depends on the implementation of
-# the output language.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# Note: This tag is used in the Makefile / make.bat.
-# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
-# (.tex).
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX. In case there is no backslash (\) as first character
-# it will be automatically added in the LaTeX code.
-# Note: This tag is used in the generated output file (.tex).
-# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_MAKEINDEX_CMD    = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
-# the generated LaTeX document. The header should contain everything until the
-# first chapter. If it is left blank doxygen will generate a standard header. It
-# is highly recommended to start with a default header using
-# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
-# and then modify the file new_header.tex. See also section "Doxygen usage" for
-# information on how to generate the default header that doxygen normally uses.
-#
-# Note: Only use a user-defined header if you know what you are doing!
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. The following
-# commands have a special meaning inside the header (and footer): For a
-# description of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
-# the generated LaTeX document. The footer should contain everything after the
-# last chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer. See also section "Doxygen
-# usage" for information on how to generate the default footer that doxygen
-# normally uses. Note: Only use a user-defined footer if you know what you are
-# doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
-# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
-# files. Set this option to YES, to get a higher quality PDF documentation.
-#
-# See also section LATEX_CMD_NAME for selecting the engine.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
-# path from which the emoji images will be read. If a relative path is entered,
-# it will be relative to the LATEX_OUTPUT directory. If left blank the
-# LATEX_OUTPUT directory will be used.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EMOJI_DIRECTORY  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# configuration file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
-# generated using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
-# namespace members in file scope as well, matching the HTML output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_NS_MEMB_FILE_SCOPE = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
-# the structure of the code including all documentation. Note that this feature
-# is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
-# RECURSIVE has no effect here.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
-# subgraphs. When you want a differently looking font in the dot files that
-# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
-# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
-# Edge and Graph Attributes specification</a> You need to make sure dot is able
-# to find the font, which can be done by putting it in a standard location or by
-# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font. Default graphviz fontsize is 14.
-# The default value is: fontname=Helvetica,fontsize=10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
-
-# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
-# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
-# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
-# arrows shapes.</a>
-# The default value is: labelfontname=Helvetica,labelfontsize=10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
-
-# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
-# around nodes set 'shape=plain' or 'shape=plaintext' <a
-# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
-# The default value is: shape=box,height=0.2,width=0.4.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
-
-# You can set the path where dot can find font specified with fontname in
-# DOT_COMMON_ATTR and others dot attributes.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
-# graph for each documented class showing the direct and indirect inheritance
-# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
-# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
-# to TEXT the direct and indirect inheritance relations will be shown as texts /
-# links.
-# Possible values are: NO, YES, TEXT and GRAPH.
-# The default value is: YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies. See also the chapter Grouping
-# in the manual.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
-# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
-# tag is set to YES, doxygen will add type and arguments for attributes and
-# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
-# will not generate fields with class member information in the UML graphs. The
-# class diagrams will look similar to the default class diagrams but using UML
-# notation for the relationships.
-# Possible values are: NO, YES and NONE.
-# The default value is: NO.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-DOT_UML_DETAILS        = NO
-
-# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
-# to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
-# Minimum value: 0, maximum value: 1000, default value: 17.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_WRAP_THRESHOLD     = 17
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = YES
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
-# of child directories generated in directory dependency graphs by dot.
-# Minimum value: 1, maximum value: 25, default value: 1.
-# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
-
-DIR_GRAPH_MAX_DEPTH    = 1
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               = @DOXYGEN_DOT_PATH@
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file or to the filename of jar file
-# to be used. If left blank, it is assumed PlantUML is not used or called during
-# a preprocessing step. Doxygen will generate a warning when it encounters a
-# \startuml command in this case and will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 100
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
-# graphical representation for inheritance and collaboration diagrams is used.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
-# files that are used to generate the various graphs.
-#
-# Note: This setting is not only used for dot files but also for msc temporary
-# files.
-# The default value is: YES.
-
-DOT_CLEANUP            = YES
diff --git a/doc/design/hermes-design.org b/doc/design/hermes-design.org
deleted file mode 100644
index 4db22eea0..000000000
--- a/doc/design/hermes-design.org
+++ /dev/null
@@ -1,816 +0,0 @@
-#+TITLE: Hermes Design
-#+AUTHOR: The Hermes Project
-#+DATE: [2019-08-28 Wed]
-#+OPTIONS: num:4 toc:t
-
-For a Hermes overview see cite:KougkasEtAl2018.
-
-* Models
-
-  See cite:Maier2009.
-
-** Purpose/objective
-   /(What the client wants)/
-
-   - Distributed deep memory and storage hierarchies
-     - In HPC and cloud architectures
-     - Require expert knowledge (currently)
-     - Independent layers
-     - Vertical /and/ horizontal I/O
-   - Accelerate I/O through
-     - Delay write
-     - Pre-read/cache
-     - Smart placement and transfer
-   - Baseline: PFS, ...
-   - Optimization problem
-     - Policies
-   - Enhance and extend /current/ software
-     - Transparent, no code changes, adapters (POSIX, MPI-IO), =LD_PRELOAD=
-     - Hermes API for new development
-   - Audience
-     - NSF -> science and research community
-
-*** Use cases
-
-**** HPC
-
-**** Cloud
-
-*** Differences between Hermes (buffer pool) and the UNIX buffer cache
-    - Hermes buffers have no direct storage counterparts such as disk blocks.
-    - Hermes buffers are typically used in buffer allocations (sequences of
-      buffers) and state is associated with such allocations rather than
-      individual buffers.
-    - Hermes maintains buffer integrity but has no integrity concept for
-      entities in storage clients. Features such as `file system integrity'
-      need to be implemented by the corresponding adapters.
-*** TODO Why?
-    Ask why the project is being done in the first place. Think about what
-    completing the project would be like. What would the finished project look
-    like?
-
-
-** Behavioral or functional
-   /(What the system does)/
-
-*** Core functions
-
-    These are /user-level/ functions. The only user-visible primitives are
-    buckets, vBuckets, and traits. They are finite resources, i.e., a creation
-    function might return an error, if system limits are exceeded.
-
-    Buckets are collections of /named/ (and timestamped = immutable) blobs that
-    are internally represented by a sequence of buffers in the storage
-    hierarchy.
-
-    #+CAPTION: Hermes Primitives label:fig:HERMES-primitves
-    #+ATTR_HTML: :width 50%
-    [[./img/primitives.png]]
-
-    vBuckets are used to group buckets by capabilities or features expressed in
-    traits. Traits are represented as sets of key/value pairs.
-
-    #+CAPTION: Hermes Core User Functions label:fig:HERMES-user-core
-    #+ATTR_HTML: :width 50%
-    [[./img/user-core.png]]
-
-    Nomenclature used in examples:
-
-    #+BEGIN_EXAMPLE
-    ctx    - context
-    vbkt   - vBucket handle
-    bkt    - bucket handle
-    name   - byte vector / unicode string
-    data   - user data
-    trs    - traits
-    key    - a trait property name (unicode string)
-    val    - a trait property value (byte vector)
-    status - error code
-    #+END_EXAMPLE
-
-    1. =vbkt <- acquire(name, trs, ctx)=
-       - purpose: :: acquire a vBucket with a set of traits
-       - input: :: name, set of vBucket traits, context
-       - output: :: vBucket handle
-       A trait could be represented as a set of key/value pairs.
-    2. =status <- release(vbkt, ctx)=
-       - purpose: :: release a vBucket
-       - input: :: vBucket handle, context
-       - output: :: error code
-       The context controls the side-effects on buckets (if any).
-    3. =status <- edit(vbkt, key, val, ctx)=
-       - purpose: :: update a vBucket's trait property
-       - input: :: vBucket handle, trait property name, trait property value,
-                   context
-       - output: :: error code
-       Here we assume either that the trait property name is unambiguous or
-       that it's clear from the context which trait is referenced.
-    4. =bkt <- acquire(vbkt, name, ctx)=
-       - purpose: :: acquire a bucket and link it to the vBucket referenced
-       - input: :: vBucket handle, name, context
-       - output: :: bucket handle
-    5. =status <- release(bkt, ctx)=
-       - purpose: :: release a bucket and flush/release the underlying buffers
-       - input: :: bucket handle, context
-       - output: :: error code
-       The context controls the side-effects on buffers (if any).
-    6. =status <- put(bkt, name, data, ctx)=
-       - purpose: :: write user data to a bucket (buffer)
-       - input: :: bucket handle, name, user data, context
-       - output: :: error code
-    7. =data <- get(bkt, name, ctx)=
-       - purpose: :: read user data from a bucket (buffer)
-       - input: :: bucket handle, name, context
-       - output: :: user data
-       A =get= may trigger a "cache miss" in which case I/O clients, etc., will
-       get involved.
-    8. =status <- link(vbkt, bkt, ctx)=
-       - purpose: :: associate a bucket with a vBucket
-       - input: :: vBucket handle, bucket handle, context
-       - output: :: error code
-    9. =status <- unlink(vbkt, bkt, ctx)=
-       - *purpose:* :: dissociate a bucket from a vBucket
-       - *input:* :: vBucket handle, bucket handle, context
-       - *output:* :: error code
-
-*** Basic examples
-
-    For files in a POSIX file system, the following parallels might be drawn:
-    - trait "=" directory-level metadata, file invariants
-    - vBucket "=" directory or file system
-    - bucket "=" (kernel) file table entry
-
-    Let's look at the simplest POSIX use cases!
-
-**** UNIX =write=
-
-     #+begin_src C -n
-     // FILE* fp = fopen("test.dat", "a+");
-     hvbkt = hermes::acquire($HOME, trs, ctx);
-     hbkt = hermes::acquire(hvbkt, "test.dat", ctx);
-     int* data = ... ;
-     // fwrite(data, sizeof(int), count, fp);
-     hermes::put(hbkt, key(0, count), data, ctx);
-     // long offset = ... ;
-     // fseek(fp, offset, SEEK_SET);
-     // fwrite(data, sizeof(int), count, fp);
-     hermes::put(hbkt, key(offset, count), data, ctx);
-     // fclose(fp);
-     hermes::release(hbkt, ctx);
-     hermes::release(hvbkt, ctx);
-     #+end_src
-
-     - line 1 :: What are the traits in =trs=?
-     - line 2 :: This could be a side effect of 3 by acquiring a bucket on the
-                 "default vBucket."
-     - line 3 :: =ctx= contains the access mode, etc.
-     - line 6 :: The =key= function calculates the "name" of the stream to be
-                 written.
-     - line 13 :: This might be unnecessary when the default vBucket is used or
-                  the vBucket represents a file system.
-
-**** UNIX =read=
-
-     #+begin_src C -n
-     // FILE* fp = fopen("test.dat", "r");
-     hvbkt = hermes::acquire($HOME, trs, ctx);
-     hbkt = hermes::acquire(hvbkt, "test.dat", ctx);
-     // int* data = ... ;
-     // fread(data, sizeof(int), count, fp);
-     data = hermes::get(hbkt, key(0, count), ctx);
-     // long offset = ... ;
-     // fseek(fp, offset, SEEK_SET);
-     // fread(data, sizeof(int), count, fp);
-     data = hermes::get(hbkt, key(offset, count), ctx);
-     // fclose(fp);
-     hermes::release(hbkt, ctx);
-     hermes::release(hvbkt, ctx);
-     #+end_src
-
-     - line 1 :: What are the traits in =trs=?
-     - line 2 :: This could be a side effect of 3 by acquiring a bucket on the
-                 "default vBucket."
-     - line 3 :: =ctx= contains the access mode, etc.
-     - line 6 :: The =key= function calculates the "name" of the stream to be
-                 written.
-     - line 13 :: This might be unnecessary when the default vBucket is used or
-                  the vBucket represents a file system.
-
-
-** Form
-   /(What the system is)/
-
-   - I/O middleware library
-     - =LD_PRELOAD=-able
-   - API adapters
-     - UNIX
-     - MPI-IO
-     - HDF5
-       - HDF5 Virtual File Driver (VFD)
-       - HDF5 Virtual Object Layer (VOL) plugin
-   - Services
-     - Application coordinator
-   - Tools
-     - System profiler
-     - Schema parser
-
-*** Core components
-
-    #+CAPTION: Hermes Components
-    #+ATTR_HTML: :width 50%
-    #+NAME:   fig:HERMES
-    [[./img/hermes-stack.png]]
-
-    - API Adapters :: Intercept standard API calls and "translate" into Hermes
-                      calls.
-    - Hermes API :: Getting Hermes things done
-    - Data placement engine (DPE) :: Oracle
-    - Prefetcher (PRE) :: Trigger read ahead
-    - Metadata manager (MDM) :: Hold user- and Hermes-internal metadata
-    - Messaging service (MSG) :: =BCAST "Hello, World!"=
-    - Data organizer (ORG) :: Execute data placement decisions. Respond to
-         events. (e.g., no space left on device)
-    - Buffer pool manager (BPM) :: Buffer management
-    - I/O clients (IOC) :: Storage interfaces that do the actual I/O.
-
-**** Buffer pool manager
-
-     - Manages a (finite) buffer pool $BP = \{b_i\}_{i\in I}$
-     - The $b_i$ are pre-allocated (across the hierarchy) fixed-size buffers
-     - A /buffer pool allocation/ is a sequence of buffers
-       $(b_{i_1},\ldots,b_{i_n}),  b_{i_k}\in BP, 1\leq k\leq n$
-     - Certain operations are supported on buffer pool allocations
-       - /Buffer fission/ - the splitting of one or more buffers in an allocation
-         into smaller buffers
-       - /Buffer fusion/ - the joining of two or more adjacent buffers into a
-         larger buffer
-       - What else?
-     - What are the possible /states/ of a buffer allocation?
-     - Chemistry analogy, molecules, polymer chains, etc.
-     - What's the initial size/layer distribution? Ratio...
-
-*** Allocation of core functions to components
-
-    The messaging service is present in all of these.
-    However, it doesn't really do anything specific to the
-    behavior of these functions.
-
-    #+CAPTION: Core function allocation
-    #+TBLNAME: table-1
-    |                   | *DPE* | *MDM* | *ORG* | *PRE* | *BUM* | *IOC* |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =create= (vBucket)  |     | [x] |     |     |     |     |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =destroy= (vBucket) |     | [x] | [*] |     | [*] | [*] |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =create= (bucket)   |     | [x] |     |     |     |     |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =destroy= (bucket)  |     | [x] | [*] |     | [*] | [*] |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =put=               | [x] |     | [*] |     | [x] | [x] |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =get=               | [x] |     | [*] | [x] | [*] | [x] |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =edit=              |     | [x] | [*] | [*] |     |     |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =link=              |     | [x] |     |     |     |     |
-    |-------------------+-----+-----+-----+-----+-----+-----|
-    | =unlink=            |     | [x] |     |     |     |     |
-    #+TBLFM: $1=create= vBucket
-
-    #+BEGIN_EXAMPLE
-    [x] - All function use cases involve this component
-    [*] - Some function use cases involve this component
-    #+END_EXAMPLE
-
-**** TODO Review the allocation table.
-**** TODO Break down the MDM.
-**** TODO What is the synchronization cycle?
-     We must prove that the buffering is self-regulating and the application
-     never sees inconsistent data. How much fault tolerance do we need / can we
-     afford?
-
-*** Distribution
-
-    #+CAPTION: Hermes Node
-    #+ATTR_HTML: :width 50%
-    #+NAME:   fig:HERMES-node
-    [[./img/hermes-node.png]]
-
-*** Adapters
-
-    #+CAPTION: Hermes Adapter
-    #+ATTR_HTML: :width 25%
-    #+NAME:   fig:HERMES-adapter
-    [[./img/adapter.png]]
-
-    1. The Unix Universal I/O Adapter
-       - =open=
-       - =creat=
-       - =close=
-       - =read=
-       - =write=
-       - =lseek=
-       - =writev=
-       - =readv=
-       - =pread=
-       - =pwrite=
-
-    2. The MPI-IO Adapter
-
-**** TODO Look at the HDF5 source and compile a list of MPI-IO calls what we need
-
-     #+CAPTION: Adaptor modules label:fig:adaptors
-     #+ATTR_HTML: :width 50%
-     [[./img/modules.png]]
-*** Modules
-
-**** Hermes core API
-
-     - Configuration
-     - Layers (tiers), buffer pools, buffers
-     - vBuckets (mappings)
-     - Instrumentation
-     - Messaging
-     - Data placement engine
-     - Data organizer
-       - Transfer content between buffers in /different/ buffer pools
-       - Sync variants
-         - Gather blocks to buffers
-         - Scatter buffers to blocks
-         - Asynchronous and ahead/delayed variants
-
-*** Configuration
-
-    - XML
-
-** Performance objectives or requirements
-   /(How effectively the system does it)/
-
-   - Metrics
-     * (Difference to caching metrics)
-     * Layer occupancy
-     * Network traffic
-     * Latency
-     * Throughput
-     * Overflow handling
-     * Scalability
-     * Capacity
-     * Concurrency
-     * Resource contention
-   - Baseline (host FS or PFS)
-   - Fault tolerance
-   - Data consistency
-   - Thread safety
-
-*** Policies
-
-    1. Maximum application bandwidth
-    2. Maximum data locality
-    3. Hot-data
-    4. User-defined
-** Data
-   /(The information retained in the system and its interrelationships)/
-
-   - Layer configuration
-   - Buffers, buckets, vBuckets
-   - Profile and instrumentation data
-   - Policies
-   - Node status
-   - File properties
-
-*** Metadata Management
-
-    - vBucket list
-      #+BEGIN_EXAMPLE
-      | vBucket ID | Name | List of Bucket Links | Trait(s) | RC |
-      |------------+------+----------------------+----------+----+
-      #+END_EXAMPLE
-    - vBucket free list
-    - vBucket name to vBucket ID map (bi-directional?) Maybe just one-way:
-      =name -> ID=
-
-    /Can a vBucket have more than one trait?/ (No, for now.)
-
-    /Can traits be shared?/ (The vBucket is the trait.)
-
-    - Bucket list
-      #+BEGIN_EXAMPLE
-      | Bucket ID | Name | Map of Buffer IDs | vBucket IDs | RC |
-      |-----------+------+-------------------+-------------+----+
-      #+END_EXAMPLE
-    - Bucket free list
-    - Bucket name to bucket ID map (bi-directional)
-
-    - Buffer list
-      #+BEGIN_EXAMPLE
-      | Buffer ID | Tier | Size | Status | Place |
-      |-----------+------+------+--------+-------|
-      #+END_EXAMPLE
-    - Buffer free list (by tier)
-
-** Managerial
-   /(The process by which the system is constructed and managed)/
-
-*** Milestones
-
-**** TODO Create a Hermes library skeleton
-     - CMake, C++11
-     - Draft of the Hermes low-level API
-     DEADLINE: <2019-04-30 Tue>
-**** TODO Create a Hermes POSIX adapter skeleton
-     - CMake, C++11, C99
-     - Draft of the Hermes high-level API
-     DEADLINE: <2019-05-31 Fri>
-
-*** Testing
-
-
-* Detailed Design
-
-** POSIX Adapter
-
-   The POSIX adapter assumes a /paged/ view of a logical file, a byte vector.
-
-   *What's the relationship between the page size and the pre-defined buffer
-   sizes in buffer pools?*
-
-   #+CAPTION: Hermes File to Object Mapping:fig:HERMES-file-2-object
-   #+ATTR_HTML: :width 50%
-   [[./img/file2object.png]]
-
-   #+CAPTION: Hermes Balanced File Mapping:fig:HERMES-balanced-map
-   #+ATTR_HTML: :width 50%
-   [[./img/balanced-mapping.png]]
-
-
-   This adapter supports a subset of [[https://pubs.opengroup.org/onlinepubs/9699919799/][POSIX.1]] calls (see below) related to file
-   I/O. It also supports /poor-man's parallel I/O/ to multiple independent files
-   (MIF).
-
-***  Metadata structures
-
-    We call them tables, but they are /maps/...
-
-**** File table (FT)
-
-     The =File ID= is obtained from =fstat=. The first two fields of the returned
-     =struct stat= uniquely identify a file.
-
-     #+begin_example
-     File ID := (st_dev, st_ino)
-     #+end_example
-
-     #+begin_example
-     File ID -> (Bucket ID, Page Size, Reference Count)
-     #+end_example
-
-     - Do we need to track EOA/EOF?
-
-**** File descriptor table (FDT)
-
-     #+begin_example
-     File Desc. -> (File ID, Cursor, Append Mode)
-     #+end_example
-
-**** Working set (WS)
-
-     The set of page keys currently present in file buckets.
-
-     #+begin_example
-     File Page Key := (File ID, Page Key)
-     #+end_example
-
-**** Working set statistics (WSS)
-
-     #+begin_example
-     File Page Key -> (read count, write count)
-     #+end_example
-
-     *WARNING:* Generally, the key sets of WS and WSS will be different. The
-     former is a subset of the latter.
-
-*** Supported APIs
-
-**** =open=
-
-     #+begin_src c
-     int open(const char *pathname, int flags);
-     int open(const char *pathname, int flags, mode_t mode);
-     #+end_src
-
-     #+begin_example
-     - Open/create the file, obtain new file descriptor
-     - Compute File ID
-     - IF File ID in FT:
-       - Increment Reference Count
-     - ELSE:
-       - Call flock and place an exclusive lock on the file
-       - Acquire a Hermes bucket
-       - Create a new entry in FT
-       - Release the lock
-     - Add entry to FDT
-     - RETURN file descriptor
-     #+end_example
-
-**** =write=
-
-     #+begin_src c
-     ssize_t write(int fd, const void *buf, size_t count);
-     #+end_src
-
-     #+begin_example
-     - Compute File Page Key Range
-     - IF File Desc. IN Append Mode:
-       - Move Cursor to end of file
-     - FORALL File Page Key IN File Page Key Range:
-       - IF writing full page:
-         - Call hermes::put on file bucket w/ File Page Key and user buffer
-       - ELSE:
-         - IF File Page Key in WS:
-           - Call hermes::get to retrieve buffer associated with File Page Key
-         - ELSE:
-           - Call client_read to retrieve the data
-         - Merge w/ user buffer
-         - Call hermes::put
-       - UNLESS File Page Key in WSS:
-         - Add (File Page Key, (0,0)) to WSS
-       - Increment write count for File Page Key
-     - Advance Cursor for this File Desc.
-     - RETURN the number of bytes written
-     #+end_example
-
-**** =read=
-
-     #+begin_src c
-     ssize_t read(int fd, void *buf, size_t count);
-     #+end_src
-
-     #+begin_example
-     - Compute File Page Key Range
-     - FORALL File Page Key in Page Key Range:
-       - IF File Page Key in WS:
-         - hermes::get the data
-       - ELSE:
-         - Call client_read to retrieve the data
-         - hermes::put the data (optional?)
-       - IF reading full page:
-         - Copy data to user buffer
-       - ELSE:
-         - Merge data into user buffer
-       - UNLESS File Page Key in WSS:
-         - Add (File Page Key, (0,0)) to WSS
-       - Increment read count for File Page Key
-     - Advance Cursor for this File Desc.
-     - RETURN the number of bytes read
-     #+end_example
-
-**** =lseek=
-
-     #+begin_src c
-     off_t lseek(int fd, off_t offset, int whence);
-     #+end_src
-
-     #+begin_example
-     - Call lseek
-     - Update the Cursor for File Desc. fd
-     - RETURN the new offset
-     #+end_example
-
-**** =posix_fallocate=
-
-     #+begin_src c
-     int posix_fallocate(int fd, off_t offset, off_t len);
-     #+end_src
-
-**** =close=
-
-     #+begin_src c
-     int close(int fd);
-     #+end_src
-
-     #+begin_example
-     - Call client_close
-     - Remove the corresponding entry from FDT
-     - Decrement the Reference Count
-     - IF Reference Count == 0:
-       - Call client_flock and place an exclusive lock on the file
-       - Release the Hermes bucket
-       - Remove the entry from FT
-       - Release the lock
-     #+end_example
-
-*** System calls in =H5FDsec2.c=
-
-    - =open=
-    - =close=
-    - =read=, =pread=
-    - =write=, =pwrite=
-    - =lseek=
-    - =stat=
-    - =ftruncate=
-    - =flock=
-    - =fallocate= (?)
-
-
-* Glossary
-
-  We follow closely standard terminology for Unix-like systems with minor
-  adaptations. (cite:Bach1986, cite:Kerrisk2010.)
-
-  - Block :: A configurable but fixed unit or granule of I/O. All I/O
-             operations occur in multiples of blocks and all offsets are
-             block-aligned. Let /B/ denote the configurable but fixed
-             /block size/ in bytes. (A typical value for /B/ is 4096 bytes.)
-  - Buffer :: A storage object which consists of metadata and data.
-              1. A header that identifies the buffer, its size, status, etc.
-              2. A byte stream, the buffer content.
-  - Buffer Pool :: During Hermes initialization, a set of buffers according to
-                   a predefined size distribution is created across storage
-                   layers. (See figure ref:fig:HERMES-buffer-pool.)
-                   As I/O activity commences, the buffer pool divides
-                   into "regions" such as the following:
-                   - Unused or available buffers
-                   - Buffers used a RAM cache
-                   - Buffers mapped to (regions of) files in NVMe devices
-                   - Buffers mapped to (regions of) files in burst buffers
-                   - Etc.
-                   - A PFS "swap file"
-  - Bucket :: A data structure that represents a collection of /named/ streams
-              (buffers).
-  - Trait :: A set of properties represented as
-             (unicode string) key/(byte array) value pairs.
-  - Virtual Bucket (vBucket) :: A data structure that represents a set of
-       traits common among a set of /named/ buckets.
-  - Visibility :: A vBucket can be /shared/ or /private/. The visibility
-                  depends on control flow granularity, i.e., threads, MPI
-                  processes, etc.
-
-  #+CAPTION: Hermes Buffer Pool label:fig:HERMES-buffer-pool
-  #+ATTR_HTML: :width 50%
-  [[./img/hermes-bucket-pool.png]]
-
-** Tasks
-
-*** TODO Clarify how we identify buffers, buckets, and vBuckets
-    - Should we be able to infer the MPI rank, bucket size, and score from a
-      bucket's ID?
-*** TODO Clarify the buffer pool initialization
-    - What's our thinking on a bucket size distribution?
-*** TODO Clarify the vBucket management
-
-
-* Miscellaneous
-
-
-** Magic numbers
-
-   | Size (Bytes) | Comment                                     |
-   |--------------+---------------------------------------------|
-   |          256 | ext4 inode size                             |
-   |          512 | Default sector size of a Linux block device |
-   |         4096 | Default memory page size                    |
-   |         4096 | Default ext4 inode block size               |
-
-
-** Paged allocation and buffering in HDF5
-
-   For the technical details of HDF5 file space management, paged allocation,
-   aggregation, and buffering see cite:Chaarawi2015, cite:ChoiEtAl2017.
-   These features are designed to be used together and don't make much sense
-   on their own.
-
-   - If an I/O request is equal or larger than a file's page size, the
-     page buffer calls directly into the VFD layer.
-   - SWMR writers are not supported because of the flush dependence.
-     SWMR readers are fine as long as on refresh they evict all pages
-     which have evicted metadata cache entries on them.
-
-*** Parallel issues
-
-    - Metadata :: Writes are collective and this works if rank 0 does all
-                  writing (=H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY=).
-                  Distributed write strategies are currently not supported.
-                  _Main reason_: a new distributed algorithm for distributing
-                  entries according to pages would be necessary. The overhead
-                  could be substantial and void potential savings or make
-                  matters worse. Likewise, PB can be effective if metadata
-                  reads are collective and process 0 does all the reading
-                  and broadcasting.
-    - Raw data :: Currently unsupported. _Rationale_: Unlike metadata access,
-                  raw data access is not "atomic" and can be done collectively
-                  or independently. Independent access might benefit, but,
-                  since it can be used simultaneously w/ collective I/O, this
-                  might lead to data inconsistency.
-
-*** API
-
-    Paged buffering is supported in the HDF5 library since version 1.10.1. The
-    page buffer sits right above the VFD layer and acts as a cache for small
-    (meta-)data I/O. With this feature enabled, I/O is always done in multiples
-    of pages.
-
-    1. Set the file space allocation strategy in the file creation property
-       list to =H5F_FSPACE_STRATEGY_PAGE=:
-       #+begin_src C
-       herr_t H5Pset_file_space_strategy
-       (
-        hid_t fcpl,
-        H5F_fspace_strategy_t strategy,
-        hbool_t persist,
-        hsize_t threshold
-        );
-       #+end_src
-       - =persist= controls whether free space should be persisted.
-       - =threshold= is the smallest free-space section size that the free space
-         manager will track.
-    2. Specify the page size of file space allocation:
-       #+begin_src C
-       herr_t H5Pset_file_space_page_size (hid_t fcpl, hsize_t fsp_size);
-       #+end_src
-       The default page size is 4096 bytes.
-    3. To enable page buffering set the maximum page buffer size on the file
-       access property list:
-       #+begin_src C
-       herr_t H5Pset_page_buffer_size
-       (
-        hid_t fapl,
-        size_t buf_size,
-        unsigned min_meta_perc,
-        unsigned min_raw_perc
-        );
-       #+end_src
-       - =buf_size= should be a multiple of the paged allocation size.
-       - =min_meta_perc= - the minimum metadata percentage to keep in the page
-         buffer before allowing pages containing metadata to be evicted.
-       - =min_raw_perc= - Minimum raw data percentage to keep in the page buffer
-         before allowing pages containing raw data to be evicted.
-
-**** TODO Compile a list of HDF5 features that we might want to disable
-
-
-** Templates
-
-*** Diagrams
-
-**** Sequence
-
-     #+CAPTION: A sequence diagram label:fig:sequence-diagram
-     #+ATTR_HTML: :width 50%
-     [[./img/sequence.png]]
-
-**** State
-
-     #+CAPTION: A state machine diagram label:fig:state-machine-diagram
-     #+ATTR_HTML: :width 50%
-     [[./img/state-machine.png]]
-
-**** Quality
-
-     #+CAPTION: The quality triangle label:fig:quality-triangle
-     #+ATTR_HTML: :width 40%
-     [[./img/quality.png]]
-
-*** Code outline template
-
-    #+BEGIN_EXAMPLE
-    terminate:= false
-    initialize application/application protocols
-    ask for current state (image request)
-    Loop
-    Get_event
-    Case Event_Type is
-    -- "normal" (non-fault-tolerant-related) requests to
-    -- perform actions; only happens if this unit is the
-    -- current primary address space
-    when X => Process X
-    Send state data updates to other address spaces
-    when Y => Process Y
-    Send state data updates to other address spaces
-    ...
-    when Terminate_Directive => clean up resources; terminate:= true
-    when State_Data_Update => apply to state data
-    -- will only happen if this unit is a secondary address
-    -- space, receiving the update from the primary after it
-    -- has completed a "normal" action sending, receiving
-    -- state data
-    when Image_Request => send current state data to new address space
-    when State_Data_Image => Initialize state data
-    when Switch_Directive => notify service packages of change in rank
-    -- these are requests that come in after a PAS/SAS
-    -- switchover; they report services that they had
-    -- requested from the old (failed) PAS which this unit
-    -- (noe the PAS) must complete. A, B, etc. are the names
-    -- of the clients.
-    when Recon_from_A => reconstitute A
-    when Recom_from_B => reconstitute B
-    ...
-    when others => log error
-    end case
-    exit when terminate
-    end loop
-    #+END_EXAMPLE
-
-
-    bibliographystyle:unsrtnat
-    bibliography:references.bib
diff --git a/doc/design/img/Hermes IC.graphml b/doc/design/img/Hermes IC.graphml
deleted file mode 100644
index 88b35dc11..000000000
--- a/doc/design/img/Hermes IC.graphml	
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0" xml:space="preserve"/>
-    <node id="n0">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="59.76000000000005" width="150.99999999999994" x="329.5" y="240.99999999999997"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="21.1513671875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="73.2548828125" x="38.87255859375" xml:space="preserve" y="19.304316406250024">Hermes IC<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="336.5" y="211.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="28.0" x="-0.8505859375" xml:space="preserve" y="1.0">PUT<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="366.5" y="211.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="28.66796875" x="-0.8505859375" xml:space="preserve" y="0.666015625">GET<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="396.5" y="211.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="30.00390625" x="-0.8505859375" xml:space="preserve" y="-0.001953125">ACQ<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="426.5" y="211.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="27.34375" x="-0.8505859375" xml:space="preserve" y="1.328125">REL<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="457.98" y="211.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="31.99609375" x="-0.8505859375" xml:space="preserve" y="-0.998046875">MOD<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="367.90000000000003" y="300.76"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="29.3359375" x="-0.8505859375" xml:space="preserve" y="0.33203125">SND<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="17.0" x="426.30000000000007" y="300.76"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="29.3359375" x="-0.8505859375" xml:space="preserve" y="0.33203125">RCV<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="82.47999999999996" x="364.36" y="338.76"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="italic" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="60.015625" x="11.232187500000009" xml:space="preserve" y="5.6494140625">I/O Clients<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="150.99999999999994" x="329.5" y="173.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="italic" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="68.681640625" x="41.1591796875" xml:space="preserve" y="5.6494140625">Hermes API<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n10">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="30.0" x="399.8399999999999" y="109.44000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="40.685546875" x="-5.3427734375" xml:space="preserve" y="29.969414062500007">Bucket<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.49836449086161994" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="trapezoid2"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n11">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="30.0" x="457.53999999999996" y="123.56"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="46.685546875" x="-8.3427734375" xml:space="preserve" y="28.689414062499992">vBucket<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.42991958224543037" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="star8"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n12">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="30.0" x="517.54" y="178.82399999999998"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="13.0" y="13.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n13">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="77.68000000000004" width="99.75999999999988" x="510.5" y="232.04000000000002"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="left" autoSizePolicy="content" fontFamily="Consolas" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="64.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="96.3671875" x="1.6964062499998818" xml:space="preserve" y="6.840000000000032">ACQuire
-RELease
-MODe
-SeND (write)
-ReCeiVe (read)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n14">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="60.0" x="321.9999999999999" y="136.44000000000003"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="44.0078125" x="7.99609375" xml:space="preserve" y="19.84941406249999">B(L)OB<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.4919477806788506" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="parallelogram"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n15">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.flowchart.dataBase">
-          <y:Geometry height="40.0" width="60.0" x="346.56" y="376.76"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="28.0" y="18.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n16">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.flowchart.sequentialData">
-          <y:Geometry height="40.0" width="80.0" x="407.53999999999996" y="376.76"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="38.0" y="18.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-        </y:GenericNode>
-      </data>
-    </node>
-    <edge id="e0" source="n12" target="n5">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="concave"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Consolas" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="52.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="96.3671875" x="9.910359341952017" xml:space="preserve" y="-31.098550142974574">(v)Bucket MODe
-
-0 - Bucket
-1 - vBucket<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="20.855112511065645" distanceToCenter="true" position="left" ratio="-79.81537541001795" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/Hermes IC.png b/doc/design/img/Hermes IC.png
deleted file mode 100644
index 20311c8c4..000000000
Binary files a/doc/design/img/Hermes IC.png and /dev/null differ
diff --git a/doc/design/img/adapter.graphml b/doc/design/img/adapter.graphml
deleted file mode 100644
index ce409318a..000000000
--- a/doc/design/img/adapter.graphml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0"/>
-    <node id="n0">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="98.0" x="290.0" y="105.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="62.705078125" x="17.6474609375" xml:space="preserve" y="5.6494140625">Application<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d5"/>
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.flowchart.dataBase">
-          <y:Geometry height="40.0" width="93.0" x="300.0" y="285.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="46.029296875" x="23.4853515625" xml:space="preserve" y="15.466374062499995">Storage<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="0.0" nodeRatioY="0.35418864843749986" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="98.0" x="295.0" y="195.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="46.005859375" x="25.9970703125" xml:space="preserve" y="5.6494140625">Hermes<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="108.0" x="285.0" y="150.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="40.66796875" x="33.666015625" xml:space="preserve" y="5.6494140625">A-TOP<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="108.0" x="285.0" y="240.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="67.328125" x="20.3359375" xml:space="preserve" y="5.6494140625">A-BOTTOM<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="120.0" width="30.0" x="255.0" y="150.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="21.1513671875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="70.1240234375" x="4.42431640625" xml:space="preserve" y="24.93798828125">ADAPTER<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/adapter.png b/doc/design/img/adapter.png
deleted file mode 100644
index c1a1eb13e..000000000
Binary files a/doc/design/img/adapter.png and /dev/null differ
diff --git a/doc/design/img/balanced-mapping.png b/doc/design/img/balanced-mapping.png
deleted file mode 100644
index 8b1a1850a..000000000
Binary files a/doc/design/img/balanced-mapping.png and /dev/null differ
diff --git a/doc/design/img/file2object.png b/doc/design/img/file2object.png
deleted file mode 100644
index 2b1141f8a..000000000
Binary files a/doc/design/img/file2object.png and /dev/null differ
diff --git a/doc/design/img/hermes-bucket-pool.png b/doc/design/img/hermes-bucket-pool.png
deleted file mode 100644
index 1df970094..000000000
Binary files a/doc/design/img/hermes-bucket-pool.png and /dev/null differ
diff --git a/doc/design/img/hermes-buckets.png b/doc/design/img/hermes-buckets.png
deleted file mode 100644
index f7b76f855..000000000
Binary files a/doc/design/img/hermes-buckets.png and /dev/null differ
diff --git a/doc/design/img/hermes-buffering.graphml b/doc/design/img/hermes-buffering.graphml
deleted file mode 100644
index 9e9ebe071..000000000
--- a/doc/design/img/hermes-buffering.graphml
+++ /dev/null
@@ -1,906 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0" xml:space="preserve"/>
-    <node id="n0">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="111.01999999999992" width="354.3500000000001" x="247.3849999999999" y="369.86782272000005"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="175.17500000000004" y="53.50999999999999">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="trapezoid"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="24.966835199999935" width="52.40179199999994" x="333.79910400000006" y="376.25829120000014"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="24.200895999999943" y="10.483417599999939">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="182.5" width="192.5" x="601.5500000000001" y="238.75000000000003"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="69.671875" x="61.4140625" xml:space="preserve" y="3.9999999999999716">Buffer Pool</y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="92.54999999999995" width="167.13000000000005" x="340.9949999999999" y="226.60000000000002"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="30.900390625" x="68.11480468750011" xml:space="preserve" y="17.032105000000115">RAM<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="2.220446049250313E-16" nodeRatioY="-0.31596861156131684" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="triangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="672.8000000000001" y="272.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="672.8000000000001" y="302.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="672.8000000000001" y="332.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="672.8000000000001" y="362.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="623.4000000000001" y="272.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="21.689453125" x="4.1552734375" xml:space="preserve" y="1.015625">#0<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="fatarrow"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="623.4000000000001" y="302.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="21.689453125" x="4.1552734375" xml:space="preserve" y="1.015625">#1<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="fatarrow"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n10">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="624.2" y="332.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="21.689453125" x="4.1552734375" xml:space="preserve" y="1.015625">#2<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="fatarrow"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n11">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="624.2" y="362.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="21.689453125" x="4.1552734375" xml:space="preserve" y="1.015625">#3<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="fatarrow"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n12">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="702.8000000000001" y="302.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n13">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="702.8000000000001" y="332.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n14">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="732.8000000000001" y="332.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n15">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="624.7308236799993" y="392.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="17.587890625" x="6.2060546875" xml:space="preserve" y="1.015625">FL<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="hexagon"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n16">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="732.8000000000001" y="302.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n17">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.flowchart.dataBase">
-          <y:Geometry height="85.50999999999999" width="371.75" x="238.68499999999995" y="492.2399999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="2.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.296875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="29.3818359375" x="171.18408203125" xml:space="preserve" y="7.3470380540081806">PFS<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="-0.41407977951107255" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n18">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.flowchart.internalStorage">
-          <y:Geometry height="30.0" width="75.0" x="252.52559999999994" y="273.21759999999983"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="52.57421875" x="11.212890625" xml:space="preserve" y="11.40415593750015">vBucket<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.5" nodeRatioX="0.0" nodeRatioY="0.47909686458333833" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n19">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="167.13000000000005" x="340.9949999999999" y="331.20000000000016"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="italic" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="44.60546875" x="61.262265625000055" xml:space="preserve" y="6.015625">Layer j<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n20">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="762.8000000000001" y="332.5"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n21">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="335.76" y="536.9999999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.869140625" x="4.0654296875" xml:space="preserve" y="1.015625">K<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n22">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="461.28000000000003" y="536.9999999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.869140625" x="4.0654296875" xml:space="preserve" y="1.015625">K<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n23">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="298.56" y="536.9999999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.869140625" x="4.0654296875" xml:space="preserve" y="1.015625">K<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n24">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="461.28000000000003" y="294.58752"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n25">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="350.0" y="336.20000000000016"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n26">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="335.76" y="378.7417088"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n27">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="298.56" y="430.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n28">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="642.82296" y="555.8"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.869140625" x="4.0654296875" xml:space="preserve" y="1.015625">K<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n29">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="34.50559999999996" x="677.0655999999999" y="550.8"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="36.455078125" x="-0.9747390625000207" xml:space="preserve" y="6.015625">Block<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n30">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="642.8229599999999" y="494.1899999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.0156249999999432">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n31">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="41.46879999999999" x="677.0655999999999" y="489.1899999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="left" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="40.603515625" x="0.43264218750005057" xml:space="preserve" y="6.015624999999943">Buffer<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n32">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="635.6229599999999" y="463.2099999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="17.587890625" x="6.2060546875" xml:space="preserve" y="1.015625">FL<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="hexagon"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n33">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="58.16895999999997" x="676.5856" y="458.2099999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="left" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.392578125" x="1.388190937499985" xml:space="preserve" y="6.015625">Free List<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n34">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="30.0" x="635.6229599999999" y="432.22999999999996"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="21.203125" x="4.3984375" xml:space="preserve" y="1.015625"># i<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="fatarrow"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n35">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="103.72799999999995" x="660.9360000000001" y="427.22999999999996"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="left" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="77.470703125" x="13.128648437500033" xml:space="preserve" y="6.015625">Hash Queue<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n36">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="457.709088" y="258.29167999999993"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n37">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="380.805696" y="258.29167999999993"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n38">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="475.0" y="278.09759999999983"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n39">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="364.425472" y="278.09759999999983"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n40">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="299.87359999999995" y="400.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n41">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="540.3248" y="400.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n42">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="88.44047999999981" width="30.0" x="538.125" y="226.6"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="90.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="81.642578125" x="6.015625" xml:space="preserve" y="3.3989509374999045">vBucket Pool<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n43">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="360.376" y="430.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n44">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="390.64799999999997" y="430.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n45">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="119.08800000000002" x="295.432" y="425.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="57.54399999999998" y="13.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n46">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="642.82296" y="524.9949999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n47">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="47.4079999999999" x="677.0655999999999" y="519.1899999999998"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="45.47265625" x="0.9676718749999509" xml:space="preserve" y="6.015625">Bucket<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n48">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="363.96" y="378.7417088"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="12.232421875" x="3.8837890625" xml:space="preserve" y="1.015625">B<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n49">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="24.966835199999935" width="52.40179199999989" x="398.51184000000006" y="260.39158240000006"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="38.921875" x="6.739958499999943" xml:space="preserve" y="3.4990425999999673">NVMe<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <edge id="e0" source="n8" target="n4">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n9" target="n5">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n5" target="n12">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e3" source="n10" target="n6">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e4" source="n6" target="n13">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e5" source="n13" target="n14">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e6" source="n11" target="n7">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e7" source="n15" target="n13">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="13.388599812382722" sy="-5.280605108224904" tx="0.0" ty="0.0">
-            <y:Point x="712.8000000000001" y="397.2193948917751"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e8" source="n13" target="n12">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e9" source="n12" target="n5">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e10" source="n5" target="n4">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e11" source="n12" target="n16">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e12" source="n14" target="n20">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e13" source="n4" target="n20">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
-            <y:Point x="772.8000000000001" y="282.5"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e14" source="n20" target="n15">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="10.622616320000589" ty="4.971600000000137">
-            <y:Point x="772.8000000000001" y="407.47160000000014"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e15" source="n19" target="n2">
-      <data key="d10">
-        <y:GenericEdge configuration="com.yworks.edge.framed">
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="16.20000000000016"/>
-          <y:LineStyle color="#000000" type="line" width="3.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="bolditalic" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="38.365234375" x="26.20114178039921" xml:space="preserve" y="-25.4675872070311">1 .. n<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="16.4832" distanceToCenter="true" position="left" ratio="0.4702454191292995" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-        </y:GenericEdge>
-      </data>
-    </edge>
-    <edge id="e16" source="n26" target="n21">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e17" source="n18" target="n24">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e18" source="n18" target="n25">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e19" source="n18" target="n45">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="-28.863300512760134" ty="-15.001010320901855"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e20" source="n27" target="n23">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e21" source="n24" target="n22">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e22" source="n37" target="n36">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e23" source="n39" target="n38">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e24" source="n40" target="n41">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e25" source="n18" target="n1">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="-9.133347127735197" ty="-6.564197632000173"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/hermes-buffering.png b/doc/design/img/hermes-buffering.png
deleted file mode 100644
index e172544d3..000000000
Binary files a/doc/design/img/hermes-buffering.png and /dev/null differ
diff --git a/doc/design/img/hermes-node.png b/doc/design/img/hermes-node.png
deleted file mode 100644
index 96adcd820..000000000
Binary files a/doc/design/img/hermes-node.png and /dev/null differ
diff --git a/doc/design/img/hermes-stack.png b/doc/design/img/hermes-stack.png
deleted file mode 100644
index 79bca3d83..000000000
Binary files a/doc/design/img/hermes-stack.png and /dev/null differ
diff --git a/doc/design/img/mmap.graphml b/doc/design/img/mmap.graphml
deleted file mode 100644
index 3ebc3a2a0..000000000
--- a/doc/design/img/mmap.graphml
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0"/>
-    <node id="n0">
-      <data key="d5"/>
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.flowchart.dataBase">
-          <y:Geometry height="90.0" width="560.0" x="185.45279999999997" y="605.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="2.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="29.634765625" x="503.90408385416634" xml:space="preserve" y="39.844958333333125">PFS<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.5" labelRatioY="0.0" nodeRatioX="0.4527479454985114" nodeRatioY="0.04254814814814578" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="110.0" width="90.0" x="180.0" y="215.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="45.90625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="53.27734375" x="18.361328125" xml:space="preserve" y="32.046875">bucket
-mapped
-region<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="185.8" width="90.0" x="180.0" y="29.19999999999999"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="43.0" y="90.9">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="90.0" width="90.0" x="180.0" y="325.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="43.0" y="43.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="58.799999999999955" width="119.59999999999997" x="300.0" y="480.59999999999997"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="57.799999999999955" y="27.399999999999977">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="58.799999999999955" width="119.59999999999991" x="419.59999999999997" y="480.6"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="45.90625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="53.27734375" x="33.161328124999955" xml:space="preserve" y="6.446874999999977">layer
-mapped
-region<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="58.799999999999955" width="119.59999999999997" x="539.1999999999998" y="480.6"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="57.799999999999955" y="27.399999999999977">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="290.0" y="464.0464"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="418.6864" y="464.0464"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="539.1999999999998" y="464.0464"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n10">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="408.6864" y="464.0464"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n11">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="35.119999999999976" width="110.63999999999999" x="169.68" y="-17.559999999999988"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="105.015625" x="2.812187499999993" xml:space="preserve" y="1.591249999999988">Process virtual
-memory<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n12">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="41.11243520000019" y="319.6948608"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n13">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="180.0" y="319.6948608"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n14">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="145.0" y="235.00000000000006"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n15">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="145.0" y="85.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n16">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="729.08" y="437.56"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n17">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="282.96" y="437.56"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n18">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="729.08" y="565.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n19">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="282.96" y="565.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n20">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="46.0" x="679.0" y="505.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.052734375" x="-4.5263671875" xml:space="preserve" y="-3.984375">Layer X<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n21">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="227.60000000000002" x="287.4576" y="650.1311999999998"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="111.80000000000001" y="13.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n22">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="137.3152" x="351.3424" y="650.1311999999998"/>
-          <y:Fill color="#FFFFFF" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="64.3046875" x="36.50525625" xml:space="preserve" y="6.015625">file region<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n23">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="62.639999999999986" x="300.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="56.037109375" x="3.3014453124999363" xml:space="preserve" y="6.015625">open file<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <edge id="e0" source="n1" target="n4">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="45.000842239999315" sy="54.51422719999982" tx="59.656345599999554" ty="-29.401062400000455">
-            <y:Point x="419.4563455999995" y="324.5142271999998"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="dotted" width="2.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="true"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n2" target="n5">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="45.0150963199996" sy="92.24949851022174" tx="59.38228479999992" ty="-29.4035200000003">
-            <y:Point x="538.7822847999998" y="214.5700668302219"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="dotted" width="2.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="true"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n7" target="n8">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="delta" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="italic" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="38.130859375" x="41.09697031250005" xml:space="preserve" y="-19.125161718750007">offset<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="10.140799999999992" distanceToCenter="true" position="left" ratio="0.5116107111184091" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e3" source="n10" target="n9">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="delta" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="italic" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="42.25" x="37.08379863281243" xml:space="preserve" y="-18.71556171874994">length<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="9.731199999999951" distanceToCenter="true" position="left" ratio="0.46999865228320836" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e4" source="n12" target="n13">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="45.90625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="74.69921875" x="27.094173837793065" xml:space="preserve" y="-52.95311893632811">address
-returned by
-mmap()<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e5" source="n14" target="n15">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" rotationAngle="90.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="105.361328125" x="-45.968750000000014" xml:space="preserve" y="-122.68066406249997">increasing
-memory address<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e6" source="n17" target="n16">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="2.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e7" source="n19" target="n18">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="2.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e8" source="n5" target="n21">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="-59.81513974041468" sy="28.872649997654776" tx="-49.98490897796256" ty="-15.004722386851313"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e9" source="n6" target="n21">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="-59.419854224154165" sy="29.423906268542055" tx="87.47884552143626" ty="-14.976030482388069"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/mmap.png b/doc/design/img/mmap.png
deleted file mode 100644
index 66f24f253..000000000
Binary files a/doc/design/img/mmap.png and /dev/null differ
diff --git a/doc/design/img/modules.graphml b/doc/design/img/modules.graphml
deleted file mode 100644
index b596eeefb..000000000
--- a/doc/design/img/modules.graphml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0"/>
-    <node id="n0">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="60.0" width="150.0" x="569.8000000000001" y="240.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="127.7265625" x="11.13671875" xml:space="preserve" y="14.03125">POSIX Adapter
-&lt;&lt;user interface&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="40.0" x="569.8000000000001" y="220.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="18.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="60.0" width="150.0" x="675.0" y="390.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="127.7265625" x="11.13671875" xml:space="preserve" y="14.03125">vBucket
-&lt;&lt;user interface&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="40.0" x="675.0" y="370.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="18.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="60.0" width="150.0" x="810.3792" y="240.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="127.7265625" x="11.13671875" xml:space="preserve" y="14.03125">MPI-IO Adapter
-&lt;&lt;user interface&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="40.0" x="810.3792" y="220.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="18.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="60.0" width="150.0" x="569.8000000000001" y="89.97439999999995"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="126.390625" x="11.8046875" xml:space="preserve" y="14.03125">Hermes VFD
-&lt;&lt;infrastructure&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="40.0" x="569.8000000000001" y="69.97439999999995"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="18.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="60.0" width="150.0" x="810.3792" y="89.97439999999995"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="126.390625" x="11.8046875" xml:space="preserve" y="14.03125">Hermes VOL
-&lt;&lt;infrastructure&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="40.0" x="810.3792" y="69.97439999999995"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="18.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <edge id="e0" source="n0" target="n2">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
-            <y:Point x="644.8000000000001" y="330.0"/>
-            <y:Point x="750.0" y="330.0"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n4" target="n2">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="29.884799999999814" ty="-29.99480000000011">
-            <y:Point x="885.3792" y="330.0"/>
-            <y:Point x="779.8847999999998" y="330.0"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n6" target="n0">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e3" source="n8" target="n4">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/modules.png b/doc/design/img/modules.png
deleted file mode 100644
index 3a47248cd..000000000
Binary files a/doc/design/img/modules.png and /dev/null differ
diff --git a/doc/design/img/perf/dev-bw.png b/doc/design/img/perf/dev-bw.png
deleted file mode 100644
index e63ab7022..000000000
Binary files a/doc/design/img/perf/dev-bw.png and /dev/null differ
diff --git a/doc/design/img/perf/tiering-1n.png b/doc/design/img/perf/tiering-1n.png
deleted file mode 100644
index 75c3adca1..000000000
Binary files a/doc/design/img/perf/tiering-1n.png and /dev/null differ
diff --git a/doc/design/img/primitives.png b/doc/design/img/primitives.png
deleted file mode 100644
index 751b25ec3..000000000
Binary files a/doc/design/img/primitives.png and /dev/null differ
diff --git a/doc/design/img/quality.graphml b/doc/design/img/quality.graphml
deleted file mode 100644
index 2e04abed2..000000000
--- a/doc/design/img/quality.graphml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0"/>
-    <node id="n0">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="144.0" width="200.0" x="470.0" y="228.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="98.0" y="70.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="triangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="30.0" x="435.0" y="359.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="left" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="33.9296875" x="-1.96484375" xml:space="preserve" y="-0.96875">Low
-Cost<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="30.0" x="705.0" y="359.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="78.203125" x="-24.1015625" xml:space="preserve" y="-0.96875">Short Time
-to Market<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="30.0" x="555.0" y="195.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="52.626953125" x="-11.3134765625" xml:space="preserve" y="-0.96875">High
-Quality<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:UMLNoteNode>
-          <y:Geometry height="53.0" width="142.0" x="514.0" y="419.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="45.90625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="135.830078125" x="3.0849609375" xml:space="preserve" y="3.546875">Inexpensive;
-lower quality;
-longer time to market<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:UMLNoteNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="487.0" y="355.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="565.0" y="239.50560000000002"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="608.0" y="308.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:UMLNoteNode>
-          <y:Geometry height="53.0" width="142.0" x="349.0" y="218.0056"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="45.90625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="135.830078125" x="3.0849609375" xml:space="preserve" y="3.546875">Expensive;
-high quality;
-longer time to market<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:UMLNoteNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:UMLNoteNode>
-          <y:Geometry height="63.879999999999995" width="132.7199999999999" x="667.0" y="223.1"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="59.875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="111.314453125" x="10.7027734374999" xml:space="preserve" y="2.0024999999999693">More expensive;
-moderate quality;
-moderate time to
-market<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:UMLNoteNode>
-      </data>
-    </node>
-    <edge id="e0" source="n4" target="n5">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n8" target="n6">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n9" target="n7">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/quality.png b/doc/design/img/quality.png
deleted file mode 100644
index a0d4d88d8..000000000
Binary files a/doc/design/img/quality.png and /dev/null differ
diff --git a/doc/design/img/sequence.graphml b/doc/design/img/sequence.graphml
deleted file mode 100644
index 22ebed503..000000000
--- a/doc/design/img/sequence.graphml
+++ /dev/null
@@ -1,1267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0"/>
-    <node id="n0">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:SVGNode>
-          <y:Geometry height="67.2" width="39.2" x="85.39999999999999" y="116.4"/>
-          <y:Fill color="#FFCC00" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="19.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" underlinedText="true" verticalTextPosition="bottom" visible="true" width="38.0107421875" x="0.5946289062500085" xml:space="preserve" y="71.2">:User<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:SVGNodeProperties usingVisualBounds="false"/>
-          <y:SVGModel svgBoundsPolicy="0">
-            <y:SVGContent refid="1"/>
-          </y:SVGModel>
-        </y:SVGNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="44.0" width="60.0" x="210.0" y="128.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" underlinedText="true" verticalTextPosition="bottom" visible="true" width="40.626953125" x="9.6865234375" xml:space="preserve" y="6.03125">:Login
-Page<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="44.0" width="89.0" x="315.5" y="128.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" underlinedText="true" verticalTextPosition="bottom" visible="true" width="63.291015625" x="12.8544921875" xml:space="preserve" y="6.03125">:Login
-Controller<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="44.0" width="89.0" x="435.5" y="128.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" underlinedText="true" verticalTextPosition="bottom" visible="true" width="59.330078125" x="14.8349609375" xml:space="preserve" y="13.015625">:UserDao<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="44.0" width="89.0" x="541.5" y="346.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" underlinedText="true" verticalTextPosition="bottom" visible="true" width="49.78515625" x="19.607421875" xml:space="preserve" y="6.03125">:User
-Session<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="44.0" width="73.0" x="653.5" y="127.99999999999999"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" underlinedText="true" verticalTextPosition="bottom" visible="true" width="49.62109375" x="11.689453125" xml:space="preserve" y="13.015625">:Logger<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="100.0" y="235.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="235.0" y="235.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="235.0" y="265.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="265.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n10">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="293.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n11">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="475.0" y="293.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n12">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="415.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n13">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="581.0" y="415.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n14">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="363.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n15">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="328.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n16">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="475.0" y="328.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n17">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="445.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n18">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="685.0" y="445.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n19">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="100.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n20">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="235.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n21">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n22">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="475.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n23">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="581.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n24">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="685.0" y="535.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n25">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:UMLNoteNode>
-          <y:Geometry height="136.0000000000001" width="595.0" x="90.99999999999994" y="578.8000000000002"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.296875" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="tl" textColor="#000000" verticalTextPosition="bottom" visible="true" width="75.5791015625" x="4.0" xml:space="preserve" y="4.0">Key (UML)</y:NodeLabel>
-        </y:UMLNoteNode>
-      </data>
-    </node>
-    <node id="n26">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="100.0" y="204.3"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n27">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="270.80000000000007" width="10.0" x="235.0" y="240.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="133.40000000000003">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n28">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="235.0" y="475.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n29">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="355.0" y="475.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n30">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="99.8" y="505.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n31">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="235.0" y="505.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n32">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="210.6384" width="10.0" x="355.0" y="270.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" backgroundColor="#999999" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="103.31920000000002">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n33">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="32.50560000000007" width="10.0" x="475.0" y="300.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="14.252800000000036">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n34">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.457600000000014" width="10.0" x="581.0" y="390.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="13.228799999999978">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n35">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="67.20000000000005" width="10.0" x="685.0" y="450.4124800000001"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="31.600000000000023">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n36">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:SVGNode>
-          <y:Geometry height="67.2" width="39.2" x="190.4" y="596.4000000000001"/>
-          <y:Fill color="#FFCC00" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="19.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="38.43603515625" x="47.35254242187452" xml:space="preserve" y="24.033593750000023">Actor<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="-0.5" labelRatioY="0.0" nodeRatioX="0.5" nodeRatioY="3.3306690738754696E-16" offsetX="8.152542421874557" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:SVGNodeProperties usingVisualBounds="false"/>
-          <y:SVGModel svgBoundsPolicy="0">
-            <y:SVGContent refid="1"/>
-          </y:SVGModel>
-        </y:SVGNode>
-      </data>
-    </node>
-    <node id="n37">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="44.0" width="63.799999999999955" x="301.20000000000005" y="608.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="43.08203125" x="76.62954437499957" xml:space="preserve" y="13.015625">Object<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="-0.5" labelRatioY="0.0" nodeRatioX="0.5" nodeRatioY="0.0" offsetX="12.829544374999614" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n38">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="463.9705599999995" y="595.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n39">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="463.9705599999995" y="649.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n40">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="552.541119999999" y="595.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n41">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="552.541119999999" y="649.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n42">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="10.0" x="552.541119999999" y="612.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="13.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n43">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="105.0" y="682.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n44">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="165.0" y="682.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n45">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="361.20000000000005" y="682.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n46">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="301.20000000000005" y="682.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n47">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="552.541119999999" y="682.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n48">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="10.0" width="10.0" x="492.54111999999895" y="682.0000000000001"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle hasColor="false" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="3.0" y="3.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <edge id="e0" source="n6" target="n7">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="33.232421875" x="41.40378906250004" xml:space="preserve" y="-19.784374999999983">login<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="10.799999999999994" distanceToCenter="true" position="left" ratio="0.44521055774513363" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n8" target="n9">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="54.0390625" x="28.390068749999955" xml:space="preserve" y="-20.961974999999995">login(...)<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n10" target="n11">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="84.607421875" x="12.83346642099059" xml:space="preserve" y="-20.961974999999995">checkPwd(...)<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e3" source="n12" target="n13">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="plain" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="107.80020696923322" y="-13.977599999999995">
-            <y:LabelModel>
-              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/>
-            </y:ModelParameter>
-            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
-          </y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e4" source="n14" target="n4">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="-44.5" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="28.802734375" x="75.07577923439345" xml:space="preserve" y="-20.961974999999995">new<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e5" source="n15" target="n16">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="plain" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="53.855543906170226" y="-13.977599999999995">
-            <y:LabelModel>
-              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/>
-            </y:ModelParameter>
-            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
-          </y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e6" source="n17" target="n18">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="138.912109375" x="81.17013520859462" xml:space="preserve" y="-19.78437500000001">register User Login(...)<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="10.799999999999994" distanceToCenter="true" position="left" ratio="0.44521055774513363" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e7" source="n26" target="n19">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e8" source="n28" target="n29">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="plain" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="53.855543906170226" y="-13.977599999999995">
-            <y:LabelModel>
-              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/>
-            </y:ModelParameter>
-            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
-          </y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e9" source="n30" target="n31">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="plain" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="61.59100197288936" y="-13.977599999999995">
-            <y:LabelModel>
-              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.9776" distanceToCenter="true" position="left" ratio="0.5089119156892732" segment="-1"/>
-            </y:ModelParameter>
-            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
-          </y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e10" source="n1" target="n20">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e11" source="n2" target="n21">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e12" source="n3" target="n22">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e13" source="n4" target="n23">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e14" source="n5" target="n24">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e15" source="n38" target="n39">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="47.283203125" x="6.358407900390148" xml:space="preserve" y="13.015625">Lifeline<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e16" source="n40" target="n41">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="70.978515625" x="20.910724492186546" xml:space="preserve" y="6.03125">Execution
-occurrence<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="56.40000000000009" distanceToCenter="true" position="left" ratio="0.5" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e17" source="n43" target="n44">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="delta"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="81.607421875" x="73.1962890625" xml:space="preserve" y="-16.968749999999886">Synchronous
-message<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="1.0" distanceToCenter="true" position="left" ratio="88.0" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e18" source="n46" target="n45">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="88.451171875" x="69.7744018554688" xml:space="preserve" y="-16.968749999999886">Asynchronous
-message<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="1.0" distanceToCenter="true" position="left" ratio="88.0" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e19" source="n48" target="n47">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="57.9296875" x="74.03516907226458" xml:space="preserve" y="-16.968749999999886">Return
-message<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="1.0" distanceToCenter="true" position="left" ratio="77.0" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources>
-      <y:Resource id="1" xml:space="preserve">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
-&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;
-&lt;svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="41"
-   height="68.997391"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\Daten\alberts\projects\yfx"
-   sodipodi:docname="uml_actor.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"&gt;
-  &lt;defs
-     id="defs4" /&gt;
-  &lt;sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.934351"
-     inkscape:cx="144.21983"
-     inkscape:cy="28.533711"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     width="48px"
-     height="48px"
-     showborder="false"
-     inkscape:showpageshadow="false" /&gt;
-  &lt;metadata
-     id="metadata7"&gt;
-    &lt;rdf:RDF&gt;
-      &lt;cc:Work
-         rdf:about=""&gt;
-        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;
-        &lt;dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;
-      &lt;/cc:Work&gt;
-    &lt;/rdf:RDF&gt;
-  &lt;/metadata&gt;
-  &lt;g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-29.5,-42.959476)"&gt;
-    &lt;a
-       id="a3142"
-       transform="matrix(1.0873906,0,0,1,-4.4741999,0)"&gt;
-      &lt;path
-         transform="translate(11.586889,5.2908993)"
-         d="M 47.02914 47.36993 A 8.5197716 9.2013531 0 1 1  29.989597,47.36993 A 8.5197716 9.2013531 0 1 1  47.02914 47.36993 z"
-         sodipodi:ry="9.2013531"
-         sodipodi:rx="8.5197716"
-         sodipodi:cy="47.36993"
-         sodipodi:cx="38.509369"
-         id="path2160"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:type="arc" /&gt;
-    &lt;/a&gt;
-    &lt;path
-       sodipodi:type="arc"
-       style="fill:none"
-       id="path3134"
-       sodipodi:cx="43.962021"
-       sodipodi:cy="48.392303"
-       sodipodi:rx="3.7486994"
-       sodipodi:ry="0"
-       d="M 47.71072 48.392303 A 3.7486994 0 0 1 1  40.213321,48.392303 A 3.7486994 0 0 1 1  47.71072 48.392303 z" /&gt;
-    &lt;path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.24319649px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 50,61.33709 C 50,91.363211 50,92.247838 50,92.247838"
-       id="path3136" /&gt;
-    &lt;path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 69.760668,72.362183 C 69.760668,72.362183 69.760668,72.362183 50.239332,72.362183 C 30.239332,72.362183 30.239332,72.362183 30.239332,72.362183 L 30.239332,72.362183"
-       id="path3138" /&gt;
-    &lt;path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 30,111.45687 C 30,111.45687 30,111.45687 50,92.013532 C 70,111.45687 70,111.45687 70,111.45687"
-       id="path3140" /&gt;
-  &lt;/g&gt;
-&lt;/svg&gt;
-</y:Resource>
-    </y:Resources>
-  </data>
-</graphml>
diff --git a/doc/design/img/sequence.png b/doc/design/img/sequence.png
deleted file mode 100644
index 3b2389024..000000000
Binary files a/doc/design/img/sequence.png and /dev/null differ
diff --git a/doc/design/img/state-machine.graphml b/doc/design/img/state-machine.graphml
deleted file mode 100644
index 3c53839d1..000000000
--- a/doc/design/img/state-machine.graphml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0"/>
-    <node id="n0">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="20.0" width="20.0" x="200.0" y="110.0"/>
-          <y:Fill color="#000000" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="8.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="48.0" width="73.0" x="173.5" y="186.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="19.791015625" x="26.6044921875" xml:space="preserve" y="15.015625">off<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="48.0" width="99.0" x="387.5" y="186.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="73.779296875" x="12.6103515625" xml:space="preserve" y="8.03125">on
-disengaged<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d5"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="48.0" width="99.0" x="627.5" y="186.0"/>
-          <y:Fill color="#C0C0C0" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="56.576171875" x="21.2119140625" xml:space="preserve" y="8.03125">on
-engaged<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="roundrectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d5"/>
-      <data key="d6">
-        <y:UMLNoteNode>
-          <y:Geometry height="28.0" width="90.39999999999998" x="747.4999999999999" y="264.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="italic" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="60.033203125" x="15.183398437499932" xml:space="preserve" y="5.015625">Key: UML<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-        </y:UMLNoteNode>
-      </data>
-    </node>
-    <edge id="e0" source="n0" target="n1">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n1" target="n2">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="36.5078125" sy="-13.0" tx="-49.5234375" ty="-13.0">
-            <y:Point x="322.5" y="197.0"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="87.6953125" x="25.536884374999943" xml:space="preserve" y="-33.68074999999999">press "cruise
-on/off" button<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="17.712000000000007" distanceToCenter="true" position="left" ratio="0.8260966793461484" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n2" target="n1">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="-49.46984000000003" sy="16.117720849691352" tx="36.47724064019687" ty="16.117720849691352"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="87.6953125" x="-115.16258378906252" xml:space="preserve" y="1.743249292074097">press "cruise
-on/off" button<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="17.711999999999957" distanceToCenter="true" position="left" ratio="0.5189171206927662" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e3" source="n2" target="n3">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="49.507896464473276" sy="-12.64611761131306" tx="-49.46024" ty="-12.64611761131306"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="109.931640625" x="13.16697963476554" xml:space="preserve" y="-36.0072774472506">press "set" or
-"resume" buttons<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="20.038528000000035" distanceToCenter="true" position="left" ratio="0.3880170991007654" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e4" source="n3" target="n2">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="-49.49725046445485" sy="15.216389295979894" tx="49.48403199999967" ty="15.216389295979894"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="98.845703125" x="-122.75837431640616" xml:space="preserve" y="2.3852294082846015">tap brake pedal<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.369600000000009" distanceToCenter="true" position="left" ratio="0.5891700419121639" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e5" source="n3" target="n1">
-      <data key="d9"/>
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="-32.3054080000004" sy="23.97781600000019" tx="0.0" ty="0.0">
-            <y:Point x="644.6945919999996" y="290.4"/>
-            <y:Point x="210.0" y="290.4"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="169.38671875" x="-318.12527418066264" xml:space="preserve" y="37.25025390625012">press "cruise on/off" button<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="10.159999999999899" distanceToCenter="true" position="right" ratio="0.537002141327623" segment="1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="true"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e6" source="n3" target="n3">
-      <data key="d9"/>
-      <data key="d10">
-        <y:SplineEdge>
-          <y:Path sx="-8.625408000000334" sy="23.997816000000228" tx="34.300886285971615" ty="24.023395402689005">
-            <y:Point x="674.7745919999996" y="270.0"/>
-            <y:Point x="705.4945919999996" y="270.0"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="55.62109375" x="-7.092081392187879" xml:space="preserve" y="41.00144195664063">press "-"
-to coast<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="20.982246400000008" distanceToCenter="true" position="right" ratio="0.4522133333333339" segment="1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-        </y:SplineEdge>
-      </data>
-    </edge>
-    <edge id="e7" source="n3" target="n3">
-      <data key="d9"/>
-      <data key="d10">
-        <y:SplineEdge>
-          <y:Path sx="49.52114918991708" sy="-15.201674072504204" tx="49.51346396825613" ty="14.108515742409082">
-            <y:Point x="761.4852735999996" y="195.65276160000013"/>
-            <y:Point x="770.4964735999994" y="210.0"/>
-            <y:Point x="763.9428735999995" y="224.3247616000002"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="45.90625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="48.712890625" x="48.121491551369104" xml:space="preserve" y="-6.715386145994557">push
-throttle
-pedal<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="25.9955002097168" distanceToCenter="true" position="left" ratio="-11.666176218741448" segment="2"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-        </y:SplineEdge>
-      </data>
-    </edge>
-    <edge id="e8" source="n3" target="n3">
-      <data key="d9"/>
-      <data key="d10">
-        <y:SplineEdge>
-          <y:Path sx="-29.395617792000166" sy="-24.03507558399977" tx="33.32498972193969" ty="-24.023462211230736">
-            <y:Point x="654.7723822079998" y="138.94399999999996"/>
-            <y:Point x="700.3403822079999" y="139.73292441600017"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="left" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="82.884765625" x="1.577896331585066" xml:space="preserve" y="-91.41899463071897">press "+"
-to accelerate<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.7621265153915691" segment="1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-        </y:SplineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources/>
-  </data>
-</graphml>
diff --git a/doc/design/img/state-machine.png b/doc/design/img/state-machine.png
deleted file mode 100644
index cb31c0755..000000000
Binary files a/doc/design/img/state-machine.png and /dev/null differ
diff --git a/doc/design/img/user-core.graphml b/doc/design/img/user-core.graphml
deleted file mode 100644
index 09309f15d..000000000
--- a/doc/design/img/user-core.graphml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
-  <!--Created by yEd 3.19-->
-  <key attr.name="Description" attr.type="string" for="graph" id="d0"/>
-  <key for="port" id="d1" yfiles.type="portgraphics"/>
-  <key for="port" id="d2" yfiles.type="portgeometry"/>
-  <key for="port" id="d3" yfiles.type="portuserdata"/>
-  <key attr.name="url" attr.type="string" for="node" id="d4"/>
-  <key attr.name="description" attr.type="string" for="node" id="d5"/>
-  <key for="node" id="d6" yfiles.type="nodegraphics"/>
-  <key for="graphml" id="d7" yfiles.type="resources"/>
-  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
-  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
-  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
-  <graph edgedefault="directed" id="G">
-    <data key="d0" xml:space="preserve"/>
-    <node id="n0">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="45.360000000000014" x="67.32" y="213.58000000000018"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="20.680000000000007" y="13.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:Shape type="hexagon"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n1">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="113.0" x="-56.5" y="345.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="52.57421875" x="30.212890625" xml:space="preserve" y="6.015625">vBucket<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n2">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="113.0" x="132.38" y="345.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="44.857421875" x="34.0712890625" xml:space="preserve" y="6.015625">bucket<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n3">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d6">
-        <y:SVGNode>
-          <y:Geometry height="100.0" width="60.0" x="158.88" y="178.58000000000018"/>
-          <y:Fill color="#FFCC00" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="19.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="38.43603515625" x="58.921982421874986" xml:space="preserve" y="70.17359375000004">Actor<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="-0.4719529453612304" labelRatioY="0.5" nodeRatioX="0.5" nodeRatioY="0.39306406250000014" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:SVGNodeProperties usingVisualBounds="false"/>
-          <y:SVGModel svgBoundsPolicy="0">
-            <y:SVGContent refid="1"/>
-          </y:SVGModel>
-        </y:SVGNode>
-      </data>
-    </node>
-    <node id="n4">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="50.0" width="110.0" x="316.20000000000005" y="109.63999999999996"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="19.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="87.2939453125" x="11.35302734375" xml:space="preserve" y="15.43359375">Buffer data<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n5">
-      <data key="d4" xml:space="preserve"/>
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="50.0" width="110.0" x="316.20000000000005" y="203.58000000000018"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="13" fontStyle="bold" hasBackgroundColor="false" hasLineColor="false" height="34.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="87.2939453125" x="11.35302734375" xml:space="preserve" y="7.8671875">Buffer data
-to PFS file<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="ellipse"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n6">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="113.0" x="321.26" y="399.88"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="61.017578125" x="25.9912109375" xml:space="preserve" y="6.015625">user data<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n7">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="50.0" width="137.79999999999995" x="-68.89999999999998" y="109.63999999999996"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="dashed" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="108.98828125" x="14.405859374999977" xml:space="preserve" y="9.03125">vBucket Manager
-&lt;&lt;controller&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n8">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="113.0" x="321.26" y="345.0"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="dotted" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="39.98828125" x="36.505859375" xml:space="preserve" y="6.015625">buffer<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n9">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="50.0" width="137.79999999999995" x="308.86" y="270.12"/>
-          <y:Fill hasColor="false" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="dotted" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="101.728515625" x="18.035742187499977" xml:space="preserve" y="9.03125">Buffer Pool
-&lt;&lt;controller&gt;&gt;<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="rectangle"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <node id="n10">
-      <data key="d6">
-        <y:ShapeNode>
-          <y:Geometry height="30.0" width="45.360000000000014" x="61.5856" y="218.0600000000002"/>
-          <y:Fill color="#FFFFFF" transparent="false"/>
-          <y:BorderStyle color="#000000" raised="false" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="29.03125" x="8.164375000000007" xml:space="preserve" y="6.015625">trait<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
-          <y:Shape type="hexagon"/>
-        </y:ShapeNode>
-      </data>
-    </node>
-    <edge id="e0" source="n3" target="n4">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e1" source="n3" target="n5">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e2" source="n5" target="n4">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="86.013671875" x="17.993151855468795" xml:space="preserve" y="-30.954376831054617">&lt;&lt;extend&gt;&gt;<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="61.0" distanceToCenter="true" position="right" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e3" source="n1" target="n2">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="48.82421875" x="16.910679767476964" xml:space="preserve" y="2.5836249999999836">acquire<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="11.56799999999998" distanceToCenter="true" position="right" ratio="0.6983368039782384" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e4" source="n2" target="n1">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
-            <y:Point x="188.88" y="420.0"/>
-            <y:Point x="0.0" y="420.0"/>
-          </y:Path>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="49.796875" x="-119.3384423828125" xml:space="preserve" y="25.183504158658366">(un)link<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="1.847745841341616" distanceToCenter="false" position="right" ratio="0.5" segment="1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e5" source="n7" target="n1">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="-64.0" y="96.90243465290484">
-            <y:LabelModel>
-              <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="62.0" distanceToCenter="true" position="right" ratio="0.5363120567375892" segment="-1"/>
-            </y:ModelParameter>
-            <y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
-          </y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e6" source="n3" target="n2">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="48.021484375" x="5.9892529296874955" xml:space="preserve" y="24.205161132812577">release<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e7" source="n2" target="n8">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="21.54000000000002" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e8" source="n9" target="n8">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e9" source="n6" target="n2">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="51.26171875" x="-78.85309226153299" xml:space="preserve" y="1.4299277673578672">put, get<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="24.850565577128418" distanceToCenter="true" position="left" ratio="0.31050670783201006" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e10" source="n8" target="n6">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="dotted" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e11" source="n10" target="n1">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="48.82421875" x="-71.45619227658327" xml:space="preserve" y="7.640294842674621">acquire<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="right" ratio="0.10441991176460719" segment="-1"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e12" source="n3" target="n0">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="27.0390625" x="-45.8966357421875" xml:space="preserve" y="-38.984376831054504">edit<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="right" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-    <edge id="e13" source="n1" target="n3">
-      <data key="d10">
-        <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
-          <y:LineStyle color="#000000" type="line" width="1.0"/>
-          <y:Arrows source="none" target="none"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="48.021484375" x="54.85953783625082" xml:space="preserve" y="-43.45310832638211">release<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="16.752049438995066" distanceToCenter="true" position="right" ratio="0.5" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
-          <y:BendStyle smoothed="false"/>
-        </y:PolyLineEdge>
-      </data>
-    </edge>
-  </graph>
-  <data key="d7">
-    <y:Resources>
-      <y:Resource id="1" xml:space="preserve">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
-&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;
-&lt;svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="41"
-   height="68.997391"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="C:\Daten\alberts\projects\yfx"
-   sodipodi:docname="uml_actor.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"&gt;
-  &lt;defs
-     id="defs4" /&gt;
-  &lt;sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.934351"
-     inkscape:cx="144.21983"
-     inkscape:cy="28.533711"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     width="48px"
-     height="48px"
-     showborder="false"
-     inkscape:showpageshadow="false" /&gt;
-  &lt;metadata
-     id="metadata7"&gt;
-    &lt;rdf:RDF&gt;
-      &lt;cc:Work
-         rdf:about=""&gt;
-        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;
-        &lt;dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;
-      &lt;/cc:Work&gt;
-    &lt;/rdf:RDF&gt;
-  &lt;/metadata&gt;
-  &lt;g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-29.5,-42.959476)"&gt;
-    &lt;a
-       id="a3142"
-       transform="matrix(1.0873906,0,0,1,-4.4741999,0)"&gt;
-      &lt;path
-         transform="translate(11.586889,5.2908993)"
-         d="M 47.02914 47.36993 A 8.5197716 9.2013531 0 1 1  29.989597,47.36993 A 8.5197716 9.2013531 0 1 1  47.02914 47.36993 z"
-         sodipodi:ry="9.2013531"
-         sodipodi:rx="8.5197716"
-         sodipodi:cy="47.36993"
-         sodipodi:cx="38.509369"
-         id="path2160"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:type="arc" /&gt;
-    &lt;/a&gt;
-    &lt;path
-       sodipodi:type="arc"
-       style="fill:none"
-       id="path3134"
-       sodipodi:cx="43.962021"
-       sodipodi:cy="48.392303"
-       sodipodi:rx="3.7486994"
-       sodipodi:ry="0"
-       d="M 47.71072 48.392303 A 3.7486994 0 0 1 1  40.213321,48.392303 A 3.7486994 0 0 1 1  47.71072 48.392303 z" /&gt;
-    &lt;path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.24319649px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 50,61.33709 C 50,91.363211 50,92.247838 50,92.247838"
-       id="path3136" /&gt;
-    &lt;path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 69.760668,72.362183 C 69.760668,72.362183 69.760668,72.362183 50.239332,72.362183 C 30.239332,72.362183 30.239332,72.362183 30.239332,72.362183 L 30.239332,72.362183"
-       id="path3138" /&gt;
-    &lt;path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 30,111.45687 C 30,111.45687 30,111.45687 50,92.013532 C 70,111.45687 70,111.45687 70,111.45687"
-       id="path3140" /&gt;
-  &lt;/g&gt;
-&lt;/svg&gt;
-</y:Resource>
-    </y:Resources>
-  </data>
-</graphml>
diff --git a/doc/design/img/user-core.png b/doc/design/img/user-core.png
deleted file mode 100644
index 4fbd94ce8..000000000
Binary files a/doc/design/img/user-core.png and /dev/null differ
diff --git a/doc/design/references.bib b/doc/design/references.bib
deleted file mode 100644
index 72357e832..000000000
--- a/doc/design/references.bib
+++ /dev/null
@@ -1,59 +0,0 @@
-
-@Inproceedings{KougkasEtAl2018,
- author = {Kougkas, Anthony and Devarajan, Hariharan and Sun, Xian-He},
- title = {Hermes: A Heterogeneous-aware Multi-tiered Distributed I/O Buffering System},
- booktitle = {Proceedings of the 27th International Symposium on High-Performance Parallel and Distributed Computing},
- series = {HPDC '18},
- year = {2018},
- isbn = {978-1-4503-5785-2},
- location = {Tempe, Arizona},
- pages = {219--230},
- numpages = {12},
- url = {http://doi.acm.org/10.1145/3208040.3208059},
- doi = {10.1145/3208040.3208059},
- acmid = {3208059},
- publisher = {ACM},
- address = {New York, NY, USA},
- keywords = {I/O buffering, burst buffers, deep memory hierarchy, heterogeneous buffering, layered buffering},
-}
-
-@Book{Bach1986,
- author = {Bach, Maurice},
- title = {The design of the UNIX operating system},
- publisher = {Prentice-Hall},
- year = {1986},
- address = {Englewood Cliffs, N.J},
- isbn = {978-0132017992}
- }
-
-@Book{Kerrisk2010,
- author = {Kerrisk, Michael},
- title = {The Linux programming interface : a Linux and UNIX system programming handbook},
- publisher = {No Starch Press},
- year = {2010},
- address = {San Francisco},
- isbn = {978-1593272203}
- }
-
-@Book{Maier2009,
- author = {Maier, Mark},
- title = {The art of systems architecting},
- publisher = {CRC Press},
- year = {2009},
- address = {Boca Raton},
- isbn = {978-1420079135}
- }
-
-@Report{Chaarawi2015,
-  author       = {Chaarawi, Mohamad},
-  title        = {RFC: Page Buffering},
-  institution  = {The HDF Group},
-  year         = {2015}
- }
-
-@Report{ChoiEtAl2017,
-  author       = {Vailin Choi and Quincey Koziol and John Mainzer},
-  title        = {RFC: HDF5 File Space Management: Paged Aggregation},
-  institution  = {The HDF Group},
-  year         = {2017}
- }
\ No newline at end of file
diff --git a/docker/ctest.Dockerfile b/docker/ctest.Dockerfile
deleted file mode 100644
index 2e97b729e..000000000
--- a/docker/ctest.Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM ubuntu:20.04
-ARG  DEBIAN_FRONTEND=noninteractive
-RUN apt update
-RUN apt-get install -y --no-install-recommends  \
-    gcc g++ gfortran \
-    autoconf \
-    automake \
-    libtool \
-    libtool-bin \
-    mpich \
-    lcov \
-    zlib1g-dev \
-    libsdl2-dev \
-    python3 \
-    python3-pip \
-    git \
-    cmake
-RUN python3 -m pip install cpplint==1.5.4
-
-RUN git clone https://github.com/HDFGroup/hermes
-WORKDIR $PWD/hermes
-RUN git remote get-url origin
-RUN ci/install_deps.sh
-RUN ci/install_hermes.sh
diff --git a/docker/deps.Dockerfile b/docker/deps.Dockerfile
deleted file mode 100644
index 4a171ff9f..000000000
--- a/docker/deps.Dockerfile
+++ /dev/null
@@ -1,76 +0,0 @@
-FROM ubuntu:20.04
-
-ENV USER=hermes
-RUN useradd -ms /bin/bash $USER
-RUN su - $USER -c "touch me"
-
-RUN apt-get update -q --fix-missing && \
-    apt-get install -yq gcc g++
-
-RUN apt-get install -y sudo
-RUN echo "${USER} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/$USER && \
-    chmod 0440 /etc/sudoers.d/$USER
-
-RUN cat /etc/sudoers.d/$USER
-
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
-    autoconf \
-    automake \
-    ca-certificates \
-    curl \
-    environment-modules \
-    git \
-    build-essential \
-    python \
-    python-dev \
-    python3-dev \
-    vim \
-    sudo \
-    unzip \
-    cmake \
-    lcov \
-    zlib1g-dev \
-    libsdl2-dev \
-    gfortran \
-    graphviz \
-    doxygen
-
-USER $USER
-
-RUN sudo apt-get update -q
-
-ENV HOME=/home/$USER
-
-ENV PROJECT=$HOME/source
-ENV INSTALL_DIR=$HOME/install
-ENV SPACK_DIR=$HOME/spack
-ENV MOCHI_DIR=$HOME/mochi
-
-RUN echo $INSTALL_DIR && mkdir -p $INSTALL_DIR
-
-RUN git clone https://github.com/spack/spack ${SPACK_DIR}
-RUN git clone https://github.com/mochi-hpc/mochi-spack-packages.git ${MOCHI_DIR}
-RUN git clone https://github.com/HDFGroup/hermes ${PROJECT}
-
-ENV spack=${SPACK_DIR}/bin/spack
-
-RUN . ${SPACK_DIR}/share/spack/setup-env.sh
-
-RUN $spack repo add ${MOCHI_DIR}
-RUN $spack repo add $PROJECT/ci/hermes
-
-RUN $spack compiler find
-
-RUN $spack compiler list
-
-ENV HERMES_VERSION=master
-
-ENV HERMES_SPEC="hermes@${HERMES_VERSION}"
-RUN $spack install --only dependencies ${HERMES_SPEC}
-
-RUN echo "export PATH=${SPACK_DIR}/bin:$PATH" >> /home/$USER/.bashrc
-RUN echo ". ${SPACK_DIR}/share/spack/setup-env.sh" >> /home/$USER/.bashrc
-
-ENV PATH=${INSTALL_DIR}/bin:$PATH
-
-WORKDIR $HOME
diff --git a/docker/dev.Dockerfile b/docker/dev.Dockerfile
deleted file mode 100644
index 6c9ee62e3..000000000
--- a/docker/dev.Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM hdfgroup/hermes-deps:latest
-
-RUN sudo apt-get update -q
-
-USER $USER
-
-ENV HOME=/home/$USER
-
-ENV INSTALL_DIR=$HOME/install
-
-ENV PROJECT=$HOME/hermes
-
-RUN $spack install --only package ${HERMES_SPEC}
-
-RUN echo "spack load --only dependencies ${HERMES_SPEC}" >> /home/$USER/.bashrc
-RUN echo "export CC=`which mpicc`" >> /home/$USER/.bashrc
-RUN echo "export CXX=`which mpicxx`" >> /home/$USER/.bashrc
-
-RUN git clone https://github.com/HDFGroup/hermes ${PROJECT}
-RUN sh /home/$USER/.bashrc
-
-RUN mkdir -p $PROJECT/build
-WORKDIR $PROJECT/build
diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile
deleted file mode 100644
index c6cc026d8..000000000
--- a/docker/user.Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM hdfgroup/hermes-deps:latest
-
-RUN sudo apt-get update -q
-
-USER $USER
-
-ENV HOME=/home/$USER
-
-ENV INSTALL_DIR=$HOME/install
-
-ENV PROJECT=$HOME/hermes
-
-RUN $spack install --only package ${HERMES_SPEC}
-
-RUN echo "spack load ${HERMES_SPEC}" >> /home/$USER/.bashrc
-RUN echo "export CC=`which mpicc`" >> /home/$USER/.bashrc
-RUN echo "export CXX=`which mpicxx`" >> /home/$USER/.bashrc
-
-RUN sh /home/$USER/.bashrc
-
-WORKDIR $HOME
diff --git a/external/pybind11 b/external/pybind11
new file mode 160000
index 000000000..0e2c3e5db
--- /dev/null
+++ b/external/pybind11
@@ -0,0 +1 @@
+Subproject commit 0e2c3e5db41b6b2af4038734c84ab855ccaaa5f0
diff --git a/hermes_adapters/CMakeLists.txt b/hermes_adapters/CMakeLists.txt
new file mode 100644
index 000000000..e335f4d0b
--- /dev/null
+++ b/hermes_adapters/CMakeLists.txt
@@ -0,0 +1,28 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+add_subdirectory(filesystem)
+add_subdirectory(posix)
+if (HERMES_ENABLE_STDIO_ADAPTER)
+    add_subdirectory(stdio)
+endif()
+if (HERMES_ENABLE_MPIIO_ADAPTER)
+    add_subdirectory(mpiio)
+endif()
+if (HERMES_ENABLE_HDF5_ADAPTER)
+    add_subdirectory(vfd)
+endif()
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+file(GLOB_RECURSE HERMES_HEADERS "*.h")
+install(
+        FILES
+        ${HERMES_HEADERS}
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters
+        COMPONENT
+        headers
+)
+install(DIRECTORY mapper DESTINATION ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters)
\ No newline at end of file
diff --git a/adapter/adapter_constants.h b/hermes_adapters/adapter_constants.h
similarity index 100%
rename from adapter/adapter_constants.h
rename to hermes_adapters/adapter_constants.h
diff --git a/hermes_adapters/adapter_types.h b/hermes_adapters/adapter_types.h
new file mode 100644
index 000000000..2bc971455
--- /dev/null
+++ b/hermes_adapters/adapter_types.h
@@ -0,0 +1,103 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HERMES_ADAPTER_ADAPTER_TYPES_H_
+#define HERMES_ADAPTER_ADAPTER_TYPES_H_
+
+#include "hermes_adapters/posix/posix_api.h"
+
+namespace hermes::adapter {
+
+/** Adapter types */
+enum class AdapterType {
+  kNone,
+  kPosix,
+  kStdio,
+  kMpiio,
+  kPubsub,
+  kVfd
+};
+
+/** Adapter modes */
+enum class AdapterMode {
+  kNone,
+  kDefault,
+  kBypass,
+  kScratch,
+  kWorkflow
+};
+
+/**
+ * Per-Object Adapter Settings.
+ * An object may be a file, for example.
+ * */
+struct AdapterObjectConfig {
+  AdapterMode mode_;
+  size_t page_size_;
+};
+
+/** Adapter Mode converter */
+class AdapterModeConv {
+ public:
+  static std::string str(AdapterMode mode) {
+    switch (mode) {
+      case AdapterMode::kDefault: {
+        return "AdapterMode::kDefault";
+      }
+      case AdapterMode::kBypass: {
+        return "AdapterMode::kBypass";
+      }
+      case AdapterMode::kScratch: {
+        return "AdapterMode::kScratch";
+      }
+      case AdapterMode::kWorkflow: {
+        return "AdapterMode::kWorkflow";
+      }
+      default: {
+        return "Unkown adapter mode";
+      }
+    }
+  }
+
+  static AdapterMode to_enum(const std::string &mode) {
+    if (mode.find("kDefault") != std::string::npos) {
+      return AdapterMode::kDefault;
+    } else if (mode.find("kBypass") != std::string::npos) {
+      return AdapterMode::kBypass;
+    } else if (mode.find("kScratch") != std::string::npos) {
+      return AdapterMode::kScratch;
+    } else if (mode.find("kWorkflow") != std::string::npos) {
+      return AdapterMode::kWorkflow;
+    }
+    return AdapterMode::kDefault;
+  }
+};
+
+struct AdapterInfo {
+  int file_id_;
+  int fd_;
+  int open_flags_;
+  int mode_flags_;
+  int refcnt_;
+  std::string path_;
+  AdapterMode adapter_mode_;
+
+  ~AdapterInfo() {
+    if (fd_ >= 0) {
+      HERMES_POSIX_API->close(fd_);
+    }
+  }
+};
+
+}  // namespace hermes::adapter
+
+#endif  // HERMES_ADAPTER_ADAPTER_TYPES_H_
diff --git a/adapter/filesystem/CMakeLists.txt b/hermes_adapters/filesystem/CMakeLists.txt
similarity index 82%
rename from adapter/filesystem/CMakeLists.txt
rename to hermes_adapters/filesystem/CMakeLists.txt
index c9564a624..d9ea0f618 100644
--- a/adapter/filesystem/CMakeLists.txt
+++ b/hermes_adapters/filesystem/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
         ${HERMES_SRC_DIR}
         ${HERMES_ADAPTER_DIR}
         ${HERMES_IO_CLIENT_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR})
+        .)
 
 # Create the metadata manager singleton + FS base class
 add_library(hermes_fs_base SHARED
@@ -52,6 +52,19 @@ EXPORT (
 )
 endif()
 
+#-----------------------------------------------------------------------------
+# Install headers
+#-----------------------------------------------------------------------------
+file(GLOB_RECURSE HERMES_HEADERS "*.h")
+install(
+        FILES
+        ${HERMES_HEADERS}
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters/filesystem
+        COMPONENT
+        headers
+)
+
 #-----------------------------------------------------------------------------
 # Add Target(s) to Coverage
 #-----------------------------------------------------------------------------
diff --git a/adapter/filesystem/filesystem.cc b/hermes_adapters/filesystem/filesystem.cc
similarity index 50%
rename from adapter/filesystem/filesystem.cc
rename to hermes_adapters/filesystem/filesystem.cc
index 24fb41c58..9900e263e 100644
--- a/adapter/filesystem/filesystem.cc
+++ b/hermes_adapters/filesystem/filesystem.cc
@@ -13,7 +13,7 @@
 #include "filesystem.h"
 #include "hermes_shm/util/singleton.h"
 #include "filesystem_mdm.h"
-#include "mapper/mapper_factory.h"
+#include "hermes_adapters/mapper/mapper_factory.h"
 
 #include <fcntl.h>
 #include <filesystem>
@@ -58,21 +58,14 @@ void Filesystem::Open(AdapterStat &stat, File &f, const std::string &path) {
     // Get or create the bucket
     if (stat.hflags_.Any(HERMES_FS_TRUNC)) {
       // The file was opened with TRUNCATION
-      stat.bkt_id_ = HERMES->GetBucket(stat.path_, ctx, 0);
+      stat.bkt_id_ = HERMES->GetBucket(stat.path_, ctx, 0, HERMES_BUCKET_IS_FILE);
       stat.bkt_id_.Clear();
     } else {
       // The file was opened regularly
       stat.file_size_ = io_client_->GetSize(*path_shm);
-      stat.bkt_id_ = HERMES->GetBucket(stat.path_, ctx, stat.file_size_);
+      stat.bkt_id_ = HERMES->GetBucket(stat.path_, ctx, stat.file_size_, HERMES_BUCKET_IS_FILE);
     }
     HILOG(kDebug, "File has size: {}", stat.bkt_id_.GetSize());
-    // Attach trait to bucket (if not scratch mode)
-    if (stat.bkt_id_.DidCreate()) {
-      io_client_->Register();
-      if (stat.adapter_mode_ != AdapterMode::kScratch) {
-        stat.bkt_id_.AttachTrait(io_client_->GetTraitId());
-      }
-    }
     // Update file position pointer
     if (stat.hflags_.Any(HERMES_FS_APPEND)) {
       stat.st_ptr_ = std::numeric_limits<size_t>::max();
@@ -90,94 +83,6 @@ void Filesystem::Open(AdapterStat &stat, File &f, const std::string &path) {
   }
 }
 
-/**
- * The amount of data to read from the backend if the blob
- * does not exist.
- * */
-static inline size_t GetBackendSize(size_t file_off,
-                                    size_t file_size,
-                                    size_t page_size) {
-  if (file_off + page_size <= file_size) {
-    // Case 1: The file has more than "PageSize" bytes remaining
-    return page_size;
-  } else if (file_off < file_size) {
-    // Case 2: The file has less than "PageSize" bytes remaining
-    return file_size - file_off;
-  } else {
-    // Case 3: The offset is beyond the size of the backend file
-    return 0;
-  }
-}
-
-/**
- * Put \a blob_name Blob into the bucket. Load the blob from the
- * I/O backend if it does not exist.
- *
- * @param blob_name the semantic name of the blob
- * @param blob the buffer to put final data in
- * @param blob_off the offset within the blob to begin the Put
- * @param page_size the page size of the adapter
- * @param io_ctx which adapter to route I/O request if blob DNE
- * @param opts which adapter to route I/O request if blob DNE
- * @param ctx any additional information
- * */
-Status Filesystem::PartialPutOrCreate(hapi::Bucket &bkt,
-                                      const std::string &blob_name,
-                                      const Blob &blob,
-                                      size_t blob_off,
-                                      size_t page_size,
-                                      BlobId &blob_id,
-                                      IoStatus &status,
-                                      const FsIoOptions &opts,
-                                      Context &ctx) {
-  Blob full_blob(page_size);
-  if (bkt.ContainsBlob(blob_name, blob_id)) {
-    // Case 1: The blob already exists (read from hermes)
-    // Read blob from Hermes
-    HILOG(kDebug, "Blob existed. Reading from Hermes.")
-    bkt.Get(blob_id, full_blob, ctx);
-  }
-  if (blob_off == 0 &&
-      blob.size() >= opts.backend_size_ &&
-      blob.size() >= full_blob.size()) {
-    // Case 2: We're overriding the entire blob
-    // Put the entire blob, no need to load from storage
-    HILOG(kDebug, "Putting the entire blob.")
-    return bkt.Put(blob_name, blob, blob_id, ctx);
-  }
-  if (full_blob.size() < opts.backend_size_) {
-    // Case 3: The blob did not fully exist (need to read from backend)
-    // Read blob using adapter
-    HILOG(kDebug, "Blob did not fully exist. Reading blob from backend."
-          " cur_size: {}"
-          " backend_size: {}",
-          full_blob.size(), opts.backend_size_)
-    full_blob.resize(opts.backend_size_);
-    io_client_->ReadBlob(bkt.GetName(),
-                        full_blob, opts, status);
-    if (!status.success_) {
-      HELOG(kFatal, "Failed to read blob from {} (PartialPut)."
-            " cur_size: {}"
-            " backend_off: {}"
-            " backend_size: {}",
-            bkt.GetName(), full_blob.size(),
-            opts.backend_off_, opts.backend_size_)
-      // return PARTIAL_PUT_OR_CREATE_OVERFLOW;
-    }
-  }
-  HILOG(kDebug, "Modifying full_blob at offset: {} for total size: {}",
-        blob_off, blob.size())
-  // Ensure the blob can hold the update
-  full_blob.resize(std::max(full_blob.size(), blob_off + blob.size()));
-  // Modify the blob
-  memcpy(full_blob.data() + blob_off, blob.data(), blob.size());
-  // Re-put the blob
-  bkt.Put(blob_name, full_blob, blob_id, ctx);
-  HILOG(kDebug, "Partially put to blob: ({}, {})",
-        blob_id.unique_, blob_id.node_id_)
-  return Status();
-}
-
 size_t Filesystem::Write(File &f, AdapterStat &stat, const void *ptr,
                          size_t off, size_t total_size,
                          IoStatus &io_status, FsIoOptions opts) {
@@ -185,26 +90,14 @@ size_t Filesystem::Write(File &f, AdapterStat &stat, const void *ptr,
   hapi::Bucket &bkt = stat.bkt_id_;
   std::string filename = bkt.GetName();
 
-  // Update the size of the bucket
-  size_t orig_off = off;
-  stat.bkt_id_.LockBucket(MdLockType::kExternalWrite);
-  size_t backend_size = stat.bkt_id_.GetSize();
-  if (off == std::numeric_limits<size_t>::max()) {
-    off = backend_size;
-  }
-  size_t new_size = off + total_size;
-  if (new_size > backend_size) {
-    stat.bkt_id_.SetSize(off + total_size);
-  }
-  stat.bkt_id_.UnlockBucket(MdLockType::kExternalWrite);
+  bool is_append = stat.st_ptr_ == std::numeric_limits<size_t>::max();
 
   HILOG(kDebug, "Write called for filename: {}"
-        " on offset: {}"
-        " from position: {}"
-        " and size: {}"
-        " and current file size: {}"
-        " and adapter mode: {}",
-        filename, off, stat.st_ptr_, total_size, backend_size,
+                " on offset: {}"
+                " from position: {}"
+                " and current file size: {}"
+                " and adapter mode: {}",
+        filename, off, stat.st_ptr_, total_size,
         AdapterModeConv::str(stat.adapter_mode_))
   if (stat.adapter_mode_ == AdapterMode::kBypass) {
     // Bypass mode is handled differently
@@ -217,120 +110,40 @@ size_t Filesystem::Write(File &f, AdapterStat &stat, const void *ptr,
             opts.backend_size_)
       return 0;
     }
-    if (opts.DoSeek() && orig_off != std::numeric_limits<size_t>::max()) {
+    if (opts.DoSeek() && !is_append) {
       stat.st_ptr_ = off + total_size;
     }
     return total_size;
   }
 
-  size_t ret;
-  Context ctx;
+  // Fragment I/O request into pages
   BlobPlacements mapping;
-  size_t kPageSize = stat.page_size_;
+  auto mapper = MapperFactory::Get(MapperType::kBalancedMapper);
+  mapper->map(off, total_size, stat.page_size_, mapping);
   size_t data_offset = 0;
-  auto mapper = MapperFactory().Get(MapperType::kBalancedMapper);
-  mapper->map(off, total_size, kPageSize, mapping);
-
-  for (const auto &p : mapping) {
-    const Blob blob_wrap((const char*)ptr + data_offset, p.blob_size_);
-    hshm::charbuf blob_name(p.CreateBlobName());
-    BlobId blob_id;
-    opts.backend_off_ = p.page_ * kPageSize;
-    opts.backend_size_ = GetBackendSize(opts.backend_off_,
-                                        stat.file_size_,
-                                        kPageSize);
-    opts.adapter_mode_ = stat.adapter_mode_;
-    bkt.TryCreateBlob(blob_name.str(), blob_id, ctx);
-    bkt.LockBlob(blob_id, MdLockType::kExternalWrite);
-    auto status = PartialPutOrCreate(bkt,
-                                     blob_name.str(),
-                                     blob_wrap,
-                                     p.blob_off_,
-                                     kPageSize,
-                                     blob_id,
-                                     io_status,
-                                     opts,
-                                     ctx);
-    if (status.Fail()) {
-      data_offset = 0;
-      bkt.UnlockBlob(blob_id, MdLockType::kExternalWrite);
-      break;
+
+  // Perform a PartialPut for each page
+  Context ctx;
+  ctx.page_size_ = stat.page_size_;
+  ctx.flags_.SetBits(HERMES_IS_FILE);
+  for (const BlobPlacement &p : mapping) {
+    const Blob page((const char*)ptr + data_offset, p.blob_size_);
+    if (!is_append) {
+      std::string blob_name(p.CreateBlobName().str());
+      bkt.AsyncPartialPut(blob_name, page, p.blob_off_, ctx);
+    } else {
+      bkt.Append(page, stat.page_size_, ctx);
     }
-    bkt.UnlockBlob(blob_id, MdLockType::kExternalWrite);
     data_offset += p.blob_size_;
   }
-  if (opts.DoSeek() && orig_off != std::numeric_limits<size_t>::max()) {
+  if (opts.DoSeek() && !is_append) {
     stat.st_ptr_ = off + total_size;
   }
   stat.UpdateTime();
 
   HILOG(kDebug, "The size of file after write: {}",
         GetSize(f, stat))
-  ret = data_offset;
-  return ret;
-}
-
-/**
- * Load \a blob_name Blob from the bucket. Load the blob from the
- * I/O backend if it does not exist.
- *
- * @param blob_name the semantic name of the blob
- * @param blob the buffer to put final data in
- * @param blob_off the offset within the blob to begin the Put
- * @param blob_size the total amount of data to read
- * @param page_size the page size of the adapter
- * @param blob_id [out] the blob id corresponding to blob_name
- * @param io_ctx information required to perform I/O to the backend
- * @param opts specific configuration of the I/O to perform
- * @param ctx any additional information
- * */
-Status Filesystem::PartialGetOrCreate(hapi::Bucket &bkt,
-                                      const std::string &blob_name,
-                                      Blob &blob,
-                                      size_t blob_off,
-                                      size_t blob_size,
-                                      size_t page_size,
-                                      BlobId &blob_id,
-                                      IoStatus &status,
-                                      const FsIoOptions &opts,
-                                      Context &ctx) {
-  Blob full_blob(page_size);
-  if (bkt.ContainsBlob(blob_name, blob_id)) {
-    // Case 1: The blob already exists (read from hermes)
-    // Read blob from Hermes
-    HILOG(kDebug, "Blob existed. Reading from Hermes."
-          " offset: {}"
-          " size: {}",
-          opts.backend_off_, blob_size)
-    bkt.Get(blob_id, full_blob, ctx);
-  }
-  if (full_blob.size() < opts.backend_size_) {
-    // Case 2: The blob did not exist (or at least not fully)
-    // Read blob using adapter
-    HILOG(kDebug, "Blob did not fully exist. Reading blob from backend."
-          " cur_size: {}"
-          " backend_size: {}",
-          full_blob.size(), opts.backend_size_)
-    full_blob.resize(opts.backend_size_);
-    io_client_->ReadBlob(bkt.GetName(), full_blob, opts, status);
-    if (!status.success_) {
-      HILOG(kDebug, "Failed to read blob from backend (PartialGet)."
-            " cur_size: {}"
-            " backend_size: {}",
-            full_blob.size(), opts.backend_size_)
-      return PARTIAL_GET_OR_CREATE_OVERFLOW;
-    }
-    bkt.Put(blob_name, full_blob, blob_id, ctx);
-  }
-  // Ensure the blob can hold the update
-  if (full_blob.size() < blob_off + blob_size) {
-    return PARTIAL_GET_OR_CREATE_OVERFLOW;
-  }
-  // Modify the blob
-  // TODO(llogan): we can avoid a copy here
-  blob.resize(blob_size);
-  memcpy(blob.data(), full_blob.data() + blob_off, blob.size());
-  return Status();
+  return data_offset;
 }
 
 size_t Filesystem::Read(File &f, AdapterStat &stat, void *ptr,
@@ -338,14 +151,12 @@ size_t Filesystem::Read(File &f, AdapterStat &stat, void *ptr,
                         IoStatus &io_status, FsIoOptions opts) {
   (void) f;
   hapi::Bucket &bkt = stat.bkt_id_;
-  std::string filename = bkt.GetName();
-  size_t file_size = stat.bkt_id_.GetSize();
 
   HILOG(kDebug, "Read called for filename: {}"
                 " on offset: {}"
                 " from position: {}"
                 " and size: {}",
-        filename, off, stat.st_ptr_, total_size)
+        stat.path_, off, stat.st_ptr_, total_size)
 
   // SEEK_END is not a valid read position
   if (off == std::numeric_limits<size_t>::max()) {
@@ -353,9 +164,6 @@ size_t Filesystem::Read(File &f, AdapterStat &stat, void *ptr,
   }
 
   // Ensure the amount being read makes sense
-  if (off + total_size > file_size) {
-    total_size = file_size - off;
-  }
   if (total_size == 0) {
     return 0;
   }
@@ -377,106 +185,48 @@ size_t Filesystem::Read(File &f, AdapterStat &stat, void *ptr,
     return total_size;
   }
 
-  size_t ret;
-  Context ctx;
+  // Fragment I/O request into pages
   BlobPlacements mapping;
-  size_t kPageSize = stat.page_size_;
+  auto mapper = MapperFactory::Get(MapperType::kBalancedMapper);
+  mapper->map(off, total_size, stat.page_size_, mapping);
   size_t data_offset = 0;
-  auto mapper = MapperFactory().Get(MapperType::kBalancedMapper);
-  mapper->map(off, total_size, kPageSize, mapping);
-
-  for (const auto &p : mapping) {
-    Blob blob_wrap((const char*)ptr + data_offset, p.blob_size_);
-    hshm::charbuf blob_name(p.CreateBlobName());
-    BlobId blob_id;
-    opts.backend_off_ = p.page_ * kPageSize;
-    opts.backend_size_ = GetBackendSize(opts.backend_off_,
-                                        stat.file_size_,
-                                        kPageSize);
-    opts.adapter_mode_ = stat.adapter_mode_;
-    bkt.TryCreateBlob(blob_name.str(), blob_id, ctx);
-    bkt.LockBlob(blob_id, MdLockType::kExternalRead);
-    auto status = PartialGetOrCreate(stat.bkt_id_,
-                                     blob_name.str(),
-                                     blob_wrap,
-                                     p.blob_off_,
-                                     p.blob_size_,
-                                     kPageSize,
-                                     blob_id,
-                                     io_status,
-                                     opts,
-                                     ctx);
-    if (status.Fail()) {
-      data_offset = 0;
-      bkt.UnlockBlob(blob_id, MdLockType::kExternalRead);
-      break;
-    }
-    bkt.UnlockBlob(blob_id, MdLockType::kExternalRead);
+
+  // Perform a PartialPut for each page
+  Context ctx;
+  ctx.flags_.SetBits(HERMES_IS_FILE);
+  for (const BlobPlacement &p : mapping) {
+    Blob page((const char*)ptr + data_offset, p.blob_size_);
+    std::string blob_name(p.CreateBlobName().str());
+    bkt.PartialGet(blob_name, page, p.blob_off_, ctx);
     data_offset += p.blob_size_;
   }
   if (opts.DoSeek()) {
     stat.st_ptr_ = off + total_size;
   }
   stat.UpdateTime();
-
-  ret = data_offset;
-  return ret;
+  return data_offset;
 }
 
-HermesRequest* Filesystem::AWrite(File &f, AdapterStat &stat, const void *ptr,
-                                  size_t off, size_t total_size, size_t req_id,
-                                  IoStatus &io_status, FsIoOptions opts) {
-  (void) io_status;
+Task* Filesystem::AWrite(File &f, AdapterStat &stat, const void *ptr,
+                         size_t off, size_t total_size, size_t req_id,
+                         IoStatus &io_status, FsIoOptions opts) {
   HILOG(kDebug, "Starting an asynchronous write",
-        opts.backend_size_)
-  auto pool = HERMES_FS_THREAD_POOL;
-  HermesRequest *hreq = new HermesRequest();
-  auto lambda =
-      [](Filesystem *fs, File &f, AdapterStat &stat, const void *ptr,
-         size_t off, size_t total_size, IoStatus &io_status, FsIoOptions opts) {
-    return fs->Write(f, stat, ptr, off, total_size, io_status, opts);
-  };
-  auto func = std::bind(lambda, this, f, stat, ptr, off,
-                        total_size, hreq->io_status, opts);
-  hreq->return_future = pool->run(func);
-  auto mdm = HERMES_FS_METADATA_MANAGER;
-  mdm->request_map.emplace(req_id, hreq);
-  return hreq;/**/
-}
-
-HermesRequest* Filesystem::ARead(File &f, AdapterStat &stat, void *ptr,
-                                 size_t off, size_t total_size, size_t req_id,
-                                 IoStatus &io_status, FsIoOptions opts) {
-  (void) io_status;
-  auto pool = HERMES_FS_THREAD_POOL;
-  HermesRequest *hreq = new HermesRequest();
-  auto lambda =
-      [](Filesystem *fs, File &f, AdapterStat &stat, void *ptr,
-         size_t off, size_t total_size, IoStatus &io_status, FsIoOptions opts) {
-        return fs->Read(f, stat, ptr, off, total_size, io_status, opts);
-      };
-  auto func = std::bind(lambda, this, f, stat,
-                        ptr, off, total_size, hreq->io_status, opts);
-  hreq->return_future = pool->run(func);
-  auto mdm = HERMES_FS_METADATA_MANAGER;
-  mdm->request_map.emplace(req_id, hreq);
-  return hreq;
+        opts.backend_size_);
+  return nullptr;
+}
+
+Task* Filesystem::ARead(File &f, AdapterStat &stat, void *ptr,
+                        size_t off, size_t total_size, size_t req_id,
+                        IoStatus &io_status, FsIoOptions opts) {
+  return nullptr;
 }
 
 size_t Filesystem::Wait(uint64_t req_id) {
-  auto mdm = HERMES_FS_METADATA_MANAGER;
-  auto req_iter = mdm->request_map.find(req_id);
-  if (req_iter == mdm->request_map.end()) {
-    return 0;
-  }
-  HermesRequest *req = (*req_iter).second;
-  size_t ret = req->return_future.get();
-  delete req;
-  return ret;
+  return 0;
 }
 
 void Filesystem::Wait(std::vector<uint64_t> &req_ids,
-                        std::vector<size_t> &ret) {
+                      std::vector<size_t> &ret) {
   for (auto &req_id : req_ids) {
     ret.emplace_back(Wait(req_id));
   }
@@ -538,10 +288,9 @@ off_t Filesystem::Tell(File &f, AdapterStat &stat) {
 }
 
 int Filesystem::Sync(File &f, AdapterStat &stat) {
-  if (HERMES->client_config_.flushing_mode_ == FlushingMode::kSync) {
+  if (HERMES_CLIENT_CONF.flushing_mode_ == FlushingMode::kSync) {
     // NOTE(llogan): only for the unit tests
     // Please don't enable synchronous flushing
-    HERMES->Flush();
   }
   return 0;
 }
@@ -562,7 +311,7 @@ int Filesystem::Close(File &f, AdapterStat &stat) {
   if (stat.amode_ & MPI_MODE_DELETE_ON_CLOSE) {
     Remove(stat.path_);
   }
-  if (HERMES->client_config_.flushing_mode_ == FlushingMode::kSync) {
+  if (HERMES_CLIENT_CONF.flushing_mode_ == FlushingMode::kSync) {
     // NOTE(llogan): only for the unit tests
     // Please don't enable synchronous flushing
     // stat.bkt_id_.Destroy();
@@ -619,16 +368,16 @@ size_t Filesystem::Read(File &f, AdapterStat &stat, void *ptr,
   return Read(f, stat, ptr, off, total_size, io_status, opts);
 }
 
-HermesRequest* Filesystem::AWrite(File &f, AdapterStat &stat, const void *ptr,
-                       size_t total_size, size_t req_id,
-                       IoStatus &io_status, FsIoOptions opts) {
+Task* Filesystem::AWrite(File &f, AdapterStat &stat, const void *ptr,
+                         size_t total_size, size_t req_id,
+                         IoStatus &io_status, FsIoOptions opts) {
   off_t off = stat.st_ptr_;
   return AWrite(f, stat, ptr, off, total_size, req_id, io_status, opts);
 }
 
-HermesRequest* Filesystem::ARead(File &f, AdapterStat &stat, void *ptr,
-                      size_t total_size, size_t req_id,
-                      IoStatus &io_status, FsIoOptions opts) {
+Task* Filesystem::ARead(File &f, AdapterStat &stat, void *ptr,
+                        size_t total_size, size_t req_id,
+                        IoStatus &io_status, FsIoOptions opts) {
   off_t off = stat.st_ptr_;
   return ARead(f, stat, ptr, off, total_size, req_id, io_status, opts);
 }
@@ -693,9 +442,9 @@ size_t Filesystem::Read(File &f, bool &stat_exists, void *ptr,
   return Read(f, *stat, ptr, off, total_size, io_status, opts);
 }
 
-HermesRequest* Filesystem::AWrite(File &f, bool &stat_exists, const void *ptr,
-                       size_t total_size, size_t req_id,
-                       IoStatus &io_status, FsIoOptions opts) {
+Task* Filesystem::AWrite(File &f, bool &stat_exists, const void *ptr,
+                         size_t total_size, size_t req_id,
+                         IoStatus &io_status, FsIoOptions opts) {
   auto mdm = HERMES_FS_METADATA_MANAGER;
   auto stat = mdm->Find(f);
   if (!stat) {
@@ -706,9 +455,9 @@ HermesRequest* Filesystem::AWrite(File &f, bool &stat_exists, const void *ptr,
   return AWrite(f, *stat, ptr, total_size, req_id, io_status, opts);
 }
 
-HermesRequest* Filesystem::ARead(File &f, bool &stat_exists, void *ptr,
-                      size_t total_size, size_t req_id,
-                      IoStatus &io_status, FsIoOptions opts) {
+Task* Filesystem::ARead(File &f, bool &stat_exists, void *ptr,
+                        size_t total_size, size_t req_id,
+                        IoStatus &io_status, FsIoOptions opts) {
   auto mdm = HERMES_FS_METADATA_MANAGER;
   auto stat = mdm->Find(f);
   if (!stat) {
@@ -719,9 +468,9 @@ HermesRequest* Filesystem::ARead(File &f, bool &stat_exists, void *ptr,
   return ARead(f, *stat, ptr, total_size, req_id, io_status, opts);
 }
 
-HermesRequest* Filesystem::AWrite(File &f, bool &stat_exists, const void *ptr,
-                       size_t off, size_t total_size, size_t req_id,
-                       IoStatus &io_status, FsIoOptions opts) {
+Task* Filesystem::AWrite(File &f, bool &stat_exists, const void *ptr,
+                         size_t off, size_t total_size, size_t req_id,
+                         IoStatus &io_status, FsIoOptions opts) {
   auto mdm = HERMES_FS_METADATA_MANAGER;
   auto stat = mdm->Find(f);
   if (!stat) {
@@ -733,9 +482,9 @@ HermesRequest* Filesystem::AWrite(File &f, bool &stat_exists, const void *ptr,
   return AWrite(f, *stat, ptr, off, total_size, req_id, io_status, opts);
 }
 
-HermesRequest* Filesystem::ARead(File &f, bool &stat_exists, void *ptr,
-                      size_t off, size_t total_size, size_t req_id,
-                      IoStatus &io_status, FsIoOptions opts) {
+Task* Filesystem::ARead(File &f, bool &stat_exists, void *ptr,
+                        size_t off, size_t total_size, size_t req_id,
+                        IoStatus &io_status, FsIoOptions opts) {
   auto mdm = HERMES_FS_METADATA_MANAGER;
   auto stat = mdm->Find(f);
   if (!stat) {
diff --git a/adapter/filesystem/filesystem.h b/hermes_adapters/filesystem/filesystem.h
similarity index 68%
rename from adapter/filesystem/filesystem.h
rename to hermes_adapters/filesystem/filesystem.h
index 28062bf48..73bccb73c 100644
--- a/adapter/filesystem/filesystem.h
+++ b/hermes_adapters/filesystem/filesystem.h
@@ -23,13 +23,12 @@
 #include <set>
 #include <string>
 
-#include "bucket.h"
-#include "hermes.h"
+#include "hermes/bucket.h"
+#include "hermes/hermes.h"
 
 #include "filesystem_io_client.h"
 #include <filesystem>
 
-namespace hapi = hermes::api;
 
 namespace hermes::adapter::fs {
 
@@ -61,71 +60,22 @@ class Filesystem {
   /** open \a f File in \a path*/
   void Open(AdapterStat &stat, File &f, const std::string &path);
 
-  /**
-   * Put \a blob_name Blob into the bucket. Load the blob from the
-   * I/O backend if it does not exist or is not fully loaded.
-   *
-   * @param bkt the bucket to use for the partial operation
-   * @param blob_name the semantic name of the blob
-   * @param blob the buffer to put final data in
-   * @param blob_off the offset within the blob to begin the Put
-   * @param page_size the page size of the adapter
-   * @param blob_id [out] the blob id corresponding to blob_name
-   * @param io_ctx information required to perform I/O to the backend
-   * @param opts specific configuration of the I/O to perform
-   * @param ctx any additional information
-   * */
-  Status PartialPutOrCreate(hapi::Bucket &bkt,
-                            const std::string &blob_name,
-                            const Blob &blob,
-                            size_t blob_off,
-                            size_t page_size,
-                            BlobId &blob_id,
-                            IoStatus &status,
-                            const FsIoOptions &opts,
-                            Context &ctx);
-
   /** write */
   size_t Write(File &f, AdapterStat &stat, const void *ptr, size_t off,
                size_t total_size, IoStatus &io_status,
                FsIoOptions opts = FsIoOptions());
 
-  /**
-   * Load \a blob_name Blob from the bucket. Load the blob from the
-   * I/O backend if it does not exist or is not fully loaded.
-   *
-   * @param bkt the bucket to use for the partial operation
-   * @param blob_name the semantic name of the blob
-   * @param blob the buffer to put final data in
-   * @param blob_off the offset within the blob to begin the Put
-   * @param page_size the page size of the adapter
-   * @param blob_id [out] the blob id corresponding to blob_name
-   * @param io_ctx information required to perform I/O to the backend
-   * @param opts specific configuration of the I/O to perform
-   * @param ctx any additional information
-   * */
-  Status PartialGetOrCreate(hapi::Bucket &bkt,
-                            const std::string &blob_name,
-                            Blob &blob,
-                            size_t blob_off,
-                            size_t blob_size,
-                            size_t page_size,
-                            BlobId &blob_id,
-                            IoStatus &status,
-                            const FsIoOptions &opts,
-                            Context &ctx);
-
   /** read */
   size_t Read(File &f, AdapterStat &stat, void *ptr,
               size_t off, size_t total_size,
               IoStatus &io_status, FsIoOptions opts = FsIoOptions());
 
   /** write asynchronously */
-  HermesRequest *AWrite(File &f, AdapterStat &stat, const void *ptr, size_t off,
+  Task* AWrite(File &f, AdapterStat &stat, const void *ptr, size_t off,
                         size_t total_size, size_t req_id, IoStatus &io_status,
                         FsIoOptions opts = FsIoOptions());
   /** read asynchronously */
-  HermesRequest *ARead(File &f, AdapterStat &stat, void *ptr, size_t off,
+  Task* ARead(File &f, AdapterStat &stat, void *ptr, size_t off,
                        size_t total_size, size_t req_id, IoStatus &io_status,
                        FsIoOptions opts = FsIoOptions());
   /** wait for \a req_id request ID */
@@ -160,11 +110,11 @@ class Filesystem {
   size_t Read(File &f, AdapterStat &stat, void *ptr, size_t total_size,
               IoStatus &io_status, FsIoOptions opts);
   /** write asynchronously */
-  HermesRequest *AWrite(File &f, AdapterStat &stat, const void *ptr,
+  Task* AWrite(File &f, AdapterStat &stat, const void *ptr,
                         size_t total_size, size_t req_id, IoStatus &io_status,
                         FsIoOptions opts);
   /** read asynchronously */
-  HermesRequest *ARead(File &f, AdapterStat &stat, void *ptr, size_t total_size,
+  Task* ARead(File &f, AdapterStat &stat, void *ptr, size_t total_size,
                        size_t req_id, IoStatus &io_status, FsIoOptions opts);
 
   /*
@@ -188,18 +138,18 @@ class Filesystem {
               size_t total_size, IoStatus &io_status,
               FsIoOptions opts = FsIoOptions());
   /** write asynchronously */
-  HermesRequest *AWrite(File &f, bool &stat_exists, const void *ptr,
+  Task* AWrite(File &f, bool &stat_exists, const void *ptr,
                         size_t total_size, size_t req_id, IoStatus &io_status,
                         FsIoOptions opts);
   /** read asynchronously */
-  HermesRequest *ARead(File &f, bool &stat_exists, void *ptr, size_t total_size,
+  Task* ARead(File &f, bool &stat_exists, void *ptr, size_t total_size,
                        size_t req_id, IoStatus &io_status, FsIoOptions opts);
   /** write \a off offset asynchronously */
-  HermesRequest *AWrite(File &f, bool &stat_exists, const void *ptr, size_t off,
+  Task* AWrite(File &f, bool &stat_exists, const void *ptr, size_t off,
                         size_t total_size, size_t req_id, IoStatus &io_status,
                         FsIoOptions opts);
   /** read \a off offset asynchronously */
-  HermesRequest *ARead(File &f, bool &stat_exists, void *ptr, size_t off,
+  Task* ARead(File &f, bool &stat_exists, void *ptr, size_t off,
                        size_t total_size, size_t req_id, IoStatus &io_status,
                        FsIoOptions opts);
   /** seek */
@@ -218,11 +168,11 @@ class Filesystem {
  public:
   /** Whether or not \a path PATH is tracked by Hermes */
   static bool IsPathTracked(const std::string &path) {
-    if (!HERMES->IsInitialized()) {
+    if (!HERMES_CONF->is_initialized_) {
       return false;
     }
     std::string abs_path = stdfs::absolute(path).string();
-    auto &paths = HERMES->client_config_.path_list_;
+    auto &paths = HERMES_CLIENT_CONF.path_list_;
     // Check if path is included or excluded
     for (config::UserPathInfo &pth : paths) {
       if (abs_path.rfind(pth.path_) != std::string::npos) {
diff --git a/adapter/filesystem/filesystem_io_client.h b/hermes_adapters/filesystem/filesystem_io_client.h
similarity index 91%
rename from adapter/filesystem/filesystem_io_client.h
rename to hermes_adapters/filesystem/filesystem_io_client.h
index f5cc32720..dab208fcd 100644
--- a/adapter/filesystem/filesystem_io_client.h
+++ b/hermes_adapters/filesystem/filesystem_io_client.h
@@ -13,9 +13,9 @@
 #ifndef HERMES_ADAPTER_FILESYSTEM_FILESYSTEM_IO_CLIENT_H_
 #define HERMES_ADAPTER_FILESYSTEM_FILESYSTEM_IO_CLIENT_H_
 
-#include "adapter/mapper/balanced_mapper.h"
-#include "hermes.h"
-#include "bucket.h"
+#include "hermes_adapters/mapper/balanced_mapper.h"
+#include "hermes/hermes.h"
+#include "hermes/bucket.h"
 #include <filesystem>
 #include <limits>
 #include <future>
@@ -295,39 +295,11 @@ struct FilesystemIoClientState {
  * Defines I/O clients which are compatible with the filesystem
  * base class.
  * */
-class FilesystemIoClient : public Trait {
+class FilesystemIoClient {
  public:
-  /** Decode I/O client context from the original blob name */
-  FsIoOptions DecodeBlobName(const std::string &blob_name) {
-    FsIoOptions decode_opts;
-    BlobPlacement p;
-    p.DecodeBlobName(blob_name);
-    decode_opts.backend_off_ = p.page_ * p.page_size_;
-    return decode_opts;
-  }
-
   /** virtual destructor */
   virtual ~FilesystemIoClient() = default;
 
-  /** Callback used for custom trait execution */
-  void Run(int method, void *params) {
-    FlushTraitParams *info = (FlushTraitParams*)params;
-    switch (method) {
-      case HERMES_TRAIT_FLUSH: {
-        FsIoOptions opts = DecodeBlobName(info->blob_name_);
-        IoStatus status;
-        WriteBlob((*info->bkt_).GetName(),
-                  (*info->blob_),
-                  opts,
-                  status);
-        break;
-      }
-      default: {
-        HELOG(kError, "Invalid I/O client run method: {}\n", method)
-      }
-    }
-  }
-
   /** Get initial statistics from the backend */
   virtual size_t GetSize(const hipc::charbuf &bkt_name) = 0;
 
@@ -383,7 +355,7 @@ class FilesystemIoClient : public Trait {
 namespace std {
 /** A structure to represent hash */
 template <>
-struct hash<hermes::adapter::fs::File> {
+struct hash<::hermes::adapter::fs::File> {
   /** hash creator functor */
   std::size_t operator()(const hermes::adapter::fs::File &key) const {
     return key.hash();
diff --git a/adapter/filesystem/filesystem_mdm.cc b/hermes_adapters/filesystem/filesystem_mdm.cc
similarity index 99%
rename from adapter/filesystem/filesystem_mdm.cc
rename to hermes_adapters/filesystem/filesystem_mdm.cc
index 0f29ab84f..69da5379d 100644
--- a/adapter/filesystem/filesystem_mdm.cc
+++ b/hermes_adapters/filesystem/filesystem_mdm.cc
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "filesystem_mdm.h"
-#include "hermes.h"
+#include "hermes/hermes.h"
 #include <filesystem>
 
 namespace hermes::adapter::fs {
diff --git a/adapter/filesystem/filesystem_mdm.h b/hermes_adapters/filesystem/filesystem_mdm.h
similarity index 87%
rename from adapter/filesystem/filesystem_mdm.h
rename to hermes_adapters/filesystem/filesystem_mdm.h
index 05c23d8e8..a4f8a6430 100644
--- a/adapter/filesystem/filesystem_mdm.h
+++ b/hermes_adapters/filesystem/filesystem_mdm.h
@@ -17,7 +17,6 @@
 #include <unordered_map>
 #include "filesystem_io_client.h"
 #include "filesystem.h"
-#include "thread_pool.h"
 
 namespace hermes::adapter::fs {
 
@@ -42,20 +41,20 @@ class MetadataManager {
 
   /** Get the current adapter mode */
   AdapterMode GetBaseAdapterMode() {
-    ScopedRwReadLock md_lock(lock_, kFS_GetBaseAdapterMode);
-    return HERMES->client_config_.GetBaseAdapterMode();
+    ScopedRwReadLock md_lock(lock_, 1);
+    return HERMES_CLIENT_CONF.GetBaseAdapterMode();
   }
 
   /** Get the adapter mode for a particular file */
   AdapterMode GetAdapterMode(const std::string &path) {
-    ScopedRwReadLock md_lock(lock_, kFS_GetAdapterMode);
-    return HERMES->client_config_.GetAdapterConfig(path).mode_;
+    ScopedRwReadLock md_lock(lock_, 2);
+    return HERMES_CLIENT_CONF.GetAdapterConfig(path).mode_;
   }
 
   /** Get the adapter page size for a particular file */
   size_t GetAdapterPageSize(const std::string &path) {
-    ScopedRwReadLock md_lock(lock_, kFS_GetAdapterPageSize);
-    return HERMES->client_config_.GetAdapterConfig(path).page_size_;
+    ScopedRwReadLock md_lock(lock_, 3);
+    return HERMES_CLIENT_CONF.GetAdapterConfig(path).page_size_;
   }
 
   /**
@@ -106,10 +105,8 @@ class MetadataManager {
 #include "hermes_shm/util/singleton.h"
 
 #define HERMES_FS_METADATA_MANAGER \
-  hshm::Singleton<hermes::adapter::fs::MetadataManager>::GetInstance()
+  hshm::Singleton<::hermes::adapter::fs::MetadataManager>::GetInstance()
 #define HERMES_FS_METADATA_MANAGER_T hermes::adapter::fs::MetadataManager*
 
-#define HERMES_FS_THREAD_POOL \
-  hshm::EasySingleton<hermes::ThreadPool>::GetInstance()
 
 #endif  // HERMES_ADAPTER_METADATA_MANAGER_H
diff --git a/adapter/filesystem/filesystem_mdm_singleton.cc b/hermes_adapters/filesystem/filesystem_mdm_singleton.cc
similarity index 100%
rename from adapter/filesystem/filesystem_mdm_singleton.cc
rename to hermes_adapters/filesystem/filesystem_mdm_singleton.cc
diff --git a/adapter/interceptor.h b/hermes_adapters/interceptor.h
similarity index 93%
rename from adapter/interceptor.h
rename to hermes_adapters/interceptor.h
index d291c4cd6..ba62e256a 100644
--- a/adapter/interceptor.h
+++ b/hermes_adapters/interceptor.h
@@ -13,8 +13,8 @@
 #ifndef HERMES_ADAPTER_UTILS_H_
 #define HERMES_ADAPTER_UTILS_H_
 
-#include "hermes.h"
-#include "adapter/filesystem/filesystem_mdm.h"
+#include "hermes/hermes.h"
+#include "hermes_adapters/filesystem/filesystem_mdm.h"
 
 namespace stdfs = std::filesystem;
 
diff --git a/adapter/mapper/abstract_mapper.h b/hermes_adapters/mapper/abstract_mapper.h
similarity index 79%
rename from adapter/mapper/abstract_mapper.h
rename to hermes_adapters/mapper/abstract_mapper.h
index 016bf7f8c..30c904f6f 100644
--- a/adapter/mapper/abstract_mapper.h
+++ b/hermes_adapters/mapper/abstract_mapper.h
@@ -13,7 +13,7 @@
 #ifndef HERMES_ABSTRACT_MAPPER_H
 #define HERMES_ABSTRACT_MAPPER_H
 
-#include "hermes_types.h"
+#include "hermes/hermes_types.h"
 
 namespace hermes::adapter {
 
@@ -30,29 +30,33 @@ enum class MapperType {
 */
 struct BlobPlacement {
   size_t page_;       /**< The index in the array placements */
-  size_t page_size_;  /**< The size of a page */
   size_t bucket_off_; /**< Offset from file start (for FS) */
   size_t blob_off_;   /**< Offset from BLOB start */
   size_t blob_size_;  /**< Size after offset to read */
-  int time_;          /**< The order of the blob in a list of blobs */
+
+  /** create a BLOB name from index. */
+  static hshm::charbuf CreateBlobName(size_t page) {
+    hshm::charbuf buf(sizeof(page));
+    hrun::LocalSerialize srl(buf);
+    srl << page;
+    return buf;
+  }
 
   /** create a BLOB name from index. */
   hshm::charbuf CreateBlobName() const {
-    hshm::charbuf buf(sizeof(page_) + sizeof(blob_off_));
-    size_t off = 0;
-    memcpy(buf.data() + off, &page_, sizeof(page_));
-    off += sizeof(page_);
-    memcpy(buf.data() + off, &page_size_, sizeof(page_size_));
+    hshm::charbuf buf(sizeof(page_));
+    hrun::LocalSerialize srl(buf);
+    srl << page_;
     return buf;
   }
 
   /** decode \a blob_name BLOB name to index.  */
   template<typename StringT>
-  void DecodeBlobName(const StringT &blob_name) {
-    size_t off = 0;
-    memcpy(&page_, blob_name.data(), sizeof(page_));
-    off += sizeof(page_);
-    memcpy(&page_size_, blob_name.data() + off, sizeof(page_size_));
+  void DecodeBlobName(const StringT &blob_name, size_t page_size) {
+    hrun::LocalDeserialize srl(blob_name);
+    srl >> page_;
+    bucket_off_ = page_ * page_size;
+    blob_off_ = 0;
   }
 };
 
diff --git a/adapter/mapper/balanced_mapper.h b/hermes_adapters/mapper/balanced_mapper.h
similarity index 70%
rename from adapter/mapper/balanced_mapper.h
rename to hermes_adapters/mapper/balanced_mapper.h
index a240606f5..fba1c849a 100644
--- a/adapter/mapper/balanced_mapper.h
+++ b/hermes_adapters/mapper/balanced_mapper.h
@@ -28,7 +28,21 @@ class BalancedMapper : public AbstractMapper {
 
   /** Divides an I/O size evenly by into units of page_size */
   void map(size_t off, size_t size, size_t page_size,
-           BlobPlacements &ps) override;
+           BlobPlacements &ps) override {
+    size_t kPageSize = page_size;
+    size_t size_mapped = 0;
+    while (size > size_mapped) {
+      BlobPlacement p;
+      p.bucket_off_ = off + size_mapped;
+      p.page_ = p.bucket_off_ / kPageSize;
+      p.blob_off_ = p.bucket_off_ % kPageSize;
+      auto left_size_page = kPageSize - p.blob_off_;
+      p.blob_size_ = left_size_page < size - size_mapped ? left_size_page
+                                                         : size - size_mapped;
+      ps.emplace_back(p);
+      size_mapped += p.blob_size_;
+    }
+  }
 };
 }  // namespace hermes::adapter
 
diff --git a/adapter/mapper/mapper_factory.h b/hermes_adapters/mapper/mapper_factory.h
similarity index 95%
rename from adapter/mapper/mapper_factory.h
rename to hermes_adapters/mapper/mapper_factory.h
index 7bc9b2f6c..bba844495 100644
--- a/adapter/mapper/mapper_factory.h
+++ b/hermes_adapters/mapper/mapper_factory.h
@@ -14,7 +14,6 @@
 #define HERMES_ADAPTER_FACTORY_H
 
 #include "abstract_mapper.h"
-#include "balanced_mapper.cc"
 #include "balanced_mapper.h"
 #include "hermes_shm/util/singleton.h"
 
@@ -30,7 +29,7 @@ class MapperFactory {
    * @param[in] type type of mapper to be used by the POSIX adapter.
    * @return Instance of mapper given a type.
    */
-  AbstractMapper* Get(const MapperType& type) {
+  static AbstractMapper* Get(const MapperType& type) {
     switch (type) {
       case MapperType::kBalancedMapper: {
         return hshm::EasySingleton<BalancedMapper>::GetInstance();
diff --git a/adapter/mpiio/CMakeLists.txt b/hermes_adapters/mpiio/CMakeLists.txt
similarity index 78%
rename from adapter/mpiio/CMakeLists.txt
rename to hermes_adapters/mpiio/CMakeLists.txt
index 1f3741e92..b12f78c59 100644
--- a/adapter/mpiio/CMakeLists.txt
+++ b/hermes_adapters/mpiio/CMakeLists.txt
@@ -1,11 +1,9 @@
-project(MPIIOAdapter VERSION ${HERMES_PACKAGE_VERSION})
-
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${HERMES_SRC_DIR}
         ${HERMES_ADAPTER_DIR}
         ${HERMES_IO_CLIENT_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR})
+        .)
 
 # Create the MPIIO I/O client
 add_library(hermes_mpiio_io_client SHARED mpiio_io_client.cc)
@@ -36,6 +34,20 @@ install(
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
 )
+
+#-----------------------------------------------------------------------------
+# Install headers
+#-----------------------------------------------------------------------------
+file(GLOB_RECURSE HERMES_HEADERS "*.h")
+install(
+        FILES
+        ${HERMES_HEADERS}
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters/stdio
+        COMPONENT
+        headers
+)
+
 #-----------------------------------------------------------------------------
 # Add Target(s) to Coverage
 #-----------------------------------------------------------------------------
diff --git a/adapter/mpiio/mpiio_api.cc b/hermes_adapters/mpiio/mpiio_api.cc
similarity index 99%
rename from adapter/mpiio/mpiio_api.cc
rename to hermes_adapters/mpiio/mpiio_api.cc
index 746b68e19..e9dbb397d 100644
--- a/adapter/mpiio/mpiio_api.cc
+++ b/hermes_adapters/mpiio/mpiio_api.cc
@@ -12,19 +12,18 @@
 
 bool mpiio_intercepted = true;
 
-#include <hermes.h>
-#include <bucket.h>
+#include <hermes/hermes.h>
+#include <hermes/bucket.h>
 
 #include "mpiio_api.h"
 #include "mpiio_fs_api.h"
 
 #include "hermes_shm/util/singleton.h"
-#include "interceptor.h"
+#include "hermes_adapters/interceptor.h"
 
 /**
  * Namespace declarations
  */
-using hermes::ThreadPool;
 using hermes::adapter::fs::MetadataManager;
 using hermes::adapter::fs::File;
 using hermes::adapter::fs::AdapterStat;
@@ -32,7 +31,6 @@ using hermes::adapter::fs::MpiioApi;
 using hermes::adapter::fs::MpiioFs;
 using hermes::adapter::fs::MpiioSeekModeConv;
 
-namespace hapi = hermes::api;
 
 extern "C" {
 
@@ -41,7 +39,7 @@ extern "C" {
  */
 int HERMES_DECL(MPI_Init)(int *argc, char ***argv) {
   HILOG(kDebug, "MPI Init intercepted.")
-  TRANSPARENT_HERMES
+  TRANSPARENT_HERMES();
   auto real_api = HERMES_MPIIO_API;
   return real_api->MPI_Init(argc, argv);
 }
diff --git a/adapter/mpiio/mpiio_api.h b/hermes_adapters/mpiio/mpiio_api.h
similarity index 98%
rename from adapter/mpiio/mpiio_api.h
rename to hermes_adapters/mpiio/mpiio_api.h
index 8ca86c43d..1328447a4 100644
--- a/adapter/mpiio/mpiio_api.h
+++ b/hermes_adapters/mpiio/mpiio_api.h
@@ -18,7 +18,7 @@
 #include "hermes_shm/util/logging.h"
 #include <mpi.h>
 #include <mpio.h>
-#include "adapter/real_api.h"
+#include "hermes_adapters/real_api.h"
 
 #ifndef MPI_MODE_TRUNCATE
 #define MPI_MODE_TRUNCATE 0
@@ -182,7 +182,7 @@ class MpiioApi : public RealApi {
 
 /** Simplify access to the stateless MpiioFs Singleton */
 #define HERMES_MPIIO_API \
-  hshm::EasySingleton<hermes::adapter::fs::MpiioApi>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::MpiioApi>::GetInstance()
 #define HERMES_MPIIO_API_T hermes::adapter::fs::MpiioApi*
 
 #endif  // HERMES_ADAPTER_MPIIO_H
diff --git a/adapter/mpiio/mpiio_fs_api.h b/hermes_adapters/mpiio/mpiio_fs_api.h
similarity index 97%
rename from adapter/mpiio/mpiio_fs_api.h
rename to hermes_adapters/mpiio/mpiio_fs_api.h
index 5a2e7718e..6e98b7b41 100644
--- a/adapter/mpiio/mpiio_fs_api.h
+++ b/hermes_adapters/mpiio/mpiio_fs_api.h
@@ -15,8 +15,8 @@
 
 #include <memory>
 
-#include "adapter/filesystem/filesystem.h"
-#include "adapter/filesystem/filesystem_mdm.h"
+#include "hermes_adapters/filesystem/filesystem.h"
+#include "hermes_adapters/filesystem/filesystem_mdm.h"
 #include "mpiio_api.h"
 #include "mpiio_io_client.h"
 
@@ -149,9 +149,10 @@ class MpiioFs : public Filesystem {
                     MPI_Datatype datatype, MPI_Request *request,
                     FsIoOptions opts) {
     HILOG(kDebug, "Starting an asynchronous write")
-    auto mdm = HERMES_FS_METADATA_MANAGER;
+    // TODO(llogan): FIX
+    /*auto mdm = HERMES_FS_METADATA_MANAGER;
     auto pool = HERMES_FS_THREAD_POOL;
-    HermesRequest *hreq = new HermesRequest();
+    Task* hreq = new HermesRequest();
     auto lambda = [](MpiioFs *fs, File &f, AdapterStat &stat, const void *ptr,
                      int count, MPI_Datatype datatype, MPI_Status *status,
                      FsIoOptions opts) {
@@ -161,23 +162,25 @@ class MpiioFs : public Filesystem {
     auto func = std::bind(lambda, this, f, stat, ptr, count, datatype,
                           &hreq->io_status.mpi_status_, opts);
     hreq->return_future = pool->run(func);
-    mdm->request_map.emplace(reinterpret_cast<size_t>(request), hreq);
+    mdm->request_map.emplace(reinterpret_cast<size_t>(request), hreq);*/
     return MPI_SUCCESS;
   }
 
   int Wait(MPI_Request *req, MPI_Status *status) {
-    auto mdm = HERMES_FS_METADATA_MANAGER;
+    // TODO(llogan): FIX
+    /*auto mdm = HERMES_FS_METADATA_MANAGER;
     auto real_api = HERMES_MPIIO_API;
     auto iter = mdm->request_map.find(reinterpret_cast<size_t>(req));
     if (iter != mdm->request_map.end()) {
-      HermesRequest *hreq = iter->second;
+      Task* hreq = iter->second;
       hreq->return_future.get();
       memcpy(status, hreq->io_status.mpi_status_ptr_, sizeof(MPI_Status));
       mdm->request_map.erase(iter);
       delete (hreq);
       return MPI_SUCCESS;
     }
-    return real_api->MPI_Wait(req, status);
+    return real_api->MPI_Wait(req, status);*/
+    return 0;
   }
 
   int WaitAll(int count, MPI_Request *req, MPI_Status *status) {
@@ -476,7 +479,7 @@ class MpiioFs : public Filesystem {
 
 /** Simplify access to the stateless StdioFs Singleton */
 #define HERMES_MPIIO_FS \
-  hshm::EasySingleton<hermes::adapter::fs::MpiioFs>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::MpiioFs>::GetInstance()
 #define HERMES_STDIO_FS_T hermes::adapter::fs::MpiioFs*
 
 #endif  // HERMES_ADAPTER_MPIIO_MPIIO_FS_API_H_
diff --git a/adapter/mpiio/mpiio_io_client.cc b/hermes_adapters/mpiio/mpiio_io_client.cc
similarity index 99%
rename from adapter/mpiio/mpiio_io_client.cc
rename to hermes_adapters/mpiio/mpiio_io_client.cc
index ab99fb1e9..09d23237f 100644
--- a/adapter/mpiio/mpiio_io_client.cc
+++ b/hermes_adapters/mpiio/mpiio_io_client.cc
@@ -219,5 +219,3 @@ void MpiioIoClient::UpdateIoStatus(size_t count, IoStatus &status) {
 }
 
 }  // namespace hermes::adapter::fs
-
-HERMES_TRAIT_CC(hermes::adapter::fs::MpiioIoClient)
diff --git a/adapter/mpiio/mpiio_io_client.h b/hermes_adapters/mpiio/mpiio_io_client.h
similarity index 82%
rename from adapter/mpiio/mpiio_io_client.h
rename to hermes_adapters/mpiio/mpiio_io_client.h
index 12e8d5ee1..e9f7dd2b3 100644
--- a/adapter/mpiio/mpiio_io_client.h
+++ b/hermes_adapters/mpiio/mpiio_io_client.h
@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "adapter/filesystem/filesystem_io_client.h"
+#include "hermes_adapters/filesystem/filesystem_io_client.h"
 #include "mpiio_api.h"
 
 using hermes::adapter::fs::AdapterStat;
@@ -25,19 +25,8 @@ using hermes::adapter::fs::MpiioApi;
 
 namespace hermes::adapter::fs {
 
-/** State for the MPI I/O trait */
-struct MpiioIoClientHeader : public TraitHeader {
-  explicit MpiioIoClientHeader(const std::string &trait_uuid,
-                               const std::string &trait_name)
-      : TraitHeader(trait_uuid, trait_name,
-                    HERMES_TRAIT_FLUSH) {}
-};
-
 /** A class to represent STDIO IO file system */
 class MpiioIoClient : public hermes::adapter::fs::FilesystemIoClient {
- public:
-  HERMES_TRAIT_H(MpiioIoClient, "mpiio_io_client")
-
  private:
   HERMES_MPIIO_API_T real_api; /**< pointer to real APIs */
 
@@ -45,14 +34,6 @@ class MpiioIoClient : public hermes::adapter::fs::FilesystemIoClient {
   /** Default constructor */
   MpiioIoClient() {
     real_api = HERMES_MPIIO_API;
-    CreateHeader<MpiioIoClientHeader>("mpiio_io_client_", trait_name_);
-  }
-
-  /** Trait deserialization constructor */
-  explicit MpiioIoClient(hshm::charbuf &params) {
-    (void) params;
-    real_api = HERMES_MPIIO_API;
-    CreateHeader<MpiioIoClientHeader>("mpiio_io_client_", trait_name_);
   }
 
   /** Virtual destructor */
@@ -121,7 +102,7 @@ class MpiioIoClient : public hermes::adapter::fs::FilesystemIoClient {
 
 /** Simplify access to the stateless StdioIoClient Singleton */
 #define HERMES_MPIIO_IO_CLIENT \
-  hshm::EasySingleton<hermes::adapter::fs::MpiioIoClient>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::MpiioIoClient>::GetInstance()
 #define HERMES_MPIIO_IO_CLIENT_T hermes::adapter::fs::MpiioIoClient*
 
 #endif  // HERMES_ADAPTER_MPIIO_MPIIO_IO_CLIENT_H_
diff --git a/adapter/posix/CMakeLists.txt b/hermes_adapters/posix/CMakeLists.txt
similarity index 83%
rename from adapter/posix/CMakeLists.txt
rename to hermes_adapters/posix/CMakeLists.txt
index d5e9eadad..bcc973f3c 100644
--- a/adapter/posix/CMakeLists.txt
+++ b/hermes_adapters/posix/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
         ${HERMES_SRC_DIR}
         ${HERMES_ADAPTER_DIR}
         ${HERMES_IO_CLIENT_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR})
+        .)
 
 # Creates the POSIX I/O client
 add_library(hermes_posix_io_client SHARED posix_io_client.cc)
@@ -52,6 +52,19 @@ EXPORT (
 )
 endif()
 
+#-----------------------------------------------------------------------------
+# Install headers
+#-----------------------------------------------------------------------------
+file(GLOB_RECURSE HERMES_HEADERS "*.h")
+install(
+        FILES
+        ${HERMES_HEADERS}
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters/posix
+        COMPONENT
+        headers
+)
+
 #-----------------------------------------------------------------------------
 # Add Target(s) to Coverage
 #-----------------------------------------------------------------------------
diff --git a/adapter/posix/posix_api.cc b/hermes_adapters/posix/posix_api.cc
similarity index 98%
rename from adapter/posix/posix_api.cc
rename to hermes_adapters/posix/posix_api.cc
index 349a56188..2360ced2e 100644
--- a/adapter/posix/posix_api.cc
+++ b/hermes_adapters/posix/posix_api.cc
@@ -19,20 +19,19 @@ bool posix_intercepted = true;
 #include "hermes_shm/util/logging.h"
 #include <filesystem>
 
-#include "hermes_types.h"
+#include "hermes/hermes_types.h"
 #include "hermes_shm/util/singleton.h"
-#include "interceptor.h"
+#include "hermes_adapters/interceptor.h"
 
 #include "posix_api.h"
 #include "posix_fs_api.h"
-#include "filesystem/filesystem.h"
+#include "hermes_adapters/filesystem/filesystem.h"
 
 using hermes::adapter::fs::AdapterStat;
 using hermes::adapter::fs::IoStatus;
 using hermes::adapter::fs::File;
 using hermes::adapter::fs::SeekMode;
 
-namespace hapi = hermes::api;
 namespace stdfs = std::filesystem;
 
 extern "C" {
@@ -40,14 +39,14 @@ extern "C" {
 static __attribute__((constructor(101))) void init_posix(void) {
   HERMES_POSIX_API;
   HERMES_POSIX_FS;
-  TRANSPARENT_HERMES;
+  TRANSPARENT_HERMES();;
 }/**/
 
 /**
  * POSIX
  */
 int HERMES_DECL(open)(const char *path, int flags, ...) {
-//  TRANSPARENT_HERMES
+//  TRANSPARENT_HERMES();
   int mode = 0;
   auto real_api = HERMES_POSIX_API;
   auto fs_api = HERMES_POSIX_FS;
@@ -75,7 +74,7 @@ int HERMES_DECL(open)(const char *path, int flags, ...) {
 }
 
 int HERMES_DECL(open64)(const char *path, int flags, ...) {
-//  TRANSPARENT_HERMES
+//  TRANSPARENT_HERMES();
   int mode = 0;
   auto real_api = HERMES_POSIX_API;
   auto fs_api = HERMES_POSIX_FS;
@@ -101,7 +100,7 @@ int HERMES_DECL(open64)(const char *path, int flags, ...) {
 }
 
 int HERMES_DECL(__open_2)(const char *path, int oflag) {
-//  TRANSPARENT_HERMES
+//  TRANSPARENT_HERMES();
   auto real_api = HERMES_POSIX_API;
   auto fs_api = HERMES_POSIX_FS;
   if (fs_api->IsPathTracked(path)) {
@@ -117,7 +116,7 @@ int HERMES_DECL(__open_2)(const char *path, int oflag) {
 }
 
 int HERMES_DECL(creat)(const char *path, mode_t mode) {
-//  TRANSPARENT_HERMES
+//  TRANSPARENT_HERMES();
   std::string path_str(path);
   auto real_api = HERMES_POSIX_API;
   auto fs_api = HERMES_POSIX_FS;
@@ -134,7 +133,7 @@ int HERMES_DECL(creat)(const char *path, mode_t mode) {
 }
 
 int HERMES_DECL(creat64)(const char *path, mode_t mode) {
-//  TRANSPARENT_HERMES
+//  TRANSPARENT_HERMES();
   std::string path_str(path);
   auto real_api = HERMES_POSIX_API;
   auto fs_api = HERMES_POSIX_FS;
diff --git a/adapter/posix/posix_api.h b/hermes_adapters/posix/posix_api.h
similarity index 98%
rename from adapter/posix/posix_api.h
rename to hermes_adapters/posix/posix_api.h
index 318870b00..8bd62f133 100644
--- a/adapter/posix/posix_api.h
+++ b/hermes_adapters/posix/posix_api.h
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "adapter/real_api.h"
+#include "hermes_adapters/real_api.h"
 
 #ifndef O_TMPFILE
 #define O_TMPFILE 0
@@ -231,7 +231,7 @@ class PosixApi : public RealApi {
 #include "hermes_shm/util/singleton.h"
 
 #define HERMES_POSIX_API \
-  hshm::EasySingleton<hermes::adapter::fs::PosixApi>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::PosixApi>::GetInstance()
 #define HERMES_POSIX_API_T hermes::adapter::fs::PosixApi*
 
 namespace hermes::adapter::fs {
diff --git a/adapter/posix/posix_fs_api.h b/hermes_adapters/posix/posix_fs_api.h
similarity index 95%
rename from adapter/posix/posix_fs_api.h
rename to hermes_adapters/posix/posix_fs_api.h
index b259e1aac..1aa5f473d 100644
--- a/adapter/posix/posix_fs_api.h
+++ b/hermes_adapters/posix/posix_fs_api.h
@@ -15,8 +15,8 @@
 
 #include <memory>
 
-#include "adapter/filesystem/filesystem.h"
-#include "adapter/filesystem/filesystem_mdm.h"
+#include "hermes_adapters/filesystem/filesystem.h"
+#include "hermes_adapters/filesystem/filesystem_mdm.h"
 #include "posix_api.h"
 #include "posix_io_client.h"
 
@@ -105,7 +105,7 @@ class PosixFs : public hermes::adapter::fs::Filesystem {
 
 /** Simplify access to the stateless PosixFs Singleton */
 #define HERMES_POSIX_FS \
-  hshm::EasySingleton<hermes::adapter::fs::PosixFs>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::PosixFs>::GetInstance()
 #define HERMES_POSIX_FS_T hermes::adapter::fs::PosixFs*
 
 }  // namespace hermes::adapter::fs
diff --git a/adapter/posix/posix_io_client.cc b/hermes_adapters/posix/posix_io_client.cc
similarity index 99%
rename from adapter/posix/posix_io_client.cc
rename to hermes_adapters/posix/posix_io_client.cc
index 603b33c4e..5fecbaef5 100644
--- a/adapter/posix/posix_io_client.cc
+++ b/hermes_adapters/posix/posix_io_client.cc
@@ -165,5 +165,3 @@ void PosixIoClient::ReadBlob(const std::string &bkt_name,
 }
 
 }  // namespace hermes::adapter::fs
-
-HERMES_TRAIT_CC(hermes::adapter::fs::PosixIoClient)
diff --git a/adapter/posix/posix_io_client.h b/hermes_adapters/posix/posix_io_client.h
similarity index 81%
rename from adapter/posix/posix_io_client.h
rename to hermes_adapters/posix/posix_io_client.h
index f922f8349..907443144 100644
--- a/adapter/posix/posix_io_client.h
+++ b/hermes_adapters/posix/posix_io_client.h
@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "adapter/filesystem/filesystem_io_client.h"
+#include "hermes_adapters/filesystem/filesystem_io_client.h"
 #include "posix_api.h"
 
 using hshm::Singleton;
@@ -26,19 +26,8 @@ using hermes::adapter::fs::PosixApi;
 
 namespace hermes::adapter::fs {
 
-/** State for the POSIX I/O trait */
-struct PosixIoClientHeader : public TraitHeader {
-  explicit PosixIoClientHeader(const std::string &trait_uuid,
-                               const std::string &trait_name)
-      : TraitHeader(trait_uuid, trait_name,
-                    HERMES_TRAIT_FLUSH) {}
-};
-
 /** A class to represent POSIX IO file system */
 class PosixIoClient : public hermes::adapter::fs::FilesystemIoClient {
- public:
-  HERMES_TRAIT_H(PosixIoClient, "posix_io_client")
-
  private:
   HERMES_POSIX_API_T real_api; /**< pointer to real APIs */
 
@@ -46,14 +35,6 @@ class PosixIoClient : public hermes::adapter::fs::FilesystemIoClient {
   /** Default constructor */
   PosixIoClient() {
     real_api = HERMES_POSIX_API;
-    CreateHeader<PosixIoClientHeader>("posix_io_client_", trait_name_);
-  }
-
-  /** Trait deserialization constructor */
-  explicit PosixIoClient(hshm::charbuf &params) {
-    (void) params;
-    real_api = HERMES_POSIX_API;
-    CreateHeader<PosixIoClientHeader>("posix_io_client_", trait_name_);
   }
 
   /** Virtual destructor */
@@ -114,7 +95,7 @@ class PosixIoClient : public hermes::adapter::fs::FilesystemIoClient {
 
 /** Simplify access to the stateless PosixIoClient Singleton */
 #define HERMES_POSIX_IO_CLIENT \
-  hshm::EasySingleton<hermes::adapter::fs::PosixIoClient>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::PosixIoClient>::GetInstance()
 #define HERMES_POSIX_IO_CLIENT_T hermes::adapter::fs::PosixIoClient*
 
 #endif  // HERMES_ADAPTER_POSIX_POSIX_IO_CLIENT_H_
diff --git a/adapter/real_api.h b/hermes_adapters/real_api.h
similarity index 100%
rename from adapter/real_api.h
rename to hermes_adapters/real_api.h
diff --git a/adapter/stdio/CMakeLists.txt b/hermes_adapters/stdio/CMakeLists.txt
similarity index 83%
rename from adapter/stdio/CMakeLists.txt
rename to hermes_adapters/stdio/CMakeLists.txt
index 654c331c4..a2da0baf1 100644
--- a/adapter/stdio/CMakeLists.txt
+++ b/hermes_adapters/stdio/CMakeLists.txt
@@ -1,10 +1,9 @@
-project(StdioAdapter VERSION ${HERMES_PACKAGE_VERSION})
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${HERMES_SRC_DIR}
         ${HERMES_ADAPTER_DIR}
         ${HERMES_IO_CLIENT_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR})
+        .)
 
 # Creates the STDIO I/O client
 add_library(hermes_stdio_io_client SHARED stdio_io_client.cc)
@@ -53,6 +52,19 @@ if(NOT HERMES_EXTERNALLY_CONFIGURED)
     )
 endif()
 
+#-----------------------------------------------------------------------------
+# Install headers
+#-----------------------------------------------------------------------------
+file(GLOB_RECURSE HERMES_HEADERS "*.h")
+install(
+        FILES
+        ${HERMES_HEADERS}
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters/stdio
+        COMPONENT
+        headers
+)
+
 #-----------------------------------------------------------------------------
 # Add Target(s) to Coverage
 #-----------------------------------------------------------------------------
diff --git a/adapter/stdio/stdio_api.cc b/hermes_adapters/stdio/stdio_api.cc
similarity index 98%
rename from adapter/stdio/stdio_api.cc
rename to hermes_adapters/stdio/stdio_api.cc
index 1cb9183b8..b88d7ea03 100644
--- a/adapter/stdio/stdio_api.cc
+++ b/hermes_adapters/stdio/stdio_api.cc
@@ -17,17 +17,14 @@ bool stdio_intercepted = true;
 #include <cstdio>
 #include "stdio_api.h"
 #include "stdio_fs_api.h"
-#include "interceptor.h"
+#include "hermes_adapters/interceptor.h"
 
 using hermes::adapter::fs::MetadataManager;
 using hermes::adapter::fs::SeekMode;
 using hermes::adapter::fs::AdapterStat;
 using hermes::adapter::fs::File;
 
-namespace hapi = hermes::api;
 namespace stdfs = std::filesystem;
-using hermes::u8;
-using hermes::u64;
 
 extern "C" {
 
@@ -36,7 +33,7 @@ extern "C" {
  */
 
 FILE *HERMES_DECL(fopen)(const char *path, const char *mode) {
-  TRANSPARENT_HERMES
+  TRANSPARENT_HERMES();
   auto real_api = HERMES_STDIO_API;
   auto fs_api = HERMES_STDIO_FS;
   if (fs_api->IsPathTracked(path)) {
@@ -50,7 +47,7 @@ FILE *HERMES_DECL(fopen)(const char *path, const char *mode) {
 }
 
 FILE *HERMES_DECL(fopen64)(const char *path, const char *mode) {
-  TRANSPARENT_HERMES
+  TRANSPARENT_HERMES();
   auto real_api = HERMES_STDIO_API;
   auto fs_api = HERMES_STDIO_FS;
   if (fs_api->IsPathTracked(path)) {
@@ -64,7 +61,7 @@ FILE *HERMES_DECL(fopen64)(const char *path, const char *mode) {
 }
 
 FILE *HERMES_DECL(fdopen)(int fd, const char *mode) {
-  TRANSPARENT_HERMES
+  TRANSPARENT_HERMES();
   auto real_api = HERMES_STDIO_API;
   auto fs_api = HERMES_STDIO_FS;
   std::shared_ptr<AdapterStat> stat;
@@ -77,7 +74,7 @@ FILE *HERMES_DECL(fdopen)(int fd, const char *mode) {
 }
 
 FILE *HERMES_DECL(freopen)(const char *path, const char *mode, FILE *stream) {
-  TRANSPARENT_HERMES
+  TRANSPARENT_HERMES();
   auto real_api = HERMES_STDIO_API;
   auto fs_api = HERMES_STDIO_FS;
   if (fs_api->IsFpTracked(stream)) {
@@ -88,7 +85,7 @@ FILE *HERMES_DECL(freopen)(const char *path, const char *mode, FILE *stream) {
 }
 
 FILE *HERMES_DECL(freopen64)(const char *path, const char *mode, FILE *stream) {
-  TRANSPARENT_HERMES
+  TRANSPARENT_HERMES();
   auto real_api = HERMES_STDIO_API;
   auto fs_api = HERMES_STDIO_FS;
   if (fs_api->IsFpTracked(stream)) {
diff --git a/adapter/stdio/stdio_api.h b/hermes_adapters/stdio/stdio_api.h
similarity index 98%
rename from adapter/stdio/stdio_api.h
rename to hermes_adapters/stdio/stdio_api.h
index 0e8c1bcda..12de1ad83 100644
--- a/adapter/stdio/stdio_api.h
+++ b/hermes_adapters/stdio/stdio_api.h
@@ -17,7 +17,7 @@
 #include <iostream>
 #include "hermes_shm/util/logging.h"
 #include <cstdio>
-#include "adapter/real_api.h"
+#include "hermes_adapters/real_api.h"
 
 extern "C" {
 typedef FILE * (*fopen_t)(const char * path, const char * mode);
@@ -167,7 +167,7 @@ class StdioApi : public RealApi {
 
 // Singleton macros
 #define HERMES_STDIO_API \
-  hshm::EasySingleton<hermes::adapter::fs::StdioApi>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::StdioApi>::GetInstance()
 #define HERMES_STDIO_API_T hermes::adapter::fs::StdioApi*
 
 #endif  // HERMES_ADAPTER_STDIO_H
diff --git a/adapter/stdio/stdio_fs_api.h b/hermes_adapters/stdio/stdio_fs_api.h
similarity index 94%
rename from adapter/stdio/stdio_fs_api.h
rename to hermes_adapters/stdio/stdio_fs_api.h
index b2b9f2531..5fb5531f6 100644
--- a/adapter/stdio/stdio_fs_api.h
+++ b/hermes_adapters/stdio/stdio_fs_api.h
@@ -15,9 +15,9 @@
 
 #include <memory>
 
-#include "adapter/filesystem/filesystem.h"
-#include "adapter/filesystem/filesystem_mdm.h"
-#include "adapter/posix/posix_fs_api.h"
+#include "hermes_adapters/filesystem/filesystem.h"
+#include "hermes_adapters/filesystem/filesystem_mdm.h"
+#include "hermes_adapters/posix/posix_fs_api.h"
 #include "stdio_api.h"
 #include "stdio_io_client.h"
 
@@ -98,7 +98,7 @@ class StdioFs : public hermes::adapter::fs::Filesystem {
 
 /** Simplify access to the stateless StdioFs Singleton */
 #define HERMES_STDIO_FS \
-  hshm::EasySingleton<hermes::adapter::fs::StdioFs>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::StdioFs>::GetInstance()
 #define HERMES_STDIO_FS_T hermes::adapter::fs::StdioFs*
 
 }  // namespace hermes::adapter::fs
diff --git a/adapter/stdio/stdio_io_client.cc b/hermes_adapters/stdio/stdio_io_client.cc
similarity index 99%
rename from adapter/stdio/stdio_io_client.cc
rename to hermes_adapters/stdio/stdio_io_client.cc
index b72db9b64..6793115da 100644
--- a/adapter/stdio/stdio_io_client.cc
+++ b/hermes_adapters/stdio/stdio_io_client.cc
@@ -162,5 +162,3 @@ void StdioIoClient::ReadBlob(const std::string &bkt_name,
 }
 
 }  // namespace hermes::adapter::fs
-
-HERMES_TRAIT_CC(hermes::adapter::fs::StdioIoClient)
diff --git a/adapter/stdio/stdio_io_client.h b/hermes_adapters/stdio/stdio_io_client.h
similarity index 82%
rename from adapter/stdio/stdio_io_client.h
rename to hermes_adapters/stdio/stdio_io_client.h
index ec3bbd618..be5d2077c 100644
--- a/adapter/stdio/stdio_io_client.h
+++ b/hermes_adapters/stdio/stdio_io_client.h
@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "adapter/filesystem/filesystem_io_client.h"
+#include "hermes_adapters/filesystem/filesystem_io_client.h"
 #include "stdio_api.h"
 
 using hermes::adapter::fs::AdapterStat;
@@ -25,18 +25,8 @@ using hermes::adapter::fs::StdioApi;
 
 namespace hermes::adapter::fs {
 
-/** State for the STDIO I/O trait */
-struct StdioIoClientHeader : public TraitHeader {
-  explicit StdioIoClientHeader(const std::string &trait_uuid,
-                               const std::string &trait_name)
-      : TraitHeader(trait_uuid, trait_name, HERMES_TRAIT_FLUSH) {}
-};
-
 /** A class to represent STDIO IO file system */
 class StdioIoClient : public hermes::adapter::fs::FilesystemIoClient {
- public:
-  HERMES_TRAIT_H(StdioIoClient, "stdio_io_client")
-
  private:
   HERMES_STDIO_API_T real_api; /**< pointer to real APIs */
 
@@ -44,14 +34,6 @@ class StdioIoClient : public hermes::adapter::fs::FilesystemIoClient {
   /** Default constructor */
   StdioIoClient() {
     real_api = HERMES_STDIO_API;
-    CreateHeader<StdioIoClientHeader>(trait_name_, trait_name_);
-  }
-
-  /** Trait deserialization constructor */
-  explicit StdioIoClient(hshm::charbuf &params) {
-    (void) params;
-    real_api = HERMES_STDIO_API;
-    CreateHeader<StdioIoClientHeader>(trait_name_, trait_name_);
   }
 
   /** Virtual destructor */
@@ -112,7 +94,7 @@ class StdioIoClient : public hermes::adapter::fs::FilesystemIoClient {
 
 /** Simplify access to the stateless StdioIoClient Singleton */
 #define HERMES_STDIO_IO_CLIENT \
-  hshm::EasySingleton<hermes::adapter::fs::StdioIoClient>::GetInstance()
+  hshm::EasySingleton<::hermes::adapter::fs::StdioIoClient>::GetInstance()
 #define HERMES_STDIO_IO_CLIENT_T hermes::adapter::fs::StdioIoClient*
 
 #endif  // HERMES_ADAPTER_STDIO_STDIO_IO_CLIENT_H_
diff --git a/adapter/vfd/CMakeLists.txt b/hermes_adapters/vfd/CMakeLists.txt
similarity index 77%
rename from adapter/vfd/CMakeLists.txt
rename to hermes_adapters/vfd/CMakeLists.txt
index 9bb21f614..6ac9e99cd 100644
--- a/adapter/vfd/CMakeLists.txt
+++ b/hermes_adapters/vfd/CMakeLists.txt
@@ -21,22 +21,14 @@ set(HDF5_HERMES_VFD_PACKAGE_TARNAME "${HDF5_HERMES_VFD_PACKAGE}")
 # Dynamically loaded VFDs must be shared libraries
 set(HDF5_HERMES_VFD_LIBTYPE SHARED)
 
-#-----------------------------------------------------------------------------
-# Targets built within this project are exported at Install time for use
-# by other projects.
-#-----------------------------------------------------------------------------
-if(NOT HDF5_HERMES_VFD_EXPORTED_TARGETS)
-  set(HDF5_HERMES_VFD_EXPORTED_TARGETS "${HDF5_HERMES_VFD_PACKAGE}-targets")
-endif()
-
 set(HDF5_HERMES_VFD_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/H5FDhermes.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/H5FDhermes.h
         ${CMAKE_CURRENT_SOURCE_DIR}/H5FDhermes.cc)
 
 add_library(hdf5_hermes_vfd SHARED ${HDF5_HERMES_VFD_SRCS})
 target_include_directories(hdf5_hermes_vfd
-  SYSTEM PUBLIC ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
-)
+        SYSTEM PUBLIC ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
+        )
 add_dependencies(hdf5_hermes_vfd
         hermes hermes_posix_io_client)
 target_link_libraries(hdf5_hermes_vfd
@@ -50,44 +42,44 @@ set(HDF5_HERMES_VFD_EXPORTED_LIBS hdf5_hermes_vfd ${HDF5_HERMES_VFD_EXPORTED_LIB
 # Specify project header files to be installed
 #-----------------------------------------------------------------------------
 set(HDF5_HERMES_VFD_HEADERS
-  ${CMAKE_CURRENT_SOURCE_DIR}/H5FDhermes.h
-)
+        ${CMAKE_CURRENT_SOURCE_DIR}/H5FDhermes.h
+        )
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install(
-  FILES
-    ${HDF5_HERMES_VFD_HEADERS}
-  DESTINATION
-    ${HERMES_INSTALL_INCLUDE_DIR}
-  COMPONENT
-    headers
+        FILES
+        ${HDF5_HERMES_VFD_HEADERS}
+        DESTINATION
+        ${HERMES_INSTALL_INCLUDE_DIR}
+        COMPONENT
+        headers
 )
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install
 #-----------------------------------------------------------------------------
 install(
-  TARGETS
-    hdf5_hermes_vfd
-  EXPORT
-    ${HDF5_HERMES_VFD_EXPORTED_TARGETS}
-  LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}/${HERMES_VFD_DIR_NAME}
-  ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}/${HERMES_VFD_DIR_NAME}
-  RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+        TARGETS
+        hdf5_hermes_vfd
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}/${HERMES_VFD_DIR_NAME}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}/${HERMES_VFD_DIR_NAME}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
 )
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 install(
-  EXPORT
-    ${HDF5_HERMES_VFD_EXPORTED_TARGETS}
-  DESTINATION
-    ${HERMES_INSTALL_DATA_DIR}/cmake/hdf5_hermes_vfd
-  FILE
-    ${HDF5_HERMES_VFD_EXPORTED_TARGETS}.cmake
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hdf5_hermes_vfd
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
 )
 
 #-----------------------------------------------------------------------------
@@ -95,10 +87,10 @@ install(
 
 if(NOT HDF5_HERMES_VFD_EXTERNALLY_CONFIGURED)
   export(
-    TARGETS
-      ${HDF5_HERMES_VFD_EXPORTED_LIBS}
-    FILE
-      ${HDF5_HERMES_VFD_EXPORTED_TARGETS}.cmake
+          TARGETS
+          ${HDF5_HERMES_VFD_EXPORTED_LIBS}
+          FILE
+          ${HERMES_EXPORTED_TARGETS}.cmake
   )
 endif()
 
@@ -130,10 +122,10 @@ set(HDF5_HERMES_VFD_LIBRARIES ${HDF5_HERMES_VFD_LIBRARIES} PARENT_SCOPE)
 # Hermes VFD external library dependencies
 # Need to generate -lib if not already passed
 set(HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES
-  ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES}
-  ${HDF5_HERMES_VFD_EXT_PKG_LIB_DEPENDENCIES}
-  PARENT_SCOPE
-)
+        ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES}
+        ${HDF5_HERMES_VFD_EXT_PKG_LIB_DEPENDENCIES}
+        PARENT_SCOPE
+        )
 foreach(lib_dep ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES})
   # get library name
   get_filename_component(lib_name ${lib_dep} NAME_WE)
@@ -157,10 +149,10 @@ set(HDF5_HERMES_VFD_LIB_DEPENDENCIES ${HDF5_HERMES_VFD_LIB_DEPENDENCIES} PARENT_
 
 # External include dependencies
 set(HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES
-  ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
-  ${HDF5_HERMES_VFD_EXT_PKG_INCLUDE_DEPENDENCIES}
-  PARENT_SCOPE
-)
+        ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
+        ${HDF5_HERMES_VFD_EXT_PKG_INCLUDE_DEPENDENCIES}
+        PARENT_SCOPE
+        )
 if(HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES)
   list(REMOVE_DUPLICATES HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES)
 endif()
@@ -170,15 +162,27 @@ endforeach()
 set(HDF5_HERMES_VFD_INCLUDE_DEPENDENCIES ${HDF5_HERMES_VFD_INCLUDE_DEPENDENCIES} PARENT_SCOPE)
 
 set(HDF5_HERMES_VFD_INCLUDES_BUILD_TIME
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
-  PARENT_SCOPE
-)
+        .
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
+        PARENT_SCOPE
+        )
 
 set(HDF5_HERMES_VFD_INCLUDES_INSTALL_TIME
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
-  PARENT_SCOPE
+        .
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
+        PARENT_SCOPE)
+
+#-----------------------------------------------------------------------------
+# Install headers
+#-----------------------------------------------------------------------------
+file(GLOB_RECURSE HERMES_HEADERS "*.h")
+install(
+        FILES
+        ${HERMES_HEADERS}
+        DESTINATION
+        ${CMAKE_INSTALL_PREFIX}/include/hermes_adapters/vfd
+        COMPONENT
+        headers
 )
diff --git a/adapter/vfd/H5FDhermes.cc b/hermes_adapters/vfd/H5FDhermes.cc
similarity index 99%
rename from adapter/vfd/H5FDhermes.cc
rename to hermes_adapters/vfd/H5FDhermes.cc
index a9f2ce0f5..60fff9455 100644
--- a/adapter/vfd/H5FDhermes.cc
+++ b/hermes_adapters/vfd/H5FDhermes.cc
@@ -39,7 +39,7 @@
 #include "H5PLextern.h"
 #include "H5FDhermes.h"     /* Hermes file driver     */
 
-#include "adapter/posix/posix_io_client.h"
+#include "hermes_adapters/posix/posix_io_client.h"
 #include "posix/posix_fs_api.h"
 
 /**
diff --git a/adapter/vfd/H5FDhermes.h b/hermes_adapters/vfd/H5FDhermes.h
similarity index 100%
rename from adapter/vfd/H5FDhermes.h
rename to hermes_adapters/vfd/H5FDhermes.h
diff --git a/adapter/vfd/README.md b/hermes_adapters/vfd/README.md
similarity index 95%
rename from adapter/vfd/README.md
rename to hermes_adapters/vfd/README.md
index 1c48793ca..34b1a5e1c 100644
--- a/adapter/vfd/README.md
+++ b/hermes_adapters/vfd/README.md
@@ -31,7 +31,7 @@ Now we must tell the HDF5 library where to find the Hermes VFD. That is done
 with the following environment variable:
 
 ```sh
-HDF5_PLUGIN_PATH=<hermes_install_prefix>/lib/hermes_vfd
+HDF5_PLUGIN_PATH=<HRUN_INSTALL_prefix>/lib/hermes_vfd
 ```
 
 The Hermes VFD has two configuration options.
@@ -65,14 +65,14 @@ initialization and finalization:
 
 ```sh
 HERMES_CONF=<path_to>/hermes.yaml
-LD_PRELOAD=<hermes_install_prefix>/hermes_vfd/libhdf5_hermes_vfd.so
+LD_PRELOAD=<HRUN_INSTALL_prefix>/hermes_vfd/libhdf5_hermes_vfd.so
 ```
 
 Heres is a full example of running an HDF5 app with the Hermes VFD:
 
 ```sh
 HDF5_DRIVER=hermes                                                    \
-  HDF5_PLUGIN_PATH=<hermes_install_prefix/lib/hermes_vfd              \
+  HDF5_PLUGIN_PATH=<HRUN_INSTALL_prefix/lib/hermes_vfd              \
   HDF5_DRIVER_CONFIG="true 65536"                                     \
   HERMES_CONF=<path_to>/hermes.yaml                                   \
   ./my_hdf5_app
diff --git a/hermes_shm/CMake/FindHermesShm.cmake b/hermes_shm/CMake/FindHermesShm.cmake
deleted file mode 100644
index 4f2912b53..000000000
--- a/hermes_shm/CMake/FindHermesShm.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# Find labstor header and library.
-#
-
-# This module defines the following uncached variables:
-#  HermesShm_FOUND, if false, do not try to use labstor.
-#  HermesShm_INCLUDE_DIRS, where to find labstor.h.
-#  HermesShm_LIBRARIES, the libraries to link against to use the labstor library
-#  HermesShm_LIBRARY_DIRS, the directory where the labstor library is found.
-
-find_path(
-  HermesShm_INCLUDE_DIR
-        hermes_shm/hermes_shm.h
-)
-
-if( HermesShm_INCLUDE_DIR )
-  get_filename_component(HermesShm_DIR ${HermesShm_INCLUDE_DIR} PATH)
-
-  find_library(
-    HermesShm_LIBRARY
-    NAMES hermes_shm_data_structures
-  )
-
-  if( HermesShm_LIBRARY )
-    set(HermesShm_LIBRARY_DIR "")
-    get_filename_component(HermesShm_LIBRARY_DIRS ${HermesShm_LIBRARY} PATH)
-    # Set uncached variables as per standard.
-    set(HermesShm_FOUND ON)
-    set(HermesShm_INCLUDE_DIRS ${HermesShm_INCLUDE_DIR})
-    set(HermesShm_LIBRARIES ${HermesShm_LIBRARY})
-  endif(HermesShm_LIBRARY)
-else(HermesShm_INCLUDE_DIR)
-  message(STATUS "FindHermesShm: Could not find hermes_shm.h")
-endif(HermesShm_INCLUDE_DIR)
-	    
-if(HermesShm_FOUND)
-  if(NOT HermesShm_FIND_QUIETLY)
-    message(STATUS "FindHermesShm: Found both hermes_shm.h and libhermes_shm.a")
-  endif(NOT HermesShm_FIND_QUIETLY)
-else(HermesShm_FOUND)
-  if(HermesShm_FIND_REQUIRED)
-    message(STATUS "FindHermesShm: Could not find hermes_shm.h and/or libhermes_shm.a")
-  endif(HermesShm_FIND_REQUIRED)
-endif(HermesShm_FOUND)
diff --git a/hermes_shm/CMake/UseDoxygenDoc.cmake b/hermes_shm/CMake/UseDoxygenDoc.cmake
deleted file mode 100644
index b9601910b..000000000
--- a/hermes_shm/CMake/UseDoxygenDoc.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-find_package(Perl REQUIRED)
-find_package(Doxygen REQUIRED)
-
-function(add_doxygen_doc)
-  set(options)
-  set(oneValueArgs BUILD_DIR DOXY_FILE TARGET_NAME COMMENT)
-  set(multiValueArgs)
-
-  cmake_parse_arguments(DOXY_DOC
-    "${options}"
-    "${oneValueArgs}"
-    "${multiValueArgs}"
-    ${ARGN}
-    )
-
-  configure_file(
-    ${DOXY_DOC_DOXY_FILE}
-    ${DOXY_DOC_BUILD_DIR}/Doxyfile
-    @ONLY
-    )
-
-  add_custom_target(${DOXY_DOC_TARGET_NAME}
-    COMMAND
-      ${DOXYGEN_EXECUTABLE} Doxyfile
-    WORKING_DIRECTORY
-      ${DOXY_DOC_BUILD_DIR}
-    COMMENT
-      "Building ${DOXY_DOC_COMMENT} with Doxygen"
-    VERBATIM
-    )
-
-  message(STATUS "Added ${DOXY_DOC_TARGET_NAME} [Doxygen] target to build documentation")
-endfunction()
\ No newline at end of file
diff --git a/hermes_shm/CMakeLists.txt b/hermes_shm/CMakeLists.txt
deleted file mode 100644
index 74fcd0efd..000000000
--- a/hermes_shm/CMakeLists.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-#------------------------------------------------------------------------------
-# Global variables
-#------------------------------------------------------------------------------
-set(HERMES_SHM_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${HERMES_SHM_ROOT}/include)
-
-#------------------------------------------------------------------------------
-# Options
-#------------------------------------------------------------------------------
-option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
-option(BUILD_HSHM_TESTS "Build tests" ON)
-option(BUILD_HSHM_BENCHMARKS "Build benchmarks" ON)
-option(BUILD_MPI_TESTS "Build tests which depend on MPI" ON)
-option(BUILD_OpenMP_TESTS "Build tests which depend on OpenMP" ON)
-option(BUILD_Boost_TESTS "Build tests which depend on libboost" ON)
-option(HERMES_RPC_THALLIUM "Build tests which depend on thallium" ON)
-option(HERMES_ENABLE_COVERAGE "Check how well tests cover code" OFF)
-option(HERMES_ENABLE_DOXYGEN "Check how well the code is documented" ON)
-option(HERMES_CXX_PROFILE "Generate profiling data from benchmarks" OFF)
-option(HERMES_PTHREADS_ENABLED "Support spawning pthreads" ON)
-option(HERMES_DEBUG_LOCK "Used for debugging locks" OFF)
-option(HERMES_ENABLE_PROFILING "View profiling logs" OFF)
-
-if (HERMES_PTHREADS_ENABLED)
-    add_compile_definitions(HERMES_PTHREADS_ENABLED)
-endif()
-if (HERMES_RPC_THALLIUM)
-    add_compile_definitions(HERMES_RPC_THALLIUM)
-endif()
-if (HERMES_DEBUG_LOCK)
-    add_compile_definitions(HERMES_DEBUG_LOCK)
-endif()
-
-#------------------------------------------------------------------------------
-# Setup CMake Environment
-#------------------------------------------------------------------------------
-if(NOT HERMES_EXTERNALLY_CONFIGURED)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
-            ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables.")
-    set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-            ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries")
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-            ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries.")
-endif()
-
-#------------------------------------------------------------------------------
-# Setup install and output Directories
-#------------------------------------------------------------------------------
-if(NOT HERMES_INSTALL_BIN_DIR)
-    set(HERMES_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-endif()
-if(NOT HERMES_INSTALL_LIB_DIR)
-    set(HERMES_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-if(NOT HERMES_INSTALL_INCLUDE_DIR)
-    set(HERMES_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
-endif()
-if(NOT HERMES_INSTALL_DATA_DIR)
-    set(HERMES_INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share)
-endif()
-
-#------------------------------------------------------------------------------
-# CMake Modules
-#------------------------------------------------------------------------------
-if (NOT IS_HERMES_MAIN)
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
-    message(${CMAKE_MODULE_PATH})
-endif()
-
-#------------------------------------------------------------------------------
-# Optimization
-#------------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 17)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message("IN DEBUG MODE")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
-elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-    message("IN RELEASE MODE")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3")
-endif()
-if(HERMES_CXX_PROFILE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-    message("CXX PROFILER IS ON")
-endif()
-function(make_gprof exec_name exec_dir)
-    message("gprof -b -A -p -q ${exec_dir}/${exec_name} gmon.out > gprof_out.txt")
-    add_custom_target(
-      ${exec_name}_gprof
-      COMMAND gprof -b -A -p -q ${exec_dir}/${exec_name} gmon.out)
-endfunction()
-
-#------------------------------------------------------------------------------
-# External libraries
-#------------------------------------------------------------------------------
-
-# YAML-CPP
-find_package(yaml-cpp REQUIRED)
-message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
-
-# Catch2
-find_package(Catch2 3.0.1 REQUIRED)
-message(STATUS "found catch2.h at ${Catch2_CXX_INCLUDE_DIRS}")
-
-# MPICH
-if(BUILD_MPI_TESTS)
-    find_package(MPI REQUIRED COMPONENTS C CXX)
-    message(STATUS "found mpi.h at ${MPI_CXX_INCLUDE_DIRS}")
-endif()
-
-# OpenMP
-#if(BUILD_OpenMP_TESTS)
-find_package(OpenMP REQUIRED COMPONENTS C CXX)
-message(STATUS "found omp.h at ${OpenMP_CXX_INCLUDE_DIRS}")
-#endif()
-
-# thallium
-if(HERMES_RPC_THALLIUM)
-    find_package(thallium CONFIG REQUIRED)
-    if(thallium_FOUND)
-        message(STATUS "found thallium at ${thallium_DIR}")
-    endif()
-endif()
-
-# Boost
-if(BUILD_Boost_TESTS)
-    find_package(Boost REQUIRED)
-    message(STATUS "found boost.h at ${Boost_INCLUDE_DIRS}")
-endif()
-
-#------------------------------------------------------------------------------
-# Code Coverage
-#------------------------------------------------------------------------------
-if (NOT IS_HERMES_MAIN)
-    if(HERMES_ENABLE_COVERAGE)
-        set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage" CACHE STRING
-            "Flags to the coverage program to perform coverage inspection")
-        mark_as_advanced(COVERAGE_FLAGS)
-
-        macro(set_coverage_flags target)
-            set_target_properties(${target}
-                    PROPERTIES
-                    COMPILE_FLAGS ${COVERAGE_FLAGS}
-                    LINK_FLAGS ${COVERAGE_FLAGS}
-                    )
-        endmacro()
-    endif()
-endif()
-
-#------------------------------------------------------------------------------
-# Documentation
-#------------------------------------------------------------------------------
-if (NOT IS_HERMES_MAIN)
-    if(HERMES_ENABLE_DOXYGEN)
-        include(UseDoxygenDoc)
-        add_doxygen_doc(
-                BUILD_DIR
-                ${CMAKE_BINARY_DIR}/bin/_build
-                DOXY_FILE
-                ${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in
-                TARGET_NAME
-                dox
-                COMMENT
-                "HTML documentation"
-        )
-    endif()
-endif()
-
-#------------------------------------------------------------------------------
-# Build hermes_shm
-#------------------------------------------------------------------------------
-add_subdirectory(src)
-
-if (NOT IS_HERMES_MAIN)
-    add_custom_target(lint COMMAND bash ${HERMES_SHM_ROOT}/scripts/lint.sh ${HERMES_SHM_ROOT})
-    add_custom_target(preamble COMMAND python3 ${HERMES_SHM_ROOT}/scripts/preamble.py ${HERMES_SHM_ROOT})
-endif()
-
-#------------------------------------------------------------------------------
-# Build tests + benchmarks
-#------------------------------------------------------------------------------
-set(TEST_MAIN ${HERMES_SHM_ROOT}/test/unit)
-enable_testing()
-if (BUILD_HSHM_TESTS)
-  message("Building HSHM unit tests")
-  add_subdirectory(test)
-endif()
-if (BUILD_HSHM_BENCHMARKS)
-  message("Building HSHM benchmarks")
-  add_subdirectory(benchmark)
-endif()
-#add_subdirectory(example)
-
-#------------------------------------------------------------------------------
-# Install hshm
-#------------------------------------------------------------------------------
-install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hermes_shm/COPYING b/hermes_shm/COPYING
deleted file mode 100644
index bb9689a91..000000000
--- a/hermes_shm/COPYING
+++ /dev/null
@@ -1,52 +0,0 @@
-Copyright Notice and License Terms for
-Hermes I/O Buffering Software Library and Utilities
-
-------------------------------------------------------------------------------
-
-Hermes I/O Buffering Software Library and Utilities
-Copyright 2018-2021, The HDF Group and Illinois Institute of Technology
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of The HDF Group, Illinois Institute of Technology, nor
-  the names of Contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-DISCLAIMER:
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-You are under no obligation whatsoever to provide any bug fixes, patches, or
-upgrades to the features, functionality or performance of the source code
-("Enhancements") to anyone; however, if you choose to make your Enhancements
-available either publicly, or directly to the copyright holders, without
-imposing a separate written license agreement for such Enhancements, then you
-hereby grant the following license: a non-exclusive, royalty-free perpetual
-license to install, use, modify, prepare derivative works, incorporate into
-other computer software, distribute, and sublicense such enhancements or
-derivative works thereof, in binary and source code form.
-
-------------------------------------------------------------------------------
-
-Hermes was developed with support from the National Science Foundation (NSF)
-under award NSF OCI-1835764.
diff --git a/hermes_shm/CPPLINT.cfg b/hermes_shm/CPPLINT.cfg
deleted file mode 100644
index f7d7492eb..000000000
--- a/hermes_shm/CPPLINT.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-set noparent
-filter=-build/header_guard,-build/include_subdir,-runtime/references,-readability/casting,-runtime/int,-build/include,-build/c++11,-build/c++14
\ No newline at end of file
diff --git a/hermes_shm/benchmark/CMakeLists.txt b/hermes_shm/benchmark/CMakeLists.txt
deleted file mode 100644
index 9533d420f..000000000
--- a/hermes_shm/benchmark/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-add_subdirectory(data_structure)
-add_subdirectory(allocator)
-add_subdirectory(lock)
\ No newline at end of file
diff --git a/hermes_shm/benchmark/allocator/CMakeLists.txt b/hermes_shm/benchmark/allocator/CMakeLists.txt
deleted file mode 100644
index 0858bdd58..000000000
--- a/hermes_shm/benchmark/allocator/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-include_directories( ${Boost_INCLUDE_DIRS} )
-include_directories( ${TEST_MAIN} )
-add_executable(benchmark_allocators
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        allocator.cc
-)
-add_dependencies(benchmark_allocators hermes_shm_data_structures)
-target_link_libraries(benchmark_allocators
-        hermes_shm_data_structures
-        Catch2::Catch2
-        MPI::MPI_CXX
-        OpenMP::OpenMP_CXX
-        ${Boost_LIBRARIES})
diff --git a/hermes_shm/benchmark/allocator/allocator.cc b/hermes_shm/benchmark/allocator/allocator.cc
deleted file mode 100644
index f2ee35ade..000000000
--- a/hermes_shm/benchmark/allocator/allocator.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "omp.h"
-
-#include <string>
-#include "hermes_shm/data_structures/ipc/string.h"
-
-/** Test cases for the allocator */
-class AllocatorTestSuite {
- public:
-  std::string alloc_type_;
-  Allocator *alloc_;
-  static std::stringstream ss_;
-  static int test_count_;
-
-  /**====================================
-   * Test Runner
-   * ===================================*/
-
-  /** Constructor */
-  AllocatorTestSuite(AllocatorType alloc_type, Allocator *alloc)
-    : alloc_(alloc) {
-    switch (alloc_type) {
-      case AllocatorType::kStackAllocator: {
-        alloc_type_ = "hipc::StackAllocator";
-        break;
-      }
-      case AllocatorType::kMallocAllocator: {
-        alloc_type_ = "hipc::MallocAllocator";
-        break;
-      }
-      case AllocatorType::kFixedPageAllocator: {
-        alloc_type_ = "hipc::FixedPageAllocator";
-        break;
-      }
-      case AllocatorType::kScalablePageAllocator: {
-        alloc_type_ = "hipc::ScalablePageAllocator";
-        break;
-      }
-      default: {
-        HELOG(kFatal, "Could not find this allocator type");
-        break;
-      }
-    }
-  }
-
-  /**====================================
-   * Test Cases
-   * ===================================*/
-
-  /** Allocate and Free a single size in a single loop */
-  void AllocateAndFreeFixedSize(size_t count, size_t size) {
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Pointer p = alloc_->Allocate(size);
-      alloc_->Free(p);
-    }
-#pragma omp barrier
-    t.Pause();
-
-    TestOutput("AllocateAndFreeFixedSize", size, t);
-  }
-
-  /** Allocate a fixed size in a loop, and then free in another loop */
-  void AllocateThenFreeFixedSize(size_t count, size_t size) {
-    Timer t;
-    std::vector<Pointer> cache(count);
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      cache[i] = alloc_->Allocate(size);
-    }
-    for (size_t i = 0; i < count; ++i) {
-      alloc_->Free(cache[i]);
-    }
-#pragma omp barrier
-    t.Pause();
-
-    TestOutput("AllocateThenFreeFixedSize", size, t);
-  }
-
-  /** Allocate, Free, Reallocate, Free in a loop */
-
-  /**====================================
-   * Test Output
-   * ===================================*/
-
-  /** The CSV header */
-  void TestOutputHeader() {
-    ss_ << "test_name" << ","
-        << "alloc_type" << ","
-        << "alloc_size" << ","
-        << "nthreads" << ","
-        << "time" << std::endl;
-  }
-
-  /** The CSV test case */
-  void TestOutput(const std::string &test_name, size_t obj_size, Timer &t) {
-    int rank = omp_get_thread_num();
-    if (rank != 0) { return; }
-    if (test_count_ == 0) {
-      TestOutputHeader();
-    }
-    ss_ << test_name << ","
-        << alloc_type_ << ","
-        << obj_size << ","
-        << omp_get_num_threads() << ","
-        << t.GetMsec() << std::endl;
-    ++test_count_;
-  }
-
-  /** Print the CSV output */
-  static void PrintTestOutput() {
-    std::cout << ss_.str() << std::endl;
-  }
-};
-
-/** The output text */
-std::stringstream AllocatorTestSuite::ss_;
-
-/** Number of tests currently conducted */
-int AllocatorTestSuite::test_count_ = 0;
-
-/** The minor number to use for allocators */
-static int minor = 1;
-const std::string shm_url = "test_allocators";
-
-/** Create the allocator + backend for the test */
-template<typename BackendT, typename AllocT, typename ...Args>
-Allocator* Pretest(MemoryBackendType backend_type,
-                   Args&& ...args) {
-  int rank = omp_get_thread_num();
-  allocator_id_t alloc_id(0, minor);
-  Allocator *alloc;
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-
-  if (rank == 0) {
-    // Create the allocator + backend
-    mem_mngr->CreateBackend<BackendT>(
-      MemoryManager::GetDefaultBackendSize(), shm_url);
-    alloc = mem_mngr->CreateAllocator<AllocT>(
-      shm_url, alloc_id, 0, std::forward<Args>(args)...);
-  }
-#pragma omp barrier
-  if (rank != 0){
-    // Retrieve the allocator + backend
-    alloc = mem_mngr->GetAllocator(alloc_id);
-  }
-
-  return alloc;
-}
-
-/** Destroy the allocator + backend from the test */
-void Posttest() {
-  int rank = omp_get_thread_num();
-#pragma omp barrier
-  if (rank == 0) {
-    allocator_id_t alloc_id(0, minor);
-    HERMES_MEMORY_MANAGER->UnregisterAllocator(
-      alloc_id);
-    HERMES_MEMORY_MANAGER->DestroyBackend(shm_url);
-  }
-# pragma omp barrier
-  if (rank == 0) {
-    minor += 1;
-  }
-}
-
-/** A series of allocator benchmarks for a particular thread */
-template<typename BackendT, typename AllocT, typename ...Args>
-void AllocatorTest(AllocatorType alloc_type,
-                   MemoryBackendType backend_type,
-                   Args&& ...args) {
-  Allocator *alloc = Pretest<BackendT, AllocT>(
-    backend_type, std::forward<Args>(args)...);
-  size_t count = 100000;
-  // Allocate many and then free many
-  AllocatorTestSuite(alloc_type, alloc).AllocateThenFreeFixedSize(
-    count, KILOBYTES(1));
-  // Allocate and free immediately
-  AllocatorTestSuite(alloc_type, alloc).AllocateAndFreeFixedSize(
-    count, KILOBYTES(1));
-  Posttest();
-}
-
-/** Test different allocators on a particular thread */
-void FullAllocatorTestPerThread() {
-  // Malloc allocator
-  AllocatorTest<hipc::NullBackend, hipc::MallocAllocator>(
-    AllocatorType::kMallocAllocator,
-    MemoryBackendType::kNullBackend);
-  // Stack allocator
-  AllocatorTest<hipc::PosixShmMmap, hipc::StackAllocator>(
-    AllocatorType::kStackAllocator,
-    MemoryBackendType::kPosixShmMmap);
-  // Scalable page allocator
-  AllocatorTest<hipc::PosixShmMmap, hipc::ScalablePageAllocator>(
-    AllocatorType::kScalablePageAllocator,
-    MemoryBackendType::kPosixShmMmap);
-}
-
-/** Spawn multiple threads and run allocator tests */
-void FullAllocatorTestThreaded(int nthreads) {
-  omp_set_dynamic(0);
-#pragma omp parallel num_threads(nthreads)
-  {
-#pragma omp barrier
-    FullAllocatorTestPerThread();
-#pragma omp barrier
-  }
-}
-
-TEST_CASE("AllocatorBenchmark") {
-  FullAllocatorTestThreaded(1);
-  /*FullAllocatorTestThreaded(2);
-  FullAllocatorTestThreaded(4);
-  FullAllocatorTestThreaded(8);*/
-  AllocatorTestSuite::PrintTestOutput();
-}
diff --git a/hermes_shm/benchmark/allocator/test_init.h b/hermes_shm/benchmark/allocator/test_init.h
deleted file mode 100644
index f18ca220f..000000000
--- a/hermes_shm/benchmark/allocator/test_init.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
-#define HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
-
-#include <boost/interprocess/allocators/allocator.hpp>
-#include <boost/interprocess/containers/string.hpp>
-#include <boost/interprocess/containers/vector.hpp>
-#include <boost/interprocess/managed_shared_memory.hpp>
-#include <boost/interprocess/allocators/allocator.hpp>
-
-#include <boost/container/scoped_allocator.hpp>
-
-#include "hermes_shm/data_structures/data_structure.h"
-#include <hermes_shm/util/timer.h>
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::Pointer;
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-using Timer = hshm::HighResMonotonicTimer;
-
-extern const std::string shm_url;
-
-#endif //HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
diff --git a/hermes_shm/benchmark/data_structure/CMakeLists.txt b/hermes_shm/benchmark/data_structure/CMakeLists.txt
deleted file mode 100644
index 143e958f6..000000000
--- a/hermes_shm/benchmark/data_structure/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-include_directories( ${Boost_INCLUDE_DIRS} )
-include_directories( ${TEST_MAIN} )
-add_executable(benchmark_data_structures
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        atomic.cc
-        ref.cc
-        string.cc
-        list.cc
-        vector.cc
-        unordered_map.cc
-        queue.cc
-)
-add_dependencies(benchmark_data_structures hermes_shm_data_structures)
-target_link_libraries(benchmark_data_structures
-        hermes_shm_data_structures
-        Catch2::Catch2
-        MPI::MPI_CXX
-        OpenMP::OpenMP_CXX
-        ${Boost_LIBRARIES})
-
-make_gprof(benchmark_data_structures ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
diff --git a/hermes_shm/benchmark/data_structure/atomic.cc b/hermes_shm/benchmark/data_structure/atomic.cc
deleted file mode 100644
index 6595124c4..000000000
--- a/hermes_shm/benchmark/data_structure/atomic.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-#include <string>
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "omp.h"
-
-/** Stringstream for storing test output */
-std::stringstream ss;
-
-/** Print the CSV output */
-static void PrintTestOutput() {
-  std::cout << ss.str() << std::endl;
-}
-
-/** Number of tests executed */
-int test_count = 0;
-
-/** Global atomic counter */
-template<typename AtomicT>
-struct GlobalAtomicCounter {
-  static AtomicT count_;
-};
-#define GLOBAL_COUNTER(Atomic, T)\
-  template<>\
-  Atomic<T> GlobalAtomicCounter<Atomic<T>>::count_ = Atomic<T>(0);
-GLOBAL_COUNTER(std::atomic, uint16_t)
-GLOBAL_COUNTER(std::atomic, uint32_t)
-GLOBAL_COUNTER(std::atomic, uint64_t)
-GLOBAL_COUNTER(hipc::nonatomic, uint16_t)
-GLOBAL_COUNTER(hipc::nonatomic, uint32_t)
-GLOBAL_COUNTER(hipc::nonatomic, uint64_t)
-
-/** Atomic Test Suite */
-template<typename AtomicT, typename T, std::memory_order MemoryOrder>
-class AtomicInstructionTestSuite {
- public:
-  std::string memory_order_;
-  std::string atomic_type_;
-  void *ptr_;
-
- public:
-  /////////////////
-  /// Test Cases
-  /////////////////
-
-  /** Constructor */
-  AtomicInstructionTestSuite() {
-    if constexpr(MemoryOrder == std::memory_order_relaxed) {
-      memory_order_ = "std::memory_order_relaxed";
-    } else if constexpr(MemoryOrder == std::memory_order_consume) {
-      memory_order_ = "std::memory_order_consume";
-    } else if constexpr(MemoryOrder == std::memory_order_acquire) {
-      memory_order_ = "std::memory_order_acquire";
-    } else if constexpr(MemoryOrder == std::memory_order_release) {
-      memory_order_ = "std::memory_order_release";
-    } else if constexpr(MemoryOrder == std::memory_order_acq_rel) {
-      memory_order_ = "std::memory_order_acq_rel";
-    } else if constexpr(MemoryOrder == std::memory_order_seq_cst) {
-      memory_order_ = "std::memory_order_seq_cst";
-    }
-
-    if constexpr(std::is_same_v<std::atomic<T>, AtomicT>) {
-      atomic_type_ = "std::atomic";
-    } else if constexpr(std::is_same_v<hipc::nonatomic<T>, AtomicT>) {
-      atomic_type_ = "non-atomic";
-    }
-  }
-
-  /** Atomic Increment */
-  void AtomicIncrement(size_t count) {
-    Timer t;
-#pragma omp barrier
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      GlobalAtomicCounter<AtomicT>::count_ += 1;
-    }
-#pragma omp barrier
-    t.Pause();
-    TestOutput("AtomicIncrement", count, t);
-  }
-
-  /** Atomic Fetch Add */
-  void AtomicFetchAdd(size_t count) {
-    Timer t;
-#pragma omp barrier
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      GlobalAtomicCounter<AtomicT>::count_.fetch_add(1, MemoryOrder);
-    }
-#pragma omp barrier
-    t.Pause();
-    TestOutput("AtomicFetchAdd", count, t);
-  }
-
-  /** Atomic Assign */
-  void AtomicAssign(size_t count) {
-    Timer t;
-#pragma omp barrier
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      GlobalAtomicCounter<AtomicT>::count_ = i;
-    }
-#pragma omp barrier
-    t.Pause();
-    TestOutput("AtomicAssign", count, t);
-  }
-
-  /** Atomic Exchange */
-  void AtomicExchange(size_t count) {
-    Timer t;
-#pragma omp barrier
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      GlobalAtomicCounter<AtomicT>::count_.exchange(i, MemoryOrder);
-    }
-#pragma omp barrier
-    t.Pause();
-    TestOutput("AtomicExchange", count, t);
-  }
-
-  /** Atomic Fetch */
-  void AtomicFetch(size_t count) {
-    Timer t;
-#pragma omp barrier
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      size_t x = GlobalAtomicCounter<AtomicT>::count_.load(MemoryOrder);
-      USE(x);
-    }
-#pragma omp barrier
-    t.Pause();
-    TestOutput("AtomicFetch", count, t);
-  }
-
-  /////////////////
-  /// Test Output
-  /////////////////
-
-  /** The CSV header */
-  void TestOutputHeader() {
-    ss << "test_name" << ","
-       << "atomic_type" << ","
-       << "type_size" << ","
-       << "atomic_size" << ","
-       << "memory_order" << ","
-       << "count" << ","
-       << "nthreads" << ","
-       << "MOps" << ","
-       << "time" << std::endl;
-  }
-
-  /** The CSV test case */
-  void TestOutput(const std::string &test_name, size_t count, Timer &t) {
-    int rank = omp_get_thread_num();
-    if (rank != 0) { return; }
-    if (test_count == 0) {
-      TestOutputHeader();
-    }
-    size_t nthreads = omp_get_num_threads();
-    ss << test_name << ","
-       << atomic_type_ << ","
-       << sizeof(T) << ","
-       << sizeof(AtomicT) << ","
-       << memory_order_ << ","
-       << count << ","
-       << omp_get_num_threads() << ","
-       << count * nthreads / t.GetUsec() << ","
-       << t.GetUsec() << std::endl;
-    ++test_count;
-  }
-};
-
-/**
- * Compare different atomic instructions on a particular thread.
- * Given the atomic type and memory order.
- * */
-template<typename AtomicT, typename T, std::memory_order MemoryOrder>
-void TestAtomicInstructionsPerThread() {
-  size_t count = (1<<20);
-  AtomicInstructionTestSuite<AtomicT, T, MemoryOrder>().AtomicIncrement(count);
-  AtomicInstructionTestSuite<AtomicT, T, MemoryOrder>().AtomicFetchAdd(count);
-  AtomicInstructionTestSuite<AtomicT, T, MemoryOrder>().AtomicAssign(count);
-  AtomicInstructionTestSuite<AtomicT, T, MemoryOrder>().AtomicExchange(count);
-  AtomicInstructionTestSuite<AtomicT, T, MemoryOrder>().AtomicFetch(count);
-}
-
-/**
- * Compare the differences between different memory orders on a particular
- * thread. Given the atomic type.
- * */
-template<typename AtomicT, typename T>
-void TestMemoryOrdersPerThread() {
-  TestAtomicInstructionsPerThread<AtomicT, T, std::memory_order_relaxed>();
-  TestAtomicInstructionsPerThread<AtomicT, T, std::memory_order_consume>();
-  TestAtomicInstructionsPerThread<AtomicT, T, std::memory_order_acquire>();
-  TestAtomicInstructionsPerThread<AtomicT, T, std::memory_order_release>();
-  TestAtomicInstructionsPerThread<AtomicT, T, std::memory_order_acq_rel>();
-  TestAtomicInstructionsPerThread<AtomicT, T, std::memory_order_seq_cst>();
-}
-
-/**
- * Compare the differences between different atomic types on a particular
- * thread.
- * */
-void TestAtomicTypes() {
-  TestMemoryOrdersPerThread<std::atomic<uint16_t>, uint16_t>();
-  TestMemoryOrdersPerThread<std::atomic<uint32_t>, uint32_t>();
-  TestMemoryOrdersPerThread<std::atomic<uint64_t>, uint64_t>();
-
-  TestMemoryOrdersPerThread<hipc::nonatomic<uint16_t>, uint16_t>();
-  TestMemoryOrdersPerThread<hipc::nonatomic<uint32_t>, uint32_t>();
-  TestMemoryOrdersPerThread<hipc::nonatomic<uint64_t>, uint64_t>();
-}
-
-/**
- * Compare the differences between different memory orders and atomic
- * instructions with multiple threads. Given number of threads.
- * */
-void TestAtomicInstructions(int nthreads) {
-  omp_set_dynamic(0);
-#pragma omp parallel num_threads(nthreads)
-  {
-#pragma omp barrier
-    TestAtomicTypes();
-#pragma omp barrier
-  }
-}
-
-TEST_CASE("AtomicInstructionTest") {
-  TestAtomicInstructions(1);
-  TestAtomicInstructions(2);
-  TestAtomicInstructions(4);
-  TestAtomicInstructions(8);
-  PrintTestOutput();
-}
diff --git a/hermes_shm/benchmark/data_structure/list.cc b/hermes_shm/benchmark/data_structure/list.cc
deleted file mode 100644
index ee384fd2e..000000000
--- a/hermes_shm/benchmark/data_structure/list.cc
+++ /dev/null
@@ -1,269 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-// Boost interprocess
-#include <boost/interprocess/containers/list.hpp>
-
-// Std
-#include <string>
-#include <list>
-
-// hermes
-#include "hermes_shm/data_structures/ipc/string.h"
-#include <hermes_shm/data_structures/ipc/list.h>
-#include <hermes_shm/data_structures/ipc/slist.h>
-
-template<typename T>
-using bipc_list = bipc::list<T, typename BoostAllocator<T>::alloc_t>;
-
-/**
- * A series of performance tests for vectors
- * OUTPUT:
- * [test_name] [vec_type] [internal_type] [time_ms]
- * */
-template<typename T, typename ListT,
-  typename ListTPtr=SHM_X_OR_Y(ListT, hipc::mptr<ListT>, ListT*)>
-class ListTest {
- public:
-  std::string list_type_;
-  std::string internal_type_;
-  ListT *lp_;
-  ListTPtr list_ptr_;
-  void *ptr_;
-
-  /**====================================
-   * Test Runner
-   * ===================================*/
-
-  /** Test case constructor */
-  ListTest() {
-    if constexpr(std::is_same_v<std::list<T>, ListT>) {
-      list_type_ = "std::list";
-    } else if constexpr(std::is_same_v<hipc::list<T>, ListT>) {
-      list_type_ = "hipc::list";
-    } else if constexpr(std::is_same_v<bipc_list<T>, ListT>) {
-      list_type_ = "bipc_list";
-    } else if constexpr(std::is_same_v<hipc::slist<T>, ListT>) {
-      list_type_ = "hipc::slist";
-    } else {
-      HELOG(kFatal, "none of the list tests matched")
-    }
-    internal_type_ = InternalTypeName<T>::Get();
-  }
-
-  /** Run the tests */
-  void Test() {
-    size_t count = 10000;
-    AllocateTest(count);
-    EmplaceTest(count);
-    ForwardIteratorTest(count);
-    CopyTest(count);
-    MoveTest(count);
-  }
-
-  /**====================================
-   * Tests
-   * ===================================*/
-
-  /** Test performance of list allocation */
-  void AllocateTest(size_t count) {
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Allocate();
-      Destroy();
-    }
-    t.Pause();
-
-    TestOutput("Allocate", t);
-  }
-
-  /** Emplace after reserving enough space */
-  void EmplaceTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    t.Resume();
-    Emplace(count);
-    t.Pause();
-
-    TestOutput("FixedEmplace", t);
-    Destroy();
-  }
-
-  /** Iterator performance */
-  void ForwardIteratorTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    int i = 0;
-    for (auto &x : *lp_) {
-      USE(x);
-      ++i;
-    }
-    t.Pause();
-
-    TestOutput("ForwardIterator", t);
-    Destroy();
-  }
-
-  /** Copy performance */
-  void CopyTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(ListT)) {
-      auto vec2 = hipc::make_uptr<ListT>(*lp_);
-      USE(vec2);
-    } else {
-      ListT vec2(*lp_);
-      USE(vec2);
-    }
-    t.Pause();
-
-    TestOutput("Copy", t);
-    Destroy();
-  }
-
-  /** Move performance */
-  void MoveTest(size_t count) {
-    Timer t;
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(ListT)) {
-      auto vec2 = hipc::make_uptr<ListT>(std::move(*lp_));
-      USE(vec2)
-    } else {
-      ListT vec2(*lp_);
-      USE(vec2)
-    }
-    t.Pause();
-
-    TestOutput("Move", t);
-    Destroy();
-  }
-
- private:
-  /**====================================
-   * Helpers
-   * ===================================*/
-
-  /** Output as CSV */
-  void TestOutput(const std::string &test_name, Timer &t) {
-    HIPRINT("{},{},{},{}\n",
-            test_name, list_type_, internal_type_, t.GetMsec())
-  }
-
-  /** Get element at position i */
-  void Get(size_t i) {
-    if constexpr(std::is_same_v<ListT, std::list<T>>) {
-      T &x = (*lp_)[i];
-      USE(x);
-    } else if constexpr(std::is_same_v<ListT, bipc_list<T>>) {
-      T &x = (*lp_)[i];
-      USE(x);
-    } else if constexpr(std::is_same_v<ListT, hipc::list<T>>) {
-      T &x = (*lp_)[i];
-      USE(x);
-    } else if constexpr(std::is_same_v<ListT, hipc::slist<T>>) {
-      T &x = (*lp_)[i];
-      USE(x);
-    }
-  }
-
-  /** Emplace elements into the list */
-  void Emplace(size_t count) {
-    StringOrInt<T> var(124);
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<ListT, std::list<T>>) {
-        lp_->emplace_back(var.Get());
-      } else if constexpr(std::is_same_v<ListT, bipc_list<T>>) {
-        lp_->emplace_back(var.Get());
-      } else if constexpr(std::is_same_v<ListT, hipc::list<T>>) {
-        lp_->emplace_back(var.Get());
-      } else if constexpr(std::is_same_v<ListT, hipc::slist<T>>) {
-        lp_->emplace_back(var.Get());
-      }
-    }
-  }
-
-  /** Allocate an arbitrary list for the test cases */
-  void Allocate() {
-    if constexpr(std::is_same_v<ListT, hipc::list<T>>) {
-      list_ptr_ = hipc::make_mptr<ListT>();
-      lp_ = list_ptr_.get();
-    } if constexpr(std::is_same_v<ListT, hipc::slist<T>>) {
-      list_ptr_ = hipc::make_mptr<ListT>();
-      lp_ = list_ptr_.get();
-    } else if constexpr (std::is_same_v<ListT, bipc_list<T>>) {
-      list_ptr_ = BOOST_SEGMENT->construct<ListT>("BoostList")(
-        BOOST_ALLOCATOR((std::pair<int, T>)));
-      lp_ = list_ptr_;
-    } else if constexpr(std::is_same_v<ListT, std::list<T>>) {
-      list_ptr_ = new std::list<T>();
-      lp_ = list_ptr_;
-    }
-  }
-
-  /** Destroy the list */
-  void Destroy() {
-    if constexpr(std::is_same_v<ListT, hipc::list<T>>) {
-      list_ptr_.shm_destroy();
-    } else if constexpr(std::is_same_v<ListT, hipc::slist<T>>) {
-      list_ptr_.shm_destroy();
-    } else if constexpr(std::is_same_v<ListT, std::list<T>>) {
-      delete list_ptr_;
-    } else if constexpr (std::is_same_v<ListT, bipc_list<T>>) {
-      BOOST_SEGMENT->destroy<ListT>("BoostList");
-    }
-  }
-};
-
-void FullListTest() {
-  // std::list tests
-  ListTest<size_t, std::list<size_t>>().Test();
-  ListTest<std::string, std::list<std::string>>().Test();
-
-  // boost::ipc::list tests
-  ListTest<size_t, bipc_list<size_t>>().Test();
-  ListTest<std::string, bipc_list<std::string>>().Test();
-  ListTest<bipc_string, bipc_list<bipc_string>>().Test();
-
-  // hipc::list tests
-  ListTest<size_t, hipc::list<size_t>>().Test();
-  ListTest<std::string, hipc::list<std::string>>().Test();
-  ListTest<hipc::string, hipc::list<hipc::string>>().Test();
-
-  // hipc::slist tests
-  ListTest<size_t, hipc::slist<size_t>>().Test();
-  ListTest<std::string, hipc::slist<std::string>>().Test();
-  ListTest<hipc::string, hipc::slist<hipc::string>>().Test();
-}
-
-TEST_CASE("ListBenchmark") {
-  FullListTest();
-}
diff --git a/hermes_shm/benchmark/data_structure/queue.cc b/hermes_shm/benchmark/data_structure/queue.cc
deleted file mode 100644
index 44f2d70c3..000000000
--- a/hermes_shm/benchmark/data_structure/queue.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-// Std
-#include <string>
-#include <queue>
-
-// hermes
-#include "hermes_shm/data_structures/ipc/string.h"
-#include <hermes_shm/data_structures/ipc/mpsc_queue.h>
-#include <hermes_shm/data_structures/ipc/spsc_queue.h>
-
-/**
- * A series of performance tests for vectors
- * OUTPUT:
- * [test_name] [vec_type] [internal_type] [time_ms]
- * */
-template<typename T, typename QueueT,
-  typename ListTPtr=SHM_X_OR_Y(QueueT, hipc::mptr<QueueT>, QueueT*)>
-class QueueTest {
- public:
-  std::string queue_type_;
-  std::string internal_type_;
-  QueueT *queue_;
-  ListTPtr queue_ptr_;
-  void *ptr_;
-  hipc::uptr<T> x_;
-
-  /**====================================
-   * Test Runner
-   * ===================================*/
-
-  /** Test case constructor */
-  QueueTest() {
-    if constexpr(std::is_same_v<std::queue<T>, QueueT>) {
-      queue_type_ = "std::queue";
-    } else if constexpr(std::is_same_v<hipc::mpsc_queue<T>, QueueT>) {
-      queue_type_ = "hipc::mpsc_queue";
-    } else if constexpr(std::is_same_v<hipc::mpsc_queue_ext<T>, QueueT>) {
-      queue_type_ = "hipc::mpsc_queue_ext";
-    } else if constexpr(std::is_same_v<hipc::spsc_queue<T>, QueueT>) {
-      queue_type_ = "hipc::spsc_queue";
-    } else {
-      HELOG(kFatal, "none of the queue tests matched")
-    }
-    internal_type_ = InternalTypeName<T>::Get();
-    x_ = hipc::make_uptr<T>();
-  }
-
-  /** Run the tests */
-  void Test() {
-    size_t count = 10000;
-    // AllocateTest(count);
-    EmplaceTest(count);
-    DequeueTest(count);
-  }
-
-  /**====================================
-   * Tests
-   * ===================================*/
-
-  /** Test performance of queue allocation */
-  void AllocateTest(size_t count) {
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Allocate(count);
-      Destroy();
-    }
-    t.Pause();
-
-    TestOutput("Allocate", t);
-  }
-
-  /** Emplace after reserving enough space */
-  void EmplaceTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate(count);
-    t.Resume();
-    Emplace(count);
-    t.Pause();
-
-    TestOutput("Enqueue", t);
-    Destroy();
-  }
-
-  /** Emplace after reserving enough space */
-  void DequeueTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate(count);
-    Emplace(count);
-
-    t.Resume();
-    Dequeue(count);
-    t.Pause();
-
-    TestOutput("Dequeue", t);
-    Destroy();
-  }
-
- private:
-  /**====================================
-   * Helpers
-   * ===================================*/
-
-  /** Output as CSV */
-  void TestOutput(const std::string &test_name, Timer &t) {
-    HIPRINT("{},{},{},{}\n",
-            test_name, queue_type_, internal_type_, t.GetMsec())
-  }
-
-  /** Get element at position i */
-  void Dequeue(size_t count) {
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<QueueT, std::queue<T>>) {
-        T &x = queue_->front();
-        USE(x);
-        queue_->pop();
-      } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue<T>>) {
-        queue_->pop(*x_);
-        USE(*x_);
-      } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue_ext<T>>) {
-        queue_->pop(*x_);
-        USE(*x_);
-      } else if constexpr(std::is_same_v<QueueT, hipc::spsc_queue<T>>) {
-        queue_->pop(*x_);
-        USE(*x_);
-      }
-    }
-  }
-
-  /** Emplace elements into the queue */
-  void Emplace(size_t count) {
-    StringOrInt<T> var(124);
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<QueueT, std::queue<T>>) {
-        queue_->emplace(var.Get());
-      } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue<T>>) {
-        queue_->emplace(var.Get());
-      } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue_ext<T>>) {
-        queue_->emplace(var.Get());
-      } else if constexpr(std::is_same_v<QueueT, hipc::spsc_queue<T>>) {
-        queue_->emplace(var.Get());
-      }
-    }
-  }
-
-  /** Allocate an arbitrary queue for the test cases */
-  void Allocate(size_t count) {
-    if constexpr(std::is_same_v<QueueT, std::queue<T>>) {
-      queue_ptr_ = new std::queue<T>();
-      queue_ = queue_ptr_;
-    } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue<T>>) {
-      queue_ptr_ = hipc::make_mptr<QueueT>(count);
-      queue_ = queue_ptr_.get();
-    } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue_ext<T>>) {
-      queue_ptr_ = hipc::make_mptr<QueueT>(count);
-      queue_ = queue_ptr_.get();
-    } else if constexpr(std::is_same_v<QueueT, hipc::spsc_queue<T>>) {
-      queue_ptr_ = hipc::make_mptr<QueueT>(count);
-      queue_ = queue_ptr_.get();
-    }
-  }
-
-  /** Destroy the queue */
-  void Destroy() {
-    if constexpr(std::is_same_v<QueueT, std::queue<T>>) {
-      delete queue_ptr_;
-    } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue<T>>) {
-      queue_ptr_.shm_destroy();
-    } else if constexpr(std::is_same_v<QueueT, hipc::mpsc_queue_ext<T>>) {
-      queue_ptr_.shm_destroy();
-    } else if constexpr(std::is_same_v<QueueT, hipc::spsc_queue<T>>) {
-      queue_ptr_.shm_destroy();
-    }
-  }
-};
-
-void FullQueueTest() {
-  // std::queue tests
-  QueueTest<size_t, std::queue<size_t>>().Test();
-  // QueueTest<std::string, std::queue<std::string>>().Test();
-
-  // hipc::mpsc_queue tests
-  QueueTest<size_t, hipc::mpsc_queue<size_t>>().Test();
-  // QueueTest<std::string, hipc::mpsc_queue<std::string>>().Test();
-  // QueueTest<hipc::string, hipc::mpsc_queue<hipc::string>>().Test();
-
-  // hipc::mpsc_ext_queue tests
-  QueueTest<size_t, hipc::mpsc_queue_ext<size_t>>().Test();
-  // QueueTest<std::string, hipc::mpsc_queue_ext<std::string>>().Test();
-  // QueueTest<hipc::string, hipc::mpsc_queue_ext<hipc::string>>().Test();
-
-  // hipc::spsc_queue tests
-  QueueTest<size_t, hipc::spsc_queue<size_t>>().Test();
-  // QueueTest<std::string, hipc::spsc_queue<std::string>>().Test();
-  // QueueTest<hipc::string, hipc::spsc_queue<hipc::string>>().Test();
-}
-
-TEST_CASE("QueueBenchmark") {
-  FullQueueTest();
-}
diff --git a/hermes_shm/benchmark/data_structure/ref.cc b/hermes_shm/benchmark/data_structure/ref.cc
deleted file mode 100644
index 9548fd628..000000000
--- a/hermes_shm/benchmark/data_structure/ref.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-#include <string>
-#include "hermes_shm/data_structures/ipc/string.h"
-
-template<typename T, bool SHM>
-void TestCase() {
-  std::string str_type = InternalTypeName<T>::Get();
-  /*size_t count = 1000000;
-  auto test2 = hipc::make_uptr<hipc::string>();
-  auto alloc = test2->GetAllocator();
-  size_t x;
-  hipc::ShmArchive<T> ar;
-  void *ptr_; */
-
-  Timer t;
-  t.Resume();
-  t.Pause();
-
-  HIPRINT("{},{},{}\n",
-          str_type, SHM, t.GetMsec())
-}
-
-TEST_CASE("RefBenchmark") {
-  TestCase<size_t, false>();
-  // TestCase<size_t, true>();
-  // TestCase<hipc::string, true>();
-}
diff --git a/hermes_shm/benchmark/data_structure/string.cc b/hermes_shm/benchmark/data_structure/string.cc
deleted file mode 100644
index 8e86abdb2..000000000
--- a/hermes_shm/benchmark/data_structure/string.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-#include <string>
-#include "hermes_shm/data_structures/ipc/string.h"
-
-template<typename T>
-class StringTestSuite {
- public:
-  std::string str_type_;
-  void *ptr_;
-
-  /**====================================
-   * Test Cases
-   * ===================================*/
-
-  /** Constructor */
-  StringTestSuite() {
-    if constexpr(std::is_same_v<std::string, T>) {
-      str_type_ = "std::string";
-    } else if constexpr(std::is_same_v<hipc::string, T>) {
-      str_type_ = "hipc::string";
-    } else if constexpr(std::is_same_v<bipc_string, T>) {
-      str_type_ = "bipc::string";
-    }
-  }
-
-  /** Dereference performance */
-  void ConstructDestructTest(size_t count, int length) {
-    std::string data(length, 1);
-
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<std::string, T>) {
-        T hello(data);
-        USE(hello);
-      } else if constexpr(std::is_same_v<hipc::string, T>) {
-        auto hello = hipc::make_uptr<hipc::string>(data);
-        USE(hello);
-      } else if constexpr(std::is_same_v<bipc_string, T>) {
-        auto hello = BOOST_SEGMENT->find_or_construct<bipc_string>("MyString")(
-          BOOST_ALLOCATOR(bipc_string));
-        BOOST_SEGMENT->destroy<bipc_string>("MyString");
-        USE(hello);
-      }
-    }
-    t.Pause();
-
-    TestOutput("ConstructDestructTest", t, length);
-  }
-
-  /** Deserialize a string in a loop */
-  void DeserializeTest(size_t count, int length) {
-    std::string data(length, 1);
-    std::string *test1 = &data;
-    auto test2 = hipc::make_uptr<hipc::string>(data);
-    bipc_string *test3 = BOOST_SEGMENT->find_or_construct<bipc_string>("MyString")(
-      BOOST_ALLOCATOR(bipc_string));
-    test3->assign(data);
-
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<std::string, T>) {
-        auto info = test1->data();
-        USE(info);
-      } else if constexpr(std::is_same_v<hipc::string, T>) {
-        auto info = test2->data();
-        USE(info);
-      } else if constexpr(std::is_same_v<bipc_string, T>) {
-        auto info = test3->c_str();
-        USE(info);
-      }
-    }
-    t.Pause();
-
-    TestOutput("DeserializeTest", t, length);
-  }
-
-  /**====================================
-   * Test Output
-   * ===================================*/
-
-  /** Output test results */
-  void TestOutput(const std::string &test_name, Timer &t, size_t length) {
-    HIPRINT("{},{},{},{}\n",
-            test_name, str_type_, length, t.GetMsec())
-  }
-};
-
-template<typename T>
-void StringTest() {
-  size_t count = 100000;
-  StringTestSuite<T>().ConstructDestructTest(count, 16);
-  StringTestSuite<T>().ConstructDestructTest(count, 256);
-  StringTestSuite<T>().DeserializeTest(count, 16);
-}
-
-void FullStringTest() {
-  StringTest<std::string>();
-  StringTest<hipc::string>();
-  StringTest<bipc_string>();
-}
-
-TEST_CASE("StringBenchmark") {
-  FullStringTest();
-}
diff --git a/hermes_shm/benchmark/data_structure/test_init.cc b/hermes_shm/benchmark/data_structure/test_init.cc
deleted file mode 100644
index 756bc5a38..000000000
--- a/hermes_shm/benchmark/data_structure/test_init.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-#include "hermes_shm/memory/allocator/stack_allocator.h"
-
-void MainPretest() {
-  // hermes shared memory
-  std::string shm_url = "HermesBench";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->CreateBackend<hipc::PosixShmMmap>(
-    MemoryManager::GetDefaultBackendSize(), shm_url);
-  // TODO(llogan): back to good allocator
-  mem_mngr->CreateAllocator<hipc::ScalablePageAllocator>(
-    shm_url, alloc_id, 0);
-
-  // Boost shared memory
-  BOOST_SEGMENT;
-  BOOST_ALLOCATOR(char);
-  BOOST_ALLOCATOR(size_t);
-  BOOST_ALLOCATOR(std::string);
-  BOOST_ALLOCATOR(bipc_string);
-  BOOST_ALLOCATOR((std::pair<size_t, char>));
-  BOOST_ALLOCATOR((std::pair<size_t, size_t>));
-  BOOST_ALLOCATOR((std::pair<size_t, std::string>));
-  BOOST_ALLOCATOR((std::pair<size_t, bipc_string>));
-}
-
-void MainPosttest() {
-  bipc::shared_memory_object::remove("LabstorBoostBench");
-}
diff --git a/hermes_shm/benchmark/data_structure/test_init.h b/hermes_shm/benchmark/data_structure/test_init.h
deleted file mode 100644
index 61c93054f..000000000
--- a/hermes_shm/benchmark/data_structure/test_init.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
-#define HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
-
-#include <boost/interprocess/allocators/allocator.hpp>
-#include <boost/interprocess/containers/string.hpp>
-#include <boost/interprocess/containers/vector.hpp>
-#include <boost/interprocess/managed_shared_memory.hpp>
-#include <boost/interprocess/allocators/allocator.hpp>
-
-#include <boost/container/scoped_allocator.hpp>
-
-#include "hermes_shm/data_structures/data_structure.h"
-#include <hermes_shm/util/timer.h>
-#include <hermes_shm/util/type_switch.h>
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::Pointer;
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-namespace bipc = boost::interprocess;
-
-/** Shared memory segment (a large contiguous region) */
-typedef bipc::managed_shared_memory::segment_manager segment_manager_t;
-
-/** Create boost segment singleton */
-struct BoostSegment {
-  std::unique_ptr<bipc::managed_shared_memory> segment_;
-
-  BoostSegment() {
-    bipc::shared_memory_object::remove("HermesBoostBench");
-    segment_ = std::make_unique<bipc::managed_shared_memory>(
-      bipc::create_only, "HermesBoostBench", GIGABYTES(4));
-  }
-};
-#define BOOST_SEGMENT \
-  hshm::EasySingleton<BoostSegment>::GetInstance()->segment_.get()
-
-/** Create boost allocator singleton */
-template<typename T>
-struct BoostAllocator {
-  typedef bipc::allocator<T, segment_manager_t> alloc_t;
-  alloc_t alloc_;
-
-  BoostAllocator()
-  : alloc_(BOOST_SEGMENT->get_segment_manager()) {}
-};
-#define BOOST_ALLOCATOR(T) \
-  hshm::EasySingleton<BoostAllocator<TYPE_UNWRAP(T)>>::GetInstance()->alloc_
-
-/** A generic string using allocator */
-typedef boost::interprocess::basic_string<
-  char, std::char_traits<char>,
-  typename BoostAllocator<char>::alloc_t> bipc_string;
-
-/** Instance of the segment */
-extern std::unique_ptr<bipc::managed_shared_memory> segment_g;
-
-/**
- * Converts an arbitrary type to std::string or int
- * */
-template<typename T>
-struct StringOrInt {
-  typedef typename hshm::type_switch<T, size_t,
-                                     size_t, size_t,
-                                     std::string, std::string,
-                                     hipc::string, hipc::uptr<hipc::string>,
-                                     bipc_string, bipc_string*>::type
-    internal_t;
-  internal_t internal_;
-
-  /** Convert from int to internal_t */
-  StringOrInt(size_t num) {
-    if constexpr(std::is_same_v<T, size_t>) {
-      internal_ = num;
-    } else if constexpr(std::is_same_v<T, std::string>) {
-      internal_ = std::to_string(num);
-    } else if constexpr(std::is_same_v<T, hipc::string>) {
-      internal_ = hipc::make_uptr<hipc::string>(std::to_string(num));
-    } else if constexpr(std::is_same_v<T, bipc_string>) {
-      internal_ = BOOST_SEGMENT->find_or_construct<bipc_string>("MyString")(
-        BOOST_ALLOCATOR(bipc_string));
-    }
-  }
-
-  /** Get the internal type */
-  T& Get() {
-    if constexpr(std::is_same_v<T, size_t>) {
-      return internal_;
-    } else if constexpr(std::is_same_v<T, std::string>) {
-      return internal_;
-    } else if constexpr(std::is_same_v<T, hipc::string>) {
-      return *internal_;
-    } else if constexpr(std::is_same_v<T, bipc_string>) {
-      return *internal_;
-    }
-  }
-
-  /** Convert internal_t to int */
-  size_t ToInt() {
-    if constexpr(std::is_same_v<T, size_t>) {
-      return internal_;
-    } else {
-      size_t num;
-      std::stringstream(ToString(internal_)) >> num;
-      return num;
-    }
-  }
-
-  /** Convert internal_t to std::string */
-  std::string ToString() {
-    if constexpr(std::is_same_v<T, size_t>) {
-      return std::to_string(internal_);
-    } else if constexpr(std::is_same_v<T, std::string>) {
-      return internal_;
-    } else if constexpr(std::is_same_v<T, hipc::string>) {
-      return internal_->str();
-    } else if constexpr(std::is_same_v<T, bipc_string>) {
-      return std::string(internal_->c_str(), internal_->length());
-    }
-  }
-
-  /** Destructor */
-  ~StringOrInt() {
-    if constexpr(std::is_same_v<T, size_t>) {
-    } else if constexpr(std::is_same_v<T, std::string>) {
-    } else if constexpr(std::is_same_v<T, hipc::string>) {
-    } else if constexpr(std::is_same_v<T, bipc_string>) {
-      BOOST_SEGMENT->destroy<bipc_string>("MyString");
-    }
-  }
-};
-
-/**
- * Gets the semantic name of a type
- * */
-template<typename T>
-struct InternalTypeName {
-  static std::string Get() {
-    if constexpr(std::is_same_v<T, hipc::string>) {
-      return "hipc::string";
-    } else if constexpr(std::is_same_v<T, std::string>) {
-      return "std::string";
-    } else if constexpr(std::is_same_v<T, bipc_string>) {
-      return "bipc::string";
-    } else if constexpr(std::is_same_v<T, size_t>) {
-      return "int";
-    }
-  }
-};
-
-
-/** Timer */
-using Timer = hshm::HighResMonotonicTimer;
-
-/** Avoid compiler warning */
-#define USE(var) ptr_ = (void*)&(var);
-
-#endif //HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
diff --git a/hermes_shm/benchmark/data_structure/unordered_map.cc b/hermes_shm/benchmark/data_structure/unordered_map.cc
deleted file mode 100644
index 139117b0d..000000000
--- a/hermes_shm/benchmark/data_structure/unordered_map.cc
+++ /dev/null
@@ -1,270 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-// Boost interprocess
-#include <boost/unordered_map.hpp>
-
-// Std
-#include <string>
-#include <unordered_map>
-
-// hermes
-#include "hermes_shm/data_structures/ipc/string.h"
-#include <hermes_shm/data_structures/ipc/unordered_map.h>
-
-template<typename Key, typename T>
-using bipc_unordered_map = boost::unordered_map<
-    Key, T,
-    std::hash<size_t>, std::equal_to<size_t>,
-    typename BoostAllocator<T>::alloc_t>;
-
-/**
- * A series of performance tests for unordered_maps
- * OUTPUT:
- * [test_name] [map_type] [internal_type] [time_ms]
- * */
-template<typename T, typename MapT,
-  typename MapTPtr=SHM_X_OR_Y(MapT, hipc::mptr<MapT>, MapT*)>
-class UnorderedMapTest {
- public:
-  std::string map_type_;
-  std::string internal_type_;
-  MapT *map_;
-  MapTPtr map_ptr_;
-  void *ptr_;
-
-  /**====================================
-   * Test Runner
-   * ===================================*/
-
-  /** Test case constructor */
-  UnorderedMapTest() {
-    if constexpr(std::is_same_v<std::unordered_map<size_t, T>, MapT>) {
-      map_type_ = "std::unordered_map";
-    } else if constexpr(std::is_same_v<hipc::unordered_map<size_t, T>, MapT>) {
-      map_type_ = "hipc::unordered_map";
-    } else if constexpr(std::is_same_v<bipc_unordered_map<size_t, T>, MapT>) {
-      map_type_ = "bipc::unordered_map";
-    } else {
-      std::cout << "INVALID: none of the unordered_map tests matched"
-      << std::endl;
-      return;
-    }
-    internal_type_ = InternalTypeName<T>::Get();
-  }
-
-  /** Run the tests */
-  void Test() {
-    size_t count = 100000;
-    // AllocateTest(count);
-    EmplaceTest(count);
-    GetTest(count);
-    ForwardIteratorTest(count);
-    // CopyTest(count);
-    // MoveTest(count);
-  }
-
-  /**====================================
-   * Tests
-   * ===================================*/
-
-  /** Test performance of unordered_map allocation */
-  void AllocateTest(size_t count) {
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Allocate();
-      Destroy();
-    }
-    t.Pause();
-
-    TestOutput("Allocate", t);
-  }
-
-  /** Emplace performance */
-  void EmplaceTest(size_t count) {
-    Timer t;
-    Allocate();
-
-    t.Resume();
-    Emplace(count);
-    t.Pause();
-
-    TestOutput("Emplace", t);
-    Destroy();
-  }
-
-  /** Get performance */
-  void GetTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Get(i);
-    }
-    t.Pause();
-
-    TestOutput("FixedGet", t);
-    Destroy();
-  }
-
-  /** Iterator performance */
-  void ForwardIteratorTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    for (auto &x : *map_) {
-      USE(x);
-    }
-    t.Pause();
-
-    TestOutput("ForwardIterator", t);
-    Destroy();
-  }
-
-  /** Copy performance */
-  void CopyTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(MapT)) {
-      auto vec2 = hipc::make_uptr<MapT>(*map_);
-      USE(vec2)
-    } else {
-      MapT vec2(*map_);
-      USE(vec2)
-    }
-    t.Pause();
-
-    TestOutput("Copy", t);
-    Destroy();
-  }
-
-  /** Move performance */
-  void MoveTest(size_t count) {
-    Timer t;
-
-    Allocate();
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(MapT)) {
-      volatile auto vec2 = hipc::make_uptr<MapT>(std::move(*map_));
-    } else {
-      volatile MapT vec2(*map_);
-    }
-    t.Pause();
-
-    TestOutput("Move", t);
-    Destroy();
-  }
-
- private:
-  /**====================================
-   * Helpers
-   * ===================================*/
-
-  /** Output as CSV */
-  void TestOutput(const std::string &test_name, Timer &t) {
-    HIPRINT("{},{},{},{}\n",
-            test_name, map_type_, internal_type_, t.GetMsec())
-  }
-
-  /** Get element at position i */
-  void Get(size_t i) {
-    if constexpr(std::is_same_v<MapT, std::unordered_map<size_t, T>>) {
-      T &x = (*map_)[i];
-      USE(x);
-    } else if constexpr(std::is_same_v<MapT, bipc_unordered_map<size_t, T>>) {
-      auto iter = (*map_).find(i);
-      USE(*iter);
-    } else if constexpr(std::is_same_v<MapT, hipc::unordered_map<size_t, T>>) {
-      T &x = (*map_)[i];
-      USE(x);
-    }
-  }
-
-  /** Emplace elements into the unordered_map */
-  void Emplace(size_t count) {
-    StringOrInt<T> var(124);
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<MapT, std::unordered_map<size_t, T>>) {
-        map_->emplace(i, var.Get());
-      } else if constexpr(std::is_same_v<MapT, bipc_unordered_map<size_t, T>>) {
-        map_->emplace(i, var.Get());
-      } else if constexpr(std::is_same_v<MapT, hipc::unordered_map<size_t, T>>) {
-        map_->emplace(i, var.Get());
-      }
-    }
-  }
-
-  /** Allocate an arbitrary unordered_map for the test cases */
-  void Allocate() {
-    if constexpr(std::is_same_v<MapT, hipc::unordered_map<size_t, T>>) {
-      map_ptr_ = hipc::make_mptr<MapT>(5000);
-      map_ = map_ptr_.get();
-    } else if constexpr(std::is_same_v<MapT, std::unordered_map<size_t, T>>) {
-      map_ptr_ = new std::unordered_map<size_t, T>();
-      map_ = map_ptr_;
-    } else if constexpr (std::is_same_v<MapT, bipc_unordered_map<size_t, T>>) {
-      map_ptr_ = BOOST_SEGMENT->construct<MapT>("BoostMap")(
-        BOOST_ALLOCATOR((std::pair<size_t, T>)));
-      map_ = map_ptr_;
-    }
-  }
-
-  /** Destroy the unordered_map */
-  void Destroy() {
-    if constexpr(std::is_same_v<MapT, hipc::unordered_map<size_t, T>>) {
-      map_ptr_.shm_destroy();
-    } else if constexpr(std::is_same_v<MapT, std::unordered_map<size_t, T>>) {
-      delete map_ptr_;
-    } else if constexpr (std::is_same_v<MapT, bipc_unordered_map<size_t, T>>) {
-      BOOST_SEGMENT->destroy<MapT>("BoostMap");
-    }
-  }
-};
-
-void FullUnorderedMapTest() {
-  // std::unordered_map tests
-  UnorderedMapTest<size_t, std::unordered_map<size_t, size_t>>().Test();
-  UnorderedMapTest<std::string, std::unordered_map<size_t, std::string>>().Test();
-
-  // boost::unordered_map tests
-  UnorderedMapTest<size_t, bipc_unordered_map<size_t, size_t>>().Test();
-  UnorderedMapTest<std::string, bipc_unordered_map<size_t, std::string>>().Test();
-  UnorderedMapTest<bipc_string, bipc_unordered_map<size_t, bipc_string>>().Test();
-
-  // hipc::unordered_map tests
-  UnorderedMapTest<size_t, hipc::unordered_map<size_t, size_t>>().Test();
-  UnorderedMapTest<std::string, hipc::unordered_map<size_t, std::string>>().Test();
-  UnorderedMapTest<hipc::string, hipc::unordered_map<size_t, hipc::string>>().Test();
-}
-
-TEST_CASE("UnorderedMapBenchmark") {
-  FullUnorderedMapTest();
-}
diff --git a/hermes_shm/benchmark/data_structure/vector.cc b/hermes_shm/benchmark/data_structure/vector.cc
deleted file mode 100644
index 49a7ded13..000000000
--- a/hermes_shm/benchmark/data_structure/vector.cc
+++ /dev/null
@@ -1,344 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-
-// Boost interprocess
-#include <boost/interprocess/containers/vector.hpp>
-
-// Std
-#include <string>
-#include <vector>
-
-// hermes
-#include "hermes_shm/data_structures/ipc/string.h"
-#include <hermes_shm/data_structures/ipc/vector.h>
-
-template<typename T>
-using bipc_vector = bipc::vector<T, typename BoostAllocator<T>::alloc_t>;
-
-/**
- * A series of performance tests for vectors
- * OUTPUT:
- * [test_name] [vec_type] [internal_type] [time_ms]
- * */
-template<typename T, typename VecT,
-  typename VecTPtr=SHM_X_OR_Y(VecT, hipc::mptr<VecT>, VecT*)>
-class VectorTest {
- public:
-  std::string vec_type_;
-  std::string internal_type_;
-  VecT *vec_;
-  VecTPtr vec_ptr_;
-  void *ptr_;
-
-  /**====================================
-   * Test Runner
-   * ===================================*/
-
-  /** Test case constructor */
-  VectorTest() {
-    if constexpr(std::is_same_v<std::vector<T>, VecT>) {
-      vec_type_ = "std::vector";
-    } else if constexpr(std::is_same_v<hipc::vector<T>, VecT>) {
-      vec_type_ = "hipc::vector";
-    } else if constexpr(std::is_same_v<bipc_vector<T>, VecT>) {
-      vec_type_ = "bipc_vector";
-    } else {
-      std::cout << "INVALID: none of the vector tests matched" << std::endl;
-      return;
-    }
-    internal_type_ = InternalTypeName<T>::Get();
-  }
-
-  /** Run the tests */
-  void Test() {
-    size_t count = 1000000;
-    // AllocateTest(count);
-    // ResizeTest(count);
-    ReserveEmplaceTest(count);
-    GetTest(count);
-    BeginIteratorTest(count);
-    EndIteratorTest(count);
-    ForwardIteratorTest(count);
-    // CopyTest(count);
-    // MoveTest(count);
-  }
-
-  /**====================================
-   * Tests
-   * ===================================*/
-
-  /** Test performance of vector allocation */
-  void AllocateTest(size_t count) {
-    Timer t;
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Allocate();
-      Destroy();
-    }
-    t.Pause();
-
-    TestOutput("Allocate", t);
-  }
-
-  /** Test the performance of a resize */
-  void ResizeTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    t.Resume();
-    vec_->resize(count);
-    t.Pause();
-
-    TestOutput("FixedResize", t);
-    Destroy();
-  }
-
-  /** Emplace after reserving enough space */
-  void ReserveEmplaceTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    t.Resume();
-    vec_->reserve(count);
-    Emplace(count);
-    t.Pause();
-
-    TestOutput("FixedEmplace", t);
-    Destroy();
-  }
-
-  /** Get performance */
-  void GetTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    vec_->reserve(count);
-    Emplace(count);
-
-    t.Resume();
-    for (size_t i = 0; i < count; ++i) {
-      Get(i);
-    }
-    t.Pause();
-
-    TestOutput("FixedGet", t);
-    Destroy();
-  }
-
-  /** Begin iterator performance */
-  void BeginIteratorTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    vec_->reserve(count);
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(VecT)) {
-      auto iter = vec_->begin();
-      USE(iter);
-    } else {
-      auto iter = vec_->begin();
-      USE(iter);
-    }
-    t.Pause();
-
-    TestOutput("BeginIterator", t);
-    Destroy();
-  }
-
-  /** End iterator performance */
-  void EndIteratorTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    vec_->reserve(count);
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(VecT)) {
-      auto iter = vec_->end();
-      USE(iter);
-    } else {
-      auto iter = vec_->end();
-      USE(iter);
-    }
-    t.Pause();
-
-    TestOutput("EndIterator", t);
-    Destroy();
-  }
-
-  /** Iterator performance */
-  void ForwardIteratorTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    vec_->reserve(count);
-    Emplace(count);
-
-    t.Resume();
-    int i = 0;
-    for (auto &x : *vec_) {
-      USE(x);
-      ++i;
-    }
-    t.Pause();
-
-    if (ptr_ == nullptr) {
-      std::cout << "hm" << std::endl;
-    }
-
-    TestOutput("ForwardIterator", t);
-    Destroy();
-  }
-
-  /** Copy performance */
-  void CopyTest(size_t count) {
-    Timer t;
-    StringOrInt<T> var(124);
-
-    Allocate();
-    vec_->reserve(count);
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(VecT)) {
-      auto vec2 = hipc::make_uptr<VecT>(*vec_);
-      USE(vec2);
-    } else {
-      VecT vec2(*vec_);
-      USE(vec2);
-    }
-    t.Pause();
-
-    TestOutput("Copy", t);
-    Destroy();
-  }
-
-  /** Move performance */
-  void MoveTest(size_t count) {
-    Timer t;
-
-    Allocate();
-    vec_->reserve(count);
-    Emplace(count);
-
-    t.Resume();
-    if constexpr(IS_SHM_ARCHIVEABLE(VecT)) {
-      auto vec2 = hipc::make_uptr<VecT>(std::move(*vec_));
-      USE(vec2)
-    } else {
-      VecT vec2(*vec_);
-      USE(vec2)
-    }
-    t.Pause();
-
-    TestOutput("Move", t);
-    Destroy();
-  }
-
- private:
-  /**====================================
-   * Helpers
-   * ===================================*/
-
-  /** Output as CSV */
-  void TestOutput(const std::string &test_name, Timer &t) {
-    HIPRINT("{},{},{},{}\n",
-            test_name, vec_type_, internal_type_, t.GetMsec())
-  }
-
-  /** Get element at position i */
-  void Get(size_t i) {
-    if constexpr(std::is_same_v<std::vector<T>, VecT>) {
-      T &x = (*vec_)[i];
-      USE(x);
-    } else if constexpr(std::is_same_v<hipc::vector<T>, VecT>) {
-      T &x = (*vec_)[i];
-      USE(x);
-    } else if constexpr(std::is_same_v<bipc_vector<T>, VecT>) {
-      T &x = (*vec_)[i];
-      USE(x);
-      if (!ptr_) { std::cout << "h" << std::endl; }
-    }
-  }
-
-  /** Emplace elements into the vector */
-  void Emplace(size_t count) {
-    StringOrInt<T> var(124);
-    for (size_t i = 0; i < count; ++i) {
-      if constexpr(std::is_same_v<std::vector<T>, VecT>) {
-        vec_->emplace_back(var.Get());
-      } else if constexpr(std::is_same_v<hipc::vector<T>, VecT>) {
-        vec_->emplace_back(var.Get());
-      } else if constexpr(std::is_same_v<bipc_vector<T>, VecT>) {
-        vec_->emplace_back(var.Get());
-      }
-    }
-  }
-
-  /** Allocate an arbitrary vector for the test cases */
-  void Allocate() {
-    if constexpr(std::is_same_v<std::vector<T>, VecT>) {
-      vec_ptr_ = new std::vector<T>();
-      vec_ = vec_ptr_;
-    } else if constexpr(std::is_same_v<hipc::vector<T>, VecT>) {
-      vec_ptr_ = hipc::make_mptr<VecT>();
-      vec_ = vec_ptr_.get();
-    } else if constexpr(std::is_same_v<bipc_vector<T>, VecT>) {
-      vec_ptr_ = BOOST_SEGMENT->construct<VecT>("BoostVector")(
-        BOOST_ALLOCATOR((std::pair<int, T>)));
-      vec_ = vec_ptr_;
-    }
-  }
-
-  /** Destroy the vector */
-  void Destroy() {
-    if constexpr(std::is_same_v<std::vector<T>, VecT>) {
-      delete vec_ptr_;
-    } else if constexpr(std::is_same_v<hipc::vector<T>, VecT>) {
-      vec_ptr_.shm_destroy();
-    } else if constexpr(std::is_same_v<bipc_vector<T>, VecT>) {
-      BOOST_SEGMENT->destroy<VecT>("BoostVector");
-    }
-  }
-};
-
-void FullVectorTest() {
-  // std::vector tests
-  VectorTest<size_t, std::vector<size_t>>().Test();
-  VectorTest<std::string, std::vector<std::string>>().Test();
-
-  // boost::ipc::vector tests
-  VectorTest<size_t, bipc_vector<size_t>>().Test();
-  VectorTest<std::string, bipc_vector<std::string>>().Test();
-  VectorTest<bipc_string, bipc_vector<bipc_string>>().Test();
-
-  // hipc::vector tests
-  VectorTest<size_t, hipc::vector<size_t>>().Test();
-  VectorTest<std::string, hipc::vector<std::string>>().Test();
-  VectorTest<hipc::string, hipc::vector<hipc::string>>().Test();
-}
-
-TEST_CASE("VectorBenchmark") {
-  FullVectorTest();
-}
diff --git a/hermes_shm/benchmark/lock/CMakeLists.txt b/hermes_shm/benchmark/lock/CMakeLists.txt
deleted file mode 100644
index 86a2d1d88..000000000
--- a/hermes_shm/benchmark/lock/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-include_directories( ${Boost_INCLUDE_DIRS} )
-include_directories( ${TEST_MAIN} )
-add_executable(benchmark_lock
-    ${TEST_MAIN}/main.cc
-    test_init.cc
-    benchmark_mutex.cc
-)
-add_dependencies(benchmark_lock hermes_shm_data_structures)
-target_link_libraries(benchmark_lock
-        hermes_shm_data_structures
-        Catch2::Catch2
-        MPI::MPI_CXX
-        OpenMP::OpenMP_CXX)
diff --git a/hermes_shm/benchmark/lock/benchmark_mutex.cc b/hermes_shm/benchmark/lock/benchmark_mutex.cc
deleted file mode 100644
index 80b5bafb4..000000000
--- a/hermes_shm/benchmark/lock/benchmark_mutex.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes_shm/util/timer.h"
-#include "hermes_shm/thread/lock.h"
-#include "test_init.h"
-#include "basic_test.h"
-#include <iostream>
-
-TEST_CASE("TestMutexTryLock") {
-  Timer t;
-  t.Resume();
-  size_t ops = (1ull << 26);
-  hshm::Mutex lock;
-  for (size_t i = 0; i < ops; ++i) {
-    lock.TryLock(0);
-    lock.Unlock();
-  }
-  t.Pause();
-  std::cout << ops / t.GetUsec() << std::endl;
-}
-
-TEST_CASE("TestMutex") {
-  Timer t;
-  t.Resume();
-  size_t ops = (1ull << 26);
-  hshm::Mutex lock;
-  for (size_t i = 0; i < ops; ++i) {
-    hshm::ScopedMutex scoped_lock(lock, 0);
-  }
-  t.Pause();
-  std::cout << ops / t.GetUsec() << std::endl;
-}
-
-TEST_CASE("TestRwReadLock") {
-  Timer t;
-  t.Resume();
-  size_t ops = (1ull << 26);
-  hshm::RwLock lock_;
-  for (size_t i = 0; i < ops; ++i) {
-    hshm::ScopedRwReadLock read_lock(lock_, 0);
-  }
-  t.Pause();
-  std::cout << ops / t.GetUsec() << std::endl;
-}
-
-TEST_CASE("TestRwWriteLock") {
-  Timer t;
-  t.Resume();
-  size_t ops = (1ull << 26);
-  hshm::RwLock lock_;
-  for (size_t i = 0; i < ops; ++i) {
-    hshm::ScopedRwReadLock write_lock(lock_, 0);
-  }
-  t.Pause();
-  std::cout << ops / t.GetUsec() << std::endl;
-}
\ No newline at end of file
diff --git a/hermes_shm/benchmark/lock/test_init.h b/hermes_shm/benchmark/lock/test_init.h
deleted file mode 100644
index f8264df31..000000000
--- a/hermes_shm/benchmark/lock/test_init.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
-#define HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
-
-#include <hermes_shm/util/timer.h>
-
-using Timer = hshm::HighResMonotonicTimer;
-
-#endif //HERMES_BENCHMARK_DATA_STRUCTURE_TEST_INIT_H_
diff --git a/hermes_shm/code_generators/cpp_macro_generator.py b/hermes_shm/code_generators/cpp_macro_generator.py
deleted file mode 100644
index 344f42688..000000000
--- a/hermes_shm/code_generators/cpp_macro_generator.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from code_generators.c_macro.macro_generator import CppMacroGenerator
-import pathlib, os
-
-PROJECT_ROOT=pathlib.Path(__file__).parent.parent.resolve()
-
-DATA_STRUCTURE_TEMPLATES='include/hermes_shm/data_structures/ipc/internal/template'
-DATA_STRUCTURE_INTERNAL='include/hermes_shm/data_structures/ipc/internal'
-
-CppMacroGenerator().generate(
-    os.path.join(PROJECT_ROOT,
-                 f"{DATA_STRUCTURE_TEMPLATES}/shm_container_base_template.h"),
-    os.path.join(PROJECT_ROOT,
-                f"{DATA_STRUCTURE_INTERNAL}/shm_container_macro.h"),
-    "SHM_CONTAINER_TEMPLATE",
-    ["CLASS_NAME", "TYPED_CLASS"],
-    ["TYPE_UNWRAP", "TYPE_UNWRAP"],
-    "HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_MACRO_H_")
diff --git a/hermes_shm/doc/Doxyfile.in b/hermes_shm/doc/Doxyfile.in
deleted file mode 100644
index e351f448e..000000000
--- a/hermes_shm/doc/Doxyfile.in
+++ /dev/null
@@ -1,2685 +0,0 @@
-# Doxyfile 1.9.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-#
-# Note:
-#
-# Use doxygen to compare the used configuration file with the template
-# configuration file:
-# doxygen -x [configFile]
-# Use doxygen to compare the used configuration file with the template
-# configuration file without replacing the environment variables or CMake type
-# replacement variables:
-# doxygen -x_noenv [configFile]
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the configuration
-# file that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = Hermes
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 0.8.0-beta
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Hierarchical Distributed I/O Buffering System"
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
-# sub-directories (in 2 levels) under the output directory of each output format
-# and will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
-# control the number of sub-directories.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# Controls the number of sub-directories that will be created when
-# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
-# level increment doubles the number of directories, resulting in 4096
-# directories at level 8 which is the default and also the maximum value. The
-# sub-directories are organized in 2 levels, the first level always has a fixed
-# numer of 16 directories.
-# Minimum value: 0, maximum value: 8, default value: 8.
-# This tag requires that the tag CREATE_SUBDIRS is set to YES.
-
-CREATE_SUBDIRS_LEVEL   = 8
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
-# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
-# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
-# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
-# English messages), Korean, Korean-en (Korean with English messages), Latvian,
-# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
-# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
-# Swedish, Turkish, Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
-# such as
-# /***************
-# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
-# Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
-# The default value is: NO.
-
-JAVADOC_BANNER         = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# By default Python docstrings are displayed as preformatted text and doxygen's
-# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
-# doxygen's special commands can be used and the contents of the docstring
-# documentation blocks is shown as doxygen documentation.
-# The default value is: YES.
-
-PYTHON_DOCSTRING       = YES
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:^^"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". Note that you cannot put \n's in the value part of an alias
-# to insert newlines (in the resulting output). You can put ^^ in the value part
-# of an alias to insert a newline as if a physical newline was in the original
-# file. When you need a literal { or } or , in the value part of an alias you
-# have to escape them by means of a backslash (\), this can lead to conflicts
-# with the commands \{ and \} for these it is advised to use the version @{ and
-# @} or use a double escape (\\{ and \\})
-
-ALIASES                = "status=A Status object." \
-                         "ctx{1}=ctx The Context for this \1." \
-                         "bool{1}=true if \1, otherwise false."
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
-# sources only. Doxygen will then generate output that is more tailored for that
-# language. For instance, namespaces will be presented as modules, types will be
-# separated into more groups, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_SLICE  = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
-# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
-# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
-# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
-# as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen. When specifying no_extension you should add
-# * to the FILE_PATTERNS.
-#
-# Note see also the list of default file extension mappings.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See https://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 5
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
-# during processing. When set to 0 doxygen will based this on the number of
-# cores available in the system. You can set it explicitly to a value larger
-# than 0 to get more control over the balance between CPU load and processing
-# speed. At this moment only the input processing can be done using multiple
-# threads. Since this is still an experimental feature the default is set to 1,
-# which effectively disables parallel processing. Please report any issues you
-# encounter. Generating dot graphs in parallel is controlled by the
-# DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 32, default value: 1.
-
-NUM_PROC_THREADS       = 1
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
-# methods of a class will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIV_VIRTUAL   = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If this flag is set to YES, the name of an unnamed parameter in a declaration
-# will be determined by the corresponding definition. By default unnamed
-# parameters remain unnamed in the output.
-# The default value is: YES.
-
-RESOLVE_UNNAMED_PARAMS = YES
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
-# documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
-# able to match the capabilities of the underlying filesystem. In case the
-# filesystem is case sensitive (i.e. it supports files in the same directory
-# whose names only differ in casing), the option must be set to YES to properly
-# deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be set to NO to properly deal with
-# output files written for symbols that only differ in casing, such as for two
-# classes, one named CLASS and the other named Class, and to also support
-# references to files without having to specify the exact matching casing. On
-# Windows (including Cygwin) and MacOS, users should typically set this option
-# to NO, whereas on Linux or other Unix flavors it should typically be set to
-# YES.
-# Possible values are: SYSTEM, NO and YES.
-# The default value is: SYSTEM.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
-# will show which file needs to be included to use the class.
-# The default value is: YES.
-
-SHOW_HEADERFILE        = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file. See also section "Changing the
-# layout of pages" for information.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as documenting some parameters in
-# a documented function twice, or documenting parameters that don't exist or
-# using markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
-# function parameter documentation. If set to NO, doxygen will accept that some
-# parameters have no documentation without warning.
-# The default value is: YES.
-
-WARN_IF_INCOMPLETE_DOC = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong parameter
-# documentation, but not about the absence of documentation. If EXTRACT_ALL is
-# set to YES then this flag will automatically be disabled. See also
-# WARN_IF_INCOMPLETE_DOC
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
-# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
-# at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# See also: WARN_LINE_FORMAT
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# In the $text part of the WARN_FORMAT command it is possible that a reference
-# to a more specific place is given. To make it easier to jump to this place
-# (outside of doxygen) the user can define a custom "cut" / "paste" string.
-# Example:
-# WARN_LINE_FORMAT = "'vi $file +$line'"
-# See also: WARN_FORMAT
-# The default value is: at line $line of file $file.
-
-WARN_LINE_FORMAT       = "at line $line of file $file"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr). In case the file specified cannot be opened for writing the
-# warning and error messages are written to standard error. When as file - is
-# specified the warning and error messages are written to standard output
-# (stdout).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = @PROJECT_SOURCE_DIR@/adapter \
-                         @PROJECT_SOURCE_DIR@/gotcha_intercept \
-                         @PROJECT_SOURCE_DIR@/src
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see:
-# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
-# See also: INPUT_FILE_ENCODING
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
-# character encoding on a per file pattern basis. Doxygen will compare the file
-# name with each pattern and apply the encoding instead of the default
-# INPUT_ENCODING) if there is a match. The character encodings are a list of the
-# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
-# "INPUT_ENCODING" for further information on supported encodings.
-
-INPUT_FILE_ENCODING    =
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# Note the list of default checked file patterns might differ from the list of
-# default file extension mappings.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
-# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
-# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
-
-FILE_PATTERNS          = *.h \
-                         *.cc
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = @PROJECT_SOURCE_DIR@/src/stb_ds.h
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# ANamespace::AClass, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that doxygen will use the data processed and written to standard output
-# for further processing, therefore nothing else, like debug statements or used
-# commands (so in case of a Windows batch file always use @echo OFF), should be
-# written to standard output.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = front_page.md
-
-# The Fortran standard specifies that for fixed formatted Fortran code all
-# characters from position 72 are to be considered as comment. A common
-# extension is to allow longer lines before the automatic comment starts. The
-# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
-# be processed before the automatic comment starts.
-# Minimum value: 7, maximum value: 10000, default value: 72.
-
-FORTRAN_COMMENT_AFTER  = 72
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# entity all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see https://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
-# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
-# enables light output unless the user preference is dark output. Other options
-# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
-# default to dark mode unless the user prefers light mode, and TOGGLE to let the
-# user toggle between dark and light mode via a button.
-# Possible values are: LIGHT Always generate light output., DARK Always generate
-# dark output., AUTO_LIGHT Automatically set the mode according to the user
-# preference, use light mode if no preference is set (the default)., AUTO_DARK
-# Automatically set the mode according to the user preference, use dark mode if
-# no preference is set. and TOGGLE Allow to user to switch between light and
-# dark mode via a button..
-# The default value is: AUTO_LIGHT.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE        = AUTO_LIGHT
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a color-wheel, see
-# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use gray-scales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
-# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
-# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
-# like the Qt help browser.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_MENUS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see:
-# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
-# create a documentation set, doxygen will generate a Makefile in the HTML
-# output directory. Running make will produce the docset in that directory and
-# running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
-# genXcode/_index.html for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag determines the URL of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDURL         =
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# on Windows. In the beginning of 2021 Microsoft took the original page, with
-# a.o. the download links, offline the HTML help workshop was already many years
-# in maintenance mode). You can download the HTML help workshop from the web
-# archives at Installation executable (see:
-# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
-# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the main .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location (absolute path
-# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
-# run qhelpgenerator on the generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine tune the look of the index (see "Fine-tuning the output"). As an
-# example, the default style sheet generated by doxygen has an example that
-# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
-# Since the tree basically has the same information as the tab index, you could
-# consider setting DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
-# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
-# area (value NO) or if it should extend to the full height of the window (value
-# YES). Setting this to YES gives a layout similar to
-# https://docs.readthedocs.io with more room for contents, but less room for the
-# project logo, title, and description. If either GENERATE_TREEVIEW or
-# DISABLE_INDEX is set to NO, this option has no effect.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FULL_SIDEBAR           = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
-# addresses.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-OBFUSCATE_EMAILS       = YES
-
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
-# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
-# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
-# the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png (the default) and svg (looks nicer but requires the
-# pdf2svg or inkscape tool).
-# The default value is: png.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FORMULA_FORMAT    = png
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
-# to create new LaTeX commands to be used in formulas as building blocks. See
-# the section "Including formulas" for details.
-
-FORMULA_MACROFILE      =
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
-# Note that the different versions of MathJax have different requirements with
-# regards to the different settings, so it is possible that also other MathJax
-# settings have to be changed when switching between the different MathJax
-# versions.
-# Possible values are: MathJax_2 and MathJax_3.
-# The default value is: MathJax_2.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_VERSION        = MathJax_2
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. For more details about the output format see MathJax
-# version 2 (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
-# (see:
-# http://docs.mathjax.org/en/latest/web/components/output.html).
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility. This is the name for Mathjax version 2, for MathJax version 3
-# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
-# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
-# is the name for Mathjax version 3, for MathJax version 2 this will be
-# translated into HTML-CSS) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment. The default value is:
-# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
-# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# for MathJax version 2 (see
-# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# For example for MathJax version 3 (see
-# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
-# MATHJAX_EXTENSIONS = ams
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/). See the section "External Indexing and Searching" for
-# details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when not enabling USE_PDFLATEX the default is latex when enabling
-# USE_PDFLATEX the default is pdflatex and when in the later case latex is
-# chosen this is overwritten by pdflatex. For specific output languages the
-# default can have been set differently, this depends on the implementation of
-# the output language.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# Note: This tag is used in the Makefile / make.bat.
-# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
-# (.tex).
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX. In case there is no backslash (\) as first character
-# it will be automatically added in the LaTeX code.
-# Note: This tag is used in the generated output file (.tex).
-# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_MAKEINDEX_CMD    = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
-# the generated LaTeX document. The header should contain everything until the
-# first chapter. If it is left blank doxygen will generate a standard header. It
-# is highly recommended to start with a default header using
-# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
-# and then modify the file new_header.tex. See also section "Doxygen usage" for
-# information on how to generate the default header that doxygen normally uses.
-#
-# Note: Only use a user-defined header if you know what you are doing!
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. The following
-# commands have a special meaning inside the header (and footer): For a
-# description of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
-# the generated LaTeX document. The footer should contain everything after the
-# last chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer. See also section "Doxygen
-# usage" for information on how to generate the default footer that doxygen
-# normally uses. Note: Only use a user-defined footer if you know what you are
-# doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
-# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
-# files. Set this option to YES, to get a higher quality PDF documentation.
-#
-# See also section LATEX_CMD_NAME for selecting the engine.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
-# path from which the emoji images will be read. If a relative path is entered,
-# it will be relative to the LATEX_OUTPUT directory. If left blank the
-# LATEX_OUTPUT directory will be used.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EMOJI_DIRECTORY  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# configuration file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
-# generated using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
-# namespace members in file scope as well, matching the HTML output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_NS_MEMB_FILE_SCOPE = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
-# the structure of the code including all documentation. Note that this feature
-# is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
-# RECURSIVE has no effect here.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
-# subgraphs. When you want a differently looking font in the dot files that
-# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
-# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
-# Edge and Graph Attributes specification</a> You need to make sure dot is able
-# to find the font, which can be done by putting it in a standard location or by
-# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font. Default graphviz fontsize is 14.
-# The default value is: fontname=Helvetica,fontsize=10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
-
-# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
-# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
-# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
-# arrows shapes.</a>
-# The default value is: labelfontname=Helvetica,labelfontsize=10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
-
-# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
-# around nodes set 'shape=plain' or 'shape=plaintext' <a
-# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
-# The default value is: shape=box,height=0.2,width=0.4.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
-
-# You can set the path where dot can find font specified with fontname in
-# DOT_COMMON_ATTR and others dot attributes.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
-# graph for each documented class showing the direct and indirect inheritance
-# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
-# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
-# to TEXT the direct and indirect inheritance relations will be shown as texts /
-# links.
-# Possible values are: NO, YES, TEXT and GRAPH.
-# The default value is: YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies. See also the chapter Grouping
-# in the manual.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
-# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
-# tag is set to YES, doxygen will add type and arguments for attributes and
-# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
-# will not generate fields with class member information in the UML graphs. The
-# class diagrams will look similar to the default class diagrams but using UML
-# notation for the relationships.
-# Possible values are: NO, YES and NONE.
-# The default value is: NO.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-DOT_UML_DETAILS        = NO
-
-# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
-# to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
-# Minimum value: 0, maximum value: 1000, default value: 17.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_WRAP_THRESHOLD     = 17
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = YES
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
-# of child directories generated in directory dependency graphs by dot.
-# Minimum value: 1, maximum value: 25, default value: 1.
-# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
-
-DIR_GRAPH_MAX_DEPTH    = 1
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               = @DOXYGEN_DOT_PATH@
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file or to the filename of jar file
-# to be used. If left blank, it is assumed PlantUML is not used or called during
-# a preprocessing step. Doxygen will generate a warning when it encounters a
-# \startuml command in this case and will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 100
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
-# graphical representation for inheritance and collaboration diagrams is used.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
-# files that are used to generate the various graphs.
-#
-# Note: This setting is not only used for dot files but also for msc temporary
-# files.
-# The default value is: YES.
-
-DOT_CLEANUP            = YES
diff --git a/hermes_shm/include/hermes_shm/constants/data_structure_singleton_macros.h b/hermes_shm/include/hermes_shm/constants/data_structure_singleton_macros.h
deleted file mode 100644
index b0101fa13..000000000
--- a/hermes_shm/include/hermes_shm/constants/data_structure_singleton_macros.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_CONSTANTS_DATA_STRUCTURE_SINGLETON_MACROS_H_H
-#define HERMES_INCLUDE_HERMES_CONSTANTS_DATA_STRUCTURE_SINGLETON_MACROS_H_H
-
-#include <hermes_shm/util/singleton.h>
-
-#define HERMES_SYSTEM_INFO hshm::GlobalSingleton<hshm::SystemInfo>::GetInstance()
-#define HERMES_SYSTEM_INFO_T hshm::SystemInfo*
-
-#define HERMES_MEMORY_REGISTRY hshm::GlobalSingleton<hshm::ipc::MemoryRegistry>::GetInstance()
-#define HERMES_MEMORY_REGISTRY_REF hshm::GlobalSingleton<hshm::ipc::MemoryRegistry>::GetRef()
-#define HERMES_MEMORY_REGISTRY_T hshm::ipc::MemoryRegistry*
-
-#define HERMES_MEMORY_MANAGER hshm::GlobalSingleton<hshm::ipc::MemoryManager>::GetInstance()
-#define HERMES_MEMORY_MANAGER_REF hshm::GlobalSingleton<hshm::ipc::MemoryManager>::GetRef()
-#define HERMES_MEMORY_MANAGER_T hshm::ipc::MemoryManager*
-
-#define HERMES_THREAD_MODEL hshm::GlobalSingleton<hshm::ThreadModelManager>::GetInstance()
-#define HERMES_THREAD_MODEL_T hshm::ThreadModelManager*
-
-#endif  // HERMES_INCLUDE_HERMES_CONSTANTS_DATA_STRUCTURE_SINGLETON_MACROS_H_H
diff --git a/hermes_shm/include/hermes_shm/constants/macros.h b/hermes_shm/include/hermes_shm/constants/macros.h
deleted file mode 100644
index 28a0e26fb..000000000
--- a/hermes_shm/include/hermes_shm/constants/macros.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_MACROS_H
-#define HERMES_MACROS_H
-
-/** Bytes -> Bytes */
-#ifndef BYTES
-#define BYTES(n) (size_t)((n) * (((size_t)1) << 0))
-#endif
-
-/** KILOBYTES -> Bytes */
-#ifndef KILOBYTES
-#define KILOBYTES(n) (size_t)((n) * (((size_t)1) << 10))
-#endif
-
-/** MEGABYTES -> Bytes */
-#ifndef MEGABYTES
-#define MEGABYTES(n) (size_t)((n) * (((size_t)1) << 20))
-#endif
-
-/** GIGABYTES -> Bytes */
-#ifndef GIGABYTES
-#define GIGABYTES(n) (size_t)((n) * (((size_t)1) << 30))
-#endif
-
-/** TERABYTES -> Bytes */
-#ifndef TERABYTES
-#define TERABYTES(n) (size_t)((n) * (((size_t)1) << 40))
-#endif
-
-/** PETABYTES -> Bytes */
-#ifndef PETABYTES
-#define PETABYTES(n) (size_t)((n) * (((size_t)1) << 50))
-#endif
-
-/**
- * Remove parenthesis surrounding "X" if it has parenthesis
- * Used for helper macros which take templated types as parameters
- * E.g., let's say we have:
- *
- * #define HELPER_MACRO(T) TYPE_UNWRAP(T)
- * HELPER_MACRO( (std::vector<std::pair<int, int>>) )
- * will return std::vector<std::pair<int, int>> without the parenthesis
- * */
-#define TYPE_UNWRAP(X) ESC(ISH X)
-#define ISH(...) ISH __VA_ARGS__
-#define ESC(...) ESC_(__VA_ARGS__)
-#define ESC_(...) VAN ## __VA_ARGS__
-#define VANISH
-
-/**
- * Ensure that the compiler ALWAYS inlines a particular function.
- * */
-#define HSHM_ALWAYS_INLINE \
-  __attribute__((always_inline))
-
-#endif  // HERMES_MACROS_H
diff --git a/hermes_shm/include/hermes_shm/data_structures/containers/charbuf.h b/hermes_shm/include/hermes_shm/data_structures/containers/charbuf.h
deleted file mode 100644
index 3a182ca27..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/containers/charbuf.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_TYPES_CHARBUF_H_
-#define HERMES_INCLUDE_HERMES_TYPES_CHARBUF_H_
-
-#include "hermes_shm/types/real_number.h"
-#include "hermes_shm/memory/memory_registry.h"
-#include <string>
-
-namespace hshm {
-
-/** An uninterpreted array of bytes */
-struct charbuf {
-  /**====================================
-   * Variables & Types
-   * ===================================*/
-
-  hipc::Allocator *alloc_; /**< The allocator used to allocate data */
-  char *data_; /**< The pointer to data */
-  size_t size_; /**< The size of data */
-  bool destructable_;  /**< Whether or not this container owns data */
-
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** Default constructor */
-  charbuf() : alloc_(nullptr), data_(nullptr), size_(0), destructable_(false) {}
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Destructor */
-  ~charbuf() { Free(); }
-
-  /**====================================
-   * Emplace Constructors
-   * ===================================*/
-
-  /** Size-based constructor */
-  explicit charbuf(size_t size) {
-    Allocate(HERMES_MEMORY_REGISTRY->GetDefaultAllocator(), size);
-  }
-
-  /** Allocator + Size-based constructor */
-  explicit charbuf(hipc::Allocator *alloc, size_t size) {
-    Allocate(alloc, size);
-  }
-
-  /**====================================
-  * Reference Constructors
-  * ===================================*/
-
-  /** Reference constructor. From char* + size */
-  explicit charbuf(char *data, size_t size)
-    : alloc_(nullptr), data_(data), size_(size), destructable_(false) {}
-
-  /**
-   * Reference constructor. From const char*
-   * We assume that the data will not be modified by the user, but
-   * we must cast away the const anyway.
-   * */
-  explicit charbuf(const char *data, size_t size)
-    : alloc_(nullptr), data_(const_cast<char*>(data)),
-      size_(size), destructable_(false) {}
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** Copy constructor. From std::string. */
-  explicit charbuf(const std::string &data) {
-    Allocate(HERMES_MEMORY_REGISTRY->GetDefaultAllocator(), data.size());
-    memcpy(data_, data.data(), data.size());
-  }
-
-  /** Copy constructor. From charbuf. */
-  charbuf(const charbuf &other) {
-    if (!Allocate(HERMES_MEMORY_REGISTRY->GetDefaultAllocator(),
-                  other.size())) {
-      return;
-    }
-    memcpy(data_, other.data(), size());
-  }
-
-  /** Copy assignment operator */
-  charbuf& operator=(const charbuf &other) {
-    if (this != &other) {
-      Free();
-      if (!Allocate(HERMES_MEMORY_REGISTRY->GetDefaultAllocator(),
-                    other.size())) {
-        return *this;
-      }
-      memcpy(data_, other.data(), size());
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** Move constructor */
-  charbuf(charbuf &&other) {
-    alloc_ = other.alloc_;
-    data_ = other.data_;
-    size_ = other.size_;
-    destructable_ = other.destructable_;
-    other.size_ = 0;
-    other.destructable_ = false;
-  }
-
-  /** Move assignment operator */
-  charbuf& operator=(charbuf &&other) {
-    if (this != &other) {
-      Free();
-      alloc_ = other.alloc_;
-      data_ = other.data_;
-      size_ = other.size_;
-      destructable_ = other.destructable_;
-      other.size_ = 0;
-      other.destructable_ = false;
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Methods
-   * ===================================*/
-
-  /** Destroy and resize */
-  void resize(size_t new_size) {
-    if (new_size <= size()) {
-      size_ = new_size;
-      return;
-    }
-    if (alloc_ == nullptr) {
-      alloc_ = HERMES_MEMORY_REGISTRY->GetDefaultAllocator();
-    }
-    if (destructable_) {
-      data_ = alloc_->ReallocatePtr<char>(data_, new_size);
-    } else {
-      data_ = alloc_->AllocatePtr<char>(new_size);
-    }
-    destructable_ = true;
-    size_ = new_size;
-  }
-
-  /** Reference data */
-  char* data() {
-    return data_;
-  }
-
-  /** Reference data */
-  char* data() const {
-    return data_;
-  }
-
-  /** Reference size */
-  size_t size() const {
-    return size_;
-  }
-
-  /** Get allocator */
-  hipc::Allocator* GetAllocator() {
-    return alloc_;
-  }
-
-  /** Convert to std::string */
-  std::string str() {
-    return std::string(data(), size());
-  }
-
-  /**====================================
-   * Comparison Operators
-   * ===================================*/
-
-  int _strncmp(const char *a, size_t len_a,
-               const char *b, size_t len_b) const {
-    if (len_a != len_b) {
-      return int((int64_t)len_a - (int64_t)len_b);
-    }
-    for (size_t i = 0; i < len_a; ++i) {
-      if (a[i] != b[i]) {
-        return a[i] - b[i];
-      }
-    }
-    return 0;
-  }
-
-#define HERMES_STR_CMP_OPERATOR(op) \
-  bool operator TYPE_UNWRAP(op)(const char *other) const { \
-    return _strncmp(data(), size(), other, strlen(other)) op 0; \
-  } \
-  bool operator op(const std::string &other) const { \
-    return _strncmp(data(), size(), other.data(), other.size()) op 0; \
-  } \
-  bool operator op(const charbuf &other) const { \
-    return _strncmp(data(), size(), other.data(), other.size()) op 0; \
-  }
-
-  HERMES_STR_CMP_OPERATOR(==)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(!=)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(<)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(>)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(<=)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(>=)  // NOLINT
-
-#undef HERMES_STR_CMP_OPERATOR
-
- private:
-  /**====================================
-   * Internal functions
-   * ===================================*/
-
-  /** Allocate charbuf */
-  bool Allocate(hipc::Allocator *alloc, size_t size) {
-    hipc::OffsetPointer p;
-    if (size == 0) {
-      alloc_ = nullptr;
-      data_ = nullptr;
-      size_ = 0;
-      destructable_ = false;
-      return false;
-    }
-    alloc_ = alloc;
-    data_ = alloc->AllocatePtr<char>(size, p);
-    size_ = size;
-    destructable_ = true;
-    return true;
-  }
-
-  /** Explicitly free the charbuf */
-  void Free() {
-    if (destructable_ && data_ && size_) {
-      alloc_->FreePtr<char>(data_);
-    }
-  }
-};
-
-typedef charbuf string;
-
-}  // namespace hshm
-
-#endif  // HERMES_INCLUDE_HERMES_TYPES_CHARBUF_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/containers/converters.h b/hermes_shm/include/hermes_shm/data_structures/containers/converters.h
deleted file mode 100644
index 47023a35b..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/containers/converters.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_CONVERTERS_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_CONVERTERS_H_
-
-#include "hermes_shm/data_structures/data_structure.h"
-#include <vector>
-#include <list>
-
-namespace hshm {
-
-/** Convert an iterable object into a vector */
-template<typename T, typename SharedT>
-std::vector<T> to_stl_vector(const SharedT &other) {
-  std::vector<T> vec;
-  vec.reserve(other.size());
-  auto end = other.cend();
-  for (auto iter = other.cbegin(); iter != end; ++iter) {
-    T &obj = (*iter);
-    vec.emplace_back(obj);
-  }
-  return vec;
-}
-
-/** Convert an iterable object into a list */
-template<typename T, typename SharedT>
-std::list<T> to_stl_list(const SharedT &other) {
-  std::list<T> vec;
-  auto end = other.cend();
-  for (auto iter = other.cbegin(); iter != end; ++iter) {
-    T& obj = (*iter);
-    vec.emplace_back(obj);
-  }
-  return vec;
-}
-
-/** Convert a string to an hshm::charbuf */
-template<typename StringT>
-hshm::charbuf to_charbuf(StringT &other) {
-  hshm::charbuf text(other.size());
-  memcpy(text.data(), other.data(), other.size());
-  return text;
-}
-
-}  // namespace hshm
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_CONVERTERS_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/containers/functional.h b/hermes_shm/include/hermes_shm/data_structures/containers/functional.h
deleted file mode 100644
index 435668c16..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/containers/functional.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_SHM_DATA_STRUCTURES_CONTAINERS_FUNCTIONAL_H_
-#define HERMES_SHM_SHM_DATA_STRUCTURES_CONTAINERS_FUNCTIONAL_H_
-
-namespace hshm {
-
-template<typename T, typename IteratorT>
-IteratorT find(IteratorT start, const IteratorT &end, T &val) {
-  for (; start != end; ++start) {
-    T &ref = *start;
-    if (ref == val) {
-      return start;
-    }
-  }
-  return end;
-}
-
-}  // namespace hshm
-
-#endif  // HERMES_SHM_SHM_DATA_STRUCTURES_CONTAINERS_FUNCTIONAL_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/containers/tuple_base.h b/hermes_shm/include/hermes_shm/data_structures/containers/tuple_base.h
deleted file mode 100644
index 35da88aa4..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/containers/tuple_base.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_DATA_STRUCTURES_TupleBase_H_
-#define HERMES_INCLUDE_HERMES_DATA_STRUCTURES_TupleBase_H_
-
-#include <utility>
-#include "hermes_shm/types/real_number.h"
-#include "hermes_shm/types/argpack.h"
-
-namespace hshm {
-
-/** The null container wrapper */
-template<typename T>
-using NullWrap = T;
-
-/** Recurrence used to create argument pack */
-template<
-  template<typename> typename Wrap,
-  size_t idx,
-  typename T = EndTemplateRecurrence,
-  typename ...Args>
-struct TupleBaseRecur {
-  Wrap<T> arg_; /**< The element stored */
-  TupleBaseRecur<Wrap, idx + 1, Args...>
-    recur_; /**< Remaining args */
-
-  /** Default constructor */
-  TupleBaseRecur() = default;
-
-  /** Constructor. Const reference. */
-  explicit TupleBaseRecur(const T &arg, Args&& ...args)
-    : arg_(std::forward<T>(arg)), recur_(std::forward<Args>(args)...) {}
-
-  /** Constructor. Lvalue reference. */
-  explicit TupleBaseRecur(T& arg, Args&& ...args)
-  : arg_(std::forward<T>(arg)), recur_(std::forward<Args>(args)...) {}
-
-  /** Constructor. Rvalue reference. */
-  explicit TupleBaseRecur(T&& arg, Args&& ...args)
-  : arg_(std::forward<T>(arg)), recur_(std::forward<Args>(args)...) {}
-
-  /** Move constructor */
-  TupleBaseRecur(TupleBaseRecur &&other) noexcept
-  : arg_(std::move(other.arg_)), recur_(std::move(other.recur_)) {}
-
-  /** Move assignment operator */
-  TupleBaseRecur& operator=(TupleBaseRecur &&other) {
-    if (this != &other) {
-      arg_ = std::move(other.arg_);
-      recur_ = std::move(other.recur_);
-    }
-    return *this;
-  }
-
-  /** Copy constructor */
-  TupleBaseRecur(const TupleBaseRecur &other)
-  : arg_(other.arg_), recur_(other.recur_) {}
-
-  /** Copy assignment operator */
-  TupleBaseRecur& operator=(const TupleBaseRecur &other) {
-    if (this != &other) {
-      arg_ = other.arg_;
-      recur_ = other.recur_;
-    }
-    return *this;
-  }
-
-  /** Solidification constructor */
-  template<typename ...CArgs>
-  explicit TupleBaseRecur(ArgPack<CArgs...> &&other)
-    : arg_(other.template Forward<idx>()),
-      recur_(std::forward<ArgPack<CArgs...>>(other)) {}
-
-  /** Get reference to internal variable (only if tuple) */
-  template<size_t i>
-  constexpr auto& Get() {
-    if constexpr(i == idx) {
-      return arg_;
-    } else {
-      return recur_.template
-        Get<i>();
-    }
-  }
-
-  /** Get reference to internal variable (only if tuple, const) */
-  template<size_t i>
-  constexpr auto& Get() const {
-    if constexpr(i == idx) {
-      return arg_;
-    } else {
-      return recur_.template
-        Get<i>();
-    }
-  }
-};
-
-/** Terminator of the TupleBase recurrence */
-template<
-  template<typename> typename Wrap,
-  size_t idx>
-struct TupleBaseRecur<Wrap, idx, EndTemplateRecurrence> {
-  /** Default constructor */
-  TupleBaseRecur() = default;
-
-  /** Solidification constructor */
-  template<typename ...CArgs>
-  explicit TupleBaseRecur(ArgPack<CArgs...> &&other) {}
-
-  /** Getter */
-  template<size_t i>
-  void Get() {
-    throw std::logic_error("(Get) TupleBase index outside of range");
-  }
-
-  /** Getter */
-  template<size_t i>
-  void Get() const {
-    throw std::logic_error("(Get) TupleBase index outside of range");
-  }
-};
-
-/** Used to semantically pack arguments */
-template<
-  bool is_argpack,
-  template<typename> typename Wrap,
-  typename ...Args>
-struct TupleBase {
-  /** Variable argument pack */
-  TupleBaseRecur<Wrap, 0, Args...> recur_;
-
-  /** Default constructor */
-  TupleBase() = default;
-
-  /** General Constructor. */
-  template<typename ...CArgs>
-  explicit TupleBase(Args&& ...args)
-  : recur_(std::forward<Args>(args)...) {}
-
-  /** Move constructor */
-  TupleBase(TupleBase &&other) noexcept
-  : recur_(std::move(other.recur_)) {}
-
-  /** Move assignment operator */
-  TupleBase& operator=(TupleBase &&other) noexcept {
-    if (this != &other) {
-      recur_ = std::move(other.recur_);
-    }
-    return *this;
-  }
-
-  /** Copy constructor */
-  TupleBase(const TupleBase &other)
-  : recur_(other.recur_) {}
-
-  /** Copy assignment operator */
-  TupleBase& operator=(const TupleBase &other) {
-    if (this != &other) {
-      recur_ = other.recur_;
-    }
-    return *this;
-  }
-
-  /** Solidification constructor */
-  template<typename ...CArgs>
-  explicit TupleBase(ArgPack<CArgs...> &&other)
-  : recur_(std::forward<ArgPack<CArgs...>>(other)) {}
-
-  /** Getter */
-  template<size_t idx>
-  constexpr auto& Get() {
-    return recur_.template Get<idx>();
-  }
-
-  /** Getter (const) */
-  template<size_t idx>
-  constexpr auto& Get() const {
-    return recur_.template Get<idx>();
-  }
-
-  /** Size */
-  constexpr static size_t Size() {
-    return sizeof...(Args);
-  }
-};
-
-/** Tuple definition */
-template<typename ...Containers>
-using tuple = TupleBase<false, NullWrap, Containers...>;
-
-/** Tuple Wrapper Definition */
-template<template<typename> typename Wrap, typename ...Containers>
-using tuple_wrap = TupleBase<false, Wrap, Containers...>;
-
-/** Apply a function over an entire TupleBase / tuple */
-template<bool reverse>
-class IterateTuple {
- public:
-  /** Apply a function to every element of a tuple */
-  template<typename TupleT, typename F>
-  constexpr static void Apply(TupleT &pack, F &&f) {
-    _Apply<0, TupleT, F>(pack, std::forward<F>(f));
-  }
-
- private:
-  /** Apply the function recursively */
-  template<size_t i, typename TupleT, typename F>
-  constexpr static void _Apply(TupleT &pack, F &&f) {
-    if constexpr(i < TupleT::Size()) {
-      if constexpr(reverse) {
-        _Apply<i + 1, TupleT, F>(pack, std::forward<F>(f));
-        f(MakeConstexpr<size_t, i>(), pack.template Get<i>());
-      } else {
-        f(MakeConstexpr<size_t, i>(), pack.template Get<i>());
-        _Apply<i + 1, TupleT, F>(pack, std::forward<F>(f));
-      }
-    }
-  }
-};
-
-/** Forward iterate over tuple and apply function  */
-using ForwardIterateTuple = IterateTuple<false>;
-
-/** Reverse iterate over tuple and apply function */
-using ReverseIterateTuple = IterateTuple<true>;
-
-}  // namespace hshm
-
-#endif  // HERMES_INCLUDE_HERMES_DATA_STRUCTURES_TupleBase_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/data_structure.h b/hermes_shm/include/hermes_shm/data_structures/data_structure.h
deleted file mode 100644
index 8880c8ec0..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/data_structure.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_DATA_STRUCTURE_H_
-#define HERMES_DATA_STRUCTURES_DATA_STRUCTURE_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/memory/memory_manager.h"
-#include "hermes_shm/data_structures/ipc/pair.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "ipc/list.h"
-#include "ipc/vector.h"
-#include "ipc/unordered_map.h"
-#include "hermes_shm/memory/memory_manager.h"
-
-namespace hipc = hshm::ipc;
-
-#endif  // HERMES_DATA_STRUCTURES_DATA_STRUCTURE_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/_queue.h b/hermes_shm/include/hermes_shm/data_structures/ipc/_queue.h
deleted file mode 100644
index 8386bd5ce..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/_queue.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_QUEUE_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_QUEUE_H_
-
-namespace hshm {
-
-/** Represents the internal qtok type */
-typedef uint64_t _qtok_t;
-
-/** Represents a ticket in the queue */
-struct qtok_t {
-  _qtok_t id_;
-
-  /** Default constructor */
-  qtok_t() = default;
-
-  /** Emplace constructor */
-  explicit qtok_t(_qtok_t id) : id_(id) {}
-
-  /** Copy constructor */
-  qtok_t(const qtok_t &other) : id_(other.id_) {}
-
-  /** Move constructor */
-  qtok_t(qtok_t &&other) : id_(other.id_) {
-    other.SetNull();
-  }
-
-  /** Set to the null qtok */
-  void SetNull() {
-    id_ = qtok_t::GetNull().id_;
-  }
-
-  /** Get the null qtok */
-  static qtok_t GetNull() {
-    static qtok_t other(std::numeric_limits<_qtok_t>::max());
-    return other;
-  }
-
-  /** Check if null */
-  bool IsNull() const {
-    return id_ == GetNull().id_;
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_QUEUE_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_archive.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_archive.h
deleted file mode 100644
index 316b92d86..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_archive.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_SHM_ARCHIVE_H_
-#define HERMES_DATA_STRUCTURES_SHM_ARCHIVE_H_
-
-#include "shm_macros.h"
-#include "hermes_shm/memory/memory.h"
-#include "hermes_shm/types/argpack.h"
-#include "hermes_shm/memory/allocator/allocator.h"
-
-namespace hshm::ipc {
-
-/**
- * Represents the layout of a data structure in shared memory.
- * */
-template<typename T>
-class ShmArchive {
- public:
-  typedef T internal_t;
-  char obj_[sizeof(T)];
-
-  /** Default constructor */
-  ShmArchive() = default;
-
-  /** Destructor */
-  ~ShmArchive() = default;
-
-  /** Pointer to internal object */
-  HSHM_ALWAYS_INLINE T* get() {
-    return reinterpret_cast<T*>(obj_);
-  }
-
-  /** Pointer to internal object (const) */
-  HSHM_ALWAYS_INLINE const T* get() const {
-    return reinterpret_cast<T*>(obj_);
-  }
-
-  /** Reference to internal object */
-  HSHM_ALWAYS_INLINE T& get_ref() {
-    return reinterpret_cast<T&>(obj_);
-  }
-
-  /** Reference to internal object (const) */
-  HSHM_ALWAYS_INLINE const T& get_ref() const {
-    return reinterpret_cast<const T&>(obj_);
-  }
-
-  /** Dereference operator */
-  HSHM_ALWAYS_INLINE T& operator*() {
-    return get_ref();
-  }
-
-  /** Dereference operator */
-  HSHM_ALWAYS_INLINE const T& operator*() const {
-    return get_ref();
-  }
-
-  /** Arrow operator */
-  HSHM_ALWAYS_INLINE T* operator->() {
-    return get();
-  }
-
-  /** Arrow operator */
-  HSHM_ALWAYS_INLINE const T* operator->() const {
-    return get();
-  }
-
-  /** Copy constructor */
-  ShmArchive(const ShmArchive &other) = delete;
-
-  /** Copy assignment operator */
-  ShmArchive& operator=(const ShmArchive &other) = delete;
-
-  /** Move constructor */
-  ShmArchive(ShmArchive &&other) = delete;
-
-  /** Move assignment operator */
-  ShmArchive& operator=(ShmArchive &&other) = delete;
-
-  /** Initialize */
-  template<typename ...Args>
-  void shm_init(Args&& ...args) {
-    Allocator::ConstructObj<T>(get_ref(), std::forward<Args>(args)...);
-  }
-
-  /** Initialize piecewise */
-  template<typename ArgPackT_1, typename ArgPackT_2>
-  void shm_init_piecewise(ArgPackT_1 &&args1, ArgPackT_2 &&args2) {
-    return hshm::PassArgPack::Call(
-      MergeArgPacks::Merge(
-        make_argpack(get_ref()),
-        std::forward<ArgPackT_1>(args1),
-        std::forward<ArgPackT_2>(args2)),
-      [](auto&& ...args) constexpr {
-        Allocator::ConstructObj<T>(std::forward<decltype(args)>(args)...);
-      });
-  }
-};
-
-#define HSHM_AR_GET_TYPE(AR) \
-  (typename std::remove_reference<decltype(AR)>::type::internal_t)
-
-#define HSHM_MAKE_AR0(AR, ALLOC) \
-  if constexpr(IS_SHM_ARCHIVEABLE(HSHM_AR_GET_TYPE(AR))) { \
-    (AR).shm_init(ALLOC); \
-  } else { \
-    (AR).shm_init(); \
-  }
-
-#define HSHM_MAKE_AR(AR, ALLOC, ...) \
-  if constexpr(IS_SHM_ARCHIVEABLE(HSHM_AR_GET_TYPE(AR))) { \
-    (AR).shm_init(ALLOC, __VA_ARGS__); \
-  } else { \
-    (AR).shm_init(__VA_ARGS__); \
-  }
-
-#define HSHM_MAKE_AR_PW(AR, ALLOC, ...) \
-  if constexpr(IS_SHM_ARCHIVEABLE(HSHM_AR_GET_TYPE(AR))) { \
-    (AR).shm_init_piecewise(make_argpack(ALLOC), __VA_ARGS__); \
-  } else { \
-    (AR).shm_init_piecewise(make_argpack(), __VA_ARGS__); \
-  }
-
-#define HSHM_DESTROY_AR(AR) \
-  if constexpr(IS_SHM_ARCHIVEABLE(HSHM_AR_GET_TYPE(AR))) { \
-    (AR).get_ref().shm_destroy(); \
-  }
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_DATA_STRUCTURES_SHM_ARCHIVE_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_container.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_container.h
deleted file mode 100644
index f561855f3..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_container.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_SHM_CONTAINER_H_
-#define HERMES_SHM_CONTAINER_H_
-
-#include "hermes_shm/memory/memory_registry.h"
-#include "hermes_shm/constants/macros.h"
-#include "shm_container_macro.h"
-#include "shm_macros.h"
-#include "shm_archive.h"
-
-namespace hipc = hshm::ipc;
-
-namespace hshm::ipc {
-
-/** The shared-memory header used for data structures */
-template<typename T>
-struct ShmHeader;
-
-/** The ShmHeader used for base containers */
-#define SHM_CONTAINER_HEADER_TEMPLATE(HEADER_NAME)\
-  /** Default constructor */\
-  TYPE_UNWRAP(HEADER_NAME)() = default;\
-  \
-  /** Copy constructor */\
-  TYPE_UNWRAP(HEADER_NAME)(const TYPE_UNWRAP(HEADER_NAME) &other) {\
-    strong_copy(other);\
-  }\
-  \
-  /** Copy assignment operator */\
-  TYPE_UNWRAP(HEADER_NAME)& operator=(const TYPE_UNWRAP(HEADER_NAME) &other) {\
-    if (this != &other) {\
-      strong_copy(other);\
-    }\
-    return *this;\
-  }\
-\
-  /** Move constructor */\
-  TYPE_UNWRAP(HEADER_NAME)(TYPE_UNWRAP(HEADER_NAME) &&other) {\
-    strong_copy(other);\
-  }\
-  \
-  /** Move operator */\
-  TYPE_UNWRAP(HEADER_NAME)& operator=(TYPE_UNWRAP(HEADER_NAME) &&other) {\
-    if (this != &other) {\
-      strong_copy(other);\
-    }\
-    return *this;\
-  }
-
-/** The ShmHeader used for wrapper containers */
-struct ShmWrapperHeader {};
-
-/**
- * ShmContainers all have a header, which is stored in
- * shared memory as a TypedPointer.
- * */
-class ShmContainer {};
-
-/** Typed nullptr */
-template<typename T>
-static inline T* typed_nullptr() {
-  return reinterpret_cast<T*>(NULL);
-}
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_SHM_CONTAINER_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_container_macro.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_container_macro.h
deleted file mode 100644
index 13dff7cbe..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_container_macro.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_MACRO_H_
-#define HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_MACRO_H_
-#define SHM_CONTAINER_TEMPLATE(CLASS_NAME,TYPED_CLASS)\
-public:\
-/**====================================\
- * Variables & Types\
- * ===================================*/\
-hipc::allocator_id_t alloc_id_;\
-\
-/**====================================\
- * Constructors\
- * ===================================*/\
-\
-/** Default constructor. Deleted. */\
-TYPE_UNWRAP(CLASS_NAME)() = delete;\
-\
-/** Move constructor. Deleted. */\
-TYPE_UNWRAP(CLASS_NAME)(TYPE_UNWRAP(CLASS_NAME) &&other) = delete;\
-\
-/** Copy constructor. Deleted. */\
-TYPE_UNWRAP(CLASS_NAME)(const TYPE_UNWRAP(CLASS_NAME) &other) = delete;\
-\
-/** Initialize container */\
-void shm_init_container(hipc::Allocator *alloc) {\
-  alloc_id_ = alloc->GetId();\
-}\
-\
-/**====================================\
- * Destructor\
- * ===================================*/\
-\
-/** Destructor. */\
-HSHM_ALWAYS_INLINE ~TYPE_UNWRAP(CLASS_NAME)() = default;\
-\
-/** Destruction operation */\
-HSHM_ALWAYS_INLINE void shm_destroy() {\
-  if (IsNull()) { return; }\
-  shm_destroy_main();\
-  SetNull();\
-}\
-\
-/**====================================\
- * Header Operations\
- * ===================================*/\
-\
-/** Get a typed pointer to the object */\
-template<typename POINTER_T>\
-HSHM_ALWAYS_INLINE POINTER_T GetShmPointer() const {\
-  return GetAllocator()->template Convert<TYPE_UNWRAP(TYPED_CLASS), POINTER_T>(this);\
-}\
-\
-/**====================================\
- * Query Operations\
- * ===================================*/\
-\
-/** Get the allocator for this container */\
-HSHM_ALWAYS_INLINE hipc::Allocator* GetAllocator() const {\
-  return HERMES_MEMORY_REGISTRY_REF.GetAllocator(alloc_id_);\
-}\
-\
-/** Get the shared-memory allocator id */\
-HSHM_ALWAYS_INLINE hipc::allocator_id_t& GetAllocatorId() const {\
-  return GetAllocator()->GetId();\
-}\
-
-#endif  // HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_MACRO_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_internal.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_internal.h
deleted file mode 100644
index 76538b00a..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_internal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                          a                 *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_HERMES_SHM_DATA_STRUCTURES_INTERNAL_SHM_INTERNAL_H_
-#define HERMES_HERMES_SHM_DATA_STRUCTURES_INTERNAL_SHM_INTERNAL_H_
-
-#include "shm_archive.h"
-#include "shm_container.h"
-#include "shm_macros.h"
-#include "shm_container.h"
-
-namespace hipc = hshm::ipc;
-
-#endif  // HERMES_HERMES_SHM_DATA_STRUCTURES_INTERNAL_SHM_INTERNAL_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_macros.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_macros.h
deleted file mode 100644
index 820b70806..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_macros.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_SHM_MACROS_H_
-#define HERMES_MEMORY_SHM_MACROS_H_
-
-#include "hermes_shm/constants/macros.h"
-
-/**
- * Determine whether or not \a T type is designed for shared memory
- * */
-#define IS_SHM_ARCHIVEABLE(T) \
-  std::is_base_of<hshm::ipc::ShmContainer, TYPE_UNWRAP(T)>::value
-
-/**
- * SHM_X_OR_Y: X if T is SHM_SERIALIZEABLE, Y otherwise
- * */
-#define SHM_X_OR_Y(T, X, Y) \
-  typename std::conditional<         \
-    IS_SHM_ARCHIVEABLE(T), \
-    TYPE_UNWRAP(X), TYPE_UNWRAP(Y)>::type
-
-#endif  // HERMES_MEMORY_SHM_MACROS_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_null_container.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_null_container.h
deleted file mode 100644
index b415d3702..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_null_container.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_DATA_STRUCTURES_INTERNAL_SHM_NULL_CONTAINER_H_
-#define HERMES_INCLUDE_HERMES_DATA_STRUCTURES_INTERNAL_SHM_NULL_CONTAINER_H_
-
-#include "shm_container.h"
-#include <string>
-
-namespace hshm::ipc {
-
-/** forward declaration for string */
-class NullContainer;
-
-/**
- * MACROS used to simplify the string namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME NullContainer
-#define TYPED_CLASS NullContainer
-#define TYPED_HEADER ShmHeader<NullContainer>
-
-/** string shared-memory header */
-template<>
-struct ShmHeader<NullContainer> {
-  /** Default constructor */
-  ShmHeader() = default;
-
-  /** Copy constructor */
-  ShmHeader(const ShmHeader &other) {
-    strong_copy(other);
-  }
-
-  /** Copy assignment operator */
-  ShmHeader& operator=(const ShmHeader &other) {
-    if (this != &other) {
-      strong_copy(other);
-    }
-    return *this;
-  }
-
-  /** Strong copy operation */
-  void strong_copy(const ShmHeader &other) {}
-
-  /** Move constructor */
-  ShmHeader(ShmHeader &&other) {
-    weak_move(other);
-  }
-
-  /** Move operator */
-  ShmHeader& operator=(ShmHeader &&other) {
-    if (this != &other) {
-      weak_move(other);
-    }
-    return *this;
-  }
-
-  /** Move operation */
-  void weak_move(ShmHeader &other) {
-    strong_copy(other);
-  }
-};
-
-/**
- * A string of characters.
- * */
-class NullContainer : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS), (TYPED_HEADER))
-
- public:
-  ////////////////////////////
-  /// SHM Overrides
-  ////////////////////////////
-
-  /** Default constructor */
-  NullContainer() = default;
-
-  /** Default shm constructor */
-  void shm_init_main(TYPED_HEADER *header,
-                     Allocator *alloc) {
-    shm_init_allocator(alloc);
-    shm_make_header(header);
-  }
-
-  /** Move constructor */
-  void shm_strong_move_main(TYPED_HEADER *header,
-                          Allocator *alloc,
-                          NullContainer &other) {}
-
-  /** Copy constructor */
-  void shm_strong_copy_main(TYPED_HEADER *header,
-                            Allocator *alloc,
-                            const NullContainer &other) {}
-
-  /**
-   * Destroy the shared-memory data.
-   * */
-  void shm_destroy_main() {}
-
-  /** Store into shared memory */
-  void shm_serialize_main() const {}
-
-  /** Load from shared memory */
-  void shm_deserialize_main() {}
-};
-
-}  // namespace hshm::ipc
-
-namespace std {
-
-}  // namespace std
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_INCLUDE_HERMES_DATA_STRUCTURES_INTERNAL_SHM_NULL_CONTAINER_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_smart_ptr.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_smart_ptr.h
deleted file mode 100644
index 0ff93fd37..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/shm_smart_ptr.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_INTERNAL_SHM_DATA_STRUCTURE_POINTER_H_
-#define HERMES_DATA_STRUCTURES_INTERNAL_SHM_DATA_STRUCTURE_POINTER_H_
-
-namespace hshm::ipc {
-
-/**
- * Indicates a data structure represents a memory paradigm for Shm.
- * */
-class ShmSmartPointer {};
-
-}  // namespace hshm::ipc
-
-/**
- * Enables a specific TypedPointer type to be serialized
- * */
-#define SHM_SERIALIZE_OPS(TYPED_CLASS)\
-  void operator>>(hipc::TypedPointer<TYPE_UNWRAP(TYPED_CLASS)> &ar) const {\
-    shm_serialize(ar);\
-  }\
-  void operator>>(\
-      hipc::TypedAtomicPointer<TYPE_UNWRAP(TYPED_CLASS)> &ar) const {\
-    shm_serialize(ar);\
-  }
-
-/**
- * Enables a specific TypedPointer type to be deserialized
- * */
-#define SHM_DESERIALIZE_OPS(TYPED_CLASS)\
-  void operator<<(const hipc::TypedPointer<TYPE_UNWRAP(TYPED_CLASS)> &ar) {\
-    shm_deserialize(ar);\
-  }\
-  void operator<<(\
-    const hipc::TypedAtomicPointer<TYPE_UNWRAP(TYPED_CLASS)> &ar) {\
-    shm_deserialize(ar);\
-  }
-
-/**
- * A macro for defining shared memory (de)serializations
- * */
-#define SHM_SERIALIZE_DESERIALIZE_OPS(AR_TYPE)\
-  SHM_SERIALIZE_OPS(AR_TYPE)\
-  SHM_DESERIALIZE_OPS(AR_TYPE)
-
-#endif  // HERMES_DATA_STRUCTURES_INTERNAL_SHM_DATA_STRUCTURE_POINTER_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/template/shm_container_base_example.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/template/shm_container_base_example.h
deleted file mode 100644
index e25ecb254..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/template/shm_container_base_example.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_EXAMPLE_H_
-#define HERMES_INCLUDE_HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_EXAMPLE_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_container.h"
-#include "hermes_shm/memory/memory_manager.h"
-
-namespace honey {
-
-class ShmContainerExample;
-
-#define CLASS_NAME ShmContainerExample
-#define TYPED_CLASS ShmContainerExample
-
-class ShmContainerExample : public hipc::ShmContainer {
- public:
-  /**====================================
-   * Shm Overrides
-   * ===================================*/
-
-  /** Constructor. Empty. */
-  explicit CLASS_NAME(hipc::Allocator *alloc) {
-    alloc_id_ = alloc->GetId();
-  }
-
-  /** Default initialization */
-  void shm_init() {
-    SetNull();
-  }
-
-  /** Load from shared memory */
-  void shm_deserialize_main() {}
-
-  /** Destroy object */
-  void shm_destroy_main() {}
-
-  /** Internal copy operation */
-  void shm_strong_copy_main(const CLASS_NAME &other) {
-  }
-
-  /** Internal move operation */
-  void shm_strong_move_main(CLASS_NAME &&other) {
-  }
-
-  /** Check if header is NULL */
-  bool IsNull() {
-  }
-
-  /** Nullify object header */
-  void SetNull() {
-  }
-
- public:
-  /**====================================
-   * Variables & Types
-   * ===================================*/
-  hipc::allocator_id_t alloc_id_;
-
-  /**====================================
-   * Constructors
-   * ===================================*/
-
-  /** Default constructor. Deleted. */
-  CLASS_NAME() = delete;
-
-  /** Move constructor. Deleted. */
-  CLASS_NAME(CLASS_NAME &&other) = delete;
-
-  /** Copy constructor. Deleted. */
-  CLASS_NAME(const CLASS_NAME &other) = delete;
-
-  /** Initialize container */
-  void shm_init_container(hipc::Allocator *alloc) {
-    alloc_id_ = alloc->GetId();
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Destructor. */
-  HSHM_ALWAYS_INLINE ~CLASS_NAME() = default;
-
-  /** Destruction operation */
-  HSHM_ALWAYS_INLINE void shm_destroy() {
-    if (IsNull()) { return; }
-    shm_destroy_main();
-    SetNull();
-  }
-
-  /**====================================
-   * Header Operations
-   * ===================================*/
-
-  /** Get a typed pointer to the object */
-  template<typename POINTER_T>
-  HSHM_ALWAYS_INLINE POINTER_T GetShmPointer() const {
-    return GetAllocator()->template Convert<TYPED_CLASS, POINTER_T>(this);
-  }
-
-  /**====================================
-   * Query Operations
-   * ===================================*/
-
-  /** Get the allocator for this container */
-  HSHM_ALWAYS_INLINE hipc::Allocator* GetAllocator() const {
-    return HERMES_MEMORY_REGISTRY_REF.GetAllocator(alloc_id_);
-  }
-
-  /** Get the shared-memory allocator id */
-  HSHM_ALWAYS_INLINE hipc::allocator_id_t& GetAllocatorId() const {
-    return GetAllocator()->GetId();
-  }
-};
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif //HERMES_INCLUDE_HERMES_DATA_STRUCTURES_INTERNAL_SHM_CONTAINER_EXAMPLE_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/template/shm_container_base_template.h b/hermes_shm/include/hermes_shm/data_structures/ipc/internal/template/shm_container_base_template.h
deleted file mode 100644
index d62d26170..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/internal/template/shm_container_base_template.h
+++ /dev/null
@@ -1,61 +0,0 @@
-public:
-/**====================================
- * Variables & Types
- * ===================================*/
-hipc::allocator_id_t alloc_id_;
-
-/**====================================
- * Constructors
- * ===================================*/
-
-/** Default constructor. Deleted. */
-CLASS_NAME() = delete;
-
-/** Move constructor. Deleted. */
-CLASS_NAME(CLASS_NAME &&other) = delete;
-
-/** Copy constructor. Deleted. */
-CLASS_NAME(const CLASS_NAME &other) = delete;
-
-/** Initialize container */
-void shm_init_container(hipc::Allocator *alloc) {
-  alloc_id_ = alloc->GetId();
-}
-
-/**====================================
- * Destructor
- * ===================================*/
-
-/** Destructor. */
-HSHM_ALWAYS_INLINE ~CLASS_NAME() = default;
-
-/** Destruction operation */
-HSHM_ALWAYS_INLINE void shm_destroy() {
-  if (IsNull()) { return; }
-  shm_destroy_main();
-  SetNull();
-}
-
-/**====================================
- * Header Operations
- * ===================================*/
-
-/** Get a typed pointer to the object */
-template<typename POINTER_T>
-HSHM_ALWAYS_INLINE POINTER_T GetShmPointer() const {
-  return GetAllocator()->template Convert<TYPED_CLASS, POINTER_T>(this);
-}
-
-/**====================================
- * Query Operations
- * ===================================*/
-
-/** Get the allocator for this container */
-HSHM_ALWAYS_INLINE hipc::Allocator* GetAllocator() const {
-  return HERMES_MEMORY_REGISTRY_REF.GetAllocator(alloc_id_);
-}
-
-/** Get the shared-memory allocator id */
-HSHM_ALWAYS_INLINE hipc::allocator_id_t& GetAllocatorId() const {
-  return GetAllocator()->GetId();
-}
\ No newline at end of file
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/iqueue.h b/hermes_shm/include/hermes_shm/data_structures/ipc/iqueue.h
deleted file mode 100644
index a0a799a99..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/iqueue.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_THREAD_UNSAFE_IQUEUE_H
-#define HERMES_DATA_STRUCTURES_THREAD_UNSAFE_IQUEUE_H
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-
-namespace hshm::ipc {
-
-/** forward pointer for iqueue */
-template<typename T>
-class iqueue;
-
-/** represents an object within a iqueue */
-struct iqueue_entry {
-  OffsetPointer next_ptr_;
-};
-
-/**
- * The iqueue iterator
- * */
-template<typename T>
-struct iqueue_iterator_templ {
- public:
-  /**< A shm reference to the containing iqueue object. */
-  iqueue<T> *iqueue_;
-  /**< A pointer to the entry in shared memory */
-  iqueue_entry *entry_;
-  /**< A pointer to the entry prior to this one */
-  iqueue_entry *prior_entry_;
-
-  /** Default constructor */
-  iqueue_iterator_templ() = default;
-
-  /** Construct begin iterator  */
-  explicit iqueue_iterator_templ(iqueue<T> &iqueue,
-                                 iqueue_entry *entry)
-    : iqueue_(&iqueue), entry_(entry), prior_entry_(nullptr) {}
-
-  /** Copy constructor */
-  iqueue_iterator_templ(const iqueue_iterator_templ &other)
-  : iqueue_(other.iqueue_) {
-    iqueue_ = other.iqueue_;
-    entry_ = other.entry_;
-    prior_entry_ = other.prior_entry_;
-  }
-
-  /** Assign this iterator from another iterator */
-  iqueue_iterator_templ& operator=(const iqueue_iterator_templ &other) {
-    if (this != &other) {
-      iqueue_ = other.iqueue_;
-      entry_ = other.entry_;
-      prior_entry_ = other.prior_entry_;
-    }
-    return *this;
-  }
-
-  /** Get the object the iterator points to */
-  T* operator*() {
-    return reinterpret_cast<T*>(entry_);
-  }
-
-  /** Get the object the iterator points to */
-  T* operator*() const {
-    return reinterpret_cast<T*>(entry_);
-  }
-
-  /** Get the next iterator (in place) */
-  iqueue_iterator_templ& operator++() {
-    if (is_end()) { return *this; }
-    prior_entry_ = entry_;
-    entry_ = iqueue_->GetAllocator()->template
-      Convert<iqueue_entry>(entry_->next_ptr_);
-    return *this;
-  }
-
-  /** Return the next iterator */
-  iqueue_iterator_templ operator++(int) const {
-    iqueue_iterator_templ next_iter(*this);
-    ++next_iter;
-    return next_iter;
-  }
-
-  /** Return the iterator at count after this one */
-  iqueue_iterator_templ operator+(size_t count) const {
-    iqueue_iterator_templ pos(*this);
-    for (size_t i = 0; i < count; ++i) {
-      ++pos;
-    }
-    return pos;
-  }
-
-  /** Get the iterator at count after this one (in-place) */
-  void operator+=(size_t count) {
-    iqueue_iterator_templ pos = (*this) + count;
-    entry_ = pos.entry_;
-    prior_entry_ = pos.prior_entry_;
-  }
-
-  /** Determine if two iterators are equal */
-  friend bool operator==(const iqueue_iterator_templ &a,
-                         const iqueue_iterator_templ &b) {
-    return (a.is_end() && b.is_end()) || (a.entry_ == b.entry_);
-  }
-
-  /** Determine if two iterators are inequal */
-  friend bool operator!=(const iqueue_iterator_templ &a,
-                         const iqueue_iterator_templ &b) {
-    return !(a.is_end() && b.is_end()) && (a.entry_ != b.entry_);
-  }
-
-  /** Determine whether this iterator is the end iterator */
-  bool is_end() const {
-    return entry_ == nullptr;
-  }
-
-  /** Determine whether this iterator is the begin iterator */
-  bool is_begin() const {
-    if (entry_) {
-      return prior_entry_ == nullptr;
-    } else {
-      return false;
-    }
-  }
-};
-
-/**
- * MACROS used to simplify the iqueue namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME iqueue
-#define TYPED_CLASS iqueue<T>
-#define TYPED_HEADER ShmHeader<iqueue<T>>
-
-/**
- * Doubly linked iqueue implementation
- * */
-template<typename T>
-class iqueue : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-  OffsetPointer head_ptr_;
-  size_t length_;
-
-  /**====================================
-   * Typedefs
-   * ===================================*/
-
-  /** forward iterator typedef */
-  typedef iqueue_iterator_templ<T> iterator_t;
-  /** const forward iterator typedef */
-  typedef iqueue_iterator_templ<T> citerator_t;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit iqueue(Allocator *alloc) {
-    shm_init_container(alloc);
-    length_ = 0;
-    head_ptr_.SetNull();
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor */
-  explicit iqueue(Allocator *alloc,
-                  const iqueue &other) {
-    shm_init_container(alloc);
-    shm_strong_copy_construct_and_op(other);
-  }
-
-  /** SHM copy assignment operator */
-  iqueue& operator=(const iqueue &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor + operator */
-  void shm_strong_copy_construct_and_op(const iqueue &other) {
-    memcpy((void*)this, (void*)&other, sizeof(*this));
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  iqueue(Allocator *alloc, iqueue &&other) noexcept {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      memcpy((void*)this, (void*)&other, sizeof(*this));
-      other.SetNull();
-    } else {
-      shm_strong_copy_construct_and_op(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  iqueue& operator=(iqueue &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (this != &other) {
-        memcpy((void *) this, (void *) &other, sizeof(*this));
-        other.SetNull();
-      } else {
-        shm_strong_copy_construct_and_op(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Check if the iqueue is null */
-  bool IsNull() {
-    return length_ == 0;
-  }
-
-  /** Set the iqueue to null */
-  void SetNull() {
-    length_ = 0;
-  }
-
-  /** SHM destructor. */
-  void shm_destroy_main() {
-    clear();
-  }
-
-  /**====================================
-   * SHM Deserialization
-   * ===================================*/
-
-  /** Load from shared memory */
-  void shm_deserialize_main() {}
-
-  /**====================================
-   * iqueue Methods
-   * ===================================*/
-
-  /** Construct an element at \a pos position in the iqueue */
-  void enqueue(T *entry) {
-    OffsetPointer entry_ptr = GetAllocator()->
-      template Convert<T, OffsetPointer>(entry);
-    reinterpret_cast<iqueue_entry*>(entry)->next_ptr_ = head_ptr_;
-    head_ptr_ = entry_ptr;
-    ++length_;
-  }
-
-  /** Dequeue the first element */
-  T* dequeue() {
-    if (size() == 0) { return nullptr; }
-    auto entry = GetAllocator()->
-      template Convert<iqueue_entry>(head_ptr_);
-    head_ptr_ = entry->next_ptr_;
-    --length_;
-    return reinterpret_cast<T*>(entry);
-  }
-
-  /** Dequeue the element at the iterator position */
-  T* dequeue(iqueue_iterator_templ<T> pos) {
-    if (pos.prior_entry_ == nullptr) {
-      return dequeue();
-    }
-    auto entry = *pos;
-    auto prior_cast = reinterpret_cast<iqueue_entry*>(pos.prior_entry_);
-    auto pos_cast = reinterpret_cast<iqueue_entry*>(pos.entry_);
-    prior_cast->next_ptr_ = pos_cast->next_ptr_;
-    --length_;
-    return reinterpret_cast<T*>(entry);
-  }
-
-  /** Peek the first element of the queue */
-  T* peek() {
-    if (size() == 0) { return nullptr; }
-    auto entry = GetAllocator()->
-      template Convert<iqueue_entry>(head_ptr_);
-    return reinterpret_cast<T*>(entry);
-  }
-
-  /** Destroy all elements in the iqueue */
-  void clear() {
-    while (size()) {
-      dequeue();
-    }
-  }
-
-  /** Get the number of elements in the iqueue */
-  size_t size() const {
-    return length_;
-  }
-
-  /**====================================
-  * Iterators
-  * ===================================*/
-
-  /** Forward iterator begin */
-  iterator_t begin() {
-    if (size() == 0) { return end(); }
-    auto head = GetAllocator()->template
-      Convert<iqueue_entry>(head_ptr_);
-    return iterator_t(*this, head);
-  }
-
-  /** Forward iterator end */
-  iterator_t const end() {
-    return iterator_t(*this, nullptr);
-  }
-
-  /** Constant forward iterator begin */
-  citerator_t cbegin() const {
-    if (size() == 0) { return cend(); }
-    auto head = GetAllocator()->template
-      Convert<iqueue_entry>(head_ptr_);
-    return citerator_t(const_cast<iqueue&>(*this), head);
-  }
-
-  /** Constant forward iterator end */
-  citerator_t const cend() const {
-    return citerator_t(const_cast<iqueue&>(*this), nullptr);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_DATA_STRUCTURES_THREAD_UNSAFE_IQUEUE_H
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/list.h b/hermes_shm/include/hermes_shm/data_structures/ipc/list.h
deleted file mode 100644
index 6f00c2398..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/list.h
+++ /dev/null
@@ -1,489 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_THREAD_UNSAFE_LIST_H_
-#define HERMES_DATA_STRUCTURES_THREAD_UNSAFE_LIST_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/data_structures/containers/functional.h"
-
-#include <list>
-
-namespace hshm::ipc {
-
-/** forward pointer for list */
-template<typename T>
-class list;
-
-/** represents an object within a list */
-template<typename T>
-struct list_entry {
- public:
-  OffsetPointer next_ptr_, prior_ptr_;
-  ShmArchive<T> data_;
-};
-
-/**
- * The list iterator
- * */
-template<typename T>
-struct list_iterator_templ {
- public:
-  /**< A shm reference to the containing list object. */
-  list<T> *list_;
-  /**< A pointer to the entry in shared memory */
-  list_entry<T> *entry_;
-  /**< The offset of the entry in the shared-memory allocator */
-  OffsetPointer entry_ptr_;
-
-  /** Default constructor */
-  list_iterator_templ() = default;
-
-  /** Construct an iterator  */
-  explicit list_iterator_templ(list<T> &list,
-                               list_entry<T> *entry,
-                               OffsetPointer entry_ptr)
-    : list_(&list), entry_(entry), entry_ptr_(entry_ptr) {}
-
-  /** Copy constructor */
-  list_iterator_templ(const list_iterator_templ &other) {
-    list_ = other.list_;
-    entry_ = other.entry_;
-    entry_ptr_ = other.entry_ptr_;
-  }
-
-  /** Assign this iterator from another iterator */
-  list_iterator_templ& operator=(const list_iterator_templ &other) {
-    if (this != &other) {
-      list_ = other.list_;
-      entry_ = other.entry_;
-      entry_ptr_ = other.entry_ptr_;
-    }
-    return *this;
-  }
-
-  /** Get the object the iterator points to */
-  T& operator*() {
-    return entry_->data_.get_ref();
-  }
-
-  /** Get the object the iterator points to */
-  const T& operator*() const {
-    return entry_->data_.get_ref();
-  }
-
-  /** Get the next iterator (in place) */
-  list_iterator_templ& operator++() {
-    if (is_end()) { return *this; }
-    entry_ptr_ = entry_->next_ptr_;
-    entry_ = list_->GetAllocator()->template
-      Convert<list_entry<T>>(entry_->next_ptr_);
-    return *this;
-  }
-
-  /** Get the prior iterator (in place) */
-  list_iterator_templ& operator--() {
-    if (is_end() || is_begin()) { return *this; }
-    entry_ptr_ = entry_->prior_ptr_;
-    entry_ = list_->GetAllocator()->template
-      Convert<list_entry<T>>(entry_->prior_ptr_);
-    return *this;
-  }
-
-  /** Return the next iterator */
-  list_iterator_templ operator++(int) const {
-    list_iterator_templ next_iter(*this);
-    ++next_iter;
-    return next_iter;
-  }
-
-  /** Return the prior iterator */
-  list_iterator_templ operator--(int) const {
-    list_iterator_templ prior_iter(*this);
-    --prior_iter;
-    return prior_iter;
-  }
-
-  /** Return the iterator at count after this one */
-  list_iterator_templ operator+(size_t count) const {
-    list_iterator_templ pos(*this);
-    for (size_t i = 0; i < count; ++i) {
-      ++pos;
-    }
-    return pos;
-  }
-
-  /** Return the iterator at count before this one */
-  list_iterator_templ operator-(size_t count) const {
-    list_iterator_templ pos(*this);
-    for (size_t i = 0; i < count; ++i) {
-      --pos;
-    }
-    return pos;
-  }
-
-  /** Get the iterator at count after this one (in-place) */
-  void operator+=(size_t count) {
-    list_iterator_templ pos = (*this) + count;
-    entry_ = pos.entry_;
-    entry_ptr_ = pos.entry_ptr_;
-  }
-
-  /** Get the iterator at count before this one (in-place) */
-  void operator-=(size_t count) {
-    list_iterator_templ pos = (*this) - count;
-    entry_ = pos.entry_;
-    entry_ptr_ = pos.entry_ptr_;
-  }
-
-  /** Determine if two iterators are equal */
-  friend bool operator==(const list_iterator_templ &a,
-                         const list_iterator_templ &b) {
-    return (a.is_end() && b.is_end()) || (a.entry_ == b.entry_);
-  }
-
-  /** Determine if two iterators are inequal */
-  friend bool operator!=(const list_iterator_templ &a,
-                         const list_iterator_templ &b) {
-    return !(a.is_end() && b.is_end()) && (a.entry_ != b.entry_);
-  }
-
-  /** Determine whether this iterator is the end iterator */
-  bool is_end() const {
-    return entry_ == nullptr;
-  }
-
-  /** Determine whether this iterator is the begin iterator */
-  bool is_begin() const {
-    if (entry_) {
-      return entry_->prior_ptr_.IsNull();
-    } else {
-      return false;
-    }
-  }
-};
-
-/**
- * MACROS used to simplify the list namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME list
-#define TYPED_CLASS list<T>
-#define TYPED_HEADER ShmHeader<list<T>>
-
-/**
- * Doubly linked list implementation
- * */
-template<typename T>
-class list : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-  OffsetPointer head_ptr_, tail_ptr_;
-  size_t length_;
-
- public:
-  /**====================================
-   * Typedefs
-   * ===================================*/
-
-  /** forward iterator typedef */
-  typedef list_iterator_templ<T> iterator_t;
-  /** const forward iterator typedef */
-  typedef list_iterator_templ<T> citerator_t;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit list(Allocator *alloc) {
-    shm_init_container(alloc);
-    SetNull();
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor */
-  explicit list(Allocator *alloc,
-                const list &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_construct_and_op<list>(other);
-  }
-
-  /** SHM copy assignment operator */
-  list& operator=(const list &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op<list>(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor. From std::list */
-  explicit list(Allocator *alloc,
-                std::list<T> &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_construct_and_op<std::list<T>>(other);
-  }
-
-  /** SHM copy assignment operator. From std::list. */
-  list& operator=(const std::list<T> &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op<std::list<T>>(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor + operator main */
-  template<typename ListT>
-  void shm_strong_copy_construct_and_op(const ListT &other) {
-    for (auto iter = other.cbegin(); iter != other.cend(); ++iter) {
-      emplace_back(*iter);
-    }
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  list(Allocator *alloc, list &&other) noexcept {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      memcpy((void*) this, (void *) &other, sizeof(*this));
-      other.SetNull();
-    } else {
-      shm_strong_copy_construct_and_op<list>(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  list& operator=(list &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        memcpy((void *) this, (void *) &other, sizeof(*this));
-        other.SetNull();
-      } else {
-        shm_strong_copy_construct_and_op<list>(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** SHM destructor.  */
-  void shm_destroy_main() {
-    clear();
-  }
-
-  /** Check if the list is empty */
-  bool IsNull() const {
-    return length_ == 0;
-  }
-
-  /** Sets this list as empty */
-  void SetNull() {
-    length_ = 0;
-    head_ptr_.SetNull();
-    tail_ptr_.SetNull();
-  }
-
-  /**====================================
-   * list Methods
-   * ===================================*/
-
-  /** Construct an element at the back of the list */
-  template<typename... Args>
-  void emplace_back(Args&&... args) {
-    emplace(end(), std::forward<Args>(args)...);
-  }
-
-  /** Construct an element at the beginning of the list */
-  template<typename... Args>
-  void emplace_front(Args&&... args) {
-    emplace(begin(), std::forward<Args>(args)...);
-  }
-
-  /** Construct an element at \a pos position in the list */
-  template<typename ...Args>
-  void emplace(iterator_t pos, Args&&... args) {
-    OffsetPointer entry_ptr;
-    auto entry = _create_entry(entry_ptr, std::forward<Args>(args)...);
-    if (size() == 0) {
-      entry->prior_ptr_.SetNull();
-      entry->next_ptr_.SetNull();
-      head_ptr_ = entry_ptr;
-      tail_ptr_ = entry_ptr;
-    } else if (pos.is_begin()) {
-      entry->prior_ptr_.SetNull();
-      entry->next_ptr_ = head_ptr_;
-      auto head = GetAllocator()->template
-        Convert<list_entry<T>>(tail_ptr_);
-      head->prior_ptr_ = entry_ptr;
-      head_ptr_ = entry_ptr;
-    } else if (pos.is_end()) {
-      entry->prior_ptr_ = tail_ptr_;
-      entry->next_ptr_.SetNull();
-      auto tail = GetAllocator()->template
-        Convert<list_entry<T>>(tail_ptr_);
-      tail->next_ptr_ = entry_ptr;
-      tail_ptr_ = entry_ptr;
-    } else {
-      auto next = GetAllocator()->template
-        Convert<list_entry<T>>(pos.entry_->next_ptr_);
-      auto prior = GetAllocator()->template
-        Convert<list_entry<T>>(pos.entry_->prior_ptr_);
-      entry->next_ptr_ = pos.entry_->next_ptr_;
-      entry->prior_ptr_ = pos.entry_->prior_ptr_;
-      next->prior_ptr_ = entry_ptr;
-      prior->next_ptr_ = entry_ptr;
-    }
-    ++length_;
-  }
-
-  /** Erase element with ID */
-  void erase(const T &entry) {
-    auto iter = find(entry);
-    erase(iter);
-  }
-
-  /** Erase the element at pos */
-  void erase(iterator_t pos) {
-    erase(pos, pos+1);
-  }
-
-  /** Erase all elements between first and last */
-  void erase(iterator_t first,
-             iterator_t last) {
-    if (first.is_end()) { return; }
-    auto first_prior_ptr = first.entry_->prior_ptr_;
-    auto pos = first;
-    while (pos != last) {
-      auto next = pos + 1;
-      HSHM_DESTROY_AR(pos.entry_->data_)
-      GetAllocator()->Free(pos.entry_ptr_);
-      --length_;
-      pos = next;
-    }
-
-    if (first_prior_ptr.IsNull()) {
-      head_ptr_ = last.entry_ptr_;
-    } else {
-      auto first_prior = GetAllocator()->template
-        Convert<list_entry<T>>(first_prior_ptr);
-      first_prior->next_ptr_ = last.entry_ptr_;
-    }
-
-    if (last.entry_ptr_.IsNull()) {
-      tail_ptr_ = first_prior_ptr;
-    } else {
-      last.entry_->prior_ptr_ = first_prior_ptr;
-    }
-  }
-
-  /** Destroy all elements in the list */
-  void clear() {
-    erase(begin(), end());
-  }
-
-  /** Get the object at the front of the list */
-  T& front() {
-    return *begin();
-  }
-
-  /** Get the object at the back of the list */
-  T& back() {
-    return *last();
-  }
-
-  /** Get the number of elements in the list */
-  size_t size() const {
-    return length_;
-  }
-
-  /** Find an element in this list */
-  iterator_t find(const T &entry) {
-    return hshm::find(begin(), end(), entry);
-  }
-
-  /**====================================
-   * Iterators
-   * ===================================*/
-
-  /** Forward iterator begin */
-  iterator_t begin() {
-    if (size() == 0) { return end(); }
-    auto head = GetAllocator()->template
-      Convert<list_entry<T>>(head_ptr_);
-    return iterator_t(*this,
-      head, head_ptr_);
-  }
-
-  /** Last iterator begin */
-  iterator_t last() {
-    if (size() == 0) { return end(); }
-    auto tail = GetAllocator()->template
-      Convert<list_entry<T>>(tail_ptr_);
-    return iterator_t(*this, tail, tail_ptr_);
-  }
-
-  /** Forward iterator end */
-  iterator_t end() {
-    return iterator_t(*this, nullptr, OffsetPointer::GetNull());
-  }
-
-  /** Constant forward iterator begin */
-  citerator_t cbegin() const {
-    if (size() == 0) { return cend(); }
-    auto head = GetAllocator()->template
-      Convert<list_entry<T>>(head_ptr_);
-    return citerator_t(const_cast<list&>(*this),
-                       head, head_ptr_);
-  }
-
-  /** Constant forward iterator end */
-  citerator_t cend() const {
-    return iterator_t(const_cast<list&>(*this),
-                      nullptr, OffsetPointer::GetNull());
-  }
-
- private:
-  template<typename ...Args>
-  HSHM_ALWAYS_INLINE list_entry<T>* _create_entry(
-    OffsetPointer &p, Args&& ...args) {
-    auto entry = GetAllocator()->template
-      AllocateObjs<list_entry<T>>(1, p);
-    HSHM_MAKE_AR(entry->data_, GetAllocator(), std::forward<Args>(args)...)
-    return entry;
-  }
-};
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_DATA_STRUCTURES_THREAD_UNSAFE_LIST_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/mpsc_queue.h b/hermes_shm/include/hermes_shm/data_structures/ipc/mpsc_queue.h
deleted file mode 100644
index 7c6026115..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/mpsc_queue.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_mpsc_queue_templ_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_mpsc_queue_templ_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/thread/lock.h"
-#include "vector.h"
-#include "pair.h"
-#include "_queue.h"
-
-namespace hshm::ipc {
-
-/** Forward declaration of mpsc_queue_templ */
-template<typename T, bool EXTENSIBLE>
-class mpsc_queue_templ;
-
-/**
- * MACROS used to simplify the mpsc_queue_templ namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME mpsc_queue_templ
-#define TYPED_CLASS mpsc_queue_templ<T, EXTENSIBLE>
-#define TYPED_HEADER ShmHeader<mpsc_queue_templ<T, EXTENSIBLE>>
-
-/**
- * A queue optimized for multiple producers (emplace) with a single
- * consumer (pop).
- * */
-template<typename T, bool EXTENSIBLE>
-class mpsc_queue_templ : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-  ShmArchive<vector<pair<bitfield32_t, T>>> queue_;
-  std::atomic<_qtok_t> tail_;
-  std::atomic<_qtok_t> head_;
-  RwLock lock_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit mpsc_queue_templ(Allocator *alloc,
-                            size_t depth = 1024) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR(queue_, GetAllocator(), depth);
-    SetNull();
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor */
-  explicit mpsc_queue_templ(Allocator *alloc,
-                            const mpsc_queue_templ &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_construct_and_op(other);
-  }
-
-  /** SHM copy assignment operator */
-  mpsc_queue_templ& operator=(const mpsc_queue_templ &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor + operator main */
-  void shm_strong_copy_construct_and_op(const mpsc_queue_templ &other) {
-    head_ = other.head_.load();
-    tail_ = other.tail_.load();
-    (*queue_) = (*other.queue_);
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  mpsc_queue_templ(Allocator *alloc,
-                   mpsc_queue_templ &&other) noexcept {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      head_ = other.head_.load();
-      tail_ = other.tail_.load();
-      (*queue_) = std::move(*other.queue_);
-      other.SetNull();
-    } else {
-      shm_strong_copy_construct_and_op(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  mpsc_queue_templ& operator=(mpsc_queue_templ &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        head_ = other.head_.load();
-        tail_ = other.tail_.load();
-        (*queue_) = std::move(*other.queue_);
-        other.SetNull();
-      } else {
-        shm_strong_copy_construct_and_op(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** SHM destructor.  */
-  void shm_destroy_main() {
-    (*queue_).shm_destroy();
-  }
-
-  /** Check if the list is empty */
-  bool IsNull() const {
-    return (*queue_).IsNull();
-  }
-
-  /** Sets this list as empty */
-  void SetNull() {
-    head_ = 0;
-    tail_ = 0;
-  }
-
-  /**====================================
-   * MPSC Queue Methods
-   * ===================================*/
-
-  /** Construct an element at \a pos position in the list */
-  template<typename ...Args>
-  qtok_t emplace(Args&&... args) {
-    // Allocate a slot in the queue
-    // The slot is marked NULL, so pop won't do anything if context switch
-    _qtok_t head = head_.load();
-    _qtok_t tail = tail_.fetch_add(1);
-    size_t size = tail - head + 1;
-
-    // Check if there's space in the queue. Resize if necessary.
-    if (size > (*queue_).size()) {
-      if constexpr(EXTENSIBLE) {
-        ScopedRwWriteLock resize_lock(lock_, 0);
-        if (size > (*queue_).size()) {
-          size_t old_size = (*queue_).size();
-          size_t new_size = (RealNumber(5, 4) * (size + 64)).as_int();
-          auto new_queue =
-            hipc::make_uptr<vector<pair<bitfield32_t, T>>>(new_size);
-          for (uint64_t i = 0; i < old_size; ++i) {
-            _qtok_t i_old = (head + i) % old_size;
-            _qtok_t i_new = (head + i) % new_size;
-            (*new_queue)[i_new] = std::move((*queue_)[i_old]);
-          }
-          (*queue_) = std::move(*new_queue);
-        }
-      } else {
-        while (1) {
-          head = head_.load();
-          size = tail - head + 1;
-          if (size <= (*queue_).size()) {
-            break;
-          }
-          HERMES_THREAD_MODEL->Yield();
-        }
-      }
-    }
-
-    // Emplace into queue at our slot
-    if constexpr(EXTENSIBLE) {
-      ScopedRwReadLock resize_lock(lock_, 0);
-      _emplace(tail, std::forward<Args>(args)...);
-    } else {
-      _emplace(tail, std::forward<Args>(args)...);
-    }
-    return qtok_t(tail);
-  }
-
- private:
-  /** Emplace operation */
-  template<typename ...Args>
-  HSHM_ALWAYS_INLINE void _emplace(_qtok_t tail, Args&& ...args) {
-    uint32_t idx = tail % (*queue_).size();
-    auto iter = (*queue_).begin() + idx;
-    (*queue_).replace(iter,
-                    hshm::PiecewiseConstruct(),
-                    make_argpack(),
-                    make_argpack(std::forward<Args>(args)...));
-
-    // Let pop know that the data is fully prepared
-    pair<bitfield32_t, T> &entry = (*iter);
-    entry.GetFirst().SetBits(1);
-  }
-
- public:
-  /** Consumer pops the head object */
-  HSHM_ALWAYS_INLINE qtok_t pop(T &val) {
-    if constexpr(EXTENSIBLE) {
-      ScopedRwReadLock resize_lock(lock_, 0);
-      return _pop(val);
-    } else {
-      return _pop(val);
-    }
-  }
-
-  /** Pop operation */
-  HSHM_ALWAYS_INLINE qtok_t _pop(T &val) {
-    // Don't pop if there's no entries
-    _qtok_t head = head_.load();
-    _qtok_t tail = tail_.load();
-    if (head >= tail) {
-      return qtok_t::GetNull();
-    }
-
-    // Pop the element, but only if it's marked valid
-    _qtok_t idx = head % (*queue_).size();
-    hipc::pair<bitfield32_t, T> &entry = (*queue_)[idx];
-    if (entry.GetFirst().Any(1)) {
-      val = std::move(entry.GetSecond());
-      entry.GetFirst().Clear();
-      head_.fetch_add(1);
-      return qtok_t(head);
-    } else {
-      return qtok_t::GetNull();
-    }
-  }
-};
-
-template<typename T>
-using mpsc_queue_ext = mpsc_queue_templ<T, true>;
-
-template<typename T>
-using mpsc_queue = mpsc_queue_templ<T, false>;
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_mpsc_queue_templ_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/pair.h b/hermes_shm/include/hermes_shm/data_structures/ipc/pair.h
deleted file mode 100644
index be1b0bbb5..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/pair.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_DATA_STRUCTURES_PAIR_H_
-#define HERMES_INCLUDE_HERMES_DATA_STRUCTURES_PAIR_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/data_structures/smart_ptr/smart_ptr_base.h"
-
-namespace hshm::ipc {
-
-/** forward declaration for string */
-template<typename FirstT, typename SecondT>
-class pair;
-
-/**
-* MACROS used to simplify the string namespace
-* Used as inputs to the SHM_CONTAINER_TEMPLATE
-* */
-#define CLASS_NAME pair
-#define TYPED_CLASS pair<FirstT, SecondT>
-#define TYPED_HEADER ShmHeader<TYPED_CLASS>
-
-/**
-* A pair of two objects.
-* */
-template<typename FirstT, typename SecondT>
-class pair : public ShmContainer {
- public:
-  /**====================================
-   * Variables
-   * ===================================*/
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-  ShmArchive<FirstT> first_;
-  ShmArchive<SecondT> second_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit pair(Allocator *alloc) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR0(first_, GetAllocator())
-    HSHM_MAKE_AR0(second_, GetAllocator())
-  }
-
-  /**====================================
-   * Emplace Constructors
-   * ===================================*/
-
-  /** SHM constructor. Move parameters. */
-  explicit pair(Allocator *alloc,
-                FirstT &&first, SecondT &&second) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR(first_, GetAllocator(),
-                 std::forward<FirstT>(first))
-    HSHM_MAKE_AR(second_, GetAllocator(),
-                 std::forward<SecondT>(second))
-  }
-
-  /** SHM constructor. Copy parameters. */
-  explicit pair(Allocator *alloc,
-                const FirstT &first, const SecondT &second) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR(first_, GetAllocator(), first)
-    HSHM_MAKE_AR(second_, GetAllocator(), second)
-  }
-
-  /** SHM constructor. Piecewise emplace. */
-  template<typename FirstArgPackT, typename SecondArgPackT>
-  explicit pair(Allocator *alloc,
-                PiecewiseConstruct &&hint,
-                FirstArgPackT &&first,
-                SecondArgPackT &&second) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR_PW(first_, GetAllocator(),
-                    std::forward<FirstArgPackT>(first))
-    HSHM_MAKE_AR_PW(second_, GetAllocator(),
-                    std::forward<SecondArgPackT>(second))
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor. From pair. */
-  explicit pair(Allocator *alloc, const pair &other) {
-    shm_init_container(alloc);
-    shm_strong_copy_construct(other);
-  }
-
-  /** SHM copy constructor main */
-  void shm_strong_copy_construct(const pair &other) {
-    HSHM_MAKE_AR(first_, GetAllocator(), *other.first_)
-    HSHM_MAKE_AR(second_, GetAllocator(), *other.second_)
-  }
-
-  /** SHM copy assignment operator. From pair. */
-  pair& operator=(const pair &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_assign_op(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy assignment operator main */
-  void shm_strong_copy_assign_op(const pair &other) {
-    (first_.get_ref()) = (*other.first_);
-    (second_.get_ref()) = (*other.second_);
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. From pair. */
-  explicit pair(Allocator *alloc, pair &&other) {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      HSHM_MAKE_AR(first_, GetAllocator(),
-                   std::forward<FirstT>(*other.first_))
-      HSHM_MAKE_AR(second_, GetAllocator(),
-                   std::forward<SecondT>(*other.second_))
-    } else {
-      shm_strong_copy_construct(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. From pair. */
-  pair& operator=(pair &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        (*first_) = std::move(*other.first_);
-        (*second_) = std::move(*other.second_);
-        other.SetNull();
-      } else {
-        shm_strong_copy_assign_op(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Check if the pair is empty */
-  HSHM_ALWAYS_INLINE bool IsNull() const {
-    return false;
-  }
-
-  /** Sets this pair as empty */
-  HSHM_ALWAYS_INLINE void SetNull() {}
-
-  /** Destroy the shared-memory data */
-  HSHM_ALWAYS_INLINE void shm_destroy_main() {
-    HSHM_DESTROY_AR(first_)
-    HSHM_DESTROY_AR(second_)
-  }
-
-  /**====================================
-   * pair Methods
-   * ===================================*/
-
-  /** Get the first object */
-  HSHM_ALWAYS_INLINE FirstT& GetFirst() { return first_.get_ref(); }
-
-  /** Get the first object (const) */
-  HSHM_ALWAYS_INLINE FirstT& GetFirst() const { return first_.get_ref(); }
-
-  /** Get the second object */
-  HSHM_ALWAYS_INLINE SecondT& GetSecond() { return second_.get_ref(); }
-
-  /** Get the second object (const) */
-  HSHM_ALWAYS_INLINE SecondT& GetSecond() const { return second_.get_ref(); }
-
-  /** Get the first object (treated as key) */
-  HSHM_ALWAYS_INLINE FirstT& GetKey() { return first_.get_ref(); }
-
-  /** Get the first object (treated as key) (const) */
-  HSHM_ALWAYS_INLINE FirstT& GetKey() const { return first_.get_ref(); }
-
-  /** Get the second object (treated as value) */
-  HSHM_ALWAYS_INLINE SecondT& GetVal() { return second_.get_ref(); }
-
-  /** Get the second object (treated as value) (const) */
-  HSHM_ALWAYS_INLINE SecondT& GetVal() const { return second_.get_ref(); }
-};
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_HERMES_DATA_STRUCTURES_PAIR_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/slist.h b/hermes_shm/include/hermes_shm/data_structures/ipc/slist.h
deleted file mode 100644
index 1f79d018c..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/slist.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_THREAD_UNSAFE_Sslist_H
-#define HERMES_DATA_STRUCTURES_THREAD_UNSAFE_Sslist_H
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/data_structures/containers/functional.h"
-
-namespace hshm::ipc {
-
-/** forward pointer for slist */
-template<typename T>
-class slist;
-
-/** represents an object within a slist */
-template<typename T>
-struct slist_entry {
- public:
-  OffsetPointer next_ptr_;
-  ShmArchive<T> data_;
-
-  /** Constructor */
-  template<typename ...Args>
-  explicit slist_entry(Allocator *alloc, Args&& ...args) {
-    HSHM_MAKE_AR(data_, alloc, std::forward<Args>(args)...)
-  }
-};
-
-/**
- * The slist iterator
- * */
-template<typename T>
-struct slist_iterator_templ {
- public:
-  /**< A shm reference to the containing slist object. */
-  slist<T> *slist_;
-  /**< A pointer to the entry in shared memory */
-  slist_entry<T> *entry_;
-  /**< The offset of the entry in the shared-memory allocator */
-  OffsetPointer entry_ptr_;
-
-  /** Default constructor */
-  slist_iterator_templ() = default;
-
-  /** Construct an iterator */
-  explicit slist_iterator_templ(slist<T>& slist,
-                                slist_entry<T> *entry,
-                                OffsetPointer entry_ptr)
-    : slist_(&slist), entry_(entry), entry_ptr_(entry_ptr) {}
-
-  /** Copy constructor */
-  slist_iterator_templ(const slist_iterator_templ &other) {
-    slist_ = other.slist_;
-    entry_ = other.entry_;
-    entry_ptr_ = other.entry_ptr_;
-  }
-
-  /** Assign this iterator from another iterator */
-  slist_iterator_templ& operator=(const slist_iterator_templ &other) {
-    if (this != &other) {
-      slist_ = other.slist_;
-      entry_ = other.entry_;
-      entry_ptr_ = other.entry_ptr_;
-    }
-    return *this;
-  }
-
-  /** Get the object the iterator points to */
-  T& operator*() {
-    return entry_->data_.get_ref();
-  }
-
-  /** Get the object the iterator points to */
-  const T& operator*() const {
-    return entry_->data_.get_ref();
-  }
-
-  /** Get the next iterator (in place) */
-  slist_iterator_templ& operator++() {
-    if (is_end()) { return *this; }
-    entry_ptr_ = entry_->next_ptr_;
-    entry_ = slist_->GetAllocator()->template
-      Convert<slist_entry<T>>(entry_->next_ptr_);
-    return *this;
-  }
-
-  /** Get the prior iterator (in place) */
-  slist_iterator_templ& operator--() {
-    if (is_end() || is_begin()) { return *this; }
-    entry_ptr_ = entry_->prior_ptr_;
-    entry_ = slist_->GetAllocator()->template
-      Convert<slist_entry<T>>(entry_->prior_ptr_);
-    return *this;
-  }
-
-  /** Return the next iterator */
-  slist_iterator_templ operator++(int) const {
-    slist_iterator_templ next_iter(*this);
-    ++next_iter;
-    return next_iter;
-  }
-
-  /** Return the prior iterator */
-  slist_iterator_templ operator--(int) const {
-    slist_iterator_templ prior_iter(*this);
-    --prior_iter;
-    return prior_iter;
-  }
-
-  /** Return the iterator at count after this one */
-  slist_iterator_templ operator+(size_t count) const {
-    slist_iterator_templ pos(*this);
-    for (size_t i = 0; i < count; ++i) {
-      ++pos;
-    }
-    return pos;
-  }
-
-  /** Return the iterator at count before this one */
-  slist_iterator_templ operator-(size_t count) const {
-    slist_iterator_templ pos(*this);
-    for (size_t i = 0; i < count; ++i) {
-      --pos;
-    }
-    return pos;
-  }
-
-  /** Get the iterator at count after this one (in-place) */
-  void operator+=(size_t count) {
-    slist_iterator_templ pos = (*this) + count;
-    entry_ = pos.entry_;
-    entry_ptr_ = pos.entry_ptr_;
-  }
-
-  /** Get the iterator at count before this one (in-place) */
-  void operator-=(size_t count) {
-    slist_iterator_templ pos = (*this) - count;
-    entry_ = pos.entry_;
-    entry_ptr_ = pos.entry_ptr_;
-  }
-
-  /** Determine if two iterators are equal */
-  friend bool operator==(const slist_iterator_templ &a,
-                         const slist_iterator_templ &b) {
-    return (a.is_end() && b.is_end()) || (a.entry_ == b.entry_);
-  }
-
-  /** Determine if two iterators are inequal */
-  friend bool operator!=(const slist_iterator_templ &a,
-                         const slist_iterator_templ &b) {
-    return !(a.is_end() && b.is_end()) && (a.entry_ != b.entry_);
-  }
-
-  /** Determine whether this iterator is the end iterator */
-  bool is_end() const {
-    return entry_ == nullptr;
-  }
-
-  /** Determine whether this iterator is the begin iterator */
-  bool is_begin() const {
-    if (entry_) {
-      return entry_ptr_ == slist_->head_ptr_;
-    } else {
-      return false;
-    }
-  }
-};
-
-/**
- * MACROS used to simplify the slist namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME slist
-#define TYPED_CLASS slist<T>
-#define TYPED_HEADER ShmHeader<slist<T>>
-
-/**
- * Doubly linked slist implementation
- * */
-template<typename T>
-class slist : public ShmContainer {
- public:
-  /**====================================
-   * Variables
-   * ===================================*/
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-  OffsetPointer head_ptr_, tail_ptr_;
-  size_t length_;
-
-  /**====================================
-   * Iterator Typedefs
-   * ===================================*/
-  /** forward iterator typedef */
-  typedef slist_iterator_templ<T> iterator_t;
-  /** const forward iterator typedef */
-  typedef slist_iterator_templ<T> citerator_t;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit slist(Allocator *alloc) {
-    shm_init_container(alloc);
-    SetNull();
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** Strong copy operation */
-  void strong_copy(const slist &other) {
-    head_ptr_ = other.head_ptr_;
-    tail_ptr_ = other.tail_ptr_;
-    length_ = other.length_;
-  }
-
-  /** SHM copy constructor. From slist. */
-  explicit slist(Allocator *alloc,
-                 const slist &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_construct_and_op<slist>(other);
-  }
-
-  /** SHM copy assignment operator. From slist. */
-  slist& operator=(const slist &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op<slist>(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor. From std::list */
-  explicit slist(Allocator *alloc,
-                 std::list<T> &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_construct_and_op<std::list<T>>(other);
-  }
-
-  /** SHM copy assignment operator. From std::list. */
-  slist& operator=(const std::list<T> &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op<std::list<T>>(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor + operator main */
-  template<typename ListT>
-  void shm_strong_copy_construct_and_op(const ListT &other) {
-    for (auto iter = other.cbegin(); iter != other.cend(); ++iter) {
-      emplace_back(*iter);
-    }
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. From slist. */
-  slist(Allocator *alloc, slist &&other) noexcept {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      strong_copy(other);
-      other.SetNull();
-    } else {
-      shm_strong_copy_construct_and_op<slist>(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. From slist. */
-  slist& operator=(slist &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        strong_copy(other);
-        other.SetNull();
-      } else {
-        shm_strong_copy_construct_and_op<slist>(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-  * Destructor
-  * ===================================*/
-
-  /** Check if the list is empty */
-  bool IsNull() const {
-    return length_ == 0;
-  }
-
-  /** Sets this list as empty */
-  void SetNull() {
-    length_ = 0;
-    head_ptr_.SetNull();
-    tail_ptr_.SetNull();
-  }
-
-  /** Destroy all shared memory allocated by the slist */
-  void shm_destroy_main() {
-    clear();
-  }
-
-  /**====================================
-   * slist Methods
-   * ===================================*/
-
-  /** Construct an element at the back of the slist */
-  template<typename... Args>
-  void emplace_back(Args&&... args) {
-    emplace(end(), std::forward<Args>(args)...);
-  }
-
-  /** Construct an element at the beginning of the slist */
-  template<typename... Args>
-  void emplace_front(Args&&... args) {
-    emplace(begin(), std::forward<Args>(args)...);
-  }
-
-  /** Construct an element at \a pos position in the slist */
-  template<typename ...Args>
-  void emplace(iterator_t pos, Args&&... args) {
-    OffsetPointer entry_ptr;
-    auto entry = _create_entry(entry_ptr, std::forward<Args>(args)...);
-    if (size() == 0) {
-      entry->next_ptr_.SetNull();
-      head_ptr_ = entry_ptr;
-      tail_ptr_ = entry_ptr;
-    } else if (pos.is_begin()) {
-      entry->next_ptr_ = head_ptr_;
-      head_ptr_ = entry_ptr;
-    } else if (pos.is_end()) {
-      entry->next_ptr_.SetNull();
-      auto tail = GetAllocator()->template
-        Convert<slist_entry<T>>(tail_ptr_);
-      tail->next_ptr_ = entry_ptr;
-      tail_ptr_ = entry_ptr;
-    } else {
-      auto prior_iter = find_prior(pos);
-      slist_entry<T> *prior = prior_iter.entry_;
-      entry->next_ptr_ = pos.entry_->next_ptr_;
-      prior->next_ptr_ = entry_ptr;
-    }
-    ++length_;
-  }
-
-  /** Find the element prior to an slist_entry */
-  iterator_t find_prior(iterator_t pos) {
-    if (pos.is_end()) {
-      return last();
-    } else if (pos.is_begin()) {
-      return end();
-    } else {
-      iterator_t prior_iter = end();
-      for (auto iter = begin(); !iter.is_end(); ++iter) {
-        if (iter == pos) {
-          return prior_iter;
-        }
-        prior_iter = iter;
-      }
-      return prior_iter;
-    }
-  }
-
-  /** Erase element with ID */
-  void erase(const T &entry) {
-    auto iter = find(entry);
-    erase(iter);
-  }
-
-  /** Erase the element at pos */
-  void erase(iterator_t pos) {
-    erase(pos, pos+1);
-  }
-
-  /** Erase all elements between first and last */
-  void erase(iterator_t first,
-             iterator_t last) {
-    if (first.is_end()) { return; }
-    auto first_prior = find_prior(first);
-    auto pos = first;
-    while (pos != last) {
-      auto next = pos + 1;
-      HSHM_DESTROY_AR(pos.entry_->data_)
-      GetAllocator()->Free(pos.entry_ptr_);
-      --length_;
-      pos = next;
-    }
-
-    if (first_prior.is_end()) {
-      head_ptr_ = last.entry_ptr_;
-    } else {
-      first_prior.entry_->next_ptr_ = last.entry_ptr_;
-    }
-
-    if (last.entry_ptr_.IsNull()) {
-      tail_ptr_ = first_prior.entry_ptr_;
-    }
-  }
-
-  /** Destroy all elements in the slist */
-  void clear() {
-    erase(begin(), end());
-  }
-
-  /** Get the object at the front of the slist */
-  T& front() {
-    return *begin();
-  }
-
-  /** Get the object at the back of the slist */
-  T& back() {
-    return *last();
-  }
-
-  /** Get the number of elements in the slist */
-  size_t size() const {
-    if (!IsNull()) {
-      return length_;
-    }
-    return 0;
-  }
-
-  /** Find an element in this slist */
-  iterator_t find(const T &entry) {
-    return hshm::find(begin(), end(), entry);
-  }
-
-  /**====================================
-  * Iterators
-  * ===================================*/
-
-  /** Forward iterator begin */
-  iterator_t begin() {
-    if (size() == 0) { return end(); }
-    auto head = GetAllocator()->template
-      Convert<slist_entry<T>>(head_ptr_);
-    return iterator_t(*this, head, head_ptr_);
-  }
-
-  /** Forward iterator end */
-  iterator_t end() {
-    return iterator_t(*this,
-                      nullptr, OffsetPointer::GetNull());
-  }
-
-  /** Forward iterator to last entry of list */
-  iterator_t last() {
-    if (size() == 0) { return end(); }
-    auto tail = GetAllocator()->template
-      Convert<slist_entry<T>>(tail_ptr_);
-    return iterator_t(*this, tail, tail_ptr_);
-  }
-
-  /** Constant forward iterator begin */
-  citerator_t cbegin() const {
-    if (size() == 0) { return cend(); }
-    auto head = GetAllocator()->template
-      Convert<slist_entry<T>>(head_ptr_);
-    return citerator_t(const_cast<slist&>(*this), head, head_ptr_);
-  }
-
-  /** Constant forward iterator end */
-  citerator_t cend() const {
-    return iterator_t(const_cast<slist&>(*this),
-                      nullptr, OffsetPointer::GetNull());
-  }
-
- private:
-  template<typename ...Args>
-  slist_entry<T>* _create_entry(OffsetPointer &p, Args&& ...args) {
-    auto entry = GetAllocator()->template
-      AllocateObjs<slist_entry<T>>(1, p);
-    HSHM_MAKE_AR(entry->data_, GetAllocator(), std::forward<Args>(args)...)
-    return entry;
-  }
-};
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_DATA_STRUCTURES_THREAD_UNSAFE_Sslist_H
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/spsc_queue.h b/hermes_shm/include/hermes_shm/data_structures/ipc/spsc_queue.h
deleted file mode 100644
index a80762d65..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/spsc_queue.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_spsc_queue_templ_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_spsc_queue_templ_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/util/auto_trace.h"
-#include "hermes_shm/thread/lock.h"
-#include "vector.h"
-#include "pair.h"
-#include "_queue.h"
-
-namespace hshm::ipc {
-
-/** Forward declaration of spsc_queue_templ */
-template<typename T, bool EXTENSIBLE>
-class spsc_queue_templ;
-
-/**
- * MACROS used to simplify the spsc_queue_templ namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME spsc_queue_templ
-#define TYPED_CLASS spsc_queue_templ<T, EXTENSIBLE>
-#define TYPED_HEADER ShmHeader<spsc_queue_templ<T, EXTENSIBLE>>
-
-/**
- * A queue optimized for multiple producers (emplace) with a single
- * consumer (pop).
- * */
-template<typename T, bool EXTENSIBLE>
-class spsc_queue_templ : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-  ShmArchive<vector<pair<bitfield32_t, T>>> queue_;
-  _qtok_t tail_;
-  _qtok_t head_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit spsc_queue_templ(Allocator *alloc,
-                      size_t depth = 1024) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR(queue_, GetAllocator(), depth)
-    SetNull();
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor */
-  explicit spsc_queue_templ(Allocator *alloc,
-                            const spsc_queue_templ &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_construct_and_op(other);
-  }
-
-  /** SHM copy assignment operator */
-  spsc_queue_templ& operator=(const spsc_queue_templ &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_construct_and_op(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor + operator main */
-  void shm_strong_copy_construct_and_op(const spsc_queue_templ &other) {
-    head_ = other.head_;
-    tail_ = other.tail_;
-    (*queue_) = (*other.queue_);
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  spsc_queue_templ(Allocator *alloc,
-                   spsc_queue_templ &&other) noexcept {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      head_ = other.head_;
-      tail_ = other.tail_;
-      (*queue_) = std::move(*other.queue_);
-      other.SetNull();
-    } else {
-      shm_strong_copy_construct_and_op(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  spsc_queue_templ& operator=(spsc_queue_templ &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        head_ = other.head_;
-        tail_ = other.tail_;
-        (*queue_) = std::move(*other.queue_);
-        other.SetNull();
-      } else {
-        shm_strong_copy_construct_and_op(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** SHM destructor.  */
-  void shm_destroy_main() {
-    (*queue_).shm_destroy();
-  }
-
-  /** Check if the list is empty */
-  bool IsNull() const {
-    return (*queue_).IsNull();
-  }
-
-  /** Sets this list as empty */
-  void SetNull() {
-    head_ = 0;
-    tail_ = 0;
-  }
-
-  /**====================================
-   * spsc Queue Methods
-   * ===================================*/
-
-  /** Construct an element at \a pos position in the list */
-  template<typename ...Args>
-  qtok_t emplace(Args&&... args) {
-    // Allocate a slot in the queue
-    // The slot is marked NULL, so pop won't do anything if context switch
-    _qtok_t tail = tail_ + 1;
-
-    // Emplace into queue at our slot
-    _emplace(tail, std::forward<Args>(args)...);
-    return qtok_t(tail);
-  }
-
- private:
-  /** Emplace operation */
-  template<typename ...Args>
-  HSHM_ALWAYS_INLINE void _emplace(const _qtok_t &tail, Args&& ...args) {
-    uint32_t idx = tail % (*queue_).size();
-    auto iter = (*queue_).begin() + idx;
-    (*queue_).replace(iter,
-                    hshm::PiecewiseConstruct(),
-                    make_argpack(),
-                    make_argpack(std::forward<Args>(args)...));
-
-    // Let pop know that the data is fully prepared
-    pair<bitfield32_t, T> &entry = (*iter);
-    entry.GetFirst().SetBits(1);
-  }
-
- public:
-  /** Consumer pops the head object */
-  qtok_t pop(T &val) {
-    return _pop(val);
-  }
-
-  /** Pop operation */
-  qtok_t _pop(T &val) {
-    // Don't pop if there's no entries
-    _qtok_t head = head_;
-    _qtok_t tail = tail_;
-    if (head >= tail) {
-      return qtok_t::GetNull();
-    }
-
-    // Pop the element, but only if it's marked valid
-    _qtok_t idx = head % (*queue_).size();
-    hipc::pair<bitfield32_t, T> &entry = (*queue_)[idx];
-    if (entry.GetFirst().Any(1)) {
-      (val) = std::move(entry.GetSecond());
-      entry.GetFirst().Clear();
-      head_ += 1;
-      return qtok_t(head);
-    } else {
-      return qtok_t::GetNull();
-    }
-  }
-};
-
-template<typename T>
-using spsc_queue_ext = spsc_queue_templ<T, true>;
-
-template<typename T>
-using spsc_queue = spsc_queue_templ<T, false>;
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_IPC_spsc_queue_templ_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/string.h b/hermes_shm/include/hermes_shm/data_structures/ipc/string.h
deleted file mode 100644
index 694e8c671..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/string.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_LOCKLESS_STRING_H_
-#define HERMES_DATA_STRUCTURES_LOCKLESS_STRING_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/data_structures/containers/charbuf.h"
-#include <string>
-
-namespace hshm::ipc {
-
-/** forward declaration for string */
-template<size_t SSO>
-class string_templ;
-
-/**
- * MACROS used to simplify the string namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME string_templ
-#define TYPED_CLASS string_templ<SSO>
-#define TYPED_HEADER ShmHeader<string_templ<SSO>>
-
-/** string shared-memory header */
-template<size_t SSO>
-struct ShmHeader<string_templ<SSO>> {
-  SHM_CONTAINER_HEADER_TEMPLATE(ShmHeader)
-  size_t length_;
-  char sso_[SSO];
-  Pointer text_;
-
-  /** Strong copy operation */
-  void strong_copy(const ShmHeader &other) {
-    length_ = other.length_;
-    text_ = other.text_;
-    if (length_ < SSO) {
-      memcpy(sso_, other.sso_, other.length_ + 1);
-    }
-  }
-};
-
-/**
- * A string of characters.
- * */
-template<size_t SSO>
-class string_templ : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-
- public:
-  size_t length_;
-  Pointer text_;
-  char sso_[SSO];
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM Constructor. Default. */
-  explicit string_templ(Allocator *alloc) {
-    shm_init_container(alloc);
-    SetNull();
-  }
-
-  /**====================================
-   * Emplace Constructors
-   * ===================================*/
-
-  /** SHM Constructor. Just allocate space. */
-  explicit string_templ(Allocator *alloc,
-                        size_t length) {
-    shm_init_container(alloc);
-    _create_str(length);
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM Constructor. From const char* */
-  explicit string_templ(Allocator *alloc,
-                        const char *text) {
-    shm_init_container(alloc);
-    size_t length = strlen(text);
-    _create_str(text, length);
-  }
-
-  /** SHM Constructor. From const char* and size */
-  explicit string_templ(Allocator *alloc,
-                        const char *text, size_t length) {
-    shm_init_container(alloc);
-    _create_str(text, length);
-  }
-
-  /** SHM Constructor. From std::string */
-  explicit string_templ(Allocator *alloc,
-                        const std::string &text) {
-    shm_init_container(alloc);
-    _create_str(text.data(), text.size());
-  }
-
-  /** SHM copy assignment operator. From std::string. */
-  string_templ& operator=(const std::string &other) {
-    shm_destroy();
-    _create_str(other.data(), other.size());
-    return *this;
-  }
-
-  /** SHM Constructor. From std::string */
-  explicit string_templ(Allocator *alloc,
-                        const hshm::charbuf &text) {
-    shm_init_container(alloc);
-    _create_str(text.data(), text.size());
-  }
-
-  /** SHM copy assignment operator. From std::string. */
-  string_templ& operator=(const hshm::charbuf &other) {
-    shm_destroy();
-    _create_str(other.data(), other.size());
-    return *this;
-  }
-
-  /** SHM copy constructor. From string. */
-  explicit string_templ(Allocator *alloc,
-                        const string_templ &other) {
-    shm_init_container(alloc);
-    _create_str(other.data(), other.size());
-  }
-
-  /** SHM copy assignment operator. From string. */
-  string_templ& operator=(const string_templ &other) {
-    if (this != &other) {
-      shm_destroy();
-      _create_str(other.data(), other.size());
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** Strong copy operation */
-  HSHM_ALWAYS_INLINE void strong_copy(const string_templ &other) {
-    length_ = other.length_;
-    text_ = other.text_;
-    if (length_ < SSO) {
-      memcpy(sso_, other.sso_, other.length_ + 1);
-    }
-  }
-
-  /** SHM move constructor. */
-  string_templ(Allocator *alloc, string_templ &&other) {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      strong_copy(other);
-      other.SetNull();
-    } else {
-      _create_str(other.data(), other.size());
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  string_templ& operator=(string_templ &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        strong_copy(other);
-        other.SetNull();
-      } else {
-        _create_str(other.data(), other.size());
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructors
-   * ===================================*/
-
-  /** Check if this string is NULL */
-  HSHM_ALWAYS_INLINE bool IsNull() const {
-    return length_ == 0;
-  }
-
-  /** Set this string to NULL */
-  HSHM_ALWAYS_INLINE void SetNull() {
-    text_.SetNull();
-    length_ = 0;
-  }
-
-  /** Destroy the shared-memory data. */
-  HSHM_ALWAYS_INLINE void shm_destroy_main() {
-    if (size() >= SSO) {
-      GetAllocator()->Free(text_);
-    }
-  }
-
-  /**====================================
-   * String Operations
-   * ===================================*/
-
-  /** Get character at index i in the string */
-  HSHM_ALWAYS_INLINE char& operator[](size_t i) {
-    return data()[i];
-  }
-
-  /** Get character at index i in the string */
-  HSHM_ALWAYS_INLINE const char& operator[](size_t i) const {
-    return data()[i];
-  }
-
-  /** Convert into a std::string */
-  HSHM_ALWAYS_INLINE std::string str() const {
-    return {c_str(), length_};
-  }
-
-  /** Get the size of the current string */
-  HSHM_ALWAYS_INLINE size_t size() const {
-    return length_;
-  }
-
-  /** Get a constant reference to the C-style string */
-  HSHM_ALWAYS_INLINE const char* c_str() const {
-    return data();
-  }
-
-  /** Get a constant reference to the C-style string */
-  HSHM_ALWAYS_INLINE const char* data() const {
-    if (length_ < SSO) {
-      return sso_;
-    } else {
-      return GetAllocator()->template Convert<char, Pointer>(text_);
-    }
-  }
-
-  /** Get a mutable reference to the C-style string */
-  HSHM_ALWAYS_INLINE char* data() {
-    if (length_ < SSO) {
-      return sso_;
-    } else {
-      return GetAllocator()->template Convert<char, Pointer>(text_);
-    }
-  }
-
-  /** Resize this string */
-  void resize(size_t new_size) {
-    if (IsNull()) {
-      _create_str(new_size);
-    } else if (new_size > size()) {
-      GetAllocator()->template Reallocate<Pointer>(text_, new_size);
-      length_ = new_size;
-    } else {
-      length_ = new_size;
-    }
-  }
-
-  /**====================================
-   * Comparison Operations
-   * ===================================*/
-
-  int _strncmp(const char *a, size_t len_a,
-               const char *b, size_t len_b) const {
-    if (len_a != len_b) {
-      return int((int64_t)len_a - (int64_t)len_b);
-    }
-    for (size_t i = 0; i < len_a; ++i) {
-      if (a[i] != b[i]) {
-        return a[i] - b[i];
-      }
-    }
-    return 0;
-  }
-
-#define HERMES_STR_CMP_OPERATOR(op) \
-  bool operator op(const char *other) const { \
-    return _strncmp(data(), size(), other, strlen(other)) op 0; \
-  } \
-  bool operator op(const std::string &other) const { \
-    return _strncmp(data(), size(), other.data(), other.size()) op 0; \
-  } \
-  bool operator op(const string_templ &other) const { \
-    return _strncmp(data(), size(), other.data(), other.size()) op 0; \
-  }
-
-  HERMES_STR_CMP_OPERATOR(==)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(!=)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(<)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(>)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(<=)  // NOLINT
-  HERMES_STR_CMP_OPERATOR(>=)  // NOLINT
-
-#undef HERMES_STR_CMP_OPERATOR
-
- private:
-  HSHM_ALWAYS_INLINE void _create_str(size_t length) {
-    if (length < SSO) {
-      // NOTE(llogan): less than and not equal because length doesn't
-      // account for trailing 0.
-    } else {
-      text_ = GetAllocator()->Allocate(length + 1);
-    }
-    length_ = length;
-  }
-  HSHM_ALWAYS_INLINE void _create_str(const char *text, size_t length) {
-    _create_str(length);
-    char *str = data();
-    memcpy(str, text, length);
-    str[length] = 0;
-  }
-};
-
-/** Our default SSO value */
-typedef string_templ<32> string;
-
-/** Consider the string as an uniterpreted set of bytes */
-typedef string charbuf;
-
-}  // namespace hshm::ipc
-
-namespace std {
-
-/** Hash function for string */
-template<size_t SSO>
-struct hash<hshm::ipc::string_templ<SSO>> {
-  size_t operator()(const hshm::ipc::string_templ<SSO> &text) const {
-    size_t sum = 0;
-    for (size_t i = 0; i < text.size(); ++i) {
-      auto shift = static_cast<size_t>(i % sizeof(size_t));
-      auto c = static_cast<size_t>((unsigned char)text[i]);
-      sum = 31*sum + (c << shift);
-    }
-    return sum;
-  }
-};
-
-}  // namespace std
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_DATA_STRUCTURES_LOCKLESS_STRING_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/unordered_map.h b/hermes_shm/include/hermes_shm/data_structures/ipc/unordered_map.h
deleted file mode 100644
index 5d4629e99..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/unordered_map.h
+++ /dev/null
@@ -1,537 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_UNORDERED_MAP_H_
-#define HERMES_DATA_STRUCTURES_UNORDERED_MAP_H_
-
-#include "hermes_shm/thread/thread_model_manager.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-#include "hermes_shm/data_structures/ipc/slist.h"
-#include "pair.h"
-#include "hermes_shm/types/atomic.h"
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-
-namespace hshm::ipc {
-
-/** forward pointer for unordered_map */
-template<typename Key, typename T, class Hash = std::hash<Key>>
-class unordered_map;
-
-/**
- * The unordered map iterator (bucket_iter, slist_iter)
- * */
-template<typename Key, typename T, class Hash>
-struct unordered_map_iterator {
- public:
-  using COLLISION_T = hipc::pair<Key, T>;
-  using BUCKET_T = hipc::slist<COLLISION_T>;
-
- public:
-  unordered_map<Key, T, Hash> *map_;
-  typename vector<BUCKET_T>::iterator_t bucket_;
-  typename slist<COLLISION_T>::iterator_t collision_;
-
-  /** Default constructor */
-  unordered_map_iterator() = default;
-
-  /** Construct the iterator  */
-  HSHM_ALWAYS_INLINE explicit unordered_map_iterator(
-    unordered_map<Key, T, Hash> &map)
-  : map_(&map) {}
-
-  /** Copy constructor  */
-  HSHM_ALWAYS_INLINE unordered_map_iterator(
-    const unordered_map_iterator &other) {
-    shm_strong_copy(other);
-  }
-
-  /** Assign one iterator into another */
-  HSHM_ALWAYS_INLINE unordered_map_iterator&
-  operator=(const unordered_map_iterator &other) {
-    if (this != &other) {
-      shm_strong_copy(other);
-    }
-    return *this;
-  }
-
-  /** Copy an iterator */
-  void shm_strong_copy(const unordered_map_iterator &other) {
-    map_ = other.map_;
-    bucket_ = other.bucket_;
-    collision_ = other.collision_;
-  }
-
-  /** Get the pointed object */
-  HSHM_ALWAYS_INLINE COLLISION_T& operator*() {
-    return *collision_;
-  }
-
-  /** Get the pointed object */
-  HSHM_ALWAYS_INLINE const COLLISION_T& operator*() const {
-    return *collision_;
-  }
-
-  /** Go to the next object */
-  HSHM_ALWAYS_INLINE unordered_map_iterator& operator++() {
-    ++collision_;
-    make_correct();
-    return *this;
-  }
-
-  /** Return the next iterator */
-  HSHM_ALWAYS_INLINE unordered_map_iterator operator++(int) const {
-    unordered_map_iterator next(*this);
-    ++next;
-    return next;
-  }
-
-  /**
-   * Shifts bucket and collision iterator until there is a valid element.
-   * Returns true if such an element is found, and false otherwise.
-   * */
-  HSHM_ALWAYS_INLINE bool make_correct() {
-    do {
-      if (bucket_.is_end()) {
-        return false;
-      }
-      if (!collision_.is_end()) {
-        return true;
-      } else {
-        ++bucket_;
-        if (bucket_.is_end()) {
-          return false;
-        }
-        BUCKET_T &bkt = *bucket_;
-        collision_ = bkt.begin();
-      }
-    } while (true);
-  }
-
-  /** Check if two iterators are equal */
-  HSHM_ALWAYS_INLINE friend bool operator==(
-    const unordered_map_iterator &a, const unordered_map_iterator &b) {
-    if (a.is_end() && b.is_end()) {
-      return true;
-    }
-    return (a.bucket_ == b.bucket_) && (a.collision_ == b.collision_);
-  }
-
-  /** Check if two iterators are inequal */
-  HSHM_ALWAYS_INLINE friend bool operator!=(
-    const unordered_map_iterator &a, const unordered_map_iterator &b) {
-    if (a.is_end() && b.is_end()) {
-      return false;
-    }
-    return (a.bucket_ != b.bucket_) || (a.collision_ != b.collision_);
-  }
-
-  /** Determine whether this iterator is the end iterator */
-  HSHM_ALWAYS_INLINE bool is_end() const {
-    return bucket_.is_end();
-  }
-
-  /** Set this iterator to the end iterator */
-  HSHM_ALWAYS_INLINE void set_end() {
-    bucket_.set_end();
-  }
-};
-
-/**
- * MACROS to simplify the unordered_map namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-
-#define CLASS_NAME unordered_map
-#define TYPED_CLASS unordered_map<Key, T, Hash>
-#define TYPED_HEADER ShmHeader<unordered_map<Key, T, Hash>>
-
-/**
- * The unordered map implementation
- * */
-template<typename Key, typename T, class Hash>
-class unordered_map : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-
-  /**====================================
-   * Typedefs
-   * ===================================*/
-  typedef unordered_map_iterator<Key, T, Hash> iterator_t;
-  friend iterator_t;
-  using COLLISION_T = hipc::pair<Key, T>;
-  using BUCKET_T = hipc::slist<COLLISION_T>;
-
-  /**====================================
-   * Variables
-   * ===================================*/
-  ShmArchive<vector<BUCKET_T>> buckets_;
-  RealNumber max_capacity_;
-  RealNumber growth_;
-  hipc::atomic<size_t> length_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /**
-   * SHM constructor. Initialize the map.
-   *
-   * @param alloc the shared-memory allocator
-   * @param num_buckets the number of buckets to create
-   * @param max_capacity the maximum number of elements before a growth is
-   * triggered
-   * @param growth the multiplier to grow the bucket vector size
-   * */
-  explicit unordered_map(Allocator *alloc,
-                         int num_buckets = 20,
-                         RealNumber max_capacity = RealNumber(4, 5),
-                         RealNumber growth = RealNumber(5, 4)) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR(buckets_, GetAllocator(), num_buckets)
-    max_capacity_ = max_capacity;
-    growth_ = growth;
-    length_ = 0;
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor */
-  explicit unordered_map(Allocator *alloc,
-                         const unordered_map &other) {
-    shm_init_container(alloc);
-    shm_strong_copy_construct(other);
-  }
-
-  /** SHM copy constructor main */
-  void shm_strong_copy_construct(const unordered_map &other) {
-    SetNull();
-    HSHM_MAKE_AR(buckets_, GetAllocator(), other.GetBuckets())
-    shm_strong_copy_construct_and_op(other);
-  }
-
-  /** SHM copy assignment operator */
-  unordered_map& operator=(const unordered_map &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_op(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy assignment main */
-  void shm_strong_copy_op(const unordered_map &other) {
-    int num_buckets = other.get_num_buckets();
-    GetBuckets().resize(num_buckets);
-    shm_strong_copy_construct_and_op(other);
-  }
-
-  /** Internal copy operation */
-  void shm_strong_copy_construct_and_op(const unordered_map &other) {
-    max_capacity_ = other.max_capacity_;
-    growth_ = other.growth_;
-    for (hipc::pair<Key, T> &entry : other) {
-      emplace_templ<false, true>(
-        entry.GetKey(), entry.GetVal());
-    }
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  HSHM_ALWAYS_INLINE unordered_map(Allocator *alloc,
-                                   unordered_map &&other) noexcept {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      strong_copy(other);
-      HSHM_MAKE_AR(buckets_, GetAllocator(), std::move(other.GetBuckets()))
-      other.SetNull();
-    } else {
-      shm_strong_copy_construct(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** Copy */
-  HSHM_ALWAYS_INLINE void strong_copy(const unordered_map &other) {
-    max_capacity_ = other.max_capacity_;
-    growth_ = other.growth_;
-    length_ = other.length_.load();
-  }
-
-  /** SHM move assignment operator. */
-  unordered_map& operator=(unordered_map &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        GetBuckets() = std::move(other.GetBuckets());
-        strong_copy(other);
-        other.SetNull();
-      } else {
-        shm_strong_copy_op(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Check if the pair is empty */
-  HSHM_ALWAYS_INLINE bool IsNull() {
-    return length_.load() == 0;
-  }
-
-  /** Sets this pair as empty */
-  HSHM_ALWAYS_INLINE void SetNull() {
-    length_ = 0;
-  }
-
-  /** Destroy the unordered_map buckets */
-  HSHM_ALWAYS_INLINE void shm_destroy_main() {
-    vector<BUCKET_T>& buckets = GetBuckets();
-    buckets.shm_destroy();
-  }
-
-  /**====================================
-   * Emplace Methods
-   * ===================================*/
-
-  /**
-   * Construct an object directly in the map. Overrides the object if
-   * key already exists.
-   *
-   * @param key the key to future index the map
-   * @param args the arguments to construct the object
-   * @return None
-   * */
-  template<typename ...Args>
-  bool emplace(const Key &key, Args&&... args) {
-    return emplace_templ<true, true>(key, std::forward<Args>(args)...);
-  }
-
-  /**
-   * Construct an object directly in the map. Does not modify the key
-   * if it already exists.
-   *
-   * @param key the key to future index the map
-   * @param args the arguments to construct the object
-   * @return None
-   * */
-  template<typename ...Args>
-  bool try_emplace(const Key &key, Args&&... args) {
-    return emplace_templ<true, false>(key, std::forward<Args>(args)...);
-  }
-
- private:
-  /**
-   * Insert a serialized (key, value) pair in the map
-   *
-   * @param growth whether or not to grow the unordered map on collision
-   * @param modify_existing whether or not to override an existing entry
-   * @param entry the (key,value) pair shared-memory serialized
-   * @return None
-   * */
-  template<bool growth, bool modify_existing, typename ...Args>
-  HSHM_ALWAYS_INLINE bool emplace_templ(const Key &key, Args&& ...args) {
-    // Hash the key to a bucket
-    vector<BUCKET_T>& buckets = GetBuckets();
-    size_t bkt_id = Hash{}(key) % buckets.size();
-    BUCKET_T& bkt = (buckets)[bkt_id];
-
-    // Insert into the map
-    auto has_key_iter = find_collision(key, bkt);
-    if (!has_key_iter.is_end()) {
-      if constexpr(!modify_existing) {
-        return false;
-      } else {
-        bkt.erase(has_key_iter);
-        --length_;
-      }
-    }
-    bkt.emplace_back(PiecewiseConstruct(),
-                     make_argpack(key),
-                     make_argpack(std::forward<Args>(args)...));
-
-    // Increment the size of the map
-    ++length_;
-    return true;
-  }
-
- public:
-  /**====================================
-   * Erase Methods
-   * ===================================*/
-
-  /**
-   * Erase an object indexable by \a key key
-   * */
-  void erase(const Key &key) {
-    // Get the bucket the key belongs to
-    vector<BUCKET_T>& buckets = GetBuckets();
-    size_t bkt_id = Hash{}(key) % buckets.size();
-    BUCKET_T& bkt = (buckets)[bkt_id];
-
-    // Find and remove key from collision slist
-    auto iter = find_collision(key, bkt);
-    if (iter.is_end()) {
-      return;
-    }
-    bkt.erase(iter);
-
-    // Decrement the size of the map
-    --length_;
-  }
-
-  /**
-   * Erase an object at the iterator
-   * */
-  void erase(iterator_t &iter) {
-    if (iter == end()) return;
-    // Acquire the bucket lock for a write (modifying collisions)
-    BUCKET_T& bkt = *iter.bucket_;
-
-    // Erase the element from the collision slist
-    bkt.erase(iter.collision_);
-
-    // Decrement the size of the map
-    --length_;
-  }
-
-  /**
-   * Erase the entire map
-   * */
-  void clear() {
-    vector<BUCKET_T>& buckets = GetBuckets();
-    size_t num_buckets = buckets.size();
-    buckets.clear();
-    buckets.resize(num_buckets);
-    length_ = 0;
-  }
-
-  /**====================================
-   * Index Methods
-   * ===================================*/
-
-  /**
-   * Locate an entry in the unordered_map
-   *
-   * @return the object pointed by key
-   * @exception UNORDERED_MAP_CANT_FIND the key was not in the map
-   * */
-  HSHM_ALWAYS_INLINE T& operator[](const Key &key) {
-    auto iter = find(key);
-    if (!iter.is_end()) {
-      return (*iter).second_.get_ref();
-    }
-    throw UNORDERED_MAP_CANT_FIND.format();
-  }
-
-  /** Find an object in the unordered_map */
-  iterator_t find(const Key &key) {
-    iterator_t iter(*this);
-
-    // Determine the bucket corresponding to the key
-    vector<BUCKET_T>& buckets = GetBuckets();
-    size_t bkt_id = Hash{}(key) % buckets.size();
-    iter.bucket_ = buckets.begin() + bkt_id;
-    BUCKET_T& bkt = (*iter.bucket_);
-
-    // Get the specific collision iterator
-    iter.collision_ = find_collision(key, bkt);
-    if (iter.collision_.is_end()) {
-      iter.set_end();
-    }
-    return iter;
-  }
-
-  /** Find a key in the collision slist */
-  typename BUCKET_T::iterator_t
-  HSHM_ALWAYS_INLINE find_collision(const Key &key, BUCKET_T &bkt) {
-    auto iter = bkt.begin();
-    auto iter_end = bkt.end();
-    for (; iter != iter_end; ++iter) {
-      COLLISION_T &collision = *iter;
-      if (collision.GetKey() == key) {
-        return iter;
-      }
-    }
-    return iter_end;
-  }
-
-  /**====================================
-   * Query Methods
-   * ===================================*/
-
-  /** The number of entries in the map */
-  HSHM_ALWAYS_INLINE size_t size() const {
-    return length_.load();
-  }
-
-  /** The number of buckets in the map */
-  HSHM_ALWAYS_INLINE size_t get_num_buckets() const {
-    vector<BUCKET_T>& buckets = GetBuckets();
-    return buckets.size();
-  }
-
- public:
-  /**====================================
-   * Iterators
-   * ===================================*/
-
-  /** Forward iterator begin */
-  HSHM_ALWAYS_INLINE iterator_t begin() const {
-    iterator_t iter(const_cast<unordered_map&>(*this));
-    vector<BUCKET_T>& buckets(GetBuckets());
-    if (buckets.size() == 0) {
-      return iter;
-    }
-    BUCKET_T& bkt = buckets[0];
-    iter.bucket_ = buckets.cbegin();
-    iter.collision_ = bkt.begin();
-    iter.make_correct();
-    return iter;
-  }
-
-  /** Forward iterator end */
-  HSHM_ALWAYS_INLINE iterator_t end() const {
-    iterator_t iter(const_cast<unordered_map&>(*this));
-    vector<BUCKET_T>& buckets(GetBuckets());
-    iter.bucket_ = buckets.cend();
-    return iter;
-  }
-
-  /** Get the buckets */
-  HSHM_ALWAYS_INLINE vector<BUCKET_T>& GetBuckets() {
-    return *buckets_;
-  }
-
-  /** Get the buckets (const) */
-  HSHM_ALWAYS_INLINE vector<BUCKET_T>& GetBuckets() const {
-    return const_cast<vector<BUCKET_T>&>(*buckets_);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_DATA_STRUCTURES_UNORDERED_MAP_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/ipc/vector.h b/hermes_shm/include/hermes_shm/data_structures/ipc/vector.h
deleted file mode 100644
index 62fc8df3c..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/ipc/vector.h
+++ /dev/null
@@ -1,688 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_LOCKLESS_VECTOR_H_
-#define HERMES_DATA_STRUCTURES_LOCKLESS_VECTOR_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-
-#include <vector>
-
-namespace hshm::ipc {
-
-/** forward pointer for vector */
-template<typename T>
-class vector;
-
-/**
- * The vector iterator implementation
- * */
-template<typename T, bool FORWARD_ITER>
-struct vector_iterator_templ {
- public:
-  vector<T> *vec_;
-  off64_t i_;
-
-  /** Default constructor */
-  HSHM_ALWAYS_INLINE vector_iterator_templ() = default;
-
-  /** Construct an iterator (called from vector class) */
-  template<typename SizeT>
-  HSHM_ALWAYS_INLINE explicit vector_iterator_templ(vector<T> *vec, SizeT i)
-  : vec_(vec), i_(static_cast<off64_t>(i)) {}
-
-  /** Construct an iterator (called from iterator) */
-  HSHM_ALWAYS_INLINE explicit vector_iterator_templ(vector<T> *vec, off64_t i)
-  : vec_(vec), i_(i) {}
-
-  /** Copy constructor */
-  HSHM_ALWAYS_INLINE vector_iterator_templ(const vector_iterator_templ &other)
-  : vec_(other.vec_), i_(other.i_) {}
-
-  /** Copy assignment operator  */
-  HSHM_ALWAYS_INLINE vector_iterator_templ&
-  operator=(const vector_iterator_templ &other) {
-    if (this != &other) {
-      vec_ = other.vec_;
-      i_ = other.i_;
-    }
-    return *this;
-  }
-
-  /** Move constructor */
-  HSHM_ALWAYS_INLINE vector_iterator_templ(
-    vector_iterator_templ &&other) noexcept {
-    vec_ = other.vec_;
-    i_ = other.i_;
-  }
-
-  /** Move assignment operator  */
-  HSHM_ALWAYS_INLINE vector_iterator_templ&
-  operator=(vector_iterator_templ &&other) noexcept {
-    if (this != &other) {
-      vec_ = other.vec_;
-      i_ = other.i_;
-    }
-    return *this;
-  }
-
-  /** Dereference the iterator */
-  HSHM_ALWAYS_INLINE T& operator*() {
-    return vec_->data_ar()[i_].get_ref();
-  }
-
-  /** Dereference the iterator */
-  HSHM_ALWAYS_INLINE const T& operator*() const {
-    return vec_->data_ar()[i_].get_ref();
-  }
-
-  /** Increment iterator in-place */
-  HSHM_ALWAYS_INLINE vector_iterator_templ& operator++() {
-    if constexpr(FORWARD_ITER) {
-      ++i_;
-    } else {
-      --i_;
-    }
-    return *this;
-  }
-
-  /** Decrement iterator in-place */
-  HSHM_ALWAYS_INLINE vector_iterator_templ& operator--() {
-    if constexpr(FORWARD_ITER) {
-      --i_;
-    } else {
-      ++i_;
-    }
-    return *this;
-  }
-
-  /** Create the next iterator */
-  HSHM_ALWAYS_INLINE vector_iterator_templ operator++(int) const {
-    vector_iterator_templ next_iter(*this);
-    ++next_iter;
-    return next_iter;
-  }
-
-  /** Create the prior iterator */
-  HSHM_ALWAYS_INLINE vector_iterator_templ operator--(int) const {
-    vector_iterator_templ prior_iter(*this);
-    --prior_iter;
-    return prior_iter;
-  }
-
-  /** Increment iterator by \a count and return */
-  HSHM_ALWAYS_INLINE vector_iterator_templ operator+(size_t count) const {
-    if constexpr(FORWARD_ITER) {
-      return vector_iterator_templ(vec_, i_ + count);
-    } else {
-      return vector_iterator_templ(vec_, i_ - count);
-    }
-  }
-
-  /** Decrement iterator by \a count and return */
-  HSHM_ALWAYS_INLINE vector_iterator_templ operator-(size_t count) const {
-    if constexpr(FORWARD_ITER) {
-      return vector_iterator_templ(vec_, i_ - count);
-    } else {
-      return vector_iterator_templ(vec_, i_ + count);
-    }
-  }
-
-  /** Increment iterator by \a count in-place */
-  HSHM_ALWAYS_INLINE void operator+=(size_t count) {
-    if constexpr(FORWARD_ITER) {
-      i_ += count;
-    } else {
-      i_ -= count;
-    }
-  }
-
-  /** Decrement iterator by \a count in-place */
-  HSHM_ALWAYS_INLINE void operator-=(size_t count) {
-    if constexpr(FORWARD_ITER) {
-      i_ -= count;
-    } else {
-      i_ += count;
-    }
-  }
-
-  /** Check if two iterators are equal */
-  HSHM_ALWAYS_INLINE friend bool operator==(const vector_iterator_templ &a,
-                         const vector_iterator_templ &b) {
-    return (a.i_ == b.i_);
-  }
-
-  /** Check if two iterators are inequal */
-  HSHM_ALWAYS_INLINE friend bool operator!=(const vector_iterator_templ &a,
-                         const vector_iterator_templ &b) {
-    return (a.i_ != b.i_);
-  }
-
-  /** Set this iterator to end */
-  HSHM_ALWAYS_INLINE void set_end() {
-    if constexpr(FORWARD_ITER) {
-      i_ = vec_->size();
-    } else {
-      i_ = -1;
-    }
-  }
-
-  /** Set this iterator to begin */
-  HSHM_ALWAYS_INLINE void set_begin() {
-    if constexpr(FORWARD_ITER) {
-      i_ = 0;
-    } else {
-      i_ = vec_->size() - 1;
-    }
-  }
-
-  /** Determine whether this iterator is the begin iterator */
-  HSHM_ALWAYS_INLINE bool is_begin() const {
-    if constexpr(FORWARD_ITER) {
-      return (i_ == 0);
-    } else {
-      return (i_ == vec_->template size<off64_t>() - 1);
-    }
-  }
-
-  /** Determine whether this iterator is the end iterator */
-  HSHM_ALWAYS_INLINE bool is_end() const {
-    if constexpr(FORWARD_ITER) {
-      return i_ >= vec_->template size<off64_t>();
-    } else {
-      return i_ == -1;
-    }
-  }
-};
-
-/**
- * MACROS used to simplify the vector namespace
- * Used as inputs to the SHM_CONTAINER_TEMPLATE
- * */
-#define CLASS_NAME vector
-#define TYPED_CLASS vector<T>
-#define TYPED_HEADER ShmHeader<vector<T>>
-
-/**
- * The vector class
- * */
-template<typename T>
-class vector : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS))
-
- public:
-  /**====================================
-   * Typedefs
-   * ===================================*/
-
-  /** forwrard iterator */
-  typedef vector_iterator_templ<T, true>  iterator_t;
-  /** reverse iterator */
-  typedef vector_iterator_templ<T, false> riterator_t;
-  /** const iterator */
-  typedef vector_iterator_templ<T, true>  citerator_t;
-  /** const reverse iterator */
-  typedef vector_iterator_templ<T, false> criterator_t;
-
- public:
-  /**====================================
-   * Variables
-   * ===================================*/
-  AtomicPointer vec_ptr_;
-  size_t max_length_, length_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit vector(Allocator *alloc) {
-    shm_init_container(alloc);
-    SetNull();
-  }
-
-  /** SHM constructor. Resize + construct. */
-  template<typename ...Args>
-  explicit vector(Allocator *alloc, size_t length, Args&& ...args) {
-    shm_init_container(alloc);
-    SetNull();
-    resize(length, std::forward<Args>(args)...);
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor. From vector. */
-  explicit vector(Allocator *alloc, const vector &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_main<vector<T>>(other);
-  }
-
-  /** SHM copy assignment operator. From vector. */
-  vector& operator=(const vector &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_main<vector>(other);
-    }
-    return *this;
-  }
-
-  /** SHM copy constructor. From std::vector */
-  explicit vector(Allocator *alloc, const std::vector<T> &other) {
-    shm_init_container(alloc);
-    SetNull();
-    shm_strong_copy_main<std::vector<T>>(other);
-  }
-
-  /** SHM copy assignment operator. From std::vector */
-  vector& operator=(const std::vector<T> &other) {
-    shm_destroy();
-    shm_strong_copy_main<std::vector<T>>(other);
-    return *this;
-  }
-
-  /** The main copy operation  */
-  template<typename VectorT>
-  void shm_strong_copy_main(const VectorT &other) {
-    reserve(other.size());
-    if constexpr(std::is_pod<T>() && !IS_SHM_ARCHIVEABLE(T)) {
-      memcpy(data(), other.data(), other.size() * sizeof(T));
-      length_ = other.size();
-    } else {
-      for (auto iter = other.cbegin(); iter != other.cend(); ++iter) {
-        if constexpr(IS_SHM_ARCHIVEABLE(VectorT)) {
-          emplace_back((*iter));
-        } else {
-          emplace_back((*iter));
-        }
-      }
-    }
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  vector(Allocator *alloc, vector &&other) {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      memcpy((void *) this, (void *) &other, sizeof(*this));
-      other.SetNull();
-    } else {
-      shm_strong_copy_main<vector>(other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  vector& operator=(vector &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        memcpy((void *) this, (void *) &other, sizeof(*this));
-        other.SetNull();
-      } else {
-        shm_strong_copy_main<vector>(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Check if null */
-  HSHM_ALWAYS_INLINE bool IsNull() const {
-    return vec_ptr_.IsNull();
-  }
-
-  /** Make null */
-  HSHM_ALWAYS_INLINE void SetNull() {
-    length_ = 0;
-    max_length_ = 0;
-    vec_ptr_.SetNull();
-  }
-
-  /** Destroy all shared memory allocated by the vector */
-  void shm_destroy_main() {
-    erase(begin(), end());
-    GetAllocator()->Free(vec_ptr_);
-  }
-
-  /**====================================
-   * Vector Operations
-   * ===================================*/
-
-  /**
-   * Convert to std::vector
-   * */
-  std::vector<T> vec() {
-    std::vector<T> v;
-    v.reserve(size());
-    for (T& entry : *this) {
-      v.emplace_back(entry);
-    }
-    return v;
-  }
-
-  /**
-   * Reserve space in the vector to emplace elements. Does not
-   * change the size of the list.
-   *
-   * @param length the maximum size the vector can get before a growth occurs
-   * @param args the arguments to construct
-   * */
-  template<typename ...Args>
-  void reserve(size_t length, Args&& ...args) {
-    if (length == 0) { return; }
-    grow_vector(data_ar(), length, false, std::forward<Args>(args)...);
-  }
-
-  /**
-   * Reserve space in the vector to emplace elements. Changes the
-   * size of the list.
-   *
-   * @param length the maximum size the vector can get before a growth occurs
-   * @param args the arguments used to construct the vector elements
-   * */
-  template<typename ...Args>
-  void resize(size_t length, Args&& ...args) {
-    if (length == 0) {
-      length_ = 0;
-      return;
-    }
-    grow_vector(data_ar(), length, true,
-                std::forward<Args>(args)...);
-    length_ = length;
-  }
-
-  /** Index the vector at position i */
-  HSHM_ALWAYS_INLINE T& operator[](const size_t i) {
-      return data_ar()[i].get_ref();
-  }
-
-  /** Index the vector at position i */
-  HSHM_ALWAYS_INLINE const T& operator[](const size_t i) const {
-    return data_ar()[i].get_ref();
-  }
-
-  /** Get first element of vector */
-  HSHM_ALWAYS_INLINE T& front() {
-    return (*this)[0];
-  }
-
-  /** Get last element of vector */
-  HSHM_ALWAYS_INLINE T& back() {
-    return (*this)[size() - 1];
-  }
-
-  /** Construct an element at the back of the vector */
-  template<typename... Args>
-  void emplace_back(Args&& ...args) {
-    ShmArchive<T> *vec = data_ar();
-    if (length_ == max_length_) {
-      vec = grow_vector(vec, 0, false);
-    }
-    HSHM_MAKE_AR(vec[length_], GetAllocator(),
-                 std::forward<Args>(args)...)
-    ++length_;
-  }
-
-  /** Construct an element in the front of the vector */
-  template<typename ...Args>
-  HSHM_ALWAYS_INLINE void emplace_front(Args&& ...args) {
-    emplace(begin(), std::forward<Args>(args)...);
-  }
-
-  /** Construct an element at an arbitrary position in the vector */
-  template<typename ...Args>
-  void emplace(iterator_t pos, Args&&... args) {
-    if (pos.is_end()) {
-      emplace_back(std::forward<Args>(args)...);
-      return;
-    }
-    ShmArchive<T> *vec = data_ar();
-    if (length_ == max_length_) {
-      vec = grow_vector(vec, 0, false);
-    }
-    shift_right(pos);
-    HSHM_MAKE_AR(vec[pos.i_], GetAllocator(),
-                 std::forward<Args>(args)...)
-    ++length_;
-  }
-
-  /** Replace an element at a position */
-  template<typename ...Args>
-  void replace(iterator_t pos, Args&&... args) {
-    if (pos.is_end()) {
-      return;
-    }
-    ShmArchive<T> *vec = data_ar();
-    (*this)[pos.i_].shm_destroy();
-    HSHM_MAKE_AR(vec[pos.i_], GetAllocator(),
-                 std::forward<Args>(args)...)
-  }
-
-  /** Delete the element at \a pos position */
-  void erase(iterator_t pos) {
-    if (pos.is_end()) return;
-    shift_left(pos, 1);
-    length_ -= 1;
-  }
-
-  /** Delete elements between first and last  */
-  void erase(iterator_t first, iterator_t last) {
-    size_t last_i;
-    if (first.is_end()) return;
-    if (last.is_end()) {
-      last_i = size();
-    } else {
-      last_i = last.i_;
-    }
-    size_t count = last_i - first.i_;
-    if (count == 0) return;
-    shift_left(first, count);
-    length_ -= count;
-  }
-
-  /** Delete all elements from the vector */
-  HSHM_ALWAYS_INLINE void clear() {
-    erase(begin(), end());
-  }
-
-  /** Get the size of the vector */
-  template<typename SizeT = size_t>
-  HSHM_ALWAYS_INLINE SizeT size() const {
-    return static_cast<SizeT>(length_);
-  }
-
-  /** Get the data in the vector */
-  HSHM_ALWAYS_INLINE void* data() {
-    return reinterpret_cast<void*>(data_ar());
-  }
-
-  /** Get constant pointer to the data */
-  HSHM_ALWAYS_INLINE void* data() const {
-    return reinterpret_cast<void*>(data_ar());
-  }
-
-  /** Retreives a pointer to the internal array */
-  HSHM_ALWAYS_INLINE ShmArchive<T>* data_ar() {
-    return GetAllocator()->template Convert<ShmArchive<T>>(vec_ptr_);
-  }
-
-  /** Retreives a pointer to the array */
-  HSHM_ALWAYS_INLINE ShmArchive<T>* data_ar() const {
-    return GetAllocator()->template Convert<ShmArchive<T>>(vec_ptr_);
-  }
-
-  /**====================================
-   * Internal Operations
-   * ===================================*/
- private:
-  /**
-   * Grow a vector to a new size.
-   *
-   * @param vec the C-style array of elements to grow
-   * @param max_length the new length of the vector. If 0, the current size
-   * of the vector will be multiplied by a constant.
-   * @param args the arguments used to construct the elements of the vector
-   * */
-  template<typename ...Args>
-  ShmArchive<T>* grow_vector(ShmArchive<T> *vec, size_t max_length,
-                             bool resize, Args&& ...args) {
-    // Grow vector by 25%
-    if (max_length == 0) {
-      max_length = 5 * max_length_ / 4;
-      if (max_length <= max_length_ + 10) {
-        max_length += 10;
-      }
-    }
-    if (max_length < max_length_) {
-      return nullptr;
-    }
-
-    // Allocate new shared-memory vec
-    ShmArchive<T> *new_vec;
-    if constexpr(std::is_pod<T>() && !IS_SHM_ARCHIVEABLE(T)) {
-      // Use reallocate for well-behaved objects
-      new_vec = GetAllocator()->template
-        ReallocateObjs<ShmArchive<T>>(vec_ptr_, max_length);
-    } else {
-      // Use std::move for unpredictable objects
-      Pointer new_p;
-      new_vec = GetAllocator()->template
-        AllocateObjs<ShmArchive<T>>(max_length, new_p);
-      for (size_t i = 0; i < length_; ++i) {
-        T& old_entry = (*this)[i];
-        HSHM_MAKE_AR(new_vec[i], GetAllocator(),
-                     std::move(old_entry))
-      }
-      if (!vec_ptr_.IsNull()) {
-        GetAllocator()->Free(vec_ptr_);
-      }
-      vec_ptr_ = new_p;
-    }
-    if (new_vec == nullptr) {
-      throw OUT_OF_MEMORY.format("vector::emplace_back",
-                                 max_length*sizeof(ShmArchive<T>));
-    }
-    if (resize) {
-      for (size_t i = length_; i < max_length; ++i) {
-        HSHM_MAKE_AR(new_vec[i], GetAllocator(),
-                     std::forward<Args>(args)...)
-      }
-    }
-
-    // Update vector header
-    max_length_ = max_length;
-    return new_vec;
-  }
-
-  /**
-   * Shift every element starting at "pos" to the left by count. Any element
-   * who would be shifted before "pos" will be deleted.
-   *
-   * @param pos the starting position
-   * @param count the amount to shift left by
-   * */
-  void shift_left(const iterator_t pos, size_t count = 1) {
-    ShmArchive<T> *vec = data_ar();
-    for (size_t i = 0; i < count; ++i) {
-      HSHM_DESTROY_AR(vec[pos.i_ + i])
-    }
-    auto dst = vec + pos.i_;
-    auto src = dst + count;
-    for (auto i = pos.i_ + count; i < size(); ++i) {
-      memcpy((void*)dst, (void*)src, sizeof(ShmArchive<T>));
-      dst += 1; src += 1;
-    }
-  }
-
-  /**
-   * Shift every element starting at "pos" to the right by count. Increases
-   * the total number of elements of the vector by "count". Does not modify
-   * the size parameter of the vector, this is done elsewhere.
-   *
-   * @param pos the starting position
-   * @param count the amount to shift right by
-   * */
-  void shift_right(const iterator_t pos, size_t count = 1) {
-    auto src = data_ar() + size() - 1;
-    auto dst = src + count;
-    auto sz = static_cast<off64_t>(size());
-    for (auto i = sz - 1; i >= pos.i_; --i) {
-      memcpy((void*)dst, (void*)src, sizeof(ShmArchive<T>));
-      dst -= 1; src -= 1;
-    }
-  }
-
-  /**====================================
-   * Iterators
-   * ===================================*/
- public:
-  /** Beginning of the forward iterator */
-  iterator_t begin() {
-    return iterator_t(this, 0);
-  }
-
-  /** End of the forward iterator */
-  iterator_t end() {
-    return iterator_t(this, size());
-  }
-
-  /** Beginning of the constant forward iterator */
-  citerator_t cbegin() const {
-    return citerator_t(const_cast<vector*>(this), 0);
-  }
-
-  /** End of the forward iterator */
-  citerator_t cend() const {
-    return citerator_t(const_cast<vector*>(this), size<off64_t>());
-  }
-
-  /** Beginning of the reverse iterator */
-  riterator_t rbegin() {
-    return riterator_t(this, size<off64_t>() - 1);
-  }
-
-  /** End of the reverse iterator */
-  riterator_t rend() {
-    return citerator_t(this, (off64_t)-1);
-  }
-
-  /** Beginning of the constant reverse iterator */
-  criterator_t crbegin() const {
-    return criterator_t(const_cast<vector*>(this), size<off64_t>() - 1);
-  }
-
-  /** End of the constant reverse iterator */
-  criterator_t crend() const {
-    return criterator_t(const_cast<vector*>(this), (off64_t)-1);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-#undef TYPED_HEADER
-
-#endif  // HERMES_DATA_STRUCTURES_LOCKLESS_VECTOR_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/numa_aware/numa_list.h b/hermes_shm/include/hermes_shm/data_structures/numa_aware/numa_list.h
deleted file mode 100644
index 8c9cea91c..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/numa_aware/numa_list.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_NUMA_AWARE_LIST_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_NUMA_AWARE_LIST_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/data_structures/ipc/list.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-
-namespace hshm::ipc {
-
-template<typename T>
-class numa_list;
-
-#define CLASS_NAME numa_list
-#define TYPED_CLASS numa_list
-#define TYPED_HEADER ShmHeader<numa_list>
-
-template<typename T>
-class ShmHeader;
-
-template<typename T>
-class ShmHeader<numa_list<T>> : public hipc::ShmBaseHeader {
-  ShmArchive<vector<list<T>>> numa_lists_;
-
-  explicit ShmHeader(Allocator *alloc, int num_numa) {
-    numa_lists_.shm_init(alloc, num_numa);
-  }
-};
-
-template<typename T>
-class numa_list : public ShmContainer {
- public:
-  SHM_CONTAINER_TEMPLATE((CLASS_NAME), (TYPED_CLASS), (TYPED_HEADER))
-
- public:
-  /**====================================
-   * Shm Overrides
-   * ===================================*/
-
-  /** Default constructor. A default is required. */
-  CLASS_NAME() = default;
-
-  /** Default shm constructor */
-  void shm_init_main(TYPED_HEADER *header,
-                     hipc::Allocator *alloc) {
-    shm_init_allocator(alloc);
-    shm_make_header(header, alloc_);
-  }
-
-  /** Move constructor */
-  void shm_strong_move_main(TYPED_HEADER *header,
-                          hipc::Allocator *alloc,
-                          CLASS_NAME &other) {
-    shm_init_main(header, alloc);
-  }
-
-  /** Copy constructor */
-  void shm_strong_copy_main(TYPED_HEADER *header,
-                            hipc::Allocator *alloc,
-                            const CLASS_NAME &other) {
-    shm_init_main(header, alloc);
-  }
-
-  /** Destroy the shared-memory data. */
-  void shm_destroy_main() {}
-
-  /** Store into shared memory */
-  void shm_serialize_main() const {}
-
-  /** Load from shared memory */
-  void shm_deserialize_main() {}
-
-  /**====================================
-   * Custom methods
-   * ===================================*/
-
-  /** Construct an element at the back of the numa_list */
-  template<typename... Args>
-  void emplace_back(Args&&... args) {
-  }
-
-  /** Construct an element at the beginning of the numa_list */
-  template<typename... Args>
-  void emplace_front(Args&&... args) {
-  }
-
-  /** Construct an element at \a pos position in the numa_list */
-  template<typename ...Args>
-  void emplace(list_iterator<T> pos, Args&&... args) {
-  }
-
-  /** Erase element with ID */
-  void erase(const T &entry) {
-  }
-
-  /** Erase the element at pos */
-  void erase(list_iterator<T> pos) {
-  }
-
-  /** Erase all elements between first and last */
-  void erase(list_iterator<T> first,
-             list_iterator<T> last) {
-  }
-
-  /** Destroy all elements in the numa_list */
-  void clear() {
-  }
-
-  /** Get the object at the front of the numa_list */
-  Ref<T> front() {
-  }
-
-  /** Get the object at the back of the numa_list */
-  Ref<T> back() {
-  }
-
-  /** Get the number of elements in the numa_list */
-  size_t size() const {
-    if (!IsNull()) {
-      return header_->length_;
-    }
-    return 0;
-  }
-
-  /** Find an element in this numa_list */
-  list_iterator<T> find(const T &entry) {
-    for (auto iter = begin(); iter != end(); ++iter) {
-      hipc::Ref<T> ref = *iter;
-      if (*ref == entry) {
-        return iter;
-      }
-    }
-    return end();
-  }
-
-  /**
-   * ITERATORS
-   * */
-
-  /** Forward iterator begin */
-  list_iterator<T> begin() {
-  }
-
-  /** Forward iterator end */
-  static list_iterator<T> const end() {
-  }
-
-  /** Constant forward iterator begin */
-  list_citerator<T> cbegin() const {
-  }
-
-  /** Constant forward iterator end */
-  static list_citerator<T> const cend() {
-  }
-};
-}  // namespace hshm::ipc
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_NUMA_AWARE_LIST_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/numa_aware/numa_vector.h b/hermes_shm/include/hermes_shm/data_structures/numa_aware/numa_vector.h
deleted file mode 100644
index 93d500909..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/numa_aware/numa_vector.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_NUMA_AWARE_VECTOR_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_NUMA_AWARE_VECTOR_H_
-
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_NUMA_AWARE_VECTOR_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/serialization/shm_serialize.h b/hermes_shm/include/hermes_shm/data_structures/serialization/shm_serialize.h
deleted file mode 100644
index fb20fcbbc..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/serialization/shm_serialize.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Created by llogan on 5/9/23.
-//
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_SERIALIZATION_SHM_SERIALIZE_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_SERIALIZATION_SHM_SERIALIZE_H_
-
-#define NOREF typename std::remove_reference<decltype(arg)>::type
-
-namespace hshm::ipc {
-
-class ShmSerializer {
- public:
-  size_t off_;
-
-  /** Default constructor */
-  ShmSerializer() : off_(0) {}
-
-  /** Get the SHM serialized size of an argument pack */
-  template<typename ...Args>
-  HSHM_ALWAYS_INLINE static size_t shm_buf_size(Args&& ...args) {
-    size_t size = 0;
-    auto lambda = [&size](auto i, auto &&arg) {
-      if constexpr(IS_SHM_ARCHIVEABLE(NOREF)) {
-        size += sizeof(hipc::OffsetPointer);
-      } else if constexpr(std::is_pod<NOREF>()) {
-        size += sizeof(arg);
-      } else {
-        throw IPC_ARGS_NOT_SHM_COMPATIBLE.format();
-      }
-    };
-    ForwardIterateArgpack::Apply(make_argpack(std::forward<Args>(args)...), lambda);
-    return size;
-  }
-
-  /** Serialize a set of arguments into shared memory */
-  template<typename ...Args>
-  HSHM_ALWAYS_INLINE char* serialize(Allocator *alloc, Args&& ...args) {
-    size_t buf_size = sizeof(allocator_id_t) + shm_buf_size(std::forward<Args>(args)...);
-    Pointer p;
-    char *buf = alloc->AllocatePtr<char>(buf_size, p);
-    memcpy(buf, &p.allocator_id_, sizeof(allocator_id_t));
-    off_ = sizeof(allocator_id_t);
-    auto lambda = [buf, this](auto i, auto &&arg) {
-      if constexpr(IS_SHM_ARCHIVEABLE(NOREF)) {
-        OffsetPointer p = arg.template GetShmPointer<OffsetPointer>();
-        memcpy(buf + this->off_, (void*)&p, sizeof(p));
-        this->off_ += sizeof(p);
-      } else if constexpr(std::is_pod<NOREF>()) {
-        memcpy(buf + this->off_, &arg, sizeof(arg));
-        this->off_ += sizeof(arg);
-      } else {
-        throw IPC_ARGS_NOT_SHM_COMPATIBLE.format();
-      }
-    };
-    ForwardIterateArgpack::Apply(make_argpack(std::forward<Args>(args)...), lambda);
-    return buf;
-  }
-
-  /** Deserialize an allocator from the SHM buffer */
-  HSHM_ALWAYS_INLINE Allocator* deserialize(char *buf) {
-    allocator_id_t alloc_id;
-    memcpy((void*)&alloc_id, buf + off_, sizeof(allocator_id_t));
-    off_ += sizeof(allocator_id_t);
-    return HERMES_MEMORY_MANAGER->GetAllocator(alloc_id);
-  }
-
-  /** Deserialize an argument from the SHM buffer */
-  template<typename T, typename ...Args>
-  HSHM_ALWAYS_INLINE T deserialize(Allocator *alloc, char *buf) {
-    if constexpr(std::is_pod<T>()) {
-      T arg;
-      memcpy(&arg, buf + off_, sizeof(arg));
-      off_ += sizeof(arg);
-      return arg;
-    } else {
-      throw IPC_ARGS_NOT_SHM_COMPATIBLE.format();
-    }
-  }
-
-  /** Deserialize an argument from the SHM buffer */
-  template<typename T, typename ...Args>
-  HSHM_ALWAYS_INLINE void deserialize(Allocator *alloc, char *buf, hipc::mptr<T> &arg) {
-    if constexpr(IS_SHM_ARCHIVEABLE(T)) {
-      OffsetPointer p;
-      memcpy((void*)&p, buf + off_, sizeof(p));
-      arg.shm_deserialize(alloc, p);
-      off_ += sizeof(p);
-    } else {
-      throw IPC_ARGS_NOT_SHM_COMPATIBLE.format();
-    }
-  }
-};
-
-}  // namespace hshm
-
-#undef NOREF
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_DATA_STRUCTURES_SERIALIZATION_SHM_SERIALIZE_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/serialization/thallium.h b/hermes_shm/include/hermes_shm/data_structures/serialization/thallium.h
deleted file mode 100644
index 219c0a2f8..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/serialization/thallium.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_SERIALIZATION_THALLIUM_H_
-#define HERMES_DATA_STRUCTURES_SERIALIZATION_THALLIUM_H_
-
-#include <thallium.hpp>
-#include "hermes_shm/data_structures/ipc/string.h"
-#include <hermes_shm/data_structures/data_structure.h>
-#include <hermes_shm/data_structures/ipc/vector.h>
-#include <hermes_shm/data_structures/ipc/list.h>
-#include "hermes_shm/data_structures/containers/charbuf.h"
-#include "hermes_shm/data_structures/ipc/slist.h"
-
-namespace thallium {
-
-/**====================================
- * Identifier Serialization
- * ===================================*/
-
-/** Lets Thallium know how to serialize an hipc::allocator_id */
-template <typename A>
-void serialize(A &ar, hipc::allocator_id_t &alloc_id) {
-  ar &alloc_id.int_;
-}
-
-/**====================================
- * Vector Serialization
- * ===================================*/
-
-/** Lets Thallium know how to serialize a generic vector */
-template <typename A, typename ContainerT, typename T>
-void save_vec(A &ar, ContainerT &obj) {
-  ar << obj.size();
-  for (auto iter = obj.cbegin(); iter != obj.cend(); ++iter) {
-    ar << (*iter);
-  }
-}
-
-/** Lets Thallium know how to deserialize a generic vector */
-template <typename A, typename ContainerT, typename T>
-void load_vec(A &ar, ContainerT &obj) {
-  size_t size;
-  ar >> size;
-  obj.resize(size);
-  for (size_t i = 0; i < size; ++i) {
-    ar >> (obj[i]);
-  }
-}
-
-/** Lets Thallium know how to serialize an hipc::vector. */
-template <typename A, typename T>
-void save(A &ar, hipc::vector<T> &vec) {
-  save_vec<A, hipc::vector<T>, T>(ar, vec);
-}
-template <typename A, typename T>
-void save(A &ar, hipc::uptr<hipc::vector<T>> &vec) {
-  save_vec<A, hipc::vector<T>, T>(ar, *vec);
-}
-
-/** Lets Thallium know how to deserialize an hipc::vector. */
-template <typename A, typename T>
-void load(A &ar, hipc::vector<T> &vec) {
-  load_vec<A, hipc::vector<T>, T>(ar, vec);
-}
-template <typename A, typename T>
-void load(A &ar, hipc::uptr<hipc::vector<T>> &vec) {
-  vec = hipc::make_uptr<hipc::vector<T>>();
-  load_vec<A, hipc::vector<T>, T>(ar, *vec);
-}
-
-/**====================================
- * List Serialization
- * ===================================*/
-
-/** Lets Thallium know how to serialize a generic list */
-template <typename A, typename ContainerT, typename T>
-void save_list(A &ar, ContainerT &obj) {
-  ar << obj.size();
-  for (auto iter = obj.cbegin(); iter != obj.cend(); ++iter) {
-    ar << *(*iter);
-  }
-}
-
-/** Lets Thallium know how to deserialize a generic list */
-template <typename A, typename ContainerT, typename T>
-void load_list(A &ar, ContainerT &obj) {
-  size_t size;
-  ar >> size;
-  for (int i = 0; i < size; ++i) {
-    obj->emplace_back();
-    auto last = obj->back();
-    ar >> (*last);
-  }
-}
-
-/** Lets Thallium know how to serialize an hipc::slist. */
-template <typename A, typename T>
-void save(A &ar, hipc::slist<T> &lp) {
-  save_list<A, hipc::slist<T>, T>(ar, lp);
-}
-template <typename A, typename T>
-void save(A &ar, hipc::uptr<hipc::slist<T>> &lp) {
-  save_list<A, hipc::slist<T>, T>(ar, *lp);
-}
-
-/** Lets Thallium know how to deserialize an hipc::slist. */
-template <typename A, typename T>
-void load(A &ar, hipc::slist<T> &lp) {
-  load_list<A, hipc::slist<T>, T>(ar, lp);
-}
-template <typename A, typename T>
-void load(A &ar, hipc::uptr<hipc::slist<T>> &lp) {
-  lp = hipc::make_uptr<hipc::slist<T>>();
-  load_list<A, hipc::slist<T>, T>(ar, *lp);
-}
-
-/** Lets Thallium know how to serialize an hipc::list. */
-template <typename A, typename T>
-void save(A &ar, const hipc::list<T> &lp) {
-  save_list<A, hipc::list<T>, T>(ar, *lp);
-}
-template <typename A, typename T>
-void save(A &ar, hipc::uptr<hipc::list<T>> &lp) {
-  save_list<A, hipc::list<T>, T>(ar, *lp);
-}
-
-/** Lets Thallium know how to deserialize an hipc::list. */
-template <typename A, typename T>
-void load(A &ar, hipc::list<T> &lp) {
-  load_list<A, hipc::list<T>, T>(ar, lp);
-}
-template <typename A, typename T>
-void load(A &ar, hipc::uptr<hipc::list<T>> &lp) {
-  lp = hipc::make_uptr<hipc::list<T>>();
-  load_list<A, hipc::list<T>, T>(ar, *lp);
-}
-
-/**====================================
- * String Serialization
- * ===================================*/
-
-/** Lets Thallium know how to serialize a generic string. */
-template <typename A, typename StringT>
-void save_string(A &ar, StringT &text) {
-  ar << text.size();
-  ar.write(text.data(), text.size());
-}
-/** Lets Thallium know how to serialize a generic string. */
-template <typename A, typename StringT>
-void load_string(A &ar, StringT &text) {
-  size_t size;
-  ar >> size;
-  text.resize(size);
-  ar.read(text.data(), text.size());
-}
-
-/** Lets Thallium know how to serialize an hipc::string. */
-template <typename A>
-void save(A &ar, hipc::string &text) {
-  save_string<A, hipc::string>(ar, text);
-}
-template <typename A>
-void save(A &ar, hipc::uptr<hipc::string> &text) {
-  save_string<A, hipc::string>(ar, *text);
-}
-
-/** Lets Thallium know how to deserialize an hipc::string. */
-template <typename A>
-void load(A &ar, hipc::string &text) {
-  load_string<A, hipc::string>(ar, text);
-}
-template <typename A>
-void load(A &ar, hipc::uptr<hipc::string> &text) {
-  text = hipc::make_uptr<hipc::string>();
-  load_string<A, hipc::string>(ar, *text);
-}
-
-/** Lets Thallium know how to serialize an hshm::charbuf. */
-template <typename A>
-void save(A &ar, hshm::charbuf &text) {
-  save_string<A, hshm::charbuf>(ar, text);
-}
-
-/** Lets Thallium know how to deserialize an hshm::charbuf. */
-template <typename A>
-void load(A &ar, hshm::charbuf &text) {
-  load_string<A, hshm::charbuf>(ar, text);
-}
-
-/**====================================
- * Bitfield Serialization
- * ===================================*/
-
-/** Lets Thallium know how to serialize a bitfield. */
-template <typename A>
-void save(A &ar, hshm::bitfield32_t &field) {
-  uint32_t bits = field.bits_;
-  ar << bits;
-}
-
-/** Lets Thallium know how to deserialize a bitfield. */
-template <typename A>
-void load(A &ar, hshm::bitfield32_t &field) {
-  uint32_t bits;
-  ar >> bits;
-  field.bits_ = bits;
-}
-
-}  // namespace thallium
-
-#endif  // HERMES_DATA_STRUCTURES_SERIALIZATION_THALLIUM_H_
diff --git a/hermes_shm/include/hermes_shm/data_structures/smart_ptr/smart_ptr_base.h b/hermes_shm/include/hermes_shm/data_structures/smart_ptr/smart_ptr_base.h
deleted file mode 100644
index c2988fe4f..000000000
--- a/hermes_shm/include/hermes_shm/data_structures/smart_ptr/smart_ptr_base.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_DATA_STRUCTURES_PTR_H_
-#define HERMES_DATA_STRUCTURES_PTR_H_
-
-#include "hermes_shm/constants/macros.h"
-#include "hermes_shm/memory/memory.h"
-#include "hermes_shm/memory/allocator/allocator.h"
-#include "hermes_shm/memory/memory_registry.h"
-#include "hermes_shm/data_structures/ipc/internal/shm_internal.h"
-#include "hermes_shm/data_structures/ipc/internal/shm_smart_ptr.h"
-
-namespace hshm::ipc {
-
-/**
- * MACROS to simplify the ptr namespace
- * */
-#define CLASS_NAME smart_ptr_base
-#define TYPED_CLASS smart_ptr_base<T>
-
-/**
- * Flags used for the smart pointer
- * */
-#define POINTER_IS_OWNED BIT_OPT(uint32_t, 0)
-
-/**
- * Creates a unique instance of a shared-memory data structure
- * and deletes eventually.
- * */
-template<typename T, bool unique>
-class smart_ptr_base {
- public:
-  T *obj_;
-  Allocator *alloc_;
-  bitfield32_t flags_;
-
- public:
-  /**====================================
-  * Initialization + Destruction
-  * ===================================*/
-
-  /** Default constructor. */
-  HSHM_ALWAYS_INLINE smart_ptr_base() = default;
-
-  /** Create the mptr contents */
-  template<typename ...Args>
-  void shm_init(Allocator *alloc, Args&& ...args) {
-    alloc_ = alloc;
-    OffsetPointer p;
-    if constexpr(IS_SHM_ARCHIVEABLE(T)) {
-      obj_ = alloc_->template AllocateConstructObjs<T>(
-        1, p, alloc, std::forward<Args>(args)...);
-    } else {
-      obj_ = alloc_->template AllocateConstructObjs<T>(
-        1, p, std::forward<Args>(args)...);
-    }
-    if constexpr(unique) {
-      flags_.SetBits(POINTER_IS_OWNED);
-    }
-  }
-
-  /** Destructor. Does not free data. */
-  HSHM_ALWAYS_INLINE ~smart_ptr_base() {
-    if constexpr(unique) {
-      if (flags_.Any(POINTER_IS_OWNED)) {
-        shm_destroy();
-      }
-    }
-  }
-
-  /** Explicit destructor */
-  HSHM_ALWAYS_INLINE void shm_destroy() {
-    if constexpr(IS_SHM_ARCHIVEABLE(T)) {
-      obj_->shm_destroy();
-    }
-    alloc_->template FreeDestructObjs<T>(obj_, 1);
-  }
-
-  /**====================================
-  * Dereference Operations
-  * ===================================*/
-
-  /** Gets a pointer to the internal object */
-  HSHM_ALWAYS_INLINE T* get() {
-    return obj_;
-  }
-
-  /** Gets a pointer to the internal object */
-  HSHM_ALWAYS_INLINE const T* get() const {
-    return obj_;
-  }
-
-  /** Dereference operator */
-  HSHM_ALWAYS_INLINE T& operator*() {
-    return *get();
-  }
-
-  /** Constant Dereference operator */
-  HSHM_ALWAYS_INLINE const T& operator*() const {
-    return *get();
-  }
-
-  /** Pointer operator */
-  HSHM_ALWAYS_INLINE T* operator->() {
-    return get();
-  }
-
-  /** Constant pointer operator */
-  HSHM_ALWAYS_INLINE const T* operator->() const {
-    return get();
-  }
-
-  /**====================================
-  * Move + Copy Operations
-  * ===================================*/
-
-  /** Copy constructor (equivalent to move) */
-  HSHM_ALWAYS_INLINE smart_ptr_base(const smart_ptr_base &other) {
-    shm_strong_copy(other);
-    if constexpr(unique) {
-      flags_.UnsetBits(POINTER_IS_OWNED);
-    }
-  }
-
-  /** Copy assignment operator (equivalent to move) */
-  HSHM_ALWAYS_INLINE smart_ptr_base& operator=(const smart_ptr_base &other) {
-    if (this != &other) {
-      shm_strong_copy(other);
-      if constexpr(unique) {
-        flags_.UnsetBits(POINTER_IS_OWNED);
-      }
-    }
-    return *this;
-  }
-
-  /** Move constructor */
-  HSHM_ALWAYS_INLINE smart_ptr_base(smart_ptr_base&& other) noexcept {
-    shm_strong_move(std::forward<smart_ptr_base>(other));
-  }
-
-  /** Move assignment operator */
-  HSHM_ALWAYS_INLINE smart_ptr_base&
-  operator=(smart_ptr_base&& other) noexcept {
-    if (this != &other) {
-      shm_strong_move(std::forward<smart_ptr_base>(other));
-    }
-    return *this;
-  }
-
-  /** Internal copy operation */
-  HSHM_ALWAYS_INLINE void shm_strong_copy(const smart_ptr_base &other) {
-    obj_ = other.obj_;
-    alloc_ = other.alloc_;
-    flags_ = other.flags_;
-  }
-
-  /** Internal move operation */
-  HSHM_ALWAYS_INLINE void shm_strong_move(smart_ptr_base &&other) {
-    shm_strong_copy(other);
-    if constexpr(unique) {
-      flags_ = other.flags_;
-      other.flags_.UnsetBits(POINTER_IS_OWNED);
-    }
-  }
-
-  /**====================================
-  * Deserialization
-  * ===================================*/
-
-  /** Constructor. Deserialize from a TypedPointer<T> */
-  HSHM_ALWAYS_INLINE explicit smart_ptr_base(const TypedPointer<T> &ar) {
-    shm_deserialize(ar);
-  }
-
-  /** Constructor. Deserialize from a TypedAtomicPointer<T> */
-  HSHM_ALWAYS_INLINE explicit smart_ptr_base(const TypedAtomicPointer<T> &ar) {
-    shm_deserialize(ar);
-  }
-
-  /** Deserialize from a process-independent pointer */
-  template<typename PointerT>
-  HSHM_ALWAYS_INLINE void shm_deserialize(const PointerT &ar) {
-    auto alloc = HERMES_MEMORY_REGISTRY_REF.GetAllocator(ar.allocator_id_);
-    obj_ = alloc->template Convert<T, PointerT>(ar);
-    if constexpr(unique) {
-      flags_.UnsetBits(POINTER_IS_OWNED);
-    }
-  }
-
-  /** Deserialize from an offset pointer */
-  HSHM_ALWAYS_INLINE void shm_deserialize(Allocator *alloc, const OffsetPointer &ar) {
-    obj_ = alloc->template Convert<T, OffsetPointer>(ar);
-    if constexpr(unique) {
-      flags_.UnsetBits(POINTER_IS_OWNED);
-    }
-  }
-
-  /**====================================
-  * Serialization
-  * ===================================*/
-
-  /** Serialize to a process-independent pointer */
-  template<typename PointerT>
-  HSHM_ALWAYS_INLINE void shm_serialize(PointerT &ar) const {
-    ar = alloc_->template Convert(obj_);
-  }
-
-  /**====================================
-  * Serialization + Deserialization Ops
-  * ===================================*/
-  SHM_SERIALIZE_DESERIALIZE_OPS((T))
-
-  /**====================================
-  * Hash function
-  * ===================================*/
-  HSHM_ALWAYS_INLINE size_t hash() const {
-    return std::hash<T>{}(*obj_);
-  }
-};
-
-/**====================================
-* Helper Functions
-* ===================================*/
-
-/** Mptr is non-unique and requires explicit destruction */
-template<typename T>
-using mptr = smart_ptr_base<T, false>;
-
-/** Uptr has a specific container owning the object */
-template<typename T>
-using uptr = smart_ptr_base<T, true>;
-
-/** Construct an mptr with default allocator */
-template<typename PointerT, typename ...Args>
-static PointerT make_ptr_base(Args&& ...args) {
-  PointerT ptr;
-  ptr.shm_init(std::forward<Args>(args)...);
-  return ptr;
-}
-
-/** Create a manual pointer with default allocator */
-template<typename T, typename ...Args>
-mptr<T> make_mptr(Args&& ...args) {
-  auto alloc = HERMES_MEMORY_REGISTRY->GetDefaultAllocator();
-  return make_ptr_base<mptr<T>>(alloc, std::forward<Args>(args)...);
-}
-
-/** Create a manual pointer with non-default allocator */
-template<typename T, typename ...Args>
-mptr<T> make_mptr(Allocator *alloc, Args&& ...args) {
-  return make_ptr_base<mptr<T>>(alloc, std::forward<Args>(args)...);
-}
-
-/** Create a unique pointer with default allocator */
-template<typename T, typename ...Args>
-uptr<T> make_uptr(Args&& ...args) {
-  auto alloc = HERMES_MEMORY_REGISTRY->GetDefaultAllocator();
-  return make_ptr_base<uptr<T>>(alloc, std::forward<Args>(args)...);
-}
-
-/** Create a unique pointer with non-default allocator */
-template<typename T, typename ...Args>
-uptr<T> make_uptr(Allocator *alloc, Args&& ...args) {
-  return make_ptr_base<uptr<T>>(alloc, std::forward<Args>(args)...);
-}
-
-}  // namespace hshm::ipc
-
-#undef CLASS_NAME
-#undef TYPED_CLASS
-
-/**====================================
-* Hash Functions
-* ===================================*/
-namespace std {
-
-/** Hash function for mptr */
-template<typename T>
-struct hash<hshm::ipc::mptr<T>> {
-  size_t operator()(const hshm::ipc::mptr<T> &obj) const {
-    return obj.hash();
-  }
-};
-
-/** Hash function for uptr */
-template<typename T>
-struct hash<hshm::ipc::uptr<T>> {
-  size_t operator()(const hshm::ipc::uptr<T> &obj) const {
-    return obj.hash();
-  }
-};
-
-}  // namespace std
-
-#endif  // HERMES_DATA_STRUCTURES_PTR_H_
diff --git a/hermes_shm/include/hermes_shm/introspect/system_info.h b/hermes_shm/include/hermes_shm/introspect/system_info.h
deleted file mode 100644
index cc83a26ec..000000000
--- a/hermes_shm/include/hermes_shm/introspect/system_info.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SYSINFO_INFO_H_
-#define HERMES_SYSINFO_INFO_H_
-
-#include <unistd.h>
-#include <sys/sysinfo.h>
-#include "hermes_shm/constants/data_structure_singleton_macros.h"
-
-namespace hshm {
-
-struct SystemInfo {
-  int pid_;
-  int ncpu_;
-  int page_size_;
-  int uid_;
-  int gid_;
-  size_t ram_size_;
-
-  SystemInfo() {
-    pid_ = getpid();
-    ncpu_ = get_nprocs_conf();
-    page_size_ = getpagesize();
-    struct sysinfo info;
-    sysinfo(&info);
-    uid_ = getuid();
-    gid_ = getgid();
-    ram_size_ = info.totalram;
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_SYSINFO_INFO_H_
diff --git a/hermes_shm/include/hermes_shm/memory/allocator/allocator.h b/hermes_shm/include/hermes_shm/memory/allocator/allocator.h
deleted file mode 100644
index c6978c469..000000000
--- a/hermes_shm/include/hermes_shm/memory/allocator/allocator.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_MEMORY_ALLOCATOR_ALLOCATOR_H_
-#define HERMES_MEMORY_ALLOCATOR_ALLOCATOR_H_
-
-#include <cstdint>
-#include <hermes_shm/memory/memory.h>
-#include <hermes_shm/util/errors.h>
-
-namespace hshm::ipc {
-
-/**
- * The allocator type.
- * Used to reconstruct allocator from shared memory
- * */
-enum class AllocatorType {
-  kStackAllocator,
-  kMallocAllocator,
-  kFixedPageAllocator,
-  kScalablePageAllocator,
-};
-
-/**
- * The basic shared-memory allocator header.
- * Allocators inherit from this.
- * */
-struct AllocatorHeader {
-  int allocator_type_;
-  allocator_id_t allocator_id_;
-  size_t custom_header_size_;
-
-  AllocatorHeader() = default;
-
-  void Configure(allocator_id_t allocator_id,
-                 AllocatorType type,
-                 size_t custom_header_size) {
-    allocator_type_ = static_cast<int>(type);
-    allocator_id_ = allocator_id;
-    custom_header_size_ = custom_header_size;
-  }
-};
-
-/**
- * The allocator base class.
- * */
-class Allocator {
- protected:
-  char *buffer_;
-  size_t buffer_size_;
-  char *custom_header_;
-
- public:
-  /**
-   * Constructor
-   * */
-  Allocator() : custom_header_(nullptr) {}
-
-  /**
-   * Destructor
-   * */
-  virtual ~Allocator() = default;
-
-  /**
-   * Create the shared-memory allocator with \a id unique allocator id over
-   * the particular slot of a memory backend.
-   *
-   * The shm_init function is required, but cannot be marked virtual as
-   * each allocator has its own arguments to this method. Though each
-   * allocator must have "id" as its first argument.
-   * */
-  // virtual void shm_init(allocator_id_t id, Args ...args) = 0;
-
-  /**
-   * Deserialize allocator from a buffer.
-   * */
-  virtual void shm_deserialize(char *buffer,
-                               size_t buffer_size) = 0;
-
-  /**
-   * Allocate a region of memory of \a size size
-   * */
-  virtual OffsetPointer AllocateOffset(size_t size) = 0;
-
-  /**
-   * Allocate a region of memory to a specific pointer type
-   * */
-  template<typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE POINTER_T Allocate(size_t size) {
-    return POINTER_T(GetId(), AllocateOffset(size).load());
-  }
-
-  /**
-   * Allocate a region of memory of \a size size
-   * and \a alignment alignment. Assumes that
-   * alignment is not 0.
-   * */
-  virtual OffsetPointer AlignedAllocateOffset(size_t size,
-                                              size_t alignment) = 0;
-
-  /**
-   * Allocate a region of memory to a specific pointer type
-   * */
-  template<typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE POINTER_T AlignedAllocate(size_t size, size_t alignment) {
-    return POINTER_T(GetId(), AlignedAllocateOffset(size, alignment).load());
-  }
-
-  /**
-   * Allocate a region of \a size size and \a alignment
-   * alignment. Will fall back to regular Allocate if
-   * alignmnet is 0.
-   * */
-  template<typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE  POINTER_T Allocate(size_t size, size_t alignment) {
-    if (alignment == 0) {
-      return Allocate<POINTER_T>(size);
-    } else {
-      return AlignedAllocate<POINTER_T>(size, alignment);
-    }
-  }
-
-  /**
-   * Reallocate \a pointer to \a new_size new size
-   * If p is kNullPointer, will internally call Allocate.
-   *
-   * @return true if p was modified.
-   * */
-  template<typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE bool Reallocate(POINTER_T &p, size_t new_size) {
-    if (p.IsNull()) {
-      p = Allocate<POINTER_T>(new_size);
-      return true;
-    }
-    auto new_p = ReallocateOffsetNoNullCheck(p.ToOffsetPointer(),
-                                             new_size);
-    bool ret = new_p == p.ToOffsetPointer();
-    p.off_ = new_p.load();
-    return ret;
-  }
-
-  /**
-   * Reallocate \a pointer to \a new_size new size.
-   * Assumes that p is not kNullPointer.
-   *
-   * @return true if p was modified.
-   * */
-  virtual OffsetPointer ReallocateOffsetNoNullCheck(OffsetPointer p,
-                                                    size_t new_size) = 0;
-
-  /**
-   * Free the memory pointed to by \a ptr Pointer
-   * */
-  template<typename T = void>
-  HSHM_ALWAYS_INLINE void FreePtr(T *ptr) {
-    if (ptr == nullptr) {
-      throw INVALID_FREE.format();
-    }
-    FreeOffsetNoNullCheck(Convert<T, OffsetPointer>(ptr));
-  }
-
-  /**
-   * Free the memory pointed to by \a p Pointer
-   * */
-  template<typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE void Free(POINTER_T &p) {
-    if (p.IsNull()) {
-      throw INVALID_FREE.format();
-    }
-    FreeOffsetNoNullCheck(OffsetPointer(p.off_.load()));
-  }
-
-  /**
-   * Free the memory pointed to by \a ptr Pointer
-   * */
-  virtual void FreeOffsetNoNullCheck(OffsetPointer p) = 0;
-
-  /**
-   * Get the allocator identifier
-   * */
-  virtual allocator_id_t &GetId() = 0;
-
-  /**
-   * Get the amount of memory that was allocated, but not yet freed.
-   * Useful for memory leak checks.
-   * */
-  virtual size_t GetCurrentlyAllocatedSize() = 0;
-
-  /**====================================
-  * Pointer Allocators
-  * ===================================*/
-
-  /**
-   * Allocate a pointer of \a size size and return \a p process-independent
-   * pointer and a process-specific pointer.
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* AllocatePtr(size_t size,
-                                    POINTER_T &p, size_t alignment = 0) {
-    p = Allocate<POINTER_T>(size, alignment);
-    if (p.IsNull()) { return nullptr; }
-    return reinterpret_cast<T*>(buffer_ + p.off_.load());
-  }
-
-  /**
-   * Allocate a pointer of \a size size
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* AllocatePtr(size_t size, size_t alignment = 0) {
-    POINTER_T p;
-    return AllocatePtr<T, POINTER_T>(size, p, alignment);
-  }
-
-  /**
-   * Allocate a pointer of \a size size
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* ClearAllocatePtr(size_t size, size_t alignment = 0) {
-    POINTER_T p;
-    return ClearAllocatePtr<T, POINTER_T>(size, p, alignment);
-  }
-
-  /**
-   * Allocate a pointer of \a size size and return \a p process-independent
-   * pointer and a process-specific pointer.
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* ClearAllocatePtr(size_t size,
-                                         POINTER_T &p, size_t alignment = 0) {
-    p = Allocate<POINTER_T>(size, alignment);
-    if (p.IsNull()) { return nullptr; }
-    auto ptr = reinterpret_cast<T*>(buffer_ + p.off_.load());
-    if (ptr) {
-      memset(ptr, 0, size);
-    }
-    return ptr;
-  }
-
-  /**
-   * Reallocate a pointer to a new size
-   *
-   * @param p process-independent pointer (input & output)
-   * @param new_size the new size to allocate
-   * @param modified whether or not p was modified (output)
-   * @return A process-specific pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* ReallocatePtr(POINTER_T &p, size_t new_size,
-                                      bool &modified) {
-    modified = Reallocate<POINTER_T>(p, new_size);
-    return Convert<T>(p);
-  }
-
-  /**
-   * Reallocate a pointer to a new size
-   *
-   * @param p process-independent pointer (input & output)
-   * @param new_size the new size to allocate
-   * @return A process-specific pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* ReallocatePtr(POINTER_T &p, size_t new_size) {
-    Reallocate<POINTER_T>(p, new_size);
-    return Convert<T>(p);
-  }
-
-  /**
-   * Reallocate a pointer to a new size
-   *
-   * @param old_ptr process-specific pointer to reallocate
-   * @param new_size the new size to allocate
-   * @return A process-specific pointer
-   * */
-  template<typename T>
-  HSHM_ALWAYS_INLINE T* ReallocatePtr(T *old_ptr, size_t new_size) {
-    OffsetPointer p = Convert<T, OffsetPointer>(old_ptr);
-    return ReallocatePtr<T, OffsetPointer>(p, new_size);
-  }
-
-  /**====================================
-  * Object Allocators
-  * ===================================*/
-
-  /**
-   * Allocate an array of objects (but don't construct).
-   *
-   * @return A process-specific pointer
-   * */
-  template<typename T>
-  HSHM_ALWAYS_INLINE T* AllocateObjs(size_t count) {
-    OffsetPointer p;
-    return AllocateObjs<T>(count, p);
-  }
-
-  /**
-   * Allocate an array of objects (but don't construct).
-   *
-   * @param count the number of objects to allocate
-   * @param p process-independent pointer (output)
-   * @return A process-specific pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* AllocateObjs(size_t count, POINTER_T &p) {
-    return AllocatePtr<T>(count * sizeof(T), p);
-  }
-
-  /**
-   * Allocate an array of objects and memset to 0.
-   *
-   * @param count the number of objects to allocate
-   * @param p process-independent pointer (output)
-   * @return A process-specific pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* ClearAllocateObjs(size_t count, POINTER_T &p) {
-    return ClearAllocatePtr<T>(count * sizeof(T), p);
-  }
-
-  /**
-   * Allocate and construct an array of objects
-   *
-   * @param count the number of objects to allocate
-   * @param p process-independent pointer (output)
-   * @param args parameters to construct object of type T
-   * @return A process-specific pointer
-   * */
-  template<
-    typename T,
-    typename POINTER_T = Pointer,
-    typename ...Args>
-  HSHM_ALWAYS_INLINE T* AllocateConstructObjs(size_t count,
-                                              POINTER_T &p, Args&& ...args) {
-    T *ptr = AllocateObjs<T>(count, p);
-    ConstructObjs<T>(ptr, 0, count, std::forward<Args>(args)...);
-    return ptr;
-  }
-
-  /**
-   * Reallocate a pointer of objects to a new size.
-   *
-   * @param p process-independent pointer (input & output)
-   * @param old_count the original number of objects (avoids reconstruction)
-   * @param new_count the new number of objects
-   *
-   * @return A process-specific pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* ReallocateObjs(POINTER_T &p, size_t new_count) {
-    T *ptr = ReallocatePtr<T>(p, new_count*sizeof(T));
-    return ptr;
-  }
-
-  /**
-   * Reallocate a pointer of objects to a new size and construct the
-   * new elements in-place.
-   *
-   * @param p process-independent pointer (input & output)
-   * @param old_count the original number of objects (avoids reconstruction)
-   * @param new_count the new number of objects
-   * @param args parameters to construct object of type T
-   *
-   * @return A process-specific pointer
-   * */
-  template<
-    typename T,
-    typename POINTER_T = Pointer,
-    typename ...Args>
-  HSHM_ALWAYS_INLINE T* ReallocateConstructObjs(POINTER_T &p,
-                                                size_t old_count,
-                                                size_t new_count,
-                                                Args&& ...args) {
-    T *ptr = ReallocatePtr<T>(p, new_count*sizeof(T));
-    ConstructObjs<T>(ptr, old_count, new_count, std::forward<Args>(args)...);
-    return ptr;
-  }
-
-  /**====================================
-  * Object Deallocators
-  * ===================================*/
-
-  /**
-   * Free + destruct objects
-   * */
-  template <typename T>
-  HSHM_ALWAYS_INLINE void FreeDestructObjs(T *ptr, size_t count) {
-    DestructObjs<T>(ptr, count);
-    auto p = Convert<T, OffsetPointer>(ptr);
-    Free(p);
-  }
-
-
-  /**====================================
-  * Object Constructors
-  * ===================================*/
-
-  /**
-   * Construct each object in an array of objects.
-   *
-   * @param ptr the array of objects (potentially archived)
-   * @param old_count the original size of the ptr
-   * @param new_count the new size of the ptr
-   * @param args parameters to construct object of type T
-   * @return None
-   * */
-  template<
-      typename T,
-      typename ...Args>
-  HSHM_ALWAYS_INLINE static void ConstructObjs(T *ptr,
-                                   size_t old_count,
-                                   size_t new_count, Args&& ...args) {
-    if (ptr == nullptr) { return; }
-    for (size_t i = old_count; i < new_count; ++i) {
-      ConstructObj<T>(*(ptr + i), std::forward<Args>(args)...);
-    }
-  }
-
-  /**
-   * Construct an object.
-   *
-   * @param ptr the object to construct (potentially archived)
-   * @param args parameters to construct object of type T
-   * @return None
-   * */
-  template<
-    typename T,
-    typename ...Args>
-  HSHM_ALWAYS_INLINE static void ConstructObj(T &obj, Args&& ...args) {
-    new (&obj) T(std::forward<Args>(args)...);
-  }
-
-  /**
-   * Destruct an array of objects
-   *
-   * @param ptr the object to destruct (potentially archived)
-   * @param count the length of the object array
-   * @return None
-   * */
-  template<typename T>
-  HSHM_ALWAYS_INLINE static void DestructObjs(T *ptr, size_t count) {
-    if (ptr == nullptr) { return; }
-    for (size_t i = 0; i < count; ++i) {
-      DestructObj<T>(*(ptr + i));
-    }
-  }
-
-  /**
-   * Destruct an object
-   *
-   * @param ptr the object to destruct (potentially archived)
-   * @param count the length of the object array
-   * @return None
-   * */
-  template<typename T>
-  HSHM_ALWAYS_INLINE static void DestructObj(T &obj) {
-    obj.~T();
-  }
-
-  /**====================================
-  * Helpers
-  * ===================================*/
-
-  /**
-   * Get the custom header of the shared-memory allocator
-   *
-   * @return Custom header pointer
-   * */
-  template<typename HEADER_T>
-  HSHM_ALWAYS_INLINE HEADER_T* GetCustomHeader() {
-    return reinterpret_cast<HEADER_T*>(custom_header_);
-  }
-
-  /**
-   * Convert a process-independent pointer into a process-specific pointer
-   *
-   * @param p process-independent pointer
-   * @return a process-specific pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE T* Convert(const POINTER_T &p) {
-    if (p.IsNull()) { return nullptr; }
-    return reinterpret_cast<T*>(buffer_ + p.off_.load());
-  }
-
-  /**
-   * Convert a process-specific pointer into a process-independent pointer
-   *
-   * @param ptr process-specific pointer
-   * @return a process-independent pointer
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  HSHM_ALWAYS_INLINE POINTER_T Convert(const T *ptr) {
-    if (ptr == nullptr) { return POINTER_T::GetNull(); }
-    return POINTER_T(GetId(),
-                     reinterpret_cast<size_t>(ptr) -
-                     reinterpret_cast<size_t>(buffer_));
-  }
-
-  /**
-   * Determine whether or not this allocator contains a process-specific
-   * pointer
-   *
-   * @param ptr process-specific pointer
-   * @return True or false
-   * */
-  template<typename T = void>
-  HSHM_ALWAYS_INLINE bool ContainsPtr(T *ptr) {
-    return  reinterpret_cast<size_t>(ptr) >=
-            reinterpret_cast<size_t>(buffer_);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_ALLOCATOR_ALLOCATOR_H_
diff --git a/hermes_shm/include/hermes_shm/memory/allocator/allocator_factory.h b/hermes_shm/include/hermes_shm/memory/allocator/allocator_factory.h
deleted file mode 100644
index 33564a929..000000000
--- a/hermes_shm/include/hermes_shm/memory/allocator/allocator_factory.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_ALLOCATOR_ALLOCATOR_FACTORY_H_
-#define HERMES_MEMORY_ALLOCATOR_ALLOCATOR_FACTORY_H_
-
-#include "allocator.h"
-#include "stack_allocator.h"
-#include "malloc_allocator.h"
-#include "scalable_page_allocator.h"
-
-namespace hshm::ipc {
-
-class AllocatorFactory {
- public:
-  /**
-   * Create a new memory allocator
-   * */
-  template<typename AllocT, typename ...Args>
-  static std::unique_ptr<Allocator> shm_init(allocator_id_t alloc_id,
-                                             size_t custom_header_size,
-                                             MemoryBackend *backend,
-                                             Args&& ...args) {
-    if constexpr(std::is_same_v<StackAllocator, AllocT>) {
-      // StackAllocator
-      auto alloc = std::make_unique<StackAllocator>();
-      alloc->shm_init(alloc_id,
-                      custom_header_size,
-                      backend->data_,
-                      backend->data_size_,
-                      std::forward<Args>(args)...);
-      return alloc;
-    } else if constexpr(std::is_same_v<MallocAllocator, AllocT>) {
-      // Malloc Allocator
-      auto alloc = std::make_unique<MallocAllocator>();
-      alloc->shm_init(alloc_id,
-                      custom_header_size,
-                      backend->data_,
-                      backend->data_size_,
-                      std::forward<Args>(args)...);
-      return alloc;
-    } else if constexpr(std::is_same_v<ScalablePageAllocator, AllocT>) {
-      // Scalable Page Allocator
-      auto alloc = std::make_unique<ScalablePageAllocator>();
-      alloc->shm_init(alloc_id,
-                      custom_header_size,
-                      backend->data_,
-                      backend->data_size_,
-                      std::forward<Args>(args)...);
-      return alloc;
-    } else {
-      // Default
-      throw std::logic_error("Not a valid allocator");
-    }
-  }
-
-  /**
-   * Deserialize the allocator managing this backend.
-   * */
-  static std::unique_ptr<Allocator> shm_deserialize(MemoryBackend *backend) {
-    auto header_ = reinterpret_cast<AllocatorHeader*>(backend->data_);
-    switch (static_cast<AllocatorType>(header_->allocator_type_)) {
-      // Stack Allocator
-      case AllocatorType::kStackAllocator: {
-        auto alloc = std::make_unique<StackAllocator>();
-        alloc->shm_deserialize(backend->data_,
-                               backend->data_size_);
-        return alloc;
-      }
-      // Malloc Allocator
-      case AllocatorType::kMallocAllocator: {
-        auto alloc = std::make_unique<MallocAllocator>();
-        alloc->shm_deserialize(backend->data_,
-                               backend->data_size_);
-        return alloc;
-      }
-      // Scalable Page Allocator
-      case AllocatorType::kScalablePageAllocator: {
-        auto alloc = std::make_unique<ScalablePageAllocator>();
-        alloc->shm_deserialize(backend->data_,
-                               backend->data_size_);
-        return alloc;
-      }
-      default: return nullptr;
-    }
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_ALLOCATOR_ALLOCATOR_FACTORY_H_
diff --git a/hermes_shm/include/hermes_shm/memory/allocator/malloc_allocator.h b/hermes_shm/include/hermes_shm/memory/allocator/malloc_allocator.h
deleted file mode 100644
index 3ce8b53f6..000000000
--- a/hermes_shm/include/hermes_shm/memory/allocator/malloc_allocator.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_ALLOCATOR_MALLOC_ALLOCATOR_H_
-#define HERMES_MEMORY_ALLOCATOR_MALLOC_ALLOCATOR_H_
-
-#include "allocator.h"
-#include "hermes_shm/thread/lock.h"
-
-namespace hshm::ipc {
-
-struct MallocAllocatorHeader : public AllocatorHeader {
-  std::atomic<size_t> total_alloc_size_;
-
-  MallocAllocatorHeader() = default;
-
-  void Configure(allocator_id_t alloc_id,
-                 size_t custom_header_size) {
-    AllocatorHeader::Configure(alloc_id, AllocatorType::kStackAllocator,
-                               custom_header_size);
-    total_alloc_size_ = 0;
-  }
-};
-
-class MallocAllocator : public Allocator {
- private:
-  MallocAllocatorHeader *header_;
-
- public:
-  /**
-   * Allocator constructor
-   * */
-  MallocAllocator()
-  : header_(nullptr) {}
-
-  /**
-   * Get the ID of this allocator from shared memory
-   * */
-  allocator_id_t &GetId() override {
-    return header_->allocator_id_;
-  }
-
-  /**
-   * Initialize the allocator in shared memory
-   * */
-  void shm_init(allocator_id_t id,
-                size_t custom_header_size,
-                char *buffer,
-                size_t buffer_size);
-
-  /**
-   * Attach an existing allocator from shared memory
-   * */
-  void shm_deserialize(char *buffer,
-                       size_t buffer_size) override;
-
-  /**
-   * Allocate a memory of \a size size. The page allocator cannot allocate
-   * memory larger than the page size.
-   * */
-  OffsetPointer AllocateOffset(size_t size) override;
-
-  /**
-   * Allocate a memory of \a size size, which is aligned to \a
-   * alignment.
-   * */
-  OffsetPointer AlignedAllocateOffset(size_t size, size_t alignment) override;
-
-  /**
-   * Reallocate \a p pointer to \a new_size new size.
-   *
-   * @return whether or not the pointer p was changed
-   * */
-  OffsetPointer ReallocateOffsetNoNullCheck(OffsetPointer p,
-                                            size_t new_size) override;
-
-  /**
-   * Free \a ptr pointer. Null check is performed elsewhere.
-   * */
-  void FreeOffsetNoNullCheck(OffsetPointer p) override;
-
-  /**
-   * Get the current amount of data allocated. Can be used for leak
-   * checking.
-   * */
-  size_t GetCurrentlyAllocatedSize() override;
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_ALLOCATOR_MALLOC_ALLOCATOR_H_
diff --git a/hermes_shm/include/hermes_shm/memory/allocator/mp_page.h b/hermes_shm/include/hermes_shm/memory/allocator/mp_page.h
deleted file mode 100644
index 1209e0f0e..000000000
--- a/hermes_shm/include/hermes_shm/memory/allocator/mp_page.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_MEMORY_ALLOCATOR_MP_PAGE_H_
-#define HERMES_INCLUDE_HERMES_MEMORY_ALLOCATOR_MP_PAGE_H_
-
-#include "hermes_shm/data_structures/ipc/iqueue.h"
-
-namespace hshm::ipc {
-
-struct MpPage {
-  iqueue_entry entry_;  /**< Position of page in free list */
-  size_t page_size_;    /**< The size of the page allocated */
-  int flags_;           /**< Page flags (e.g., is_allocated?) */
-  uint32_t off_;        /**< The offset within the page */
-  uint32_t cpu_;        /**< The CPU the page was alloc'd from */
-
-  void SetAllocated() {
-    flags_ = 0x1;
-  }
-
-  void UnsetAllocated() {
-    flags_ = 0;
-  }
-
-  bool IsAllocated() const {
-    return flags_ & 0x1;
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_HERMES_MEMORY_ALLOCATOR_MP_PAGE_H_
diff --git a/hermes_shm/include/hermes_shm/memory/allocator/scalable_page_allocator.h b/hermes_shm/include/hermes_shm/memory/allocator/scalable_page_allocator.h
deleted file mode 100644
index 1829d55da..000000000
--- a/hermes_shm/include/hermes_shm/memory/allocator/scalable_page_allocator.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_ALLOCATOR_SCALABLE_PAGE_ALLOCATOR_H
-#define HERMES_MEMORY_ALLOCATOR_SCALABLE_PAGE_ALLOCATOR_H
-
-#include "allocator.h"
-#include "hermes_shm/thread/lock.h"
-#include "hermes_shm/data_structures/ipc/pair.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-#include "hermes_shm/data_structures/ipc/list.h"
-#include "hermes_shm/data_structures/ipc/pair.h"
-#include <hermes_shm/memory/allocator/stack_allocator.h>
-#include "mp_page.h"
-
-namespace hshm::ipc {
-
-struct FreeListStats {
-  size_t page_size_;  /**< Page size stored in this free list */
-  size_t cur_alloc_;  /**< Number of pages currently allocated */
-  size_t max_alloc_;  /**< Maximum number of pages allocated at a time */
-  Mutex lock_;        /**< The enqueue / dequeue lock */
-
-  /** Default constructor */
-  FreeListStats() = default;
-
-  /** Copy constructor */
-  FreeListStats(const FreeListStats &other) {
-    strong_copy(other);
-  }
-
-  /** Copy assignment operator */
-  FreeListStats& operator=(const FreeListStats &other) {
-    strong_copy(other);
-    return *this;
-  }
-
-  /** Move constructor */
-  FreeListStats(FreeListStats &&other) {
-    strong_copy(other);
-  }
-
-  /** Move assignment operator */
-  FreeListStats& operator=(FreeListStats &&other) {
-    strong_copy(other);
-    return *this;
-  }
-
-  /** Internal copy */
-  void strong_copy(const FreeListStats &other) {
-    page_size_ = other.page_size_;
-    cur_alloc_ = other.cur_alloc_;
-    max_alloc_ = other.max_alloc_;
-  }
-
-  /** Increment allocation count */
-  void AddAlloc() {
-    cur_alloc_ += 1;
-    if (cur_alloc_ > max_alloc_) {
-      max_alloc_ += 1;
-    }
-  }
-
-  /** Decrement allocation count */
-  void AddFree() {
-    cur_alloc_ -= 1;
-  }
-};
-
-struct ScalablePageAllocatorHeader : public AllocatorHeader {
-  ShmArchive<vector<pair<FreeListStats, iqueue<MpPage>>>> free_lists_;
-  std::atomic<size_t> total_alloc_;
-  size_t coalesce_trigger_;
-  size_t coalesce_window_;
-  RwLock coalesce_lock_;
-
-  ScalablePageAllocatorHeader() = default;
-
-  void Configure(allocator_id_t alloc_id,
-                 size_t custom_header_size,
-                 Allocator *alloc,
-                 size_t buffer_size,
-                 RealNumber coalesce_trigger,
-                 size_t coalesce_window) {
-    AllocatorHeader::Configure(alloc_id,
-                               AllocatorType::kScalablePageAllocator,
-                               custom_header_size);
-    HSHM_MAKE_AR0(free_lists_, alloc)
-    total_alloc_ = 0;
-    coalesce_trigger_ = (coalesce_trigger * buffer_size).as_int();
-    coalesce_window_ = coalesce_window;
-    coalesce_lock_.Init();
-  }
-};
-
-class ScalablePageAllocator : public Allocator {
- private:
-  ScalablePageAllocatorHeader *header_;
-  vector<pair<FreeListStats, iqueue<MpPage>>> *free_lists_;
-  StackAllocator alloc_;
-  /** The power-of-two exponent of the minimum size that can be cached */
-  static const size_t min_cached_size_exp_ = 6;
-  /** The minimum size that can be cached directly (64 bytes) */
-  static const size_t min_cached_size_ = (1 << min_cached_size_exp_);
-  /** The power-of-two exponent of the minimum size that can be cached */
-  static const size_t max_cached_size_exp_ = 24;
-  /** The maximum size that can be cached directly (16MB) */
-  static const size_t max_cached_size_ = (1 << max_cached_size_exp_);
-  /** Cache every size between 64 (2^6) BYTES and 16MB (2^24): (19 entries) */
-  static const size_t num_caches_ = 24 - 6 + 1;
-  /**
-   * The last free list stores sizes larger than 16KB or sizes which are
-   * not exactly powers-of-two.
-   * */
-  static const size_t num_free_lists_ = num_caches_ + 1;
-
- public:
-  /**
-   * Allocator constructor
-   * */
-  ScalablePageAllocator()
-    : header_(nullptr) {}
-
-  /**
-   * Get the ID of this allocator from shared memory
-   * */
-  allocator_id_t &GetId() override {
-    return header_->allocator_id_;
-  }
-
-  /**
-   * Initialize the allocator in shared memory
-   * */
-  void shm_init(allocator_id_t id,
-                size_t custom_header_size,
-                char *buffer,
-                size_t buffer_size,
-                RealNumber coalesce_trigger = RealNumber(1, 5),
-                size_t coalesce_window = MEGABYTES(1));
-
-  /**
-   * Attach an existing allocator from shared memory
-   * */
-  void shm_deserialize(char *buffer,
-                       size_t buffer_size) override;
-
-  /**
-   * Allocate a memory of \a size size. The page allocator cannot allocate
-   * memory larger than the page size.
-   * */
-  OffsetPointer AllocateOffset(size_t size) override;
-
- private:
-  /** Check if a cached page on this core can be re-used */
-  MpPage* CheckLocalCaches(size_t size_mp, uint32_t cpu);
-
-  /**
-   * Find the first fit of an element in a free list
-   * */
-  MpPage* FindFirstFit(size_t size_mp,
-                       FreeListStats &stats,
-                       iqueue<MpPage> &free_list);
-
-  /**
-   * Divide a page into smaller pages and cache them
-   * */
-  void DividePage(FreeListStats &stats,
-                  iqueue<MpPage> &free_list,
-                  MpPage *fit_page,
-                  MpPage *&rem_page,
-                  size_t size_mp,
-                  size_t max_divide);
-
-
- public:
-  /**
-   * Allocate a memory of \a size size, which is aligned to \a
-   * alignment.
-   * */
-  OffsetPointer AlignedAllocateOffset(size_t size, size_t alignment) override;
-
-  /**
-   * Reallocate \a p pointer to \a new_size new size.
-   *
-   * @return whether or not the pointer p was changed
-   * */
-  OffsetPointer ReallocateOffsetNoNullCheck(
-    OffsetPointer p, size_t new_size) override;
-
-  /**
-   * Free \a ptr pointer. Null check is performed elsewhere.
-   * */
-  void FreeOffsetNoNullCheck(OffsetPointer p) override;
-
-  /**
-   * Get the current amount of data allocated. Can be used for leak
-   * checking.
-   * */
-  size_t GetCurrentlyAllocatedSize() override;
-
- private:
-  /** Round a number up to the nearest page size. */
-  size_t RoundUp(size_t num, size_t &exp);
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_ALLOCATOR_SCALABLE_PAGE_ALLOCATOR_H
diff --git a/hermes_shm/include/hermes_shm/memory/allocator/stack_allocator.h b/hermes_shm/include/hermes_shm/memory/allocator/stack_allocator.h
deleted file mode 100644
index e4b35ccc2..000000000
--- a/hermes_shm/include/hermes_shm/memory/allocator/stack_allocator.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_ALLOCATOR_STACK_ALLOCATOR_H_
-#define HERMES_MEMORY_ALLOCATOR_STACK_ALLOCATOR_H_
-
-#include "allocator.h"
-#include "hermes_shm/thread/lock.h"
-
-namespace hshm::ipc {
-
-struct StackAllocatorHeader : public AllocatorHeader {
-  std::atomic<size_t> region_off_;
-  std::atomic<size_t> region_size_;
-  std::atomic<size_t> total_alloc_;
-
-  StackAllocatorHeader() = default;
-
-  void Configure(allocator_id_t alloc_id,
-                 size_t custom_header_size,
-                 size_t region_off,
-                 size_t region_size) {
-    AllocatorHeader::Configure(alloc_id, AllocatorType::kStackAllocator,
-                               custom_header_size);
-    region_off_ = region_off;
-    region_size_ = region_size;
-    total_alloc_ = 0;
-  }
-};
-
-class StackAllocator : public Allocator {
- private:
-  StackAllocatorHeader *header_;
-
- public:
-  /**
-   * Allocator constructor
-   * */
-  StackAllocator()
-  : header_(nullptr) {}
-
-  /**
-   * Get the ID of this allocator from shared memory
-   * */
-  allocator_id_t &GetId() override {
-    return header_->allocator_id_;
-  }
-
-  /**
-   * Initialize the allocator in shared memory
-   * */
-  void shm_init(allocator_id_t id,
-                size_t custom_header_size,
-                char *buffer,
-                size_t buffer_size);
-
-  /**
-   * Attach an existing allocator from shared memory
-   * */
-  void shm_deserialize(char *buffer,
-                       size_t buffer_size) override;
-
-  /**
-   * Allocate a memory of \a size size. The page allocator cannot allocate
-   * memory larger than the page size.
-   * */
-  OffsetPointer AllocateOffset(size_t size) override;
-
-  /**
-   * Allocate a memory of \a size size, which is aligned to \a
-   * alignment.
-   * */
-  OffsetPointer AlignedAllocateOffset(size_t size, size_t alignment) override;
-
-  /**
-   * Reallocate \a p pointer to \a new_size new size.
-   *
-   * @return whether or not the pointer p was changed
-   * */
-  OffsetPointer ReallocateOffsetNoNullCheck(
-    OffsetPointer p, size_t new_size) override;
-
-  /**
-   * Free \a ptr pointer. Null check is performed elsewhere.
-   * */
-  void FreeOffsetNoNullCheck(OffsetPointer p) override;
-
-  /**
-   * Get the current amount of data allocated. Can be used for leak
-   * checking.
-   * */
-  size_t GetCurrentlyAllocatedSize() override;
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_ALLOCATOR_STACK_ALLOCATOR_H_
diff --git a/hermes_shm/include/hermes_shm/memory/backend/array_backend.h b/hermes_shm/include/hermes_shm/memory/backend/array_backend.h
deleted file mode 100644
index 6d7ae3d52..000000000
--- a/hermes_shm/include/hermes_shm/memory/backend/array_backend.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_MEMORY_BACKEND_ARRAY_BACKEND_H_
-#define HERMES_INCLUDE_HERMES_MEMORY_BACKEND_ARRAY_BACKEND_H_
-
-#include "memory_backend.h"
-#include <string>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/shm.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include <hermes_shm/util/errors.h>
-#include <hermes_shm/constants/macros.h>
-#include <hermes_shm/introspect/system_info.h>
-
-namespace hshm::ipc {
-
-class ArrayBackend : public MemoryBackend {
- public:
-  ArrayBackend() = default;
-
-  ~ArrayBackend() override {}
-
-  bool shm_init(size_t size, char *region) {
-    if (size < sizeof(MemoryBackendHeader)) {
-      throw SHMEM_CREATE_FAILED.format();
-    }
-    SetInitialized();
-    Own();
-    header_ = reinterpret_cast<MemoryBackendHeader *>(region);
-    header_->data_size_ = size - sizeof(MemoryBackendHeader);
-    data_size_ = header_->data_size_;
-    data_ = region + sizeof(MemoryBackendHeader);
-    return true;
-  }
-
-  bool shm_deserialize(std::string url) override {
-    (void) url;
-    throw SHMEM_NOT_SUPPORTED.format();
-  }
-
-  void shm_detach() override {}
-
-  void shm_destroy() override {}
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_HERMES_MEMORY_BACKEND_ARRAY_BACKEND_H_
diff --git a/hermes_shm/include/hermes_shm/memory/backend/memory_backend.h b/hermes_shm/include/hermes_shm/memory/backend/memory_backend.h
deleted file mode 100644
index 01039fbdb..000000000
--- a/hermes_shm/include/hermes_shm/memory/backend/memory_backend.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_MEMORY_H
-#define HERMES_MEMORY_H
-
-#include <cstdint>
-#include <vector>
-#include <string>
-#include <hermes_shm/memory/memory.h>
-#include "hermes_shm/constants/macros.h"
-#include <limits>
-
-namespace hshm::ipc {
-
-struct MemoryBackendHeader {
-  size_t data_size_;
-};
-
-enum class MemoryBackendType {
-  kPosixShmMmap,
-  kNullBackend,
-  kArrayBackend,
-  kPosixMmap,
-};
-
-#define MEMORY_BACKEND_INITIALIZED 0x1
-#define MEMORY_BACKEND_OWNED 0x2
-
-class MemoryBackend {
- public:
-  MemoryBackendHeader *header_;
-  char *data_;
-  size_t data_size_;
-  bitfield32_t flags_;
-
- public:
-  MemoryBackend() = default;
-
-  virtual ~MemoryBackend() = default;
-
-  /** Mark data as valid */
-  void SetInitialized() {
-    flags_.SetBits(MEMORY_BACKEND_INITIALIZED);
-  }
-
-  /** Check if data is valid */
-  bool IsInitialized() {
-    return flags_.Any(MEMORY_BACKEND_INITIALIZED);
-  }
-
-  /** Mark data as invalid */
-  void UnsetInitialized() {
-    flags_.UnsetBits(MEMORY_BACKEND_INITIALIZED);
-  }
-
-  /** This is the process which destroys the backend */
-  void Own() {
-    flags_.SetBits(MEMORY_BACKEND_OWNED);
-  }
-
-  /** This is owned */
-  bool IsOwned() {
-    return flags_.Any(MEMORY_BACKEND_OWNED);
-  }
-
-  /** This is not the process which destroys the backend */
-  void Disown() {
-    flags_.UnsetBits(MEMORY_BACKEND_OWNED);
-  }
-
-  /// Each allocator must define its own shm_init.
-  // virtual bool shm_init(size_t size, ...) = 0;
-  virtual bool shm_deserialize(std::string url) = 0;
-  virtual void shm_detach() = 0;
-  virtual void shm_destroy() = 0;
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_H
diff --git a/hermes_shm/include/hermes_shm/memory/backend/memory_backend_factory.h b/hermes_shm/include/hermes_shm/memory/backend/memory_backend_factory.h
deleted file mode 100644
index cb0f35ff1..000000000
--- a/hermes_shm/include/hermes_shm/memory/backend/memory_backend_factory.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_BACKEND_MEMORY_BACKEND_FACTORY_H_
-#define HERMES_MEMORY_BACKEND_MEMORY_BACKEND_FACTORY_H_
-
-#include "memory_backend.h"
-#include "posix_mmap.h"
-#include "posix_shm_mmap.h"
-#include "null_backend.h"
-#include "array_backend.h"
-
-namespace hshm::ipc {
-
-class MemoryBackendFactory {
- public:
-  /** Initialize a new backend */
-  template<typename BackendT, typename ...Args>
-  static std::unique_ptr<MemoryBackend> shm_init(
-    size_t size, const std::string &url, Args ...args) {
-    if constexpr(std::is_same_v<PosixShmMmap, BackendT>) {
-      // PosixShmMmap
-      auto backend = std::make_unique<PosixShmMmap>();
-      backend->shm_init(size, url, std::forward<args>(args)...);
-      return backend;
-    } else if constexpr(std::is_same_v<PosixMmap, BackendT>) {
-      // PosixMmap
-      auto backend = std::make_unique<PosixMmap>();
-      backend->shm_init(size, std::forward<args>(args)...);
-      return backend;
-    } else if constexpr(std::is_same_v<NullBackend, BackendT>) {
-      // NullBackend
-      auto backend = std::make_unique<NullBackend>();
-      backend->shm_init(size, url, std::forward<args>(args)...);
-      return backend;
-    } else if constexpr(std::is_same_v<ArrayBackend, BackendT>) {
-      // ArrayBackend
-      auto backend = std::make_unique<ArrayBackend>();
-      backend->shm_init(size, url, std::forward<args>(args)...);
-      return backend;
-    } else {
-      throw MEMORY_BACKEND_NOT_FOUND.format();
-    }
-  }
-
-  /** Deserialize an existing backend */
-  static std::unique_ptr<MemoryBackend> shm_deserialize(
-    MemoryBackendType type, const std::string &url) {
-    switch (type) {
-      // PosixShmMmap
-      case MemoryBackendType::kPosixShmMmap: {
-        auto backend = std::make_unique<PosixShmMmap>();
-        if (!backend->shm_deserialize(url)) {
-          throw MEMORY_BACKEND_NOT_FOUND.format();
-        }
-        return backend;
-      }
-
-      // PosixMmap
-      case MemoryBackendType::kPosixMmap: {
-        auto backend = std::make_unique<PosixMmap>();
-        if (!backend->shm_deserialize(url)) {
-          throw MEMORY_BACKEND_NOT_FOUND.format();
-        }
-        return backend;
-      }
-
-      // NullBackend
-      case MemoryBackendType::kNullBackend: {
-        auto backend = std::make_unique<NullBackend>();
-        if (!backend->shm_deserialize(url)) {
-          throw MEMORY_BACKEND_NOT_FOUND.format();
-        }
-        return backend;
-      }
-
-      // ArrayBackend
-      case MemoryBackendType::kArrayBackend: {
-        auto backend = std::make_unique<ArrayBackend>();
-        if (!backend->shm_deserialize(url)) {
-          throw MEMORY_BACKEND_NOT_FOUND.format();
-        }
-        return backend;
-      }
-
-      // Default
-      default: return nullptr;
-    }
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_BACKEND_MEMORY_BACKEND_FACTORY_H_
diff --git a/hermes_shm/include/hermes_shm/memory/backend/null_backend.h b/hermes_shm/include/hermes_shm/memory/backend/null_backend.h
deleted file mode 100644
index f58b76999..000000000
--- a/hermes_shm/include/hermes_shm/memory/backend/null_backend.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_MEMORY_BACKEND_NULL_H_
-#define HERMES_INCLUDE_HERMES_MEMORY_BACKEND_NULL_H_
-
-#include "memory_backend.h"
-#include <string>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/shm.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include <hermes_shm/util/errors.h>
-#include <hermes_shm/constants/macros.h>
-#include <hermes_shm/introspect/system_info.h>
-
-namespace hshm::ipc {
-
-class NullBackend : public MemoryBackend {
- private:
-  size_t total_size_;
-
- public:
-  NullBackend() = default;
-
-  ~NullBackend() override {}
-
-  bool shm_init(size_t size, const std::string &url) {
-    (void) url;
-    SetInitialized();
-    Own();
-    total_size_ = sizeof(MemoryBackendHeader) + size;
-    char *ptr = (char*)malloc(sizeof(MemoryBackendHeader));
-    header_ = reinterpret_cast<MemoryBackendHeader*>(ptr);
-    header_->data_size_ = size;
-    data_size_ = size;
-    data_ = nullptr;
-    return true;
-  }
-
-  bool shm_deserialize(std::string url) override {
-    (void) url;
-    throw SHMEM_NOT_SUPPORTED.format();
-  }
-
-  void shm_detach() override {
-    _Detach();
-  }
-
-  void shm_destroy() override {
-    _Destroy();
-  }
-
- protected:
-  void _Detach() {
-    free(header_);
-  }
-
-  void _Destroy() {
-    free(header_);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_HERMES_MEMORY_BACKEND_NULL_H_
diff --git a/hermes_shm/include/hermes_shm/memory/backend/posix_mmap.h b/hermes_shm/include/hermes_shm/memory/backend/posix_mmap.h
deleted file mode 100644
index d56ce4b0a..000000000
--- a/hermes_shm/include/hermes_shm/memory/backend/posix_mmap.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_MEMORY_BACKEND_POSIX_MMAP_H
-#define HERMES_INCLUDE_MEMORY_BACKEND_POSIX_MMAP_H
-
-#include "memory_backend.h"
-#include <string>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/shm.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include <hermes_shm/util/errors.h>
-#include <hermes_shm/constants/macros.h>
-#include <hermes_shm/introspect/system_info.h>
-
-namespace hshm::ipc {
-
-class PosixMmap : public MemoryBackend {
- private:
-  size_t total_size_;
-
- public:
-  /** Constructor */
-  PosixMmap() = default;
-
-  /** Destructor */
-  ~PosixMmap() override {
-    if (IsOwned()) {
-      _Destroy();
-    } else {
-      _Detach();
-    }
-  }
-
-  /** Initialize backend */
-  bool shm_init(size_t size) {
-    SetInitialized();
-    Own();
-    total_size_ = sizeof(MemoryBackendHeader) + size;
-    char *ptr = _Map(total_size_);
-    header_ = reinterpret_cast<MemoryBackendHeader*>(ptr);
-    header_->data_size_ = size;
-    data_size_ = size;
-    data_ = reinterpret_cast<char*>(header_ + 1);
-    return true;
-  }
-
-  /** Deserialize the backend */
-  bool shm_deserialize(std::string url) override {
-    (void) url;
-    throw SHMEM_NOT_SUPPORTED.format();
-  }
-
-  /** Detach the mapped memory */
-  void shm_detach() override {
-    _Detach();
-  }
-
-  /** Destroy the mapped memory */
-  void shm_destroy() override {
-    _Destroy();
-  }
-
- protected:
-  /** Map shared memory */
-  template<typename T = char>
-  T* _Map(size_t size) {
-    T *ptr = reinterpret_cast<T*>(
-      mmap64(nullptr, NextPageSizeMultiple(size), PROT_READ | PROT_WRITE,
-             MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));
-    if (ptr == MAP_FAILED) {
-      perror("map failed");
-      throw SHMEM_CREATE_FAILED.format();
-    }
-    return ptr;
-  }
-
-  /** Unmap shared memory */
-  void _Detach() {
-    if (!IsInitialized()) { return; }
-    munmap(reinterpret_cast<void*>(header_), total_size_);
-    UnsetInitialized();
-  }
-
-  /** Destroy shared memory */
-  void _Destroy() {
-    if (!IsInitialized()) { return; }
-    _Detach();
-    UnsetInitialized();
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_MEMORY_BACKEND_POSIX_MMAP_H
diff --git a/hermes_shm/include/hermes_shm/memory/backend/posix_shm_mmap.h b/hermes_shm/include/hermes_shm/memory/backend/posix_shm_mmap.h
deleted file mode 100644
index acdebb619..000000000
--- a/hermes_shm/include/hermes_shm/memory/backend/posix_shm_mmap.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_MEMORY_BACKEND_POSIX_SHM_MMAP_H
-#define HERMES_INCLUDE_MEMORY_BACKEND_POSIX_SHM_MMAP_H
-
-#include "memory_backend.h"
-#include <string>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/shm.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include <hermes_shm/util/errors.h>
-#include <hermes_shm/constants/macros.h>
-#include <hermes_shm/introspect/system_info.h>
-
-namespace hshm::ipc {
-
-class PosixShmMmap : public MemoryBackend {
- private:
-  std::string url_;
-  int fd_;
-
- public:
-  /** Constructor */
-  PosixShmMmap() : fd_(-1) {}
-
-  /** Destructor */
-  ~PosixShmMmap() override {
-    if (IsOwned()) {
-      _Destroy();
-    } else {
-      _Detach();
-    }
-  }
-
-  /** Initialize backend */
-  bool shm_init(size_t size, std::string url) {
-    SetInitialized();
-    Own();
-    url_ = std::move(url);
-    shm_unlink(url_.c_str());
-    fd_ = shm_open(url_.c_str(), O_CREAT | O_RDWR, 0666);
-    if (fd_ < 0) {
-      return false;
-    }
-    _Reserve(size + HERMES_SYSTEM_INFO->page_size_);
-    header_ = _Map<MemoryBackendHeader>(HERMES_SYSTEM_INFO->page_size_, 0);
-    header_->data_size_ = size;
-    data_size_ = size;
-    data_ = _Map(size, HERMES_SYSTEM_INFO->page_size_);
-    return true;
-  }
-
-  /** Deserialize the backend */
-  bool shm_deserialize(std::string url) override {
-    SetInitialized();
-    Disown();
-    url_ = std::move(url);
-    fd_ = shm_open(url_.c_str(), O_RDWR, 0666);
-    if (fd_ < 0) {
-      return false;
-    }
-    header_ = _Map<MemoryBackendHeader>(HERMES_SYSTEM_INFO->page_size_, 0);
-    data_size_ = header_->data_size_;
-    data_ = _Map(data_size_, HERMES_SYSTEM_INFO->page_size_);
-    return true;
-  }
-
-  /** Detach the mapped memory */
-  void shm_detach() override {
-    _Detach();
-  }
-
-  /** Destroy the mapped memory */
-  void shm_destroy() override {
-    _Destroy();
-  }
-
- protected:
-  /** Reserve shared memory */
-  void _Reserve(size_t size) {
-    int ret = ftruncate64(fd_, static_cast<off64_t>(size));
-    if (ret < 0) {
-      throw SHMEM_RESERVE_FAILED.format();
-    }
-  }
-
-  /** Map shared memory */
-  template<typename T = char>
-  T* _Map(size_t size, off64_t off) {
-    T *ptr = reinterpret_cast<T*>(
-      mmap64(nullptr, size, PROT_READ | PROT_WRITE,
-             MAP_SHARED, fd_, off));
-    if (ptr == MAP_FAILED) {
-      throw SHMEM_CREATE_FAILED.format();
-    }
-    return ptr;
-  }
-
-  /** Unmap shared memory */
-  void _Detach() {
-    if (!IsInitialized()) { return; }
-    munmap(data_, data_size_);
-    munmap(header_, HERMES_SYSTEM_INFO->page_size_);
-    close(fd_);
-    UnsetInitialized();
-  }
-
-  /** Destroy shared memory */
-  void _Destroy() {
-    if (!IsInitialized()) { return; }
-    _Detach();
-    shm_unlink(url_.c_str());
-    UnsetInitialized();
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_MEMORY_BACKEND_POSIX_SHM_MMAP_H
diff --git a/hermes_shm/include/hermes_shm/memory/memory.h b/hermes_shm/include/hermes_shm/memory/memory.h
deleted file mode 100644
index 38e82e558..000000000
--- a/hermes_shm/include/hermes_shm/memory/memory.h
+++ /dev/null
@@ -1,387 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_MEMORY_MEMORY_H_
-#define HERMES_MEMORY_MEMORY_H_
-
-#include <hermes_shm/types/real_number.h>
-#include <hermes_shm/constants/data_structure_singleton_macros.h>
-#include <hermes_shm/introspect/system_info.h>
-#include <hermes_shm/types/bitfield.h>
-#include <hermes_shm/types/atomic.h>
-#include <hermes_shm/constants/macros.h>
-
-namespace hshm::ipc {
-
-/**
- * The identifier for an allocator
- * */
-union allocator_id_t {
-  struct {
-    uint32_t major_;  // Typically some sort of process id
-    uint32_t minor_;  // Typically a process-local id
-  } bits_;
-  uint64_t int_;
-
-  HSHM_ALWAYS_INLINE allocator_id_t() = default;
-
-  /**
-   * Constructor which sets major & minor
-   * */
-  HSHM_ALWAYS_INLINE explicit allocator_id_t(uint32_t major, uint32_t minor) {
-    bits_.major_ = major;
-    bits_.minor_ = minor;
-  }
-
-  /**
-   * Set this allocator to null
-   * */
-  HSHM_ALWAYS_INLINE void SetNull() {
-    int_ = 0;
-  }
-
-  /**
-   * Check if this is the null allocator
-   * */
-  HSHM_ALWAYS_INLINE bool IsNull() const { return int_ == 0; }
-
-  /** Equality check */
-  HSHM_ALWAYS_INLINE bool operator==(const allocator_id_t &other) const {
-    return other.int_ == int_;
-  }
-
-  /** Inequality check */
-  HSHM_ALWAYS_INLINE bool operator!=(const allocator_id_t &other) const {
-    return other.int_ != int_;
-  }
-
-  /** Get the null allocator */
-  HSHM_ALWAYS_INLINE static allocator_id_t GetNull() {
-    static allocator_id_t alloc(0, 0);
-    return alloc;
-  }
-
-  /** To index */
-  HSHM_ALWAYS_INLINE uint32_t ToIndex() {
-    return bits_.major_ * 4 + bits_.minor_;
-  }
-};
-
-typedef uint32_t slot_id_t;  // Uniquely ids a MemoryBackend slot
-
-/**
- * Stores an offset into a memory region. Assumes the developer knows
- * which allocator the pointer comes from.
- * */
-template<bool ATOMIC = false>
-struct OffsetPointerBase {
-  typedef typename std::conditional<ATOMIC,
-    atomic<size_t>, nonatomic<size_t>>::type atomic_t;
-  atomic_t off_; /**< Offset within the allocator's slot */
-
-  /** Default constructor */
-  OffsetPointerBase() = default;
-
-  /** Full constructor */
-  explicit OffsetPointerBase(size_t off) : off_(off) {}
-
-  /** Full constructor */
-  explicit OffsetPointerBase(atomic_t off) : off_(off.load()) {}
-
-  /** Pointer constructor */
-  explicit OffsetPointerBase(allocator_id_t alloc_id, size_t off) : off_(off) {
-    (void) alloc_id;
-  }
-
-  /** Copy constructor */
-  OffsetPointerBase(const OffsetPointerBase &other)
-  : off_(other.off_.load()) {}
-
-  /** Other copy constructor */
-  OffsetPointerBase(const OffsetPointerBase<!ATOMIC> &other)
-  : off_(other.off_.load()) {}
-
-  /** Move constructor */
-  OffsetPointerBase(OffsetPointerBase &&other) noexcept
-    : off_(other.off_.load()) {
-    other.SetNull();
-  }
-
-  /** Get the offset pointer */
-  OffsetPointerBase<false> ToOffsetPointer() {
-    return OffsetPointerBase<false>(off_.load());
-  }
-
-  /** Set to null */
-  void SetNull() {
-    off_ = (size_t)-1;
-  }
-
-  /** Check if null */
-  bool IsNull() const {
-    return off_.load() == (size_t)-1;
-  }
-
-  /** Get the null pointer */
-  static OffsetPointerBase GetNull() {
-    static const OffsetPointerBase p(-1);
-    return p;
-  }
-
-  /** Atomic load wrapper */
-  inline size_t load(
-    std::memory_order order = std::memory_order_seq_cst) const {
-    return off_.load(order);
-  }
-
-  /** Atomic exchange wrapper */
-  inline void exchange(
-    size_t count, std::memory_order order = std::memory_order_seq_cst) {
-    off_.exchange(count, order);
-  }
-
-  /** Atomic compare exchange weak wrapper */
-  inline bool compare_exchange_weak(size_t& expected, size_t desired,
-                                    std::memory_order order =
-                                    std::memory_order_seq_cst) {
-    return off_.compare_exchange_weak(expected, desired, order);
-  }
-
-  /** Atomic compare exchange strong wrapper */
-  inline bool compare_exchange_strong(size_t& expected, size_t desired,
-                                      std::memory_order order =
-                                      std::memory_order_seq_cst) {
-    return off_.compare_exchange_weak(expected, desired, order);
-  }
-
-  /** Atomic add operator */
-  inline OffsetPointerBase operator+(size_t count) const {
-    return OffsetPointerBase(off_ + count);
-  }
-
-  /** Atomic subtract operator */
-  inline OffsetPointerBase operator-(size_t count) const {
-    return OffsetPointerBase(off_ - count);
-  }
-
-  /** Atomic add assign operator */
-  inline OffsetPointerBase& operator+=(size_t count) {
-    off_ += count;
-    return *this;
-  }
-
-  /** Atomic subtract assign operator */
-  inline OffsetPointerBase& operator-=(size_t count) {
-    off_ -= count;
-    return *this;
-  }
-
-  /** Atomic assign operator */
-  inline OffsetPointerBase& operator=(size_t count) {
-    off_ = count;
-    return *this;
-  }
-
-  /** Atomic copy assign operator */
-  inline OffsetPointerBase& operator=(const OffsetPointerBase &count) {
-    off_ = count.load();
-    return *this;
-  }
-
-  /** Equality check */
-  bool operator==(const OffsetPointerBase &other) const {
-    return off_ == other.off_;
-  }
-
-  /** Inequality check */
-  bool operator!=(const OffsetPointerBase &other) const {
-    return off_ != other.off_;
-  }
-};
-
-/** Non-atomic offset */
-typedef OffsetPointerBase<false> OffsetPointer;
-
-/** Atomic offset */
-typedef OffsetPointerBase<true> AtomicOffsetPointer;
-
-/** Typed offset pointer */
-template<typename T>
-using TypedOffsetPointer = OffsetPointer;
-
-/** Typed atomic pointer */
-template<typename T>
-using TypedAtomicOffsetPointer = AtomicOffsetPointer;
-
-/**
- * A process-independent pointer, which stores both the allocator's
- * information and the offset within the allocator's region
- * */
-template<bool ATOMIC = false>
-struct PointerBase {
-  allocator_id_t allocator_id_;     /// Allocator the pointer comes from
-  OffsetPointerBase<ATOMIC> off_;   /// Offset within the allocator's slot
-
-  /** Default constructor */
-  PointerBase() = default;
-
-  /** Full constructor */
-  explicit PointerBase(allocator_id_t id, size_t off) :
-    allocator_id_(id), off_(off) {}
-
-  /** Full constructor using offset pointer */
-  explicit PointerBase(allocator_id_t id, OffsetPointer off) :
-    allocator_id_(id), off_(off) {}
-
-  /** Copy constructor */
-  PointerBase(const PointerBase &other)
-  : allocator_id_(other.allocator_id_), off_(other.off_) {}
-
-  /** Other copy constructor */
-  PointerBase(const PointerBase<!ATOMIC> &other)
-  : allocator_id_(other.allocator_id_), off_(other.off_.load()) {}
-
-  /** Move constructor */
-  PointerBase(PointerBase &&other) noexcept
-  : allocator_id_(other.allocator_id_), off_(other.off_) {
-    other.SetNull();
-  }
-
-  /** Get the offset pointer */
-  OffsetPointerBase<false> ToOffsetPointer() const {
-    return OffsetPointerBase<false>(off_.load());
-  }
-
-  /** Set to null */
-  void SetNull() {
-    allocator_id_.SetNull();
-  }
-
-  /** Check if null */
-  bool IsNull() const {
-    return allocator_id_.IsNull();
-  }
-
-  /** Get the null pointer */
-  static PointerBase GetNull() {
-    static const PointerBase p(allocator_id_t::GetNull(),
-                               OffsetPointer::GetNull());
-    return p;
-  }
-
-  /** Copy assignment operator */
-  PointerBase& operator=(const PointerBase &other) {
-    if (this != &other) {
-      allocator_id_ = other.allocator_id_;
-      off_ = other.off_;
-    }
-    return *this;
-  }
-
-  /** Move assignment operator */
-  PointerBase& operator=(PointerBase &&other) {
-    if (this != &other) {
-      allocator_id_ = other.allocator_id_;
-      off_.exchange(other.off_.load());
-      other.SetNull();
-    }
-    return *this;
-  }
-
-  /** Addition operator */
-  PointerBase operator+(size_t size) const {
-    PointerBase p;
-    p.allocator_id_ = allocator_id_;
-    p.off_ = off_ + size;
-    return p;
-  }
-
-  /** Subtraction operator */
-  PointerBase operator-(size_t size) const {
-    PointerBase p;
-    p.allocator_id_ = allocator_id_;
-    p.off_ = off_ - size;
-    return p;
-  }
-
-  /** Addition assignment operator */
-  PointerBase& operator+=(size_t size) {
-    off_ += size;
-    return *this;
-  }
-
-  /** Subtraction assignment operator */
-  PointerBase& operator-=(size_t size) {
-    off_ -= size;
-    return *this;
-  }
-
-  /** Equality check */
-  bool operator==(const PointerBase &other) const {
-    return (other.allocator_id_ == allocator_id_ && other.off_ == off_);
-  }
-
-  /** Inequality check */
-  bool operator!=(const PointerBase &other) const {
-    return (other.allocator_id_ != allocator_id_ || other.off_ != off_);
-  }
-};
-
-/** Non-atomic pointer */
-typedef PointerBase<false> Pointer;
-
-/** Atomic pointer */
-typedef PointerBase<true> AtomicPointer;
-
-/** Typed pointer */
-template<typename T>
-using TypedPointer = Pointer;
-
-/** Typed atomic pointer */
-template<typename T>
-using TypedAtomicPointer = AtomicPointer;
-
-/** Round up to the nearest multiple of the alignment */
-static inline size_t NextAlignmentMultiple(size_t alignment, size_t size) {
-  auto page_size = HERMES_SYSTEM_INFO->page_size_;
-  size_t new_size = size;
-  size_t page_off = size % alignment;
-  if (page_off) {
-    new_size = size + page_size - page_off;
-  }
-  return new_size;
-}
-
-/** Round up to the nearest multiple of page size */
-static inline size_t NextPageSizeMultiple(size_t size) {
-  auto page_size = HERMES_SYSTEM_INFO->page_size_;
-  size_t new_size = NextAlignmentMultiple(page_size, size);
-  return new_size;
-}
-
-}  // namespace hshm::ipc
-
-namespace std {
-
-/** Allocator ID hash */
-template <>
-struct hash<hshm::ipc::allocator_id_t> {
-  std::size_t operator()(const hshm::ipc::allocator_id_t &key) const {
-    return std::hash<uint64_t>{}(key.int_);
-  }
-};
-
-}  // namespace std
-
-
-#endif  // HERMES_MEMORY_MEMORY_H_
diff --git a/hermes_shm/include/hermes_shm/memory/memory_manager.h b/hermes_shm/include/hermes_shm/memory/memory_manager.h
deleted file mode 100644
index 229059063..000000000
--- a/hermes_shm/include/hermes_shm/memory/memory_manager.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_MEMORY_MEMORY_MANAGER_H_
-#define HERMES_MEMORY_MEMORY_MANAGER_H_
-
-#include "hermes_shm/memory/backend/memory_backend_factory.h"
-#include "hermes_shm/memory/allocator/allocator_factory.h"
-#include "hermes_shm/memory/memory_registry.h"
-#include "hermes_shm/constants/macros.h"
-#include <hermes_shm/constants/data_structure_singleton_macros.h>
-
-namespace hipc = hshm::ipc;
-
-namespace hshm::ipc {
-
-class MemoryManager {
- public:
-  /** Default constructor. */
-  MemoryManager() = default;
-
-  /** Default backend size */
-  static size_t GetDefaultBackendSize() {
-    return HERMES_SYSTEM_INFO->ram_size_;
-  }
-
-  /**
-   * Create a memory backend. Memory backends are divided into slots.
-   * Each slot corresponds directly with a single allocator.
-   * There can be multiple slots per-backend, enabling multiple allocation
-   * policies over a single memory region.
-   * */
-  template<typename BackendT, typename ...Args>
-  MemoryBackend* CreateBackend(size_t size,
-                               const std::string &url,
-                               Args&& ...args) {
-    auto backend_u = MemoryBackendFactory::shm_init<BackendT>(
-      size, url, std::forward<Args>(args)...);
-    auto backend = HERMES_MEMORY_REGISTRY_REF.RegisterBackend(url, backend_u);
-    backend->Own();
-    return backend;
-  }
-
-  /**
-   * Attaches to an existing memory backend located at \a url url.
-   * */
-  MemoryBackend* AttachBackend(MemoryBackendType type,
-                               const std::string &url) {
-    auto backend_u = MemoryBackendFactory::shm_deserialize(type, url);
-    auto backend = HERMES_MEMORY_REGISTRY_REF.RegisterBackend(url, backend_u);
-    ScanBackends();
-    backend->Disown();
-    return backend;
-  }
-
-  /**
-   * Returns a pointer to a backend that has already been attached.
-   * */
-  MemoryBackend* GetBackend(const std::string &url) {
-    return HERMES_MEMORY_REGISTRY_REF.GetBackend(url);
-  }
-
-  /**
-   * Unregister backend
-   * */
-  void UnregisterBackend(const std::string &url) {
-    HERMES_MEMORY_REGISTRY_REF.UnregisterBackend(url);
-  }
-
-  /**
-   * Destroy backend
-   * */
-  void DestroyBackend(const std::string &url) {
-    auto backend = GetBackend(url);
-    backend->Own();
-    UnregisterBackend(url);
-  }
-
-  /**
-   * Scans all attached backends for new memory allocators.
-   * */
-  void ScanBackends();
-
-  /**
-   * Registers an allocator. Used internally by ScanBackends, but may
-   * also be used externally.
-   * */
-  void RegisterAllocator(std::unique_ptr<Allocator> &alloc) {
-    HERMES_MEMORY_REGISTRY_REF.RegisterAllocator(alloc);
-  }
-
-  /**
-   * Registers an allocator. Used internally by ScanBackends, but may
-   * also be used externally.
-   * */
-  void RegisterAllocator(Allocator *alloc) {
-    HERMES_MEMORY_REGISTRY_REF.RegisterAllocator(alloc);
-  }
-
-  /**
-   * Destroys an allocator
-   * */
-  void UnregisterAllocator(allocator_id_t alloc_id) {
-    HERMES_MEMORY_REGISTRY_REF.UnregisterAllocator(alloc_id);
-  }
-
-  /**
-   * Create and register a memory allocator for a particular backend.
-   * */
-  template<typename AllocT, typename ...Args>
-  Allocator* CreateAllocator(const std::string &url,
-                             allocator_id_t alloc_id,
-                             size_t custom_header_size,
-                             Args&& ...args) {
-    auto backend = GetBackend(url);
-    if (alloc_id.IsNull()) {
-      HELOG(kFatal, "Allocator cannot be created with a NIL ID");
-    }
-    auto alloc = AllocatorFactory::shm_init<AllocT>(
-      alloc_id, custom_header_size, backend, std::forward<Args>(args)...);
-    RegisterAllocator(alloc);
-    return GetAllocator(alloc_id);
-  }
-
-  /**
-   * Locates an allocator of a particular id
-   * */
-  HSHM_ALWAYS_INLINE Allocator* GetAllocator(allocator_id_t alloc_id) {
-    return HERMES_MEMORY_REGISTRY_REF.GetAllocator(alloc_id);
-  }
-
-  /**
-   * Gets the allocator used for initializing other allocators.
-   * */
-  HSHM_ALWAYS_INLINE Allocator* GetRootAllocator() {
-    return HERMES_MEMORY_REGISTRY_REF.GetRootAllocator();
-  }
-
-  /**
-   * Gets the allocator used by default when no allocator is
-   * used to construct an object.
-   * */
-  HSHM_ALWAYS_INLINE Allocator* GetDefaultAllocator() {
-    return HERMES_MEMORY_REGISTRY_REF.GetDefaultAllocator();
-  }
-
-  /**
-   * Sets the allocator used by default when no allocator is
-   * used to construct an object.
-   * */
-  HSHM_ALWAYS_INLINE void SetDefaultAllocator(Allocator *alloc) {
-    HERMES_MEMORY_REGISTRY_REF.SetDefaultAllocator(alloc);
-  }
-
-  /**
-   * Convert a process-independent pointer into a process-specific pointer.
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  T* Convert(const POINTER_T &p) {
-    if (p.IsNull()) {
-      return nullptr;
-    }
-    return GetAllocator(p.allocator_id_)->template
-      Convert<T, POINTER_T>(p);
-  }
-
-  /**
-   * Convert a process-specific pointer into a process-independent pointer
-   *
-   * @param allocator_id the allocator the pointer belongs to
-   * @param ptr the pointer to convert
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  POINTER_T Convert(allocator_id_t allocator_id, T *ptr) {
-    return GetAllocator(allocator_id)->template
-      Convert<T, POINTER_T>(ptr);
-  }
-
-  /**
-   * Convert a process-specific pointer into a process-independent pointer when
-   * the allocator is unkown.
-   *
-   * @param ptr the pointer to convert
-   * */
-  template<typename T, typename POINTER_T = Pointer>
-  POINTER_T Convert(T *ptr) {
-    for (auto &alloc : HERMES_MEMORY_REGISTRY_REF.allocators_) {
-      if (alloc && alloc->ContainsPtr(ptr)) {
-        return alloc->template
-          Convert<T, POINTER_T>(ptr);
-      }
-    }
-    return Pointer::GetNull();
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_MEMORY_MEMORY_MANAGER_H_
diff --git a/hermes_shm/include/hermes_shm/memory/memory_registry.h b/hermes_shm/include/hermes_shm/memory/memory_registry.h
deleted file mode 100644
index bbb142735..000000000
--- a/hermes_shm/include/hermes_shm/memory/memory_registry.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_MEMORY_MEMORY_REGISTRY_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_MEMORY_MEMORY_REGISTRY_H_
-
-#include "hermes_shm/memory/allocator/allocator.h"
-#include "backend/memory_backend.h"
-#include "hermes_shm/memory/allocator/stack_allocator.h"
-#include "hermes_shm/memory/backend/posix_mmap.h"
-
-namespace hipc = hshm::ipc;
-
-namespace hshm::ipc {
-
-#define MAX_ALLOCATORS 64
-
-class MemoryRegistry {
- public:
-  allocator_id_t root_allocator_id_;
-  PosixMmap root_backend_;
-  StackAllocator root_allocator_;
-  std::unordered_map<std::string, std::unique_ptr<MemoryBackend>> backends_;
-  std::unique_ptr<Allocator> allocators_made_[MAX_ALLOCATORS];
-  Allocator *allocators_[MAX_ALLOCATORS];
-  Allocator *default_allocator_;
-
- public:
-  /**
-   * Constructor. Create the root allocator and backend, which is used
-   * until the user specifies a new default. The root allocator stores
-   * only private memory.
-   * */
-  MemoryRegistry();
-
-  /** Register a memory backend */
-  MemoryBackend* RegisterBackend(const std::string &url,
-                                 std::unique_ptr<MemoryBackend> &backend) {
-    auto ptr = backend.get();
-    if (backends_.find(url) != backends_.end()) {
-      backends_.erase(url);
-    }
-    backends_.emplace(url, std::move(backend));
-    return ptr;
-  }
-
-  /** Unregister memory backend */
-  void UnregisterBackend(const std::string &url) {
-    backends_.erase(url);
-  }
-
-  /**
-   * Returns a pointer to a backend that has already been attached.
-   * */
-  MemoryBackend* GetBackend(const std::string &url) {
-    auto iter = backends_.find(url);
-    if (iter == backends_.end()) {
-      return nullptr;
-    }
-    return (*iter).second.get();
-  }
-
-  /** Registers an allocator. */
-  Allocator* RegisterAllocator(std::unique_ptr<Allocator> &alloc) {
-    if (default_allocator_ == nullptr ||
-        default_allocator_ == &root_allocator_ ||
-        default_allocator_->GetId() == alloc->GetId()) {
-      default_allocator_ = alloc.get();
-    }
-    auto idx = alloc->GetId().ToIndex();
-    allocators_made_[idx] = std::move(alloc);
-    allocators_[idx] = allocators_made_[idx].get();
-    return allocators_[idx];
-  }
-
-  /** Registers an allocator. */
-  void RegisterAllocator(Allocator *alloc) {
-    auto idx = alloc->GetId().ToIndex();
-    allocators_[idx] = alloc;
-  }
-
-  /** Unregisters an allocator */
-  void UnregisterAllocator(allocator_id_t alloc_id) {
-    if (alloc_id == default_allocator_->GetId()) {
-      default_allocator_ = &root_allocator_;
-    }
-    allocators_made_[alloc_id.ToIndex()] = nullptr;
-    allocators_[alloc_id.ToIndex()] = nullptr;
-  }
-
-  /**
-   * Locates an allocator of a particular id
-   * */
-  HSHM_ALWAYS_INLINE Allocator* GetAllocator(allocator_id_t alloc_id) {
-    return allocators_[alloc_id.ToIndex()];
-  }
-
-  /**
-   * Gets the allocator used for initializing other allocators.
-   * */
-  HSHM_ALWAYS_INLINE Allocator* GetRootAllocator() {
-    return &root_allocator_;
-  }
-
-  /**
-   * Gets the allocator used by default when no allocator is
-   * used to construct an object.
-   * */
-  HSHM_ALWAYS_INLINE Allocator* GetDefaultAllocator() {
-    return reinterpret_cast<Allocator*>(default_allocator_);
-  }
-
-  /**
-   * Sets the allocator used by default when no allocator is
-   * used to construct an object.
-   * */
-  HSHM_ALWAYS_INLINE void SetDefaultAllocator(Allocator *alloc) {
-    default_allocator_ = alloc;
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_MEMORY_MEMORY_REGISTRY_H_
diff --git a/hermes_shm/include/hermes_shm/thread/ipc_call_manager.h b/hermes_shm/include/hermes_shm/thread/ipc_call_manager.h
deleted file mode 100644
index 5072b9b4a..000000000
--- a/hermes_shm/include/hermes_shm/thread/ipc_call_manager.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_THREAD_IPCALL_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_THREAD_IPCALL_H_
-
-#include <vector>
-#include <hermes_shm/types/real_number.h>
-#include <functional>
-#include <hermes_shm/data_structures/ipc/vector.h>
-#include <hermes_shm/data_structures/ipc/mpsc_queue.h>
-
-namespace hshm::ipc {
-
-/** Unique id of an IPC function to call */
-typedef uint32_t ipc_call_id_t;
-
-/** Used for asynchronous polling of IPC call */
-struct IpcFuture {
-  bitfield32_t *completion_;
-
-  /** Default constructor */
-  IpcFuture() = default;
-
-  /** Emplace constructor */
-  explicit IpcFuture(char *ptr) {
-    completion_ = reinterpret_cast<bitfield32_t*>(ptr);
-  }
-
-  bool IsComplete() {
-    return (*completion_).Any(1);
-  }
-};
-
-/**
- * Used for single-node, inter-process procedure calls.
- * Calls are divided into two groups: readers and writers.
- *
- * Read calls will occur in the thread that called them since reads can
- * progress in parallel.
- *
- * Write calls will occur in an asynchronous thread.
- *
- * This implementation requires that all arguments to the IPC function
- * can be stored in shared memory.
- * */
-class IpcCallManager {
- private:
-  std::vector<std::pair<ipc_call_id_t, std::function<void()>>> ipcs_;
-  hipc::Allocator *alloc_;
-  hipc::Ref<hipc::mpsc_queue<hipc::OffsetPointer>> queue_;
-
- public:
-  /** Register an IPC to be called server-side */
-  template<typename FUNC>
-  void RegisterIpc(ipc_call_id_t id, FUNC &&lambda) {
-    if (id >= ipcs_.size()) {
-      size_t new_size = (RealNumber(5, 4) * (id + 16)).as_int();
-      ipcs_.resize(new_size);
-    }
-    ipcs_[id] = lambda;
-  }
-
-  /** Call a function asynchronously */
-  template<typename ...Args>
-  IpcFuture AsyncCall(ipc_call_id_t id, Args&& ...args) {
-    bitfield32_t completion;
-
-    // Get size of serialized message
-    size_t size = 0;
-    auto lambda1 = [&size](auto i, auto &&arg) {
-      if constexpr(std::is_pod<decltype(arg)>()) {
-        size += sizeof(arg);
-      } else if constexpr (IS_SHM_ARCHIVEABLE(decltype(arg))) {
-        size += sizeof(hipc::OffsetPointer);
-      } else {
-        throw IPC_ARGS_NOT_SHM_COMPATIBLE.format();
-      }
-    };
-    hshm::ForwardIterateArgpack::Apply(
-      make_argpack(completion, id, std::forward<Args>(args)...),
-      lambda1);
-
-    // Allocate SHM message
-    hipc::OffsetPointer p;
-    char *ptr = alloc_->AllocatePtr<char>(size, p);
-
-    // Serialize id + args into a buffer
-    auto lambda2 = [&ptr](auto i, auto &&arg) {
-      if constexpr(std::is_pod<decltype(arg)>()) {
-        *reinterpret_cast<decltype(arg)*>(ptr) = arg;
-        ptr += sizeof(arg);
-      } else if constexpr (IS_SHM_ARCHIVEABLE(decltype(arg))) {
-        arg >> *reinterpret_cast<hipc::OffsetPointer*>(ptr);
-        ptr += sizeof(hipc::OffsetPointer);
-      } else {
-        throw IPC_ARGS_NOT_SHM_COMPATIBLE.format();
-      }
-    };
-    hshm::ForwardIterateArgpack::Apply(
-      make_argpack(completion, id, std::forward<Args>(args)...),
-      lambda2);
-
-    // Submit request into a queue
-    queue_->emplace(ptr);
-
-    // Send completion event
-    IpcFuture future(ptr);
-    return future;
-  }
-
-  /** Process this read event if possible */
-  template<typename RetT>
-  void ProcessRead() {
-  }
-
-  /** Process an event in the queue */
-  void ProcessWrite() {
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_THREAD_IPCALL_H_
diff --git a/hermes_shm/include/hermes_shm/thread/lock.h b/hermes_shm/include/hermes_shm/thread/lock.h
deleted file mode 100644
index 08876f437..000000000
--- a/hermes_shm/include/hermes_shm/thread/lock.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_THREAD_LOCK_H_
-#define HERMES_THREAD_LOCK_H_
-
-#include "lock/mutex.h"
-#include "lock/rwlock.h"
-#include "thread_model_manager.h"
-
-#endif  // HERMES_THREAD_LOCK_H_
diff --git a/hermes_shm/include/hermes_shm/thread/lock/mutex.h b/hermes_shm/include/hermes_shm/thread/lock/mutex.h
deleted file mode 100644
index 54834d28b..000000000
--- a/hermes_shm/include/hermes_shm/thread/lock/mutex.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_THREAD_MUTEX_H_
-#define HERMES_THREAD_MUTEX_H_
-
-#include <atomic>
-
-namespace hshm {
-
-struct Mutex {
-  std::atomic<uint32_t> lock_;
-#ifdef HERMES_DEBUG_LOCK
-  uint32_t owner_;
-#endif
-
-  /** Default constructor */
-  Mutex() : lock_(0) {}
-
-  /** Explicit initialization */
-  void Init() {
-    lock_ = 0;
-  }
-
-  /** Acquire lock */
-  void Lock(uint32_t owner);
-
-  /** Try to acquire the lock */
-  bool TryLock(uint32_t owner);
-
-  /** Unlock */
-  void Unlock();
-};
-
-struct ScopedMutex {
-  Mutex &lock_;
-  bool is_locked_;
-
-  /** Acquire the mutex */
-  explicit ScopedMutex(Mutex &lock, uint32_t owner);
-
-  /** Release the mutex */
-  ~ScopedMutex();
-
-  /** Explicitly acquire the mutex */
-  void Lock(uint32_t owner);
-
-  /** Explicitly try to lock the mutex */
-  bool TryLock(uint32_t owner);
-
-  /** Explicitly unlock the mutex */
-  void Unlock();
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_THREAD_MUTEX_H_
diff --git a/hermes_shm/include/hermes_shm/thread/lock/rwlock.h b/hermes_shm/include/hermes_shm/thread/lock/rwlock.h
deleted file mode 100644
index 934dbe77a..000000000
--- a/hermes_shm/include/hermes_shm/thread/lock/rwlock.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_THREAD_RWLOCK_H_
-#define HERMES_THREAD_RWLOCK_H_
-
-#include <atomic>
-
-namespace hshm {
-
-/** The information stored by RwLock */
-union RwLockPayload {
-  struct {
-    uint32_t r_;
-    uint32_t w_;
-  } bits_;
-  uint64_t as_int_;
-
-  /** Default constructor */
-  RwLockPayload() = default;
-
-  /** Copy constructor */
-  RwLockPayload(const RwLockPayload &other) {
-    as_int_ = other.as_int_;
-  }
-
-  /** Copy constructor. From uint64_t. */
-  explicit RwLockPayload(uint64_t other) {
-    as_int_ = other;
-  }
-
-  /** Check if write locked */
-  bool IsWriteLocked() const {
-    return bits_.w_ > 0;
-  }
-
-  /** Check if read locked */
-  bool IsReadLocked() const {
-    return bits_.r_ > 0;
-  }
-};
-
-/** A reader-writer lock implementation */
-struct RwLock {
-  std::atomic<uint64_t> payload_;
-#ifdef HERMES_DEBUG_LOCK
-  uint32_t owner_;
-#endif
-
-  /** Default constructor */
-  RwLock() : payload_(0) {}
-
-  /** Explicit constructor */
-  void Init() {
-    payload_ = 0;
-  }
-
-  /** Delete copy constructor */
-  RwLock(const RwLock &other) = delete;
-
-  /** Move constructor */
-  RwLock(RwLock &&other) noexcept
-  : payload_(other.payload_.load()) {}
-
-  /** Move assignment operator */
-  RwLock& operator=(RwLock &&other) noexcept {
-    payload_ = other.payload_.load();
-    return (*this);
-  }
-
-  /** Acquire read lock */
-  void ReadLock(uint32_t owner);
-
-  /** Release read lock */
-  void ReadUnlock();
-
-  /** Acquire write lock */
-  void WriteLock(uint32_t owner);
-
-  /** Release write lock */
-  void WriteUnlock();
-};
-
-/** Acquire the read lock in a scope */
-struct ScopedRwReadLock {
-  RwLock &lock_;
-  bool is_locked_;
-
-  /** Acquire the read lock */
-  explicit ScopedRwReadLock(RwLock &lock, uint32_t owner);
-
-  /** Release the read lock */
-  ~ScopedRwReadLock();
-
-  /** Explicitly acquire read lock */
-  void Lock(uint32_t owner);
-
-  /** Explicitly release read lock */
-  void Unlock();
-};
-
-/** Acquire scoped write lock */
-struct ScopedRwWriteLock {
-  RwLock &lock_;
-  bool is_locked_;
-
-  /** Acquire the write lock */
-  explicit ScopedRwWriteLock(RwLock &lock, uint32_t owner);
-
-  /** Release the write lock */
-  ~ScopedRwWriteLock();
-
-  /** Explicity acquire the write lock */
-  void Lock(uint32_t owner);
-
-  /** Explicitly release the write lock */
-  void Unlock();
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_THREAD_RWLOCK_H_
diff --git a/hermes_shm/include/hermes_shm/thread/thread_model/argobots.h b/hermes_shm/include/hermes_shm/thread/thread_model/argobots.h
deleted file mode 100644
index 6f9eb1ecd..000000000
--- a/hermes_shm/include/hermes_shm/thread/thread_model/argobots.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_THREAD_THALLIUM_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_THREAD_THALLIUM_H_
-
-#include "thread_model.h"
-#include <thallium.hpp>
-#include <errno.h>
-#include "hermes_shm/util/errors.h"
-#include <omp.h>
-#include "hermes_shm/introspect/system_info.h"
-
-namespace hshm::thread_model {
-
-class Argobots : public ThreadModel {
- public:
-  /** Default constructor */
-  Argobots() = default;
-
-  /** Virtual destructor */
-  virtual ~Argobots() = default;
-
-  /** Yield the current thread for a period of time */
-  void SleepForUs(size_t us) override {
-    usleep(us);
-  }
-
-  /** Yield thread time slice */
-  void Yield() override {
-    ABT_thread_yield();
-  }
-
-  /** Get the TID of the current thread */
-  tid_t GetTid() override {
-    ABT_thread thread;
-    ABT_thread_id tid;
-    ABT_thread_self(&thread);
-    ABT_thread_get_id(thread, &tid);
-    return (tid_t)tid;
-  }
-};
-
-}  // namespace hshm::thread_model
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_THREAD_THALLIUM_H_
diff --git a/hermes_shm/include/hermes_shm/thread/thread_model/pthread.h b/hermes_shm/include/hermes_shm/thread/thread_model/pthread.h
deleted file mode 100644
index 491772f13..000000000
--- a/hermes_shm/include/hermes_shm/thread/thread_model/pthread.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_THREAD_PTHREAD_H_
-#define HERMES_THREAD_PTHREAD_H_
-
-#include "thread_model.h"
-#include <errno.h>
-#include "hermes_shm/util/errors.h"
-#include <omp.h>
-#include "hermes_shm/introspect/system_info.h"
-
-namespace hshm::thread_model {
-
-class Pthread : public ThreadModel {
- public:
-  /** Default constructor */
-  Pthread() = default;
-
-  /** Virtual destructor */
-  virtual ~Pthread() = default;
-
-  /** Yield the thread for a period of time */
-  void SleepForUs(size_t us) override {
-    usleep(us);
-  }
-
-  /** Yield thread time slice */
-  void Yield() override {
-    sched_yield();
-  }
-
-  /** Get the TID of the current thread */
-  tid_t GetTid() override {
-    return (tid_t)omp_get_thread_num();
-    // return static_cast<tid_t>(pthread_self());
-  }
-};
-
-}  // namespace hshm::thread_model
-
-#endif  // HERMES_THREAD_PTHREAD_H_
diff --git a/hermes_shm/include/hermes_shm/thread/thread_model/thread_model.h b/hermes_shm/include/hermes_shm/thread/thread_model/thread_model.h
deleted file mode 100644
index 85ec7a2b6..000000000
--- a/hermes_shm/include/hermes_shm/thread/thread_model/thread_model.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_THREAD_THREAD_H_
-#define HERMES_THREAD_THREAD_H_
-
-#include <vector>
-#include <cstdint>
-#include <memory>
-#include <atomic>
-#include "hermes_shm/types/bitfield.h"
-
-namespace hshm {
-
-/** Available threads that are mapped */
-enum class ThreadType {
-  kNone,
-  kPthread,
-  kArgobots
-};
-
-/** Used to represent tid */
-typedef uint64_t tid_t;
-
-}  // namespace hshm
-
-namespace hshm::thread_model {
-/** Represents the generic operations of a thread */
-class ThreadModel {
- public:
-  /** Sleep thread for a period of time */
-  virtual void SleepForUs(size_t us) = 0;
-
-  /** Yield thread time slice */
-  virtual void Yield() = 0;
-
-  /** Get the TID of the current thread */
-  virtual tid_t GetTid() = 0;
-};
-
-}  // namespace hshm::thread_model
-
-#endif  // HERMES_THREAD_THREAD_H_
diff --git a/hermes_shm/include/hermes_shm/thread/thread_model/thread_model_factory.h b/hermes_shm/include/hermes_shm/thread/thread_model/thread_model_factory.h
deleted file mode 100644
index 56f8220b0..000000000
--- a/hermes_shm/include/hermes_shm/thread/thread_model/thread_model_factory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_THREAD_THREAD_FACTORY_H_
-#define HERMES_THREAD_THREAD_FACTORY_H_
-
-#include "thread_model.h"
-#include "pthread.h"
-#include "argobots.h"
-#include "hermes_shm/util/logging.h"
-
-namespace hshm::thread_model {
-
-class ThreadFactory {
- public:
-  /** Get a thread instance */
-  static std::unique_ptr<ThreadModel> Get(ThreadType type) {
-    switch (type) {
-      case ThreadType::kPthread: {
-#ifdef HERMES_PTHREADS_ENABLED
-        return std::make_unique<Pthread>();
-#else
-        return nullptr;
-#endif
-      }
-      case ThreadType::kArgobots: {
-#ifdef HERMES_RPC_THALLIUM
-        return std::make_unique<Argobots>();
-#else
-        return nullptr;
-#endif
-      }
-      default: {
-        HELOG(kWarning, "No such thread type");
-        return nullptr;
-      }
-    }
-  }
-};
-
-}  // namespace hshm::thread_model
-
-#endif  // HERMES_THREAD_THREAD_FACTORY_H_
diff --git a/hermes_shm/include/hermes_shm/thread/thread_model_manager.h b/hermes_shm/include/hermes_shm/thread/thread_model_manager.h
deleted file mode 100644
index 141954b3a..000000000
--- a/hermes_shm/include/hermes_shm/thread/thread_model_manager.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_THREAD_THREAD_MANAGER_H_
-#define HERMES_THREAD_THREAD_MANAGER_H_
-
-#include "hermes_shm/thread/thread_model/thread_model.h"
-#include "hermes_shm/thread/thread_model/thread_model_factory.h"
-#include <hermes_shm/constants/data_structure_singleton_macros.h>
-#include <hermes_shm/introspect/system_info.h>
-#include <mutex>
-
-#define US_TO_CLOCKS(x) (x * 56)
-
-namespace hshm {
-
-union NodeThreadId;
-
-class ThreadModelManager {
- public:
-  ThreadType type_; /**< The type of threads used in this program */
-  std::unique_ptr<thread_model::ThreadModel>
-    thread_static_; /**< Functions static to all threads */
-  std::mutex lock_; /**< Synchronize */
-
-  /** Default constructor */
-  ThreadModelManager() {
-    SetThreadModel(ThreadType::kPthread);
-  }
-
-  /** Set the threading model of this application */
-  void SetThreadModel(ThreadType type) {
-    lock_.lock();
-    if (type_ == type) {
-      lock_.unlock();
-      return;
-    }
-    type_ = type;
-    thread_static_ = thread_model::ThreadFactory::Get(type);
-    if (thread_static_ == nullptr) {
-      HELOG(kFatal, "Could not load the threading model");
-    }
-    lock_.unlock();
-  }
-
-  /** Sleep for a period of time (microseconds) */
-  void SleepForUs(size_t us) {
-    thread_static_->SleepForUs(us);
-  }
-
-  /** Call Yield */
-  void Yield() {
-    thread_static_->Yield();
-  }
-
-  /** Call GetTid */
-  tid_t GetTid() {
-    return thread_static_->GetTid();
-  }
-};
-
-/** A unique identifier of this thread across processes */
-union NodeThreadId {
-  struct {
-    uint32_t tid_;
-    uint32_t pid_;
-  } bits_;
-  uint64_t as_int_;
-
-  /** Default constructor */
-  NodeThreadId() {
-    bits_.tid_ = HERMES_THREAD_MODEL->GetTid();
-    bits_.pid_ = HERMES_SYSTEM_INFO->pid_;
-  }
-
-  /** Hash function */
-  uint32_t hash() {
-    return as_int_;
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_THREAD_THREAD_MANAGER_H_
diff --git a/hermes_shm/include/hermes_shm/types/argpack.h b/hermes_shm/include/hermes_shm/types/argpack.h
deleted file mode 100644
index 7db97462b..000000000
--- a/hermes_shm/include/hermes_shm/types/argpack.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_TYPES_ARGPACK_H_
-#define HERMES_INCLUDE_HERMES_TYPES_ARGPACK_H_
-
-#include "real_number.h"
-#include  <functional>
-
-namespace hshm {
-
-/** Type which indicates that a constructor takes ArgPacks as input */
-struct PiecewiseConstruct {};
-
-/** Type which ends template recurrence */
-struct EndTemplateRecurrence {};
-
-/** Recurrence used to create argument pack */
-template<
-  size_t idx,
-  typename T = EndTemplateRecurrence,
-  typename ...Args>
-struct ArgPackRecur {
-  constexpr static bool is_rval = std::is_rvalue_reference<T>();
-  typedef typename std::conditional<is_rval, T&&, T&>::type ElementT;
-
-  ElementT arg_; /**< The element stored */
-  ArgPackRecur<idx + 1, Args...>
-    recur_; /**< Remaining args */
-
-  /** Default constructor */
-  ArgPackRecur() = default;
-
-  /** Constructor. Rvalue reference. */
-  explicit ArgPackRecur(T arg, Args&& ...args)
-  : arg_(std::forward<T>(arg)), recur_(std::forward<Args>(args)...) {}
-
-  /** Forward an rvalue reference (only if argpack) */
-  template<size_t i>
-  constexpr decltype(auto) Forward() const {
-    if constexpr(i == idx) {
-      if constexpr(is_rval) {
-        return std::forward<T>(arg_);
-      } else {
-        return arg_;
-      }
-    } else {
-      return recur_.template
-        Forward<i>();
-    }
-  }
-};
-
-/** Terminator of the ArgPack recurrence */
-template<size_t idx>
-struct ArgPackRecur<idx, EndTemplateRecurrence> {
-  /** Default constructor */
-  ArgPackRecur() = default;
-
-  /** Forward an rvalue reference (only if argpack) */
-  template<size_t i>
-  constexpr void Forward() const {
-    throw std::logic_error("(Forward) ArgPack index outside of range");
-  }
-};
-
-/** Used to semantically pack arguments */
-template<typename ...Args>
-struct ArgPack {
-  /** Variable argument pack */
-  ArgPackRecur<0, Args...> recur_;
-  /** Size of the argpack */
-  static constexpr const size_t size_ = sizeof...(Args);
-
-  /** General Constructor. */
-  ArgPack(Args&& ...args)  // NOLINT
-  : recur_(std::forward<Args>(args)...) {}
-
-  /** Get forward reference */
-  template<size_t idx>
-  constexpr decltype(auto) Forward() const {
-    return recur_.template Forward<idx>();
-  }
-
-  /** Size */
-  constexpr static size_t Size() {
-    return size_;
-  }
-};
-
-/** Make an argpack */
-template<typename ...Args>
-ArgPack<Args&&...> make_argpack(Args&& ...args) {
-  return ArgPack<Args&&...>(std::forward<Args>(args)...);
-}
-
-/** Get the type + reference of the forward for \a pack pack at \a index i */
-#define FORWARD_ARGPACK_FULL_TYPE(pack, i)\
-  decltype(pack.template Forward<i>())
-
-/** Forward the param for \a pack pack at \a index i */
-#define FORWARD_ARGPACK_PARAM(pack, i)\
-  std::forward<FORWARD_ARGPACK_FULL_TYPE(pack, i)>(\
-    pack.template Forward<i>())
-
-/** Forward an argpack */
-#define FORWARD_ARGPACK(pack) \
-  std::forward<decltype(pack)>(pack)
-
-/** Used to pass an argument pack to a function or class method */
-class PassArgPack {
- public:
-  /** Call function with ArgPack */
-  template<typename ArgPackT, typename F>
-  constexpr static decltype(auto) Call(ArgPackT &&pack, F &&f) {
-    return _CallRecur<0, ArgPackT, F>(
-      std::forward<ArgPackT>(pack), std::forward<F>(f));
-  }
-
- private:
-  /** Unpacks the ArgPack and passes it to the function */
-  template<size_t i, typename ArgPackT,
-    typename F, typename ...CurArgs>
-  constexpr static decltype(auto) _CallRecur(ArgPackT &&pack,
-                                             F &&f,
-                                             CurArgs&& ...args) {
-    if constexpr(i < ArgPackT::Size()) {
-      return _CallRecur<i + 1, ArgPackT, F>(
-        std::forward<ArgPackT>(pack),
-        std::forward<F>(f),
-        std::forward<CurArgs>(args)...,
-        FORWARD_ARGPACK_PARAM(pack, i));
-    } else {
-      return std::__invoke(f, std::forward<CurArgs>(args)...);
-    }
-  }
-};
-
-/** Combine multiple argpacks into a single argpack */
-class MergeArgPacks {
- public:
-  /** Call function with ArgPack */
-  template<typename ...ArgPacks>
-  constexpr static decltype(auto) Merge(ArgPacks&& ...packs) {
-    return _MergePacksRecur<0>(make_argpack(std::forward<ArgPacks>(packs)...));
-  }
-
- private:
-  /** Unpacks the C++ parameter pack of ArgPacks */
-  template<size_t cur_pack, typename ArgPacksT,
-    typename ...CurArgs>
-  constexpr static decltype(auto) _MergePacksRecur(ArgPacksT &&packs,
-                                         CurArgs&& ...args) {
-    if constexpr(cur_pack < ArgPacksT::Size()) {
-      return _MergeRecur<
-        cur_pack, ArgPacksT, 0>(
-        // End template parameters
-        std::forward<ArgPacksT>(packs),
-        FORWARD_ARGPACK_PARAM(packs, cur_pack),
-        std::forward<CurArgs>(args)...);
-    } else {
-      return make_argpack(std::forward<CurArgs>(args)...);
-    }
-  }
-
-  /** Unpacks the C++ parameter pack of ArgPacks */
-  template<
-    size_t cur_pack, typename ArgPacksT,
-    size_t i, typename ArgPackT,
-    typename ...CurArgs>
-  constexpr static decltype(auto) _MergeRecur(ArgPacksT &&packs,
-                                    ArgPackT &&pack,
-                                    CurArgs&& ...args) {
-    if constexpr(i < ArgPackT::Size()) {
-      return _MergeRecur<cur_pack, ArgPacksT, i + 1, ArgPackT>(
-        std::forward<ArgPacksT>(packs),
-        std::forward<ArgPackT>(pack),
-        std::forward<CurArgs>(args)..., FORWARD_ARGPACK_PARAM(pack, i));
-    } else {
-      return _MergePacksRecur<cur_pack + 1, ArgPacksT>(
-        std::forward<ArgPacksT>(packs),
-        std::forward<CurArgs>(args)...);
-    }
-  }
-};
-
-/** Insert an argpack at the head of each pack in a set of ArgPacks */
-class ProductArgPacks {
- public:
-  /** The product function */
-  template<typename ProductPackT, typename ...ArgPacks>
-  constexpr static decltype(auto) Product(ProductPackT &&prod_pack,
-                                ArgPacks&& ...packs) {
-    return _ProductPacksRecur<0>(
-      std::forward<ProductPackT>(prod_pack),
-      make_argpack(std::forward<ArgPacks>(packs)...));
-  }
-
- private:
-  /** Prepend \a ArgPack prod_pack to every ArgPack in orig_packs */
-  template<
-    size_t cur_pack,
-    typename ProductPackT,
-    typename OrigPacksT,
-    typename ...NewPacks>
-  constexpr static decltype(auto) _ProductPacksRecur(ProductPackT &&prod_pack,
-                                           OrigPacksT &&orig_packs,
-                                           NewPacks&& ...packs) {
-    if constexpr(cur_pack < OrigPacksT::Size()) {
-      return _ProductPacksRecur<cur_pack + 1>(
-        std::forward<ProductPackT>(prod_pack),
-        std::forward<OrigPacksT>(orig_packs),
-        std::forward<NewPacks>(packs)...,
-        std::forward<ProductPackT>(prod_pack),
-        FORWARD_ARGPACK_PARAM(orig_packs, cur_pack));
-    } else {
-      return make_argpack(std::forward<NewPacks>(packs)...);
-    }
-  }
-};
-
-/** Used to emulate constexpr to lambda */
-template<typename T, T Val>
-struct MakeConstexpr {
-  constexpr static T val_ = Val;
-  constexpr static T Get() {
-    return val_;
-  }
-};
-
-/** Apply a function over an entire TupleBase / tuple */
-template<bool reverse>
-class IterateArgpack {
- public:
-  /** Apply a function to every element of a tuple */
-  template<typename TupleT, typename F>
-  constexpr static void Apply(TupleT &&pack, F &&f) {
-    _Apply<0, TupleT, F>(std::forward<TupleT>(pack), std::forward<F>(f));
-  }
-
- private:
-  /** Apply the function recursively */
-  template<size_t i, typename TupleT, typename F>
-  constexpr static void _Apply(TupleT &&pack, F &&f) {
-    if constexpr(i < TupleT::Size()) {
-      if constexpr(reverse) {
-        _Apply<i + 1, TupleT, F>(std::forward<TupleT>(pack),
-                                 std::forward<F>(f));
-        f(MakeConstexpr<size_t, i>(), pack.template Forward<i>());
-      } else {
-        f(MakeConstexpr<size_t, i>(), pack.template Forward<i>());
-        _Apply<i + 1, TupleT, F>(std::forward<TupleT>(pack),
-                                 std::forward<F>(f));
-      }
-    }
-  }
-};
-
-/** Forward iterate over tuple and apply function  */
-using ForwardIterateArgpack = IterateArgpack<false>;
-
-/** Reverse iterate over tuple and apply function */
-using ReverseIterateArgpack = IterateArgpack<true>;
-
-}  // namespace hshm
-
-#endif  // HERMES_INCLUDE_HERMES_TYPES_ARGPACK_H_
diff --git a/hermes_shm/include/hermes_shm/types/atomic.h b/hermes_shm/include/hermes_shm/types/atomic.h
deleted file mode 100644
index 9aef4972d..000000000
--- a/hermes_shm/include/hermes_shm/types/atomic.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_TYPES_ATOMIC_H_
-#define HERMES_INCLUDE_HERMES_TYPES_ATOMIC_H_
-
-#include <atomic>
-#include <hermes_shm/constants/macros.h>
-
-namespace hshm::ipc {
-
-/** Provides the API of an atomic, without being atomic */
-template<typename T>
-struct nonatomic {
-  T x;
-
-  /** Constructor */
-  HSHM_ALWAYS_INLINE nonatomic() = default;
-
-  /** Full constructor */
-  HSHM_ALWAYS_INLINE explicit nonatomic(T def) : x(def) {}
-
-  /** Atomic fetch_add wrapper*/
-  HSHM_ALWAYS_INLINE T fetch_add(
-    T count, std::memory_order order = std::memory_order_seq_cst) {
-    (void) order;
-    x += count;
-    return x;
-  }
-
-  /** Atomic fetch_sub wrapper*/
-  HSHM_ALWAYS_INLINE T fetch_sub(
-    T count, std::memory_order order = std::memory_order_seq_cst) {
-    (void) order;
-    x -= count;
-    return x;
-  }
-
-  /** Atomic load wrapper */
-  HSHM_ALWAYS_INLINE T load(
-    std::memory_order order = std::memory_order_seq_cst) const {
-    (void) order;
-    return x;
-  }
-
-  /** Atomic exchange wrapper */
-  HSHM_ALWAYS_INLINE void exchange(
-    T count, std::memory_order order = std::memory_order_seq_cst) {
-    (void) order;
-    x = count;
-  }
-
-  /** Atomic compare exchange weak wrapper */
-  HSHM_ALWAYS_INLINE bool compare_exchange_weak(T& expected, T desired,
-                                    std::memory_order order =
-                                    std::memory_order_seq_cst) {
-    (void) expected; (void) order;
-    x = desired;
-    return true;
-  }
-
-  /** Atomic compare exchange strong wrapper */
-  HSHM_ALWAYS_INLINE bool compare_exchange_strong(T& expected, T desired,
-                                      std::memory_order order =
-                                      std::memory_order_seq_cst) {
-    (void) expected; (void) order;
-    x = desired;
-    return true;
-  }
-
-  /** Atomic pre-increment operator */
-  HSHM_ALWAYS_INLINE nonatomic& operator++() {
-    ++x;
-    return *this;
-  }
-
-  /** Atomic post-increment operator */
-  HSHM_ALWAYS_INLINE nonatomic operator++(int) {
-    return atomic(x+1);
-  }
-
-  /** Atomic pre-decrement operator */
-  HSHM_ALWAYS_INLINE nonatomic& operator--() {
-    --x;
-    return *this;
-  }
-
-  /** Atomic post-decrement operator */
-  HSHM_ALWAYS_INLINE nonatomic operator--(int) {
-    return atomic(x-1);
-  }
-
-  /** Atomic add operator */
-  HSHM_ALWAYS_INLINE nonatomic operator+(T count) const {
-    return nonatomic(x + count);
-  }
-
-  /** Atomic subtract operator */
-  HSHM_ALWAYS_INLINE nonatomic operator-(T count) const {
-    return nonatomic(x - count);
-  }
-
-  /** Atomic add assign operator */
-  HSHM_ALWAYS_INLINE nonatomic& operator+=(T count) {
-    x += count;
-    return *this;
-  }
-
-  /** Atomic subtract assign operator */
-  HSHM_ALWAYS_INLINE nonatomic& operator-=(T count) {
-    x -= count;
-    return *this;
-  }
-
-  /** Atomic assign operator */
-  HSHM_ALWAYS_INLINE nonatomic& operator=(T count) {
-    x = count;
-    return *this;
-  }
-
-  /** Equality check */
-  HSHM_ALWAYS_INLINE bool operator==(const nonatomic &other) const {
-    return (other.x == x);
-  }
-
-  /** Inequality check */
-  HSHM_ALWAYS_INLINE bool operator!=(const nonatomic &other) const {
-    return (other.x != x);
-  }
-};
-
-/** A wrapper around std::atomic */
-template<typename T>
-struct atomic {
-  std::atomic<T> x;
-
-  /** Constructor */
-  HSHM_ALWAYS_INLINE atomic() = default;
-
-  /** Full constructor */
-  HSHM_ALWAYS_INLINE explicit atomic(T def) : x(def) {}
-
-  /** Atomic fetch_add wrapper*/
-  HSHM_ALWAYS_INLINE T fetch_add(
-    T count, std::memory_order order = std::memory_order_seq_cst) {
-    return x.fetch_add(count, order);
-  }
-
-  /** Atomic fetch_sub wrapper*/
-  HSHM_ALWAYS_INLINE T fetch_sub(
-    T count, std::memory_order order = std::memory_order_seq_cst) {
-    return x.fetch_sub(count, order);
-  }
-
-  /** Atomic load wrapper */
-  HSHM_ALWAYS_INLINE T load(
-    std::memory_order order = std::memory_order_seq_cst) const {
-    return x.load(order);
-  }
-
-  /** Atomic exchange wrapper */
-  HSHM_ALWAYS_INLINE void exchange(
-    T count, std::memory_order order = std::memory_order_seq_cst) {
-    x.exchange(count, order);
-  }
-
-  /** Atomic compare exchange weak wrapper */
-  HSHM_ALWAYS_INLINE bool compare_exchange_weak(T& expected, T desired,
-                                    std::memory_order order =
-                                    std::memory_order_seq_cst) {
-    return x.compare_exchange_weak(expected, desired, order);
-  }
-
-  /** Atomic compare exchange strong wrapper */
-  HSHM_ALWAYS_INLINE bool compare_exchange_strong(T& expected, T desired,
-                                      std::memory_order order =
-                                      std::memory_order_seq_cst) {
-    return x.compare_exchange_strong(expected, desired, order);
-  }
-
-  /** Atomic pre-increment operator */
-  HSHM_ALWAYS_INLINE atomic& operator++() {
-    ++x;
-    return *this;
-  }
-
-  /** Atomic post-increment operator */
-  HSHM_ALWAYS_INLINE atomic operator++(int) {
-    return atomic(x + 1);
-  }
-
-  /** Atomic pre-decrement operator */
-  HSHM_ALWAYS_INLINE atomic& operator--() {
-    --x;
-    return *this;
-  }
-
-  /** Atomic post-decrement operator */
-  HSHM_ALWAYS_INLINE atomic operator--(int) {
-    return atomic(x - 1);
-  }
-
-  /** Atomic add operator */
-  HSHM_ALWAYS_INLINE atomic operator+(T count) const {
-    return x + count;
-  }
-
-  /** Atomic subtract operator */
-  HSHM_ALWAYS_INLINE atomic operator-(T count) const {
-    return x - count;
-  }
-
-  /** Atomic add assign operator */
-  HSHM_ALWAYS_INLINE atomic& operator+=(T count) {
-    x += count;
-    return *this;
-  }
-
-  /** Atomic subtract assign operator */
-  HSHM_ALWAYS_INLINE atomic& operator-=(T count) {
-    x -= count;
-    return *this;
-  }
-
-  /** Atomic assign operator */
-  HSHM_ALWAYS_INLINE atomic& operator=(T count) {
-    x.exchange(count);
-    return *this;
-  }
-
-  /** Equality check */
-  HSHM_ALWAYS_INLINE bool operator==(const atomic &other) const {
-    return (other.x == x);
-  }
-
-  /** Inequality check */
-  HSHM_ALWAYS_INLINE bool operator!=(const atomic &other) const {
-    return (other.x != x);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_INCLUDE_HERMES_TYPES_ATOMIC_H_
diff --git a/hermes_shm/include/hermes_shm/types/bitfield.h b/hermes_shm/include/hermes_shm/types/bitfield.h
deleted file mode 100644
index afea1138f..000000000
--- a/hermes_shm/include/hermes_shm/types/bitfield.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_TYPES_BITFIELD_H_
-#define HERMES_INCLUDE_HERMES_TYPES_BITFIELD_H_
-
-#include <cstdint>
-
-namespace hshm {
-
-#define BIT_OPT(T, n) (((T)1) << n)
-#define ALL_BITS(T) (~((T)0))
-
-/**
- * A generic bitfield template
- * */
-template<typename T = uint32_t>
-struct bitfield {
-  T bits_;
-
-  bitfield() : bits_(0) {}
-
-  explicit bitfield(T mask) : bits_(mask) {}
-
-  inline void SetBits(T mask) {
-    bits_ |= mask;
-  }
-
-  inline void UnsetBits(T mask) {
-    bits_ &= ~mask;
-  }
-
-  inline bool Any(T mask) const {
-    return bits_ & mask;
-  }
-
-  inline bool All(T mask) const {
-    return Any(mask) == mask;
-  }
-
-  inline void CopyBits(bitfield field, T mask) {
-    bits_ &= (field.bits_ & mask);
-  }
-
-  inline void Clear() {
-    bits_ = 0;
-  }
-
-  static T MakeMask(int start, int length) {
-    return ((((T)1) << length) - 1) << start;
-  }
-} __attribute__((packed));
-typedef bitfield<uint8_t> bitfield8_t;
-typedef bitfield<uint16_t> bitfield16_t;
-typedef bitfield<uint32_t> bitfield32_t;
-
-/**
- * A helper type needed for std::conditional
- * */
-template<size_t LEN>
-struct len_bits {
-  static constexpr size_t value = LEN;
-};
-
-/**
- * A generic bitfield template
- * */
-template<size_t NUM_BITS,
-  typename LEN = typename std::conditional<
-    ((NUM_BITS % 32 == 0) && (NUM_BITS > 0)),
-    len_bits<(NUM_BITS / 32)>,
-    len_bits<(NUM_BITS / 32) + 1>>::type>
-struct big_bitfield {
-  bitfield32_t bits_[LEN::value];
-
-  big_bitfield() : bits_() {}
-
-  inline size_t size() const {
-    return LEN::value;
-  }
-
-  inline void SetBits(int start, int length) {
-    int bf_idx = start / 32;
-    int bf_idx_count = 32 - bf_idx;
-    int rem = length;
-    while (rem) {
-      bits_[bf_idx].SetBits(bitfield32_t::MakeMask(start, bf_idx_count));
-      rem -= bf_idx_count;
-      bf_idx += 1;
-      if (rem >= 32) {
-        bf_idx_count = 32;
-      } else {
-        bf_idx_count = rem;
-      }
-    }
-  }
-
-  inline void UnsetBits(int start, int length) {
-    int bf_idx = start / 32;
-    int bf_idx_count = 32 - bf_idx;
-    int rem = length;
-    while (rem) {
-      bits_[bf_idx].SetBits(bitfield32_t::MakeMask(start, bf_idx_count));
-      rem -= bf_idx_count;
-      bf_idx += 1;
-      if (rem >= 32) {
-        bf_idx_count = 32;
-      } else {
-        bf_idx_count = rem;
-      }
-    }
-  }
-
-  inline bool Any(int start, int length) const {
-    int bf_idx = start / 32;
-    int bf_idx_count = 32 - bf_idx;
-    int rem = length;
-    while (rem) {
-      if (bits_[bf_idx].Any(bitfield32_t::MakeMask(start, bf_idx_count))) {
-        return true;
-      }
-      rem -= bf_idx_count;
-      bf_idx += 1;
-      if (rem >= 32) {
-        bf_idx_count = 32;
-      } else {
-        bf_idx_count = rem;
-      }
-    }
-    return false;
-  }
-
-  inline bool All(int start, int length) const {
-    int bf_idx = start / 32;
-    int bf_idx_count = 32 - bf_idx;
-    int rem = length;
-    while (rem) {
-      if (!bits_[bf_idx].All(bitfield32_t::MakeMask(start, bf_idx_count))) {
-        return false;
-      }
-      rem -= bf_idx_count;
-      bf_idx += 1;
-      if (rem >= 32) {
-        bf_idx_count = 32;
-      } else {
-        bf_idx_count = rem;
-      }
-    }
-    return true;
-  }
-
-  inline void Clear() {
-    memset((void*)bits_, 0, sizeof(bitfield32_t) * LEN::value);
-  }
-} __attribute__((packed));
-
-}  // namespace hshm
-
-#endif  // HERMES_INCLUDE_HERMES_TYPES_BITFIELD_H_
diff --git a/hermes_shm/include/hermes_shm/types/real_number.h b/hermes_shm/include/hermes_shm/types/real_number.h
deleted file mode 100644
index e3db4535a..000000000
--- a/hermes_shm/include/hermes_shm/types/real_number.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_BASICS_H
-#define HERMES_BASICS_H
-
-#include <cstdint>
-#include <cstddef>
-
-#ifdef __cplusplus
-
-namespace hshm {
-
-/**
- * decimal + (numerator/65536)
- * */
-struct RealNumber {
-  uint64_t decimal_;
-  uint32_t numerator_;
-  static const uint32_t precision = 65536;
-
-  RealNumber() =  default;
-
-  /**
-   * Converts numerator / denomintor ->
-   * decimal + (numerator / 65536);
-   *
-   * For example,
-   * 4/5 = (4 * 65536 / 5) / 65536
-   * */
-  explicit RealNumber(uint64_t numerator, uint64_t denominator) {
-    decimal_ = numerator / denominator;
-    uint64_t rem = numerator % denominator;
-    numerator_ = rem * precision / denominator;
-  }
-
-  /**
-   * (d1 + n1/p) * d2 =
-   * d1 * d2 + d2 * n1 / p
-   * */
-  RealNumber operator*(size_t other) const {
-    RealNumber res;
-    res.decimal_ = other * decimal_;
-    uint64_t frac = other * numerator_;
-    res.decimal_ += frac / precision;
-    res.numerator_ = frac % precision;
-    return res;
-  }
-
-  /**
-   * (d1 + n1/p) * (d2 + n2/p) =
-   * (d1 * d2) + (d1 * n2)/p + (d2 * n1) / p + (n1 * n2 / p) / p =
-   * (d1 * d2) + [(d1 * n2) + (d2 * n1) + (n1 * n2)/p] / p
-   * */
-  RealNumber operator*(const RealNumber &other) const {
-    RealNumber res;
-    // d1 * d2
-    res.decimal_ = other.decimal_ * decimal_;
-    uint64_t frac =
-      (decimal_ * other.numerator_) +  // d1 * n2
-      (other.decimal_ * numerator_) +  // d2 * n1
-      (numerator_ * other.numerator_) / precision;  // n1 * n2 / p
-    res.decimal_ += frac / precision;
-    res.numerator_ = frac % precision;
-    return res;
-  }
-
-  RealNumber operator*=(size_t other) {
-    (*this) = (*this) * other;
-    return *this;
-  }
-
-  RealNumber operator*=(const RealNumber &other) {
-    (*this) = (*this) * other;
-    return *this;
-  }
-
-  size_t as_int() const {
-    return decimal_ + numerator_ / precision;
-  }
-};
-
-}  // namespace hshm
-
-#endif
-
-
-
-#endif  // HERMES_BASICS_H
diff --git a/hermes_shm/include/hermes_shm/util/auto_trace.h b/hermes_shm/include/hermes_shm/util/auto_trace.h
deleted file mode 100644
index c2cd1f2a6..000000000
--- a/hermes_shm/include/hermes_shm/util/auto_trace.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_INCLUDE_HERMES_UTIL_AUTO_TRACE_H_
-#define HERMES_INCLUDE_HERMES_UTIL_AUTO_TRACE_H_
-
-#include "formatter.h"
-#include "timer.h"
-#include "logging.h"
-#include <iostream>
-
-namespace hshm {
-
-#ifdef HERMES_ENABLE_PROFILING
-#define AUTO_TRACE(LOG_LEVEL) \
-  hshm::AutoTrace<LOG_LEVEL> hshm_tracer_(__func__);
-#define TIMER_START(NAME) \
-  hshm_tracer_.StartTimer(NAME);
-#define TIMER_END()  \
-  hshm_tracer_.EndTimer();
-#else
-#define AUTO_TRACE(LOG_LEVEL)
-#define TIMER_START(NAME)
-#define TIMER_END()
-#endif
-
-/** Trace function execution times */
-template<int LOG_LEVEL>
-class AutoTrace {
- private:
-  HighResMonotonicTimer timer_;
-  HighResMonotonicTimer timer2_;
-  std::string fname_;
-  std::string internal_name_;
-
- public:
-  template<typename ...Args>
-  explicit AutoTrace(const char *fname) : fname_(fname) {
-    _StartTimer(timer_);
-  }
-
-  ~AutoTrace() {
-    _EndTimer(timer_);
-  }
-
-  void StartTimer(const char *internal_name) {
-    internal_name_ = "/" + std::string(internal_name);
-    _StartTimer(timer2_);
-  }
-
-  void EndTimer() {
-    _EndTimer(timer2_);
-  }
-
- private:
-  template<typename ...Args>
-  void _StartTimer(HighResMonotonicTimer &timer) {
-#ifdef HERMES_ENABLE_PROFILING
-    if constexpr(LOG_LEVEL <= HERMES_LOG_VERBOSITY) {
-      timer.Resume();
-      HILOG(LOG_LEVEL, "{}{}",
-           fname_,
-           internal_name_)
-    }
-#endif
-  }
-
-  void _EndTimer(HighResMonotonicTimer &timer) {
-#ifdef HERMES_ENABLE_PROFILING
-    if constexpr(LOG_LEVEL <= HERMES_LOG_VERBOSITY) {
-      timer.Pause();
-      HILOG(LOG_LEVEL, "{}{} {}ns",
-           fname_,
-           internal_name_,
-           timer.GetNsec())
-      timer.Reset();
-      internal_name_.clear();
-    }
-#endif
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_INCLUDE_HERMES_UTIL_AUTO_TRACE_H_
diff --git a/hermes_shm/include/hermes_shm/util/config_parse.h b/hermes_shm/include/hermes_shm/util/config_parse.h
deleted file mode 100644
index 085634d9c..000000000
--- a/hermes_shm/include/hermes_shm/util/config_parse.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_CONFIG_PARSE_PARSER_H
-#define HERMES_CONFIG_PARSE_PARSER_H
-
-#include <cstdlib>
-#include <string>
-#include <regex>
-#include <list>
-#include "formatter.h"
-#include "logging.h"
-#include "hermes_shm/constants/macros.h"
-
-#include <iomanip>
-#include <float.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-namespace hshm {
-
-class ConfigParse {
- public:
-  /**
-   * parse a hostfile string
-   * [] represents a range to generate
-   * ; represents a new host name completely
-   *
-   * Example: hello[00-09,10]-40g;hello2[11-13]-40g
-   * */
-  static void ParseHostNameString(std::string hostname_set_str,
-                                  std::vector<std::string> &list) {
-    // Remove all whitespace characters from host name
-    std::remove(hostname_set_str.begin(), hostname_set_str.end(), ' ');
-    std::remove(hostname_set_str.begin(), hostname_set_str.end(), '\n');
-    std::remove(hostname_set_str.begin(), hostname_set_str.end(), '\r');
-    std::remove(hostname_set_str.begin(), hostname_set_str.end(), '\t');
-    if (hostname_set_str.size() == 0) {
-      return;
-    }
-    // Expand hostnames
-    std::stringstream ss(hostname_set_str);
-    while (ss.good()) {
-      // Get the current host
-      std::string hostname;
-      std::getline(ss, hostname, ';');
-
-      // Divide the hostname string into prefix, ranges, and suffix
-      auto lbracket = hostname.find_first_of('[');
-      auto rbracket = hostname.find_last_of(']');
-      std::string prefix, ranges_str, suffix;
-      if (lbracket != std::string::npos && rbracket != std::string::npos) {
-        /*
-         * For example, hello[00-09]-40g
-         * lbracket = 5
-         * rbracket = 11
-         * prefix = hello (length: 5)
-         * range = 00-09 (length: 5)
-         * suffix = -40g (length: 4)
-         * */
-        prefix = hostname.substr(0, lbracket);
-        ranges_str = hostname.substr(lbracket + 1, rbracket - lbracket - 1);
-        suffix = hostname.substr(rbracket + 1);
-      } else {
-        list.emplace_back(hostname);
-        continue;
-      }
-
-      // Parse the range list into a tuple of (min, max, num_width)
-      std::stringstream ss_ranges(ranges_str);
-      std::vector<std::tuple<int, int, int>> ranges;
-      while (ss_ranges.good()) {
-        // Parse ',' and remove spaces
-        std::string range_str;
-        std::getline(ss_ranges, range_str, ',');
-        std::remove(range_str.begin(), range_str.end(), ' ');
-
-        // Divide the range by '-'
-        auto dash = range_str.find_first_of('-');
-        if (dash != std::string::npos) {
-          int min, max;
-          // Get the minimum and maximum value
-          std::string min_str = range_str.substr(0, dash);
-          std::string max_str = range_str.substr(dash + 1);
-          std::stringstream(min_str) >> min;
-          std::stringstream(max_str) >> max;
-
-          // Check for leading 0s
-          int num_width = 0;
-          if (min_str.size() == max_str.size()) {
-            num_width = min_str.size();
-          }
-
-          // Place the range with width
-          ranges.emplace_back(min, max, num_width);
-        } else if (range_str.size()) {
-          int val;
-          std::stringstream(range_str) >> val;
-          ranges.emplace_back(val, val, range_str.size());
-        }
-      }
-
-      // Expand the host names by each range
-      for (auto &range : ranges) {
-        int min = std::get<0>(range);
-        int max = std::get<1>(range);
-        int num_width = std::get<2>(range);
-
-        for (int i = min; i <= max; ++i) {
-          std::stringstream host_ss;
-          host_ss << prefix;
-          host_ss << std::setw(num_width) << std::setfill('0') << i;
-          host_ss << suffix;
-          list.emplace_back(host_ss.str());
-        }
-      }
-    }
-  }
-
-  /** parse the suffix of \a num_text NUMBER text */
-  static std::string ParseNumberSuffix(const std::string &num_text) {
-    size_t i;
-    for (i = 0; i < num_text.size(); ++i) {
-      char c = num_text[i];
-      // Skip numbers
-      if ('0' <= c && c <= '9') {
-        continue;
-      }
-      // Skip whitespace
-      if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
-        continue;
-      }
-      // Skip period (for floats)
-      if (c == '.') {
-        continue;
-      }
-      break;
-    }
-    return std::string(num_text.begin() + i, num_text.end());;
-  }
-
-  /** parse the number of \a num_text NUMBER text */
-  template<typename T>
-  static T ParseNumber(const std::string &num_text) {
-    T size;
-    if (num_text == "inf") {
-      return std::numeric_limits<T>::max();
-    }
-    std::stringstream(num_text) >> size;
-    return size;
-  }
-
-  /** Converts \a size_text SIZE text into a size_t */
-  static size_t ParseSize(const std::string &size_text) {
-    auto size = ParseNumber<float>(size_text);
-    if (size_text == "inf") {
-      return std::numeric_limits<size_t>::max();
-    }
-    std::string suffix = ParseNumberSuffix(size_text);
-    if (suffix.empty()) {
-      return BYTES(size);
-    } else if (suffix[0] == 'k' || suffix[0] == 'K') {
-      return KILOBYTES(size);
-    } else if (suffix[0] == 'm' || suffix[0] == 'M') {
-      return MEGABYTES(size);
-    } else if (suffix[0] == 'g' || suffix[0] == 'G') {
-      return GIGABYTES(size);
-    } else if (suffix[0] == 't' || suffix[0] == 'T') {
-      return TERABYTES(size);
-    } else if (suffix[0] == 'p' || suffix[0] == 'P') {
-      return PETABYTES(size);
-    } else {
-      HELOG(kFatal, "Could not parse the size: {}", size_text)
-      exit(1);
-    }
-  }
-
-  /** Returns bandwidth (bytes / second) */
-  static size_t ParseBandwidth(const std::string &size_text) {
-    return ParseSize(size_text);
-  }
-
-  /** Returns latency (nanoseconds) */
-  static size_t ParseLatency(const std::string &latency_text) {
-    auto size = ParseNumber<float>(latency_text);
-    std::string suffix = ParseNumberSuffix(latency_text);
-    if (suffix.empty()) {
-      return BYTES(size);
-    } else if (suffix[0] == 'n' || suffix[0] == 'N') {
-      return BYTES(size);
-    } else if (suffix[0] == 'u' || suffix[0] == 'U') {
-      return KILOBYTES(size);
-    } else if (suffix[0] == 'm' || suffix[0] == 'M') {
-      return MEGABYTES(size);
-    } else if (suffix[0] == 's' || suffix[0] == 'S') {
-      return GIGABYTES(size);
-    }
-    HELOG(kFatal, "Could not parse the latency: {}", latency_text)
-    return 0;
-  }
-
-  /** Expands all environment variables in a path string */
-  static std::string ExpandPath(std::string path) {
-    std::smatch env_names;
-    std::regex expr("\\$\\{[^\\}]+\\}");
-    if (!std::regex_search(path, env_names, expr)) {
-      return path;
-    }
-    for (auto &env_name_re : env_names) {
-      std::string to_replace = std::string(env_name_re);
-      std::string env_name = to_replace.substr(2, to_replace.size()-3);
-      std::string env_val = env_name;
-      try {
-        char *ret = getenv(env_name.c_str());
-        if (ret) {
-          env_val = ret;
-        } else {
-          continue;
-        }
-      } catch(...) {
-      }
-      std::regex replace_expr("\\$\\{" + env_name + "\\}");
-      path = std::regex_replace(path, replace_expr, env_val);
-    }
-    return path;
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_CONFIG_PARSE_PARSER_H
diff --git a/hermes_shm/include/hermes_shm/util/error.h b/hermes_shm/include/hermes_shm/util/error.h
deleted file mode 100644
index 113df1392..000000000
--- a/hermes_shm/include/hermes_shm/util/error.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_ERROR_H
-#define HERMES_ERROR_H
-
-// #ifdef __cplusplus
-
-#include <iostream>
-#include <string>
-#include <cstdlib>
-#include <memory>
-#include <hermes_shm/util/formatter.h>
-
-#define HERMES_ERROR_TYPE std::shared_ptr<hshm::Error>
-#define HERMES_ERROR_HANDLE_START() try {
-#define HERMES_ERROR_HANDLE_END() \
-  } catch(HERMES_ERROR_TYPE &err) { err->print(); exit(-1024); }
-#define HERMES_ERROR_HANDLE_TRY try
-#define HERMES_ERROR_PTR err
-#define HERMES_ERROR_HANDLE_CATCH catch(HERMES_ERROR_TYPE &HERMES_ERROR_PTR)
-#define HERMES_ERROR_IS(err, check) (err->get_code() == check.get_code())
-
-namespace hshm {
-
-class Error : std::exception {
- private:
-  std::string fmt_;
-  std::string msg_;
- public:
-  Error() : fmt_() {}
-  explicit Error(std::string fmt) : fmt_(std::move(fmt)) {}
-  ~Error() override = default;
-
-  template<typename ...Args>
-  Error format(Args&& ...args) const {
-    Error err = Error(fmt_);
-    err.msg_ = Formatter::format(fmt_, std::forward<Args>(args)...);
-    return err;
-  }
-
-  const char* what() const throw() override {
-    return msg_.c_str();
-  }
-
-  void print() {
-    std::cout << what() << std::endl;
-  }
-};
-
-}  // namespace hshm
-
-// #endif
-
-#endif  // HERMES_ERROR_H
diff --git a/hermes_shm/include/hermes_shm/util/errors.h b/hermes_shm/include/hermes_shm/util/errors.h
deleted file mode 100644
index c2f474d90..000000000
--- a/hermes_shm/include/hermes_shm/util/errors.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_ERRORS_H
-#define HERMES_ERRORS_H
-
-#ifdef __cplusplus
-
-#include <hermes_shm/util/error.h>
-
-namespace hshm {
-  const Error FILE_NOT_FOUND("File not found at {}");
-  const Error INVALID_STORAGE_TYPE("{} is not a valid storage method");
-  const Error INVALID_SERIALIZER_TYPE("{} is not a valid serializer type");
-  const Error INVALID_TRANSPORT_TYPE("{} is not a valid transport type");
-  const Error INVALID_AFFINITY("Could not set CPU affinity of thread: {}");
-  const Error MMAP_FAILED("Could not mmap file: {}");
-  const Error LAZY_ERROR("Error in function {}");
-  const Error PTHREAD_CREATE_FAILED("Failed to create a pthread");
-  const Error NOT_IMPLEMENTED("{} not implemented");
-
-  const Error DLSYM_MODULE_NOT_FOUND("Module {} was not loaded; error {}");
-  const Error DLSYM_MODULE_NO_CONSTRUCTOR("Module {} has no constructor");
-
-  const Error UNIX_SOCKET_FAILED("Failed to create socket: {}");
-  const Error UNIX_BIND_FAILED("Failed to bind socket: {}");
-  const Error UNIX_CONNECT_FAILED("Failed to connect over socket: {}");
-  const Error UNIX_SENDMSG_FAILED("Failed to send message over socket: {}");
-  const Error UNIX_RECVMSG_FAILED("Failed to receive message over socket: {}");
-  const Error UNIX_SETSOCKOPT_FAILED("Failed to set socket options: {}");
-  const Error UNIX_GETSOCKOPT_FAILED("Failed to acquire user credentials: {}");
-  const Error UNIX_LISTEN_FAILED("Failed to listen for connections: {}");
-  const Error UNIX_ACCEPT_FAILED("Failed accept connections: {}");
-
-  const Error ARRAY_OUT_OF_BOUNDS("Exceeded the bounds of array in {}");
-
-  const Error SHMEM_CREATE_FAILED("Failed to allocate SHMEM");
-  const Error SHMEM_RESERVE_FAILED("Failed to reserve SHMEM");
-  const Error SHMEM_NOT_SUPPORTED("Attempting to deserialize a non-shm backend");
-  const Error MEMORY_BACKEND_NOT_FOUND("Failed to find the memory backend");
-  const Error NOT_ENOUGH_CONCURRENT_SPACE("{}: Failed to divide memory slot {} among {} devices");
-  const Error ALIGNED_ALLOC_NOT_SUPPORTED("Allocator does not support aligned allocations");
-  const Error PAGE_SIZE_UNSUPPORTED("Allocator does not support size: {}");
-  const Error OUT_OF_MEMORY("{}: could not allocate memory of size {}");
-  const Error INVALID_FREE("{}: could not free memory of size {}");
-  const Error DOUBLE_FREE("Freeing the same memory twice!");
-
-  const Error IPC_ARGS_NOT_SHM_COMPATIBLE("Args are not compatible with SHM");
-
-  const Error UNORDERED_MAP_CANT_FIND("Could not find key in unordered_map");
-}  // namespace hshm
-
-#endif
-
-#endif  // HERMES_ERRORS_H
diff --git a/hermes_shm/include/hermes_shm/util/formatter.h b/hermes_shm/include/hermes_shm/util/formatter.h
deleted file mode 100644
index e236279f7..000000000
--- a/hermes_shm/include/hermes_shm/util/formatter.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_ERROR_SERIALIZER_H
-#define HERMES_ERROR_SERIALIZER_H
-
-#include <memory>
-#include <vector>
-#include <list>
-#include <string>
-#include <type_traits>
-#include <cstring>
-#include <sstream>
-#include <hermes_shm/types/argpack.h>
-
-namespace hshm {
-
-class Formatter {
- public:
-  template<typename ...Args>
-  static std::string format(std::string fmt, Args&& ...args) {
-    std::stringstream ss;
-    std::vector<std::pair<size_t, size_t>> offsets = tokenize(fmt);
-    size_t packlen =
-      make_argpack(std::forward<Args>(args)...).Size();
-    if (offsets.size() != packlen + 1) {
-      return fmt;
-    }
-    auto lambda = [&ss, &fmt, &offsets](auto i, auto &&arg) {
-      if (i.Get() >= offsets.size()) { return; }
-      auto &sub = offsets[i.Get()];
-      ss << fmt.substr(sub.first, sub.second);
-      ss << arg;
-    };
-    ForwardIterateArgpack::Apply(
-      make_argpack(std::forward<Args>(args)...), lambda);
-    if (offsets.back().second > 0) {
-      auto &sub = offsets.back();
-      ss << fmt.substr(sub.first, sub.second);
-    }
-    return ss.str();
-  }
-
-  static std::vector<std::pair<size_t, size_t>>
-    tokenize(const std::string &fmt) {
-    std::vector<std::pair<size_t, size_t>> offsets;
-    size_t i = 0;
-    offsets.emplace_back(std::pair<size_t, size_t>(0, fmt.size()));
-    while (i < fmt.size()) {
-      if (fmt[i] == '{') {
-        // Set the size of the prior substring
-        // E.g., "hello{}there".
-        // prior.first is 0
-        // i = 5 for the '{'
-        // The substring's length is i - 0 = 5.
-        auto &prior = offsets.back();
-        prior.second = i - prior.first;
-
-        // The token after the closing '}'
-        // i = 5 for the '{'
-        // i = 7 for the 't'
-        // The total size is 12
-        // The remaining size is: 12 - 7 = 5 (length of "there").
-        i += 2;
-        offsets.emplace_back(std::pair<size_t, size_t>(i, fmt.size() - i));
-        continue;
-      }
-      ++i;
-    }
-    return offsets;
-  }
-};
-
-}  // namespace hshm
-
-#endif  //HERMES_ERROR_SERIALIZER_H
diff --git a/hermes_shm/include/hermes_shm/util/logging.h b/hermes_shm/include/hermes_shm/util/logging.h
deleted file mode 100644
index 8389558a7..000000000
--- a/hermes_shm/include/hermes_shm/util/logging.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_UTIL_LOGGING_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_UTIL_LOGGING_H_
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-
-#include <unistd.h>
-#include <climits>
-
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <filesystem>
-#include "formatter.h"
-#include "singleton.h"
-
-namespace hshm {
-
-/**
- * A macro to indicate the verbosity of the logger.
- * Verbosity indicates how much data will be printed.
- * The higher the verbosity, the more data will be printed.
- * */
-#ifndef HERMES_LOG_VERBOSITY
-#define HERMES_LOG_VERBOSITY 10
-#endif
-#if HERMES_LOG_VERBOSITY < 0
-#error "HERMES_LOG_VERBOSITY cannot be less than 0"
-#endif
-
-/** Prints log verbosity at compile time */
-#define XSTR(s) STR(s)
-#define STR(s) #s
-// #pragma message XSTR(HERMES_LOG_VERBOSITY)
-
-/** Simplify access to Logger singleton */
-#define HERMES_LOG hshm::EasySingleton<hshm::Logger>::GetInstance()
-
-/** Information Logging levels */
-#define kDebug 10  /**< Low-priority debugging information*/
-// ... may want to add more levels here
-#define kInfo 1    /**< Useful information the user should know */
-
-/** Error Logging Levels */
-#define kFatal 0   /**< A fatal error has occurred */
-#define kError 1   /**< A non-fatal error has occurred */
-#define kWarning 2   /**< Something might be wrong */
-
-/**
- * Hermes Print. Like printf, except types are inferred
- * */
-#define HIPRINT(...) \
-  HERMES_LOG->Print(__VA_ARGS__);
-
-/**
- * Hermes Info (HI) Log
- * LOG_LEVEL indicates the priority of the log.
- * LOG_LEVEL 0 is considered required
- * LOG_LEVEL 10 is considered debugging priority.
- * */
-#define HILOG(LOG_LEVEL, ...) \
-  if constexpr(LOG_LEVEL <= HERMES_LOG_VERBOSITY) { \
-    HERMES_LOG->InfoLog(LOG_LEVEL, __FILE__,        \
-    __func__, __LINE__, __VA_ARGS__); \
-  }
-
-/**
- * Hermes Error (HE) Log
- * LOG_LEVEL indicates the priority of the log.
- * LOG_LEVEL 0 is considered required
- * LOG_LEVEL 10 is considered debugging priority.
- * */
-#define HELOG(LOG_LEVEL, ...) \
-  if constexpr(LOG_LEVEL <= HERMES_LOG_VERBOSITY) { \
-    HERMES_LOG->ErrorLog(LOG_LEVEL, __FILE__,       \
-    __func__, __LINE__, __VA_ARGS__); \
-  }
-
-class Logger {
- public:
-  int verbosity_;
-  FILE *fout_;
-
- public:
-  Logger() {
-    // exe_name_ = std::filesystem::path(exe_path_).filename().string();
-    int verbosity = kDebug;
-    auto verbosity_env = getenv("HERMES_LOG_VERBOSITY");
-    if (verbosity_env && strlen(verbosity_env)) {
-      try {
-        verbosity = std::stoi(verbosity_env);
-      } catch (...) {
-        verbosity = kDebug;
-      }
-    }
-    SetVerbosity(verbosity);
-
-    auto env = getenv("HERMES_LOG_OUT");
-    if (env == nullptr) {
-      fout_ = nullptr;
-    } else {
-      fout_ = fopen(env, "w");
-    }
-  }
-
-  void SetVerbosity(int LOG_LEVEL) {
-    verbosity_ = LOG_LEVEL;
-    if (verbosity_ < 0) {
-      verbosity_ = 0;
-    }
-  }
-
-  template<typename ...Args>
-  void Print(const char *fmt,
-             Args&& ...args) {
-    std::string out =
-      hshm::Formatter::format(fmt, std::forward<Args>(args)...);
-    std::cout << out;
-    if (fout_) {
-      fwrite(out.data(), 1, out.size(), fout_);
-    }
-  }
-
-  template<typename ...Args>
-  void InfoLog(int LOG_LEVEL,
-               const char *path,
-               const char *func,
-               int line,
-               const char *fmt,
-               Args&& ...args) {
-    if (LOG_LEVEL > verbosity_) { return; }
-    std::string msg =
-      hshm::Formatter::format(fmt, std::forward<Args>(args)...);
-    int tid = GetTid();
-    std::string out = hshm::Formatter::format(
-      "{}:{} {} {} {}\n",
-      path, line, tid, func, msg);
-    std::cerr << out;
-    if (fout_) {
-      fwrite(out.data(), 1, out.size(), fout_);
-    }
-  }
-
-  template<typename ...Args>
-  void ErrorLog(int LOG_LEVEL,
-                const char *path,
-                const char *func,
-                int line,
-                const char *fmt,
-                Args&& ...args) {
-    if (LOG_LEVEL > verbosity_) { return; }
-    std::string level;
-    switch (LOG_LEVEL) {
-      case kWarning: {
-        level = "Warning";
-        break;
-      }
-      case kError: {
-        level = "ERROR";
-        break;
-      }
-      case kFatal: {
-        level = "FATAL";
-        break;
-      }
-      default: {
-        level = "WARNING";
-        break;
-      }
-    }
-
-    std::string msg =
-      hshm::Formatter::format(fmt, std::forward<Args>(args)...);
-    int tid = GetTid();
-    std::string out = hshm::Formatter::format(
-      "{}:{} {} {} {} {}\n",
-      path, line, level, tid, func, msg);
-    std::cerr << out;
-    if (fout_) {
-      fwrite(out.data(), 1, out.size(), fout_);
-    }
-    if (LOG_LEVEL == kFatal) {
-      exit(1);
-    }
-  }
-
-  int GetTid() {
-#ifdef SYS_gettid
-    return (pid_t)syscall(SYS_gettid);
-#else
-    #warning "GetTid is not defined"
-    return GetPid();
-#endif
-  }
-
-  int GetPid() {
-#ifdef SYS_getpid
-    return (pid_t)syscall(SYS_getpid);
-#else
-    #warning "GetPid is not defined"
-    return 0;
-#endif
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_UTIL_LOGGING_H_
diff --git a/hermes_shm/include/hermes_shm/util/partitioner.h b/hermes_shm/include/hermes_shm/util/partitioner.h
deleted file mode 100644
index 9919ef0d3..000000000
--- a/hermes_shm/include/hermes_shm/util/partitioner.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_PARTITIONER_H
-#define HERMES_PARTITIONER_H
-
-// Reference: https://stackoverflow.com/questions/63372288/getting-list-of-pids-from-proc-in-linux
-
-#include <vector>
-#include <dirent.h>
-#include <sys/sysinfo.h>
-#include <sched.h>
-#include <string>
-
-namespace hshm {
-
-class ProcessAffiner {
- private:
-  int n_cpu_;
-  cpu_set_t *cpus_;
-
- public:
-  ProcessAffiner() {
-    n_cpu_ = get_nprocs_conf();
-    cpus_ = new cpu_set_t[n_cpu_];
-    CPU_ZERO(cpus_);
-  }
-
-  ~ProcessAffiner() {
-    delete cpus_;
-  }
-
-  inline bool isdigit(char digit) {
-    return ('0' <= digit && digit <= '9');
-  }
-
-  inline int GetNumCPU() {
-    return n_cpu_;
-  }
-
-  inline void SetCpu(int cpu) {
-    CPU_SET(cpu, cpus_);
-  }
-
-  inline void SetCpus(int off, int len) {
-    for (int i = 0; i < len; ++i) {
-      SetCpu(off + i);
-    }
-  }
-
-  inline void ClearCpu(int cpu) {
-    CPU_CLR(cpu, cpus_);
-  }
-
-  inline void ClearCpus(int off, int len) {
-    for (int i = 0; i < len; ++i) {
-      ClearCpu(off + i);
-    }
-  }
-
-  inline void Clear() {
-    CPU_ZERO(cpus_);
-  }
-
-  int AffineAll(void) {
-    DIR *procdir;
-    struct dirent *entry;
-    size_t count = 0;
-
-    // Open /proc directory.
-    procdir = opendir("/proc");
-    if (!procdir) {
-      perror("opendir failed");
-      return 0;
-    }
-
-    // Iterate through all files and folders of /proc.
-    while ((entry = readdir(procdir))) {
-      // Skip anything that is not a PID folder.
-      if (!is_pid_folder(entry))
-        continue;
-      // Get the PID of the running process
-      int proc_pid = atoi(entry->d_name);
-      // Set the affinity of all running process to this mask
-      count += Affine(proc_pid);
-    }
-    closedir(procdir);
-    return count;
-  }
-  int Affine(std::vector<pid_t> &&pids) {
-    return Affine(pids);
-  }
-  int Affine(std::vector<pid_t> &pids) {
-    // Set the affinity of all running process to this mask
-    size_t count = 0;
-    for (pid_t &pid : pids) {
-      count += Affine(pid);
-    }
-    return count;
-  }
-  int Affine(int pid) {
-    return SetAffinitySafe(pid, n_cpu_, cpus_);
-  }
-
-  void PrintAffinity(int pid) {
-    PrintAffinity("", pid);
-  }
-  void PrintAffinity(std::string prefix, int pid) {
-    std::vector<cpu_set_t> cpus(n_cpu_);
-    sched_getaffinity(pid, n_cpu_, cpus.data());
-    PrintAffinity(prefix, pid, cpus.data());
-  }
-
-  void PrintAffinity(std::string prefix, int pid, cpu_set_t *cpus) {
-    std::string affinity = "";
-    for (int i = 0; i < n_cpu_; ++i) {
-      if (CPU_ISSET(i, cpus)) {
-        affinity += std::to_string(i) + ", ";
-      }
-    }
-    printf("%s: CPU affinity[pid=%d]: %s\n", prefix.c_str(),
-           pid, affinity.c_str());
-  }
-
- private:
-  int SetAffinitySafe(int pid, int n_cpu, cpu_set_t *cpus) {
-    int ret = sched_setaffinity(pid, n_cpu, cpus);
-    if (ret == -1) {
-      return 0;
-    }
-    return 1;
-  }
-
-  // Helper function to check if a struct dirent from /proc is a PID folder.
-  int is_pid_folder(const struct dirent *entry) {
-    const char *p;
-    for (p = entry->d_name; *p; p++) {
-      if (!isdigit(*p))
-        return false;
-    }
-    return true;
-  }
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_PARTITIONER_H
diff --git a/hermes_shm/include/hermes_shm/util/singleton.h b/hermes_shm/include/hermes_shm/util/singleton.h
deleted file mode 100644
index 7e9f79a09..000000000
--- a/hermes_shm/include/hermes_shm/util/singleton.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_SINGLETON_H
-#define HERMES_SHM_SINGLETON_H
-
-#include <memory>
-#include "hermes_shm/thread/lock/mutex.h"
-#include "hermes_shm/constants/macros.h"
-
-namespace hshm {
-
-/**
- * Makes a singleton. Constructs the first time GetInstance is called.
- * Requires user to define the static storage of obj_ in separate file.
- * @tparam T
- */
-template<typename T>
-class Singleton {
- private:
-  static T *obj_;
-  static hshm::Mutex *lock_;
-
- public:
-  Singleton() = default;
-
-  /** Get or create an instance of type T */
-  inline static T *GetInstance() {
-    if (!obj_) {
-      hshm::ScopedMutex lock(*lock_, 0);
-      if (obj_ == nullptr) {
-        obj_ = new T();
-      }
-    }
-    return obj_;
-  }
-
-  /** Static initialization method for obj */
-  static T *_GetObj();
-
-  /** Static initialization method for lock */
-  static hshm::Mutex *_GetLock();
-};
-template<typename T>
-T* Singleton<T>::obj_ = Singleton<T>::_GetObj();
-template<typename T>
-hshm::Mutex* Singleton<T>::lock_ = Singleton<T>::_GetLock();
-#define DEFINE_SINGLETON_CC(T)\
-  template<> T* hshm::Singleton<T>::_GetObj() {\
-    return nullptr;\
-  }\
-  template<> hshm::Mutex* hshm::Singleton<T>::_GetLock() {\
-    static hshm::Mutex lock;\
-    return &lock;\
-  }
-
-/**
- * Makes a singleton. Constructs during initialization of program.
- * Requires user to define the static storage of obj_ in separate file.
- * */
-template<typename T>
-class GlobalSingleton {
- public:
-  static T *obj_;
-
- public:
-  GlobalSingleton() = default;
-
-  /** Get instance of type T */
-  HSHM_ALWAYS_INLINE static T* GetInstance() {
-    return obj_;
-  }
-
-  /** Get ref of type T */
-  HSHM_ALWAYS_INLINE static T& GetRef() {
-    return *obj_;
-  }
-
-  /** Static initialization method for obj */
-  static T& _GetObj();
-};
-template<typename T>
-T* GlobalSingleton<T>::obj_ = &GlobalSingleton<T>::_GetObj();
-#define DEFINE_GLOBAL_SINGLETON_CC(T)\
-  template<> T& hshm::GlobalSingleton<T>::_GetObj() {\
-    static T obj; \
-    return obj;\
-  }
-
-/**
- * A class to represent singleton pattern
- * Does not require specific initialization of the static variable
- * */
-template<typename T>
-class EasySingleton {
- protected:
-  /** static instance. */
-  static T* obj_;
-  static hshm::Mutex lock_;
-
- public:
-  /**
-   * Uses unique pointer to build a static global instance of variable.
-   * @tparam T
-   * @return instance of T
-   */
-  template<typename ...Args>
-  static T* GetInstance(Args&& ...args) {
-    if (obj_ == nullptr) {
-      hshm::ScopedMutex lock(lock_, 0);
-      if (obj_ == nullptr) {
-        obj_ = new T(std::forward<Args>(args)...);
-      }
-    }
-    return obj_;
-  }
-};
-template <typename T>
-T* EasySingleton<T>::obj_ = nullptr;
-template <typename T>
-hshm::Mutex EasySingleton<T>::lock_ = hshm::Mutex();
-
-/**
- * Makes a singleton. Constructs during initialization of program.
- * Does not require specific initialization of the static variable.
- * */
-template<typename T>
-class EasyGlobalSingleton {
- private:
-  static T obj_;
- public:
-  EasyGlobalSingleton() = default;
-  static T* GetInstance() {
-    return &obj_;
-  }
-};
-template <typename T>
-T EasyGlobalSingleton<T>::obj_;
-
-}  // namespace hshm
-
-#endif  // HERMES_SHM_SINGLETON_H
diff --git a/hermes_shm/include/hermes_shm/util/timer.h b/hermes_shm/include/hermes_shm/util/timer.h
deleted file mode 100644
index 2dde003ae..000000000
--- a/hermes_shm/include/hermes_shm/util/timer.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TIMER_H
-#define HERMES_TIMER_H
-
-#include <chrono>
-#include <vector>
-#include <functional>
-
-namespace hshm {
-
-template<typename T>
-class TimerBase {
- private:
-  std::chrono::time_point<T> start_, end_;
-  double time_ns_;
-
- public:
-  TimerBase() : time_ns_(0) {}
-
-  void Resume() {
-    start_ = T::now();
-  }
-  double Pause() {
-    time_ns_ += GetNsecFromStart();
-    return time_ns_;
-  }
-  double Pause(double &dt) {
-    dt = GetNsecFromStart();
-    time_ns_ += dt;
-    return time_ns_;
-  }
-  void Reset() {
-    time_ns_ = 0;
-  }
-
-  double GetNsecFromStart() {
-    end_ = T::now();
-    double elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(
-        end_ - start_).count();
-    return elapsed;
-  }
-  double GetUsecFromStart() {
-    end_ = T::now();
-    return std::chrono::duration_cast<std::chrono::microseconds>(
-        end_ - start_).count();
-  }
-  double GetMsecFromStart() {
-    end_ = T::now();
-    return std::chrono::duration_cast<std::chrono::milliseconds>(
-        end_ - start_).count();
-  }
-  double GetSecFromStart() {
-    end_ = T::now();
-    return std::chrono::duration_cast<std::chrono::seconds>(
-        end_ - start_).count();
-  }
-
-  double GetNsec() const {
-    return time_ns_;
-  }
-  double GetUsec() const {
-    return time_ns_/1000;
-  }
-  double GetMsec() const {
-    return time_ns_/1000000;
-  }
-  double GetSec() const {
-    return time_ns_/1000000000;
-  }
-
-  double GetUsFromEpoch() const {
-    std::chrono::time_point<std::chrono::system_clock> point =
-        std::chrono::system_clock::now();
-    return std::chrono::duration_cast<std::chrono::microseconds>(
-        point.time_since_epoch()).count();
-  }
-};
-
-typedef TimerBase<std::chrono::high_resolution_clock> HighResCpuTimer;
-typedef TimerBase<std::chrono::steady_clock> HighResMonotonicTimer;
-typedef HighResMonotonicTimer Timer;
-
-}  // namespace hshm
-
-#endif  // HERMES_TIMER_H
diff --git a/hermes_shm/include/hermes_shm/util/type_switch.h b/hermes_shm/include/hermes_shm/util/type_switch.h
deleted file mode 100644
index 4a26f9033..000000000
--- a/hermes_shm/include/hermes_shm/util/type_switch.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_INCLUDE_HERMES_SHM_UTIL_STATIC_SWITCH_H_
-#define HERMES_SHM_INCLUDE_HERMES_SHM_UTIL_STATIC_SWITCH_H_
-
-#include  <functional>
-
-namespace hshm {
-
-/** Ends the recurrence of the switch-case */
-class EndTypeSwitch {};
-
-/**
- * A compile-time switch-case statement used for choosing
- * a type based on another type
- *
- * @param T the type being checked (i.e., switch (T)
- * @param Default the default case
- * @param Case a case of the switch (i.e., case Case:)
- * @param Val the body of the case
- * */
-template<typename T, typename Default,
-  typename Case = EndTypeSwitch,
-  typename Val = EndTypeSwitch,
-  typename ...Args>
-struct type_switch {
-  typedef typename std::conditional<
-    std::is_same_v<T, Case>,
-    Val,
-    typename type_switch<T, Default, Args...>::type>::type type;
-};
-
-/** The default case */
-template<typename T, typename Default>
-struct type_switch<T, Default, EndTypeSwitch, EndTypeSwitch> {
-  typedef Default type;
-};
-
-}  // namespace hshm
-
-#endif  // HERMES_SHM_INCLUDE_HERMES_SHM_UTIL_STATIC_SWITCH_H_
diff --git a/hermes_shm/readme.md b/hermes_shm/readme.md
deleted file mode 100644
index a16457d5c..000000000
--- a/hermes_shm/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# hermes_shmn
-
-This library contains a variety of data structures and synchronization
-primitives which are compatible with shared memory.
diff --git a/hermes_shm/scripts/ci/install_deps.sh b/hermes_shm/scripts/ci/install_deps.sh
deleted file mode 100644
index cd341562e..000000000
--- a/hermes_shm/scripts/ci/install_deps.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# CD into git workspace
-cd ${GITHUB_WORKSPACE}
-
-# This script will build and install them via Spack from source
-# because Hermes requires a very specific version and configuration options
-# for each package.
-
-set -x
-set -e
-set -o pipefail
-
-# Change this especially when your $HOME doesn't have enough disk space. 
-INSTALL_DIR="${HOME}"
-SPACK_DIR=${INSTALL_DIR}/spack
-SPACK_VERSION=0.18.1
-
-echo "Installing dependencies at ${INSTALL_DIR}"
-mkdir -p ${INSTALL_DIR}
-
-# Load Spack
-git clone https://github.com/spack/spack ${SPACK_DIR}
-cd ${SPACK_DIR}
-git checkout v${SPACK_VERSION}
-
-# Set spack env
-set +x
-. ${SPACK_DIR}/share/spack/setup-env.sh
-set -x
-
-# This will allow Spack to skip building some packages that are directly
-# available from the system. For example, autoconf, cmake, m4, etc.
-# Modify ci/pckages.yaml to skip building compilers or build tools via Spack.
-cd ${GITHUB_WORKSPACE}
-cp scripts/ci/packages.yaml ${SPACK_DIR}/etc/spack/packages.yaml
-
-# Install hermes_shm (needed for dependencies)
-spack repo add scripts/hermes_shm
-spack install hermes_shm
diff --git a/hermes_shm/scripts/ci/install_docs.sh b/hermes_shm/scripts/ci/install_docs.sh
deleted file mode 100755
index 63f912bd8..000000000
--- a/hermes_shm/scripts/ci/install_docs.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# CD into git workspace
-cd ${GITHUB_WORKSPACE}
-
-# Make build directory
-mkdir build
-cd build
-
-INSTALL_PREFIX="${HOME}"
-
-export CXXFLAGS="${CXXFLAGS} -std=c++17 -Werror -Wall -Wextra"
-cmake                                                      \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}               \
-    -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX}                  \
-    -DCMAKE_BUILD_RPATH=${INSTALL_PREFIX}/lib              \
-    -DCMAKE_INSTALL_RPATH=${INSTALL_PREFIX}/lib            \
-    -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                       \
-    -DBUILD_SHARED_LIBS=ON                                 \
-    -DHERMES_ENABLE_DOXYGEN=ON                             \
-    -DHERMES_ENABLE_COVERAGE=ON                            \
-    ..
-make dox >& out.txt
-# cat out.txt | grep warning | grep -v "ignoring unsupported tag"
-rec="$( grep warning build/out.txt | grep -v "ignoring unsupported tag" |  wc -l )"
-echo "$rec"
-exit "$rec"
diff --git a/hermes_shm/scripts/ci/install_hshm.sh b/hermes_shm/scripts/ci/install_hshm.sh
deleted file mode 100755
index 33191e5f6..000000000
--- a/hermes_shm/scripts/ci/install_hshm.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# CD into git workspace
-cd ${GITHUB_WORKSPACE}
-
-set -x
-set -e
-set -o pipefail
-
-# Set spack env
-INSTALL_DIR="${HOME}"
-SPACK_DIR=${INSTALL_DIR}/spack
-. ${SPACK_DIR}/share/spack/setup-env.sh
-
-mkdir -p "${HOME}/install"
-mkdir build
-cd build
-spack load --only dependencies hermes_shm
-cmake ../ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${HOME}/install
-cmake --build . -- -j4
-
-export CXXFLAGS=-Wall
-ctest -VV
diff --git a/hermes_shm/scripts/ci/packages.yaml b/hermes_shm/scripts/ci/packages.yaml
deleted file mode 100644
index 7be206aad..000000000
--- a/hermes_shm/scripts/ci/packages.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-packages:
-  all:
-    target: [x86_64]
-  mpich:
-    externals:
-    - spec: mpich@3.3.2
-      prefix: /usr
-    buildable: False
-  cmake:
-    externals:
-    - spec: cmake@3.23.2
-      prefix: /usr/local
-    buildable: False
-  autoconf:
-    externals:
-    - spec: autoconf@2.69
-      prefix: /usr
-    buildable: False
-  automake:
-    externals:
-    - spec: automake@1.16
-      prefix: /usr
-    buildable: False
-  libtool:
-    externals:
-    - spec: libtool@2.4.6
-      prefix: /usr
-    buildable: False
-  m4:
-    externals:
-    - spec: m4@1.4.18
-      prefix: /usr
-    buildable: False
-  pkg-config:
-    externals:
-    - spec: pkg-config@0.29.1
-      prefix: /usr
-    buildable: False
diff --git a/hermes_shm/scripts/hermes_shm/repo.yaml b/hermes_shm/scripts/hermes_shm/repo.yaml
deleted file mode 100644
index f38c31d94..000000000
--- a/hermes_shm/scripts/hermes_shm/repo.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-repo:
-  namespace: 'hermes_shm'
diff --git a/hermes_shm/scripts/lint.sh b/hermes_shm/scripts/lint.sh
deleted file mode 100644
index ff11eda53..000000000
--- a/hermes_shm/scripts/lint.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-HERMES_ROOT=$1
-
-cpplint --recursive \
---exclude="${HERMES_ROOT}/include/hermes_shm/constants/singleton_macros.h" \
---exclude="${HERMES_ROOT}/include/hermes_shm/constants/data_structure_singleton_macros.h" \
---exclude="${HERMES_ROOT}/include/hermes_shm/data_structures/ipc/internal/template" \
---exclude="${HERMES_ROOT}/include/hermes_shm/data_structures/ipc/internal/shm_container_macro.h" \
---exclude="${HERMES_ROOT}/src/singleton.cc" \
---exclude="${HERMES_ROOT}/src/data_structure_singleton.cc" \
---exclude="${HERMES_ROOT}/include/hermes_shm/util/formatter.h" \
---exclude="${HERMES_ROOT}/include/hermes_shm/util/errors.h" \
-"${HERMES_ROOT}/src" "${HERMES_ROOT}/include" "${HERMES_ROOT}/test"
\ No newline at end of file
diff --git a/hermes_shm/scripts/preamble.py b/hermes_shm/scripts/preamble.py
deleted file mode 100644
index f4906b8ab..000000000
--- a/hermes_shm/scripts/preamble.py
+++ /dev/null
@@ -1,93 +0,0 @@
-"""
-Prepends the preabmle to all files in the repo
-
-USAGE:
-    python3 scripts/preamble.py ${HERMES_ROOT}
-"""
-
-import sys,os,re
-import pathlib
-
-hermes_preamble = """
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-""".strip()
-
-preamble2 = """
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-""".strip()
-
-labstor_preamble = """
-/*
- * Copyright (C) 2022  SCS Lab <scslab@iit.edu>,
- * Luke Logan <llogan@hawk.iit.edu>,
- * Jaime Cernuda Garcia <jcernudagarcia@hawk.iit.edu>
- * Jay Lofstead <gflofst@sandia.gov>,
- * Anthony Kougkas <akougkas@iit.edu>,
- * Xian-He Sun <sun@iit.edu>
- *
- * This file is part of HermesShm
- *
- * HermesShm is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-""".strip()
-
-def PrependPreamble(path):
-    text = ""
-    with open(path, 'r') as fp:
-        text = fp.read()
-        text = text.replace(hermes_preamble, "")
-        text = text.replace(preamble2, "")
-        text = text.replace(labstor_preamble, "")
-        text = re.sub("//\n// Created by [^\n]*\n//\n", "", text)
-        text = text.strip()
-        text = hermes_preamble + "\n\n" + text + "\n"
-
-    with open(path, 'w') as fp:
-        fp.write(text)
-
-
-def LocateCppFiles(root):
-    for entry in os.listdir(root):
-        full_path = os.path.join(root, entry)
-        if os.path.isdir(full_path):
-            LocateCppFiles(full_path)
-        elif os.path.isfile(full_path):
-            file_ext = pathlib.Path(full_path).suffix
-            if file_ext == '.cc' or file_ext == '.h':
-                PrependPreamble(full_path)
-
-
-PROJECT_ROOT=pathlib.Path(__file__).parent.parent.resolve()
-LocateCppFiles(PROJECT_ROOT)
\ No newline at end of file
diff --git a/hermes_shm/scripts/singleton_generator.py b/hermes_shm/scripts/singleton_generator.py
deleted file mode 100644
index b0da22b0b..000000000
--- a/hermes_shm/scripts/singleton_generator.py
+++ /dev/null
@@ -1,98 +0,0 @@
-
-"""
-Create the .h and .cc files for defining hermes singletons
-USAGE:
-    cd /path/to/hermes
-    python3 scripts/singleton_generator.py
-"""
-
-import re
-
-def ToCamelCase(string):
-    if string is None:
-        return
-    words = re.sub(r"(_|-)+", " ", string).split()
-    words = [word.capitalize() for word in words]
-    return "".join(words)
-
-def ToSnakeCase(string):
-    if string is None:
-        return
-    string = re.sub('(\.|-)+', '_', string)
-    words = re.split('([A-Z][^A-Z]*)', string)
-    words = [word for word in words if len(word)]
-    string = "_".join(words)
-    return string.lower()
-
-class SingletonDefinition:
-    def __init__(self, namespace, class_name, include):
-        snake = ToSnakeCase(class_name).upper()
-        self.macro_name = f"HERMES_{snake}"
-        self.type_name = f"{self.macro_name}_T"
-        if namespace is not None:
-            self.class_name = f"{namespace}::{class_name}"
-        else:
-            self.class_name = class_name
-        self.include = include
-
-class SingletonGenerator:
-    def __init__(self):
-        self.defs = []
-
-    def Add(self, namespace, class_name, include):
-        self.defs.append(SingletonDefinition(
-            namespace, class_name, include
-        ))
-
-    def Generate(self, cc_file, h_file):
-        self._GenerateCC(cc_file, h_file)
-        self._GenerateH(h_file)
-
-    def _GenerateCC(self, path, h_file):
-        lines = []
-        lines.append("#include <hermes_shm/constants/macros.h>")
-        lines.append("#include <hermes_shm/util/singleton.h>")
-        lines.append("#include <hermes_shm/thread/lock/mutex.h>")
-        lines.append(f"#include <{h_file.replace('include/', '')}>")
-        lines.append("")
-        for defn in self.defs:
-            lines.append(f"#include <{defn.include}>")
-            lines.append(f"template<> {defn.class_name} hshm::GlobalSingleton<{defn.class_name}>::obj_ = {defn.class_name}();")
-            #lines.append(f"template<> hshm::Mutex hshm::GlobalSingleton<{defn.class_name}>::lock_ = hshm::Mutex();")
-        self._SaveLines(lines, path)
-
-    def _GenerateH(self, path):
-        lines = []
-        guard = ToSnakeCase(path).replace('/', '_')
-        lines.append(f"#ifndef HERMES_{guard.upper()}_H")
-        lines.append(f"#define HERMES_{guard.upper()}_H")
-        lines.append("")
-        lines.append("#include <hermes_shm/util/singleton.h>")
-        lines.append("")
-        for defn in self.defs:
-            lines.append(f"#define {defn.macro_name} hshm::GlobalSingleton<{defn.class_name}>::GetInstance()")
-            lines.append(f"#define {defn.type_name} {defn.class_name}*")
-            lines.append("")
-        lines.append(f"#endif  // {guard}")
-        self._SaveLines(lines, path)
-
-    def _SaveLines(self, lines, path):
-        text = "\n".join(lines) + "\n"
-        if path is None:
-            print(text)
-            return
-        with open(path, 'w') as fp:
-            fp.write(text)
-
-gen = SingletonGenerator()
-gen.Add("hermes", "IpcManager", "hermes_shm/ipc_manager/ipc_manager.h")
-gen.Add("hermes", "ConfigurationManager", "hermes_shm/runtime/configuration_manager.h")
-gen.Generate("src/singleton.cc",
-             "include/hermes_shm/constants/singleton_macros.h")
-
-gen = SingletonGenerator()
-gen.Add("hermes", "SystemInfo", "hermes_shm/introspect/system_info.h")
-gen.Add("hshm::ipc", "MemoryManager", "hermes_shm/memory/memory_manager.h")
-gen.Add("hermes", "ThreadManager", "hermes_shm/thread/thread_manager.h")
-gen.Generate("src/data_structure_singleton.cc",
-             "include/hermes_shm/constants/data_structure_singleton_macros.h")
\ No newline at end of file
diff --git a/hermes_shm/src/data_structure_singleton.cc b/hermes_shm/src/data_structure_singleton.cc
deleted file mode 100644
index b923b28d1..000000000
--- a/hermes_shm/src/data_structure_singleton.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <hermes_shm/constants/macros.h>
-#include <hermes_shm/util/singleton.h>
-#include <hermes_shm/thread/lock/mutex.h>
-#include <hermes_shm/constants/data_structure_singleton_macros.h>
-
-#include <hermes_shm/introspect/system_info.h>
-DEFINE_GLOBAL_SINGLETON_CC(hshm::SystemInfo)
-#include <hermes_shm/memory/memory_registry.h>
-DEFINE_GLOBAL_SINGLETON_CC(hshm::ipc::MemoryRegistry)
-#include <hermes_shm/memory/memory_manager.h>
-DEFINE_GLOBAL_SINGLETON_CC(hshm::ipc::MemoryManager)
-#include <hermes_shm/thread/thread_model_manager.h>
-DEFINE_GLOBAL_SINGLETON_CC(hshm::ThreadModelManager)
diff --git a/hermes_shm/src/memory/malloc_allocator.cc b/hermes_shm/src/memory/malloc_allocator.cc
deleted file mode 100644
index a5f579011..000000000
--- a/hermes_shm/src/memory/malloc_allocator.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include <hermes_shm/memory/allocator/malloc_allocator.h>
-
-namespace hshm::ipc {
-
-struct MallocPage {
-  size_t page_size_;
-};
-
-void MallocAllocator::shm_init(allocator_id_t id,
-                               size_t custom_header_size,
-                               char *buffer,
-                               size_t buffer_size) {
-  buffer_ = buffer;
-  buffer_size_ = buffer_size;
-  header_ = reinterpret_cast<MallocAllocatorHeader*>(
-    malloc(sizeof(MallocAllocatorHeader) + custom_header_size));
-  custom_header_ = reinterpret_cast<char*>(header_ + 1);
-  header_->Configure(id, custom_header_size);
-}
-
-void MallocAllocator::shm_deserialize(char *buffer,
-                                      size_t buffer_size) {
-  throw NOT_IMPLEMENTED.format("MallocAllocator::shm_deserialize");
-}
-
-size_t MallocAllocator::GetCurrentlyAllocatedSize() {
-  return header_->total_alloc_size_;
-}
-
-OffsetPointer MallocAllocator::AllocateOffset(size_t size) {
-  auto page = reinterpret_cast<MallocPage*>(
-    malloc(sizeof(MallocPage) + size));
-  page->page_size_ = size;
-  header_->total_alloc_size_ += size;
-  return OffsetPointer(size_t(page + 1));
-}
-
-OffsetPointer MallocAllocator::AlignedAllocateOffset(size_t size,
-                                                     size_t alignment) {
-  auto page = reinterpret_cast<MallocPage*>(
-    aligned_alloc(alignment, sizeof(MallocPage) + size));
-  page->page_size_ = size;
-  header_->total_alloc_size_ += size;
-  return OffsetPointer(size_t(page + 1));
-}
-
-OffsetPointer MallocAllocator::ReallocateOffsetNoNullCheck(OffsetPointer p,
-                                                           size_t new_size) {
-  // Get the input page
-  auto page = reinterpret_cast<MallocPage*>(
-    p.off_.load() - sizeof(MallocPage));
-  header_->total_alloc_size_ += new_size - page->page_size_;
-
-  // Reallocate the input page
-  auto new_page = reinterpret_cast<MallocPage*>(
-    realloc(page, sizeof(MallocPage) + new_size));
-  new_page->page_size_ = new_size;
-
-  // Create the pointer
-  return OffsetPointer(size_t(new_page + 1));
-}
-
-void MallocAllocator::FreeOffsetNoNullCheck(OffsetPointer p) {
-  auto page = reinterpret_cast<MallocPage*>(
-    p.off_.load() - sizeof(MallocPage));
-  header_->total_alloc_size_ -= page->page_size_;
-  free(page);
-}
-
-}  // namespace hshm::ipc
diff --git a/hermes_shm/src/memory/memory_intercept.cc b/hermes_shm/src/memory/memory_intercept.cc
deleted file mode 100644
index 8407f1382..000000000
--- a/hermes_shm/src/memory/memory_intercept.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <malloc.h>
-#include <stdlib.h>
-#include "hermes_shm/memory/memory_manager.h"
-
-using hshm::ipc::Pointer;
-using hshm::ipc::Allocator;
-
-/** Allocate SIZE bytes of memory. */
-void* malloc(size_t size) {
-  auto alloc = HERMES_MEMORY_MANAGER->GetDefaultAllocator();
-  return alloc->AllocatePtr<void>(size);
-}
-
-/** Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */
-void* calloc(size_t nmemb, size_t size) {
-  auto alloc = HERMES_MEMORY_MANAGER->GetDefaultAllocator();
-  return alloc->ClearAllocatePtr<void>(nmemb * size);
-}
-
-/**
- * Re-allocate the previously allocated block in ptr, making the new
- * block SIZE bytes long.
- * */
-void* realloc(void *ptr, size_t size) {
-  Pointer p = HERMES_MEMORY_MANAGER->Convert(ptr);
-  auto alloc = HERMES_MEMORY_MANAGER->GetAllocator(p.allocator_id_);
-  return alloc->AllocatePtr<void>(size);
-}
-
-/**
- * Re-allocate the previously allocated block in PTR, making the new
- * block large enough for NMEMB elements of SIZE bytes each.
- * */
-void* reallocarray(void *ptr, size_t nmemb, size_t size) {
-  return realloc(ptr, nmemb * size);
-}
-
-/** Free a block allocated by `malloc', `realloc' or `calloc'. */
-void free(void *ptr) {
-  Pointer p = HERMES_MEMORY_MANAGER->Convert(ptr);
-  auto alloc = HERMES_MEMORY_MANAGER->GetAllocator(p.allocator_id_);
-  alloc->Free(p);
-}
-
-/** Allocate SIZE bytes allocated to ALIGNMENT bytes. */
-void* memalign(size_t alignment, size_t size) {
-  // TODO(llogan): need to add an aligned allocator
-  return malloc(size);
-}
-
-/** Allocate SIZE bytes on a page boundary. */
-void* valloc(size_t size) {
-  return memalign(HERMES_SYSTEM_INFO->page_size_, size);
-}
-
-/**
- * Equivalent to valloc(minimum-page-that-holds(n)),
- * that is, round up size to nearest pagesize.
- * */
-void* pvalloc(size_t size) {
-  size_t new_size = hshm::ipc::NextPageSizeMultiple(size);
-  return valloc(new_size);
-}
-
-/**
- * Allocates size bytes and places the address of the
- * allocated memory in *memptr. The address of the allocated memory
- * will be a multiple of alignment, which must be a power of two and a multiple
- * of sizeof(void*). Returns NULL if size is 0. */
-int posix_memalign(void **memptr, size_t alignment, size_t size) {
-  (*memptr) = memalign(alignment, size);
-  return 0;
-}
-
-/**
- * Aligned to an alignment with a size that is a multiple of the
- * alignment
- * */
-void *aligned_alloc(size_t alignment, size_t size) {
-  return memalign(alignment,
-                  hshm::ipc::NextAlignmentMultiple(alignment, size));
-}
diff --git a/hermes_shm/src/memory/memory_intercept.h b/hermes_shm/src/memory/memory_intercept.h
deleted file mode 100644
index ce3989570..000000000
--- a/hermes_shm/src/memory/memory_intercept.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_MEMORY_MEMORY_INTERCEPT_H_
-#define HERMES_SRC_MEMORY_MEMORY_INTERCEPT_H_
-
-#endif  // HERMES_SRC_MEMORY_MEMORY_INTERCEPT_H_
diff --git a/hermes_shm/src/memory/memory_registry.cc b/hermes_shm/src/memory/memory_registry.cc
deleted file mode 100644
index 89f79cf54..000000000
--- a/hermes_shm/src/memory/memory_registry.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes_shm/memory/memory_registry.h"
-
-namespace hshm::ipc {
-
-MemoryRegistry::MemoryRegistry() {
-  root_allocator_id_.bits_.major_ = 3;
-  root_allocator_id_.bits_.minor_ = 3;
-  root_backend_.shm_init(MEGABYTES(128));
-  root_backend_.Own();
-  root_allocator_.shm_init(root_allocator_id_, 0,
-                           root_backend_.data_,
-                           root_backend_.data_size_);
-  default_allocator_ = &root_allocator_;
-  RegisterAllocator(&root_allocator_);
-}
-
-}  // namespace hshm::ipc
diff --git a/hermes_shm/src/memory/scalable_page_allocator.cc b/hermes_shm/src/memory/scalable_page_allocator.cc
deleted file mode 100644
index e5971781e..000000000
--- a/hermes_shm/src/memory/scalable_page_allocator.cc
+++ /dev/null
@@ -1,295 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include <hermes_shm/memory/allocator/scalable_page_allocator.h>
-#include <hermes_shm/memory/allocator/mp_page.h>
-
-namespace hshm::ipc {
-
-void ScalablePageAllocator::shm_init(allocator_id_t id,
-                                     size_t custom_header_size,
-                                     char *buffer,
-                                     size_t buffer_size,
-                                     RealNumber coalesce_trigger,
-                                     size_t coalesce_window) {
-  buffer_ = buffer;
-  buffer_size_ = buffer_size;
-  header_ = reinterpret_cast<ScalablePageAllocatorHeader*>(buffer_);
-  custom_header_ = reinterpret_cast<char*>(header_ + 1);
-  size_t region_off = (custom_header_ - buffer_) + custom_header_size;
-  size_t region_size = buffer_size_ - region_off;
-  allocator_id_t sub_id(id.bits_.major_, id.bits_.minor_ + 1);
-  alloc_.shm_init(sub_id, 0, buffer + region_off, region_size);
-  HERMES_MEMORY_REGISTRY_REF.RegisterAllocator(&alloc_);
-  header_->Configure(id, custom_header_size, &alloc_,
-                     buffer_size, coalesce_trigger, coalesce_window);
-  free_lists_ = header_->free_lists_.get();
-  // Cache every power-of-two between 32B and 16KB
-  size_t ncpu = HERMES_SYSTEM_INFO->ncpu_;
-  free_lists_->resize(ncpu * num_free_lists_);
-  for (int i = 0; i < HERMES_SYSTEM_INFO->ncpu_; ++i) {
-    for (size_t j = 0; j < num_free_lists_; ++j) {
-      pair<FreeListStats, iqueue<MpPage>>&
-        free_list = (*free_lists_)[i * num_free_lists_ + j];
-      free_list.GetFirst().page_size_ = sizeof(MpPage) +
-        min_cached_size_ * (1 << j);
-      free_list.GetFirst().lock_.Init();
-      free_list.GetFirst().cur_alloc_ = 0;
-      free_list.GetFirst().max_alloc_ =
-        max_cached_size_ / free_list.GetFirst().page_size_;
-      if (free_list.GetFirst().max_alloc_ > 16) {
-        free_list.GetFirst().max_alloc_ = 16;
-      }
-    }
-  }
-}
-
-void ScalablePageAllocator::shm_deserialize(char *buffer,
-                                            size_t buffer_size) {
-  buffer_ = buffer;
-  buffer_size_ = buffer_size;
-  header_ = reinterpret_cast<ScalablePageAllocatorHeader*>(buffer_);
-  custom_header_ = reinterpret_cast<char*>(header_ + 1);
-  size_t region_off = (custom_header_ - buffer_) + header_->custom_header_size_;
-  size_t region_size = buffer_size_ - region_off;
-  alloc_.shm_deserialize(buffer + region_off, region_size);
-  HERMES_MEMORY_REGISTRY_REF.RegisterAllocator(&alloc_);
-  free_lists_ = header_->free_lists_.get();
-}
-
-size_t ScalablePageAllocator::GetCurrentlyAllocatedSize() {
-  return header_->total_alloc_;
-}
-
-/** Round a number up to the nearest page size. */
-size_t ScalablePageAllocator::RoundUp(size_t num, size_t &exp) {
-  size_t round;
-  for (exp = 0; exp < num_caches_; ++exp) {
-    round = 1 << (exp + min_cached_size_exp_);
-    round += sizeof(MpPage);
-    if (num <= round) {
-      return round;
-    }
-  }
-  return num;
-}
-
-OffsetPointer ScalablePageAllocator::AllocateOffset(size_t size) {
-  MpPage *page = nullptr;
-  size_t exp;
-  size_t size_mp = RoundUp(size + sizeof(MpPage), exp);
-  uint32_t cpu = NodeThreadId().hash() % HERMES_SYSTEM_INFO->ncpu_;
-
-  // Case 1: Can we re-use an existing page?
-  page = CheckLocalCaches(size_mp, cpu);
-
-  // Case 2: Coalesce if enough space is being wasted
-  // if (page == nullptr) {}
-
-  // Case 3: Allocate from stack if no page found
-  if (page == nullptr) {
-    auto off = alloc_.AllocateOffset(size_mp);
-    if (!off.IsNull()) {
-      page = alloc_.Convert<MpPage>(off - sizeof(MpPage));
-      page->page_size_ = size_mp;
-    }
-  }
-
-  // Case 4: Completely out of memory
-  if (page == nullptr) {
-    throw OUT_OF_MEMORY;
-  }
-
-  // Mark as allocated
-  header_->total_alloc_.fetch_add(page->page_size_);
-  auto p = Convert<MpPage, OffsetPointer>(page);
-  page->SetAllocated();
-  page->cpu_ = cpu;
-  return p + sizeof(MpPage);
-}
-
-MpPage *ScalablePageAllocator::CheckLocalCaches(size_t size_mp, uint32_t cpu) {
-  MpPage *page;
-  // ScopedRwReadLock coalesce_lock(header_->coalesce_lock_, 0);
-  uint32_t cpu_start = cpu * num_free_lists_;
-  pair<FreeListStats, iqueue<MpPage>> &first_free_list =
-    (*free_lists_)[cpu_start];
-  ScopedMutex first_list_lock(first_free_list.GetFirst().lock_, 0);
-
-  // Check the small buffer caches
-  if (size_mp <= max_cached_size_) {
-    size_t exp;
-    // Check the nearest buffer cache
-    size_mp = RoundUp(size_mp, exp);
-    pair<FreeListStats, iqueue<MpPage>> &free_list =
-      (*free_lists_)[cpu_start + exp];
-    if (free_list.GetSecond().size()) {
-      MpPage *rem_page;
-      page = free_list.GetSecond().dequeue();
-      DividePage(free_list.GetFirst(),
-                 free_list.GetSecond(),
-                 page, rem_page, size_mp,
-                 16);
-      return page;
-    } else {
-      return nullptr;
-    }
-
-    // Check all upper buffer caches
-    /* for (size_t i = exp + 1; i < num_caches_; ++i) {
-      pair<FreeListStats, iqueue<MpPage>> &high_free_list =
-        (*free_lists_)[cpu_start + i];
-      if (high_free_list.GetSecond().size()) {
-        MpPage *rem_page;
-        page = high_free_list.GetSecond().dequeue();
-        DividePage(free_list.GetFirst(),
-                   free_list.GetSecond(),
-                   page, rem_page, size_mp,
-                   16);
-        if (rem_page) {
-          pair<FreeListStats, iqueue<MpPage>> &last_free_list =
-            (*free_lists_)[cpu_start + num_caches_];
-          last_free_list.GetSecond().enqueue(rem_page);
-        }
-        return page;
-      }
-    } */
-  } else {
-    // Check the arbitrary buffer cache
-    pair<FreeListStats, iqueue<MpPage>> &last_free_list =
-      (*free_lists_)[cpu_start + num_caches_];
-    page = FindFirstFit(size_mp,
-                        last_free_list.GetFirst(),
-                        last_free_list.GetSecond());
-    return page;
-  }
-}
-
-MpPage* ScalablePageAllocator::FindFirstFit(
-  size_t size_mp,
-  FreeListStats &stats,
-  iqueue<MpPage> &free_list) {
-  for (auto iter = free_list.begin(); iter != free_list.end(); ++iter) {
-    MpPage *fit_page = *iter;
-    MpPage *rem_page;
-    if (fit_page->page_size_ >= size_mp) {
-      DividePage(stats, free_list, fit_page, rem_page, size_mp, 0);
-      free_list.dequeue(iter);
-      if (rem_page) {
-        free_list.enqueue(rem_page);
-      }
-      return fit_page;
-    }
-  }
-  return nullptr;
-}
-
-void ScalablePageAllocator::DividePage(FreeListStats &stats,
-                                       iqueue<MpPage> &free_list,
-                                       MpPage *fit_page,
-                                       MpPage *&rem_page,
-                                       size_t size_mp,
-                                       size_t max_divide) {
-  // Get space remaining after size_mp is allocated
-  size_t rem_size;
-  rem_size = fit_page->page_size_ - size_mp;
-  stats.AddAlloc();
-
-  // Case 1: The remaining size can't be cached
-  rem_page = nullptr;
-  if (rem_size < min_cached_size_) {
-    return;
-  }
-
-  // Case 2: Divide the remaining space into units of size_mp
-  fit_page->page_size_ = size_mp;
-  rem_page = (MpPage *) ((char *) fit_page + size_mp);
-  if (max_divide > 0 && rem_size >= size_mp) {
-    size_t num_divisions = (rem_size - size_mp) / size_mp;
-    if (num_divisions > max_divide) { num_divisions = max_divide; }
-    for (size_t i = 0; i < num_divisions; ++i) {
-      rem_page->page_size_ = size_mp;
-      rem_page->flags_ = 0;
-      rem_page->off_ = 0;
-      stats.AddAlloc();
-      free_list.enqueue(rem_page);
-      rem_page = (MpPage *) ((char *) rem_page + size_mp);
-      rem_size -= size_mp;
-    }
-  }
-
-  // Case 3: There is still remaining space after the divisions
-  if (rem_size > 0) {
-    rem_page->page_size_ = rem_size;
-    rem_page->flags_ = 0;
-    rem_page->off_ = 0;
-  } else {
-    rem_page = nullptr;
-  }
-}
-
-OffsetPointer ScalablePageAllocator::AlignedAllocateOffset(size_t size,
-                                                           size_t alignment) {
-  throw ALIGNED_ALLOC_NOT_SUPPORTED.format();
-}
-
-OffsetPointer ScalablePageAllocator::ReallocateOffsetNoNullCheck(
-  OffsetPointer p, size_t new_size) {
-  OffsetPointer new_p;
-  void *ptr = AllocatePtr<void*, OffsetPointer>(new_size, new_p);
-  MpPage *hdr = Convert<MpPage>(p - sizeof(MpPage));
-  void *old = (void*)(hdr + 1);
-  memcpy(ptr, old, hdr->page_size_ - sizeof(MpPage));
-  FreeOffsetNoNullCheck(p);
-  return new_p;
-}
-
-void ScalablePageAllocator::FreeOffsetNoNullCheck(OffsetPointer p) {
-  // Mark as free
-  auto hdr_offset = p - sizeof(MpPage);
-  auto hdr = Convert<MpPage>(hdr_offset);
-  if (!hdr->IsAllocated()) {
-    throw DOUBLE_FREE.format();
-  }
-  hdr->UnsetAllocated();
-  header_->total_alloc_.fetch_sub(hdr->page_size_);
-
-  // Get the free list to start from
-  uint32_t cpu = NodeThreadId().hash() % HERMES_SYSTEM_INFO->ncpu_;
-  // hdr->cpu_;
-  // NodeThreadId().hash() % HERMES_SYSTEM_INFO->ncpu_;
-  uint32_t cpu_start = cpu * num_free_lists_;
-  pair<FreeListStats, iqueue<MpPage>> &first_free_list =
-    (*free_lists_)[cpu_start];
-  ScopedMutex first_list_lock(first_free_list.GetFirst().lock_, 0);
-
-  // Append to small buffer cache free list
-  if (hdr->page_size_ <= max_cached_size_) {
-    for (size_t i = 0; i < num_caches_; ++i) {
-      pair<FreeListStats, iqueue<MpPage>> &free_list =
-        (*free_lists_)[cpu_start + i];
-      size_t page_size = free_list.GetFirst().page_size_;
-      if (page_size == hdr->page_size_) {
-        free_list.GetSecond().enqueue(hdr);
-        return;
-      }
-    }
-  }
-
-  // Append to arbitrary free list
-  pair<FreeListStats, iqueue<MpPage>> &last_free_list =
-    (*free_lists_)[cpu_start + num_caches_];
-  last_free_list.GetSecond().enqueue(hdr);
-}
-
-}  // namespace hshm::ipc
diff --git a/hermes_shm/src/memory/stack_allocator.cc b/hermes_shm/src/memory/stack_allocator.cc
deleted file mode 100644
index 8a703e8c7..000000000
--- a/hermes_shm/src/memory/stack_allocator.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include <hermes_shm/memory/allocator/stack_allocator.h>
-#include <hermes_shm/memory/allocator/mp_page.h>
-
-namespace hshm::ipc {
-
-void StackAllocator::shm_init(allocator_id_t id,
-                              size_t custom_header_size,
-                              char *buffer,
-                              size_t buffer_size) {
-  buffer_ = buffer;
-  buffer_size_ = buffer_size;
-  header_ = reinterpret_cast<StackAllocatorHeader*>(buffer_);
-  custom_header_ = reinterpret_cast<char*>(header_ + 1);
-  size_t region_off = (custom_header_ - buffer_) + custom_header_size;
-  size_t region_size = buffer_size_ - region_off;
-  header_->Configure(id, custom_header_size, region_off, region_size);
-}
-
-void StackAllocator::shm_deserialize(char *buffer,
-                                     size_t buffer_size) {
-  buffer_ = buffer;
-  buffer_size_ = buffer_size;
-  header_ = reinterpret_cast<StackAllocatorHeader*>(buffer_);
-  custom_header_ = reinterpret_cast<char*>(header_ + 1);
-}
-
-size_t StackAllocator::GetCurrentlyAllocatedSize() {
-  return header_->total_alloc_;
-}
-
-OffsetPointer StackAllocator::AllocateOffset(size_t size) {
-  size += sizeof(MpPage);
-  if (header_->region_size_ < size) {
-    return OffsetPointer::GetNull();
-  }
-  OffsetPointer p(header_->region_off_.fetch_add(size));
-  auto hdr = Convert<MpPage>(p);
-  hdr->SetAllocated();
-  hdr->page_size_ = size;
-  hdr->off_ = 0;
-  header_->region_size_.fetch_sub(hdr->page_size_);
-  header_->total_alloc_.fetch_add(hdr->page_size_);
-  return p + sizeof(MpPage);
-}
-
-OffsetPointer StackAllocator::AlignedAllocateOffset(size_t size,
-                                                    size_t alignment) {
-  throw ALIGNED_ALLOC_NOT_SUPPORTED.format();
-}
-
-OffsetPointer StackAllocator::ReallocateOffsetNoNullCheck(OffsetPointer p,
-                                                          size_t new_size) {
-  OffsetPointer new_p;
-  void *src = Convert<void>(p);
-  auto hdr = Convert<MpPage>(p - sizeof(MpPage));
-  size_t old_size = hdr->page_size_ - sizeof(MpPage);
-  void *dst = AllocatePtr<void, OffsetPointer>(new_size, new_p);
-  memcpy((void*)dst, (void*)src, old_size);
-  Free(p);
-  return new_p;
-}
-
-void StackAllocator::FreeOffsetNoNullCheck(OffsetPointer p) {
-  auto hdr = Convert<MpPage>(p - sizeof(MpPage));
-  if (!hdr->IsAllocated()) {
-    throw DOUBLE_FREE.format();
-  }
-  hdr->UnsetAllocated();
-  header_->total_alloc_.fetch_sub(hdr->page_size_);
-}
-
-}  // namespace hshm::ipc
diff --git a/hermes_shm/src/thread/mutex.cc b/hermes_shm/src/thread/mutex.cc
deleted file mode 100644
index e61125679..000000000
--- a/hermes_shm/src/thread/mutex.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "hermes_shm/thread/lock.h"
-#include "hermes_shm/thread/thread_model_manager.h"
-#include "hermes_shm/util/logging.h"
-
-namespace hshm {
-
-/**====================================
- * Mutex
- * ===================================*/
-
-/**
- * Acquire the mutex
- * */
-void Mutex::Lock(uint32_t owner) {
-  do {
-    for (int i = 0; i < 1; ++i) {
-      if (TryLock(owner)) { return; }
-    }
-    HERMES_THREAD_MODEL->Yield();
-  } while (true);
-}
-
-/**
- * Attempt to acquire the mutex
- * */
-bool Mutex::TryLock(uint32_t owner) {
-  if (lock_.load() != 0) {
-    return false;
-  }
-  uint32_t tkt = lock_.fetch_add(1);
-  if (tkt != 0) {
-    lock_.fetch_sub(1);
-    return false;
-  }
-#ifdef HERMES_DEBUG_LOCK
-  owner_ = owner;
-#endif
-  return true;
-}
-
-/**
- * Release the mutex
- * */
-void Mutex::Unlock() {
-#ifdef HERMES_DEBUG_LOCK
-  owner_ = 0;
-#endif
-  lock_.fetch_sub(1);
-}
-
-/**====================================
- * Scoped Mutex
- * ===================================*/
-
-/**
- * Constructor
- * */
-ScopedMutex::ScopedMutex(Mutex &lock, uint32_t owner)
-: lock_(lock), is_locked_(false) {
-  Lock(owner);
-}
-
-/**
- * Release the mutex
- * */
-ScopedMutex::~ScopedMutex() {
-  Unlock();
-}
-
-/**
- * Acquire the mutex
- * */
-void ScopedMutex::Lock(uint32_t owner) {
-  if (!is_locked_) {
-    lock_.Lock(owner);
-    is_locked_ = true;
-  }
-}
-
-/**
- * Attempt to acquire the mutex
- * */
-bool ScopedMutex::TryLock(uint32_t owner) {
-  if (!is_locked_) {
-    is_locked_ = lock_.TryLock(owner);
-  }
-  return is_locked_;
-}
-
-/**
- * Acquire the mutex
- * */
-void ScopedMutex::Unlock() {
-  if (is_locked_) {
-    lock_.Unlock();
-    is_locked_ = false;
-  }
-}
-
-}  // namespace hshm
diff --git a/hermes_shm/src/thread/rwlock.cc b/hermes_shm/src/thread/rwlock.cc
deleted file mode 100644
index 734a29c2e..000000000
--- a/hermes_shm/src/thread/rwlock.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "hermes_shm/thread/lock/rwlock.h"
-#include "hermes_shm/thread/thread_model_manager.h"
-#include "hermes_shm/util/logging.h"
-
-namespace hshm {
-
-/**====================================
- * Rw Lock
- * ===================================*/
-
-/**
- * Acquire the read lock
- * */
-void RwLock::ReadLock(uint32_t owner) {
-  bool ret = false;
-  RwLockPayload expected, desired;
-  do {
-    for (int i = 0; i < 1; ++i) {
-      expected.as_int_ = payload_.load();
-      if (expected.IsWriteLocked()) {
-        continue;
-      }
-      desired = expected;
-      desired.bits_.r_ += 1;
-      ret = payload_.compare_exchange_weak(
-        expected.as_int_,
-        desired.as_int_);
-      if (ret) {
-#ifdef HERMES_DEBUG_LOCK
-        owner_ = owner;
-        HILOG(kDebug, "Acquired read lock for {}", owner);
-#endif
-        return;
-      }
-    }
-    HERMES_THREAD_MODEL->Yield();
-  } while (true);
-}
-
-/**
- * Release the read lock
- * */
-void RwLock::ReadUnlock() {
-  bool ret;
-  RwLockPayload expected, desired;
-#ifdef HERMES_DEBUG_LOCK
-  owner_ = 0;
-#endif
-  do {
-    expected.as_int_ = payload_.load();
-    desired = expected;
-    desired.bits_.r_ -= 1;
-    ret = payload_.compare_exchange_weak(
-      expected.as_int_,
-      desired.as_int_);
-  } while (!ret);
-}
-
-/**
- * Acquire the write lock
- * */
-void RwLock::WriteLock(uint32_t owner) {
-  bool ret = false;
-  RwLockPayload expected, desired;
-  do {
-    for (int i = 0; i < 1; ++i) {
-      expected.as_int_ = payload_.load();
-      if (expected.IsReadLocked() || expected.IsWriteLocked()) {
-        continue;
-      }
-      desired = expected;
-      desired.bits_.w_ += 1;
-      ret = payload_.compare_exchange_weak(
-        expected.as_int_,
-        desired.as_int_);
-      if (ret) {
-#ifdef HERMES_DEBUG_LOCK
-        owner_ = owner;
-        HILOG(kDebug, "Acquired write lock for {}", owner);
-#endif
-        return;
-      }
-    }
-    HERMES_THREAD_MODEL->Yield();
-  } while (true);
-}
-
-/**
- * Release the write lock
- * */
-void RwLock::WriteUnlock() {
-  bool ret;
-  RwLockPayload expected, desired;
-#ifdef HERMES_DEBUG_LOCK
-  owner_ = 0;
-#endif
-  do {
-    expected.as_int_ = payload_.load();
-    desired = expected;
-    desired.bits_.w_ -= 1;
-    ret = payload_.compare_exchange_weak(
-      expected.as_int_,
-      desired.as_int_);
-  } while (!ret);
-}
-
-/**====================================
- * ScopedRwReadLock
- * ===================================*/
-
-/**
- * Constructor
- * */
-ScopedRwReadLock::ScopedRwReadLock(RwLock &lock, uint32_t owner)
-: lock_(lock), is_locked_(false) {
-  Lock(owner);
-}
-
-/**
- * Release the read lock
- * */
-ScopedRwReadLock::~ScopedRwReadLock() {
-  Unlock();
-}
-
-/**
- * Acquire the read lock
- * */
-void ScopedRwReadLock::Lock(uint32_t owner) {
-  if (!is_locked_) {
-    lock_.ReadLock(owner);
-    is_locked_ = true;
-  }
-}
-
-/**
- * Release the read lock
- * */
-void ScopedRwReadLock::Unlock() {
-  if (is_locked_) {
-    lock_.ReadUnlock();
-    is_locked_ = false;
-  }
-}
-
-/**====================================
- * ScopedRwWriteLock
- * ===================================*/
-
-/**
- * Constructor
- * */
-ScopedRwWriteLock::ScopedRwWriteLock(RwLock &lock, uint32_t owner)
-: lock_(lock), is_locked_(false) {
-  Lock(owner);
-}
-
-/**
- * Release the write lock
- * */
-ScopedRwWriteLock::~ScopedRwWriteLock() {
-  Unlock();
-}
-
-/**
- * Acquire the write lock
- * */
-void ScopedRwWriteLock::Lock(uint32_t owner) {
-  if (!is_locked_) {
-    lock_.WriteLock(owner);
-    is_locked_ = true;
-  }
-}
-
-/**
- * Release the write lock
- * */
-void ScopedRwWriteLock::Unlock() {
-  if (is_locked_) {
-    lock_.WriteUnlock();
-    is_locked_ = false;
-  }
-}
-
-}  // namespace hshm
diff --git a/hermes_shm/test/CMakeLists.txt b/hermes_shm/test/CMakeLists.txt
deleted file mode 100644
index 81aad4158..000000000
--- a/hermes_shm/test/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-add_subdirectory(unit)
\ No newline at end of file
diff --git a/hermes_shm/test/unit/CMakeLists.txt b/hermes_shm/test/unit/CMakeLists.txt
deleted file mode 100644
index d4a927a97..000000000
--- a/hermes_shm/test/unit/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-set(TEST_MAIN ${CMAKE_CURRENT_SOURCE_DIR})
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory(data_structures)
-add_subdirectory(allocators)
-add_subdirectory(types)
-add_subdirectory(thread)
\ No newline at end of file
diff --git a/hermes_shm/test/unit/allocators/CMakeLists.txt b/hermes_shm/test/unit/allocators/CMakeLists.txt
deleted file mode 100644
index 010b1dbb8..000000000
--- a/hermes_shm/test/unit/allocators/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-#------------------------------------------------------------------------------
-# Build Tests
-#------------------------------------------------------------------------------
-
-add_executable(test_allocator_exec
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        allocator.cc
-        allocator_thread.cc)
-add_dependencies(test_allocator_exec hermes_shm_data_structures)
-target_link_libraries(test_allocator_exec
-        hermes_shm_data_structures Catch2::Catch2 MPI::MPI_CXX OpenMP::OpenMP_CXX)
-
-#------------------------------------------------------------------------------
-# Test Cases
-#------------------------------------------------------------------------------
-
-# ALLOCATOR tests
-set(ALLOCATORS
-        StackAllocator
-        MallocAllocator
-        ScalablePageAllocator)
-foreach(ALLOCATOR ${ALLOCATORS})
-    add_test(NAME test_${ALLOCATOR} COMMAND
-            ${CMAKE_BINARY_DIR}/bin/test_allocator_exec "${ALLOCATOR}")
-endforeach()
-
-# Multi-Thread ALLOCATOR tests
-set(MT_ALLOCATORS
-        StackAllocator
-        ScalablePageAllocator)
-foreach(ALLOCATOR ${MT_ALLOCATORS})
-    add_test(NAME test_${ALLOCATOR}_4t COMMAND
-            ${CMAKE_BINARY_DIR}/bin/test_allocator_exec "${ALLOCATOR}Multithreaded")
-endforeach()
-
-#------------------------------------------------------------------------------
-# Install Targets
-#------------------------------------------------------------------------------
-install(TARGETS
-        test_allocator_exec
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
diff --git a/hermes_shm/test/unit/allocators/allocator.cc b/hermes_shm/test/unit/allocators/allocator.cc
deleted file mode 100644
index 1bf0fd253..000000000
--- a/hermes_shm/test/unit/allocators/allocator.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "test_init.h"
-
-void PageAllocationTest(Allocator *alloc) {
-  size_t count = 1024;
-  size_t page_size = KILOBYTES(4);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-
-  // Allocate pages
-  std::vector<Pointer> ps(count);
-  void *ptrs[count];
-  for (size_t i = 0; i < count; ++i) {
-    ptrs[i] = alloc->AllocatePtr<void>(page_size, ps[i]);
-    memset(ptrs[i], i, page_size);
-    REQUIRE(ps[i].off_.load() != 0);
-    REQUIRE(!ps[i].IsNull());
-    REQUIRE(ptrs[i] != nullptr);
-  }
-
-  // Convert process pointers into independent pointers
-  for (size_t i = 0; i < count; ++i) {
-    Pointer p = mem_mngr->Convert(ptrs[i]);
-    REQUIRE(p == ps[i]);
-    REQUIRE(VerifyBuffer((char*)ptrs[i], page_size, i));
-  }
-
-  // Check the custom header
-  auto hdr = alloc->GetCustomHeader<SimpleAllocatorHeader>();
-  REQUIRE(hdr->checksum_ == HEADER_CHECKSUM);
-
-  // Free pages
-  for (size_t i = 0; i < count; ++i) {
-    alloc->Free(ps[i]);
-  }
-
-  // Reallocate pages
-  for (size_t i = 0; i < count; ++i) {
-    ptrs[i] = alloc->AllocatePtr<void>(page_size, ps[i]);
-    REQUIRE(ps[i].off_.load() != 0);
-    REQUIRE(!ps[i].IsNull());
-  }
-
-  // Free again
-  for (size_t i = 0; i < count; ++i) {
-    alloc->Free(ps[i]);
-  }
-}
-
-void MultiPageAllocationTest(Allocator *alloc) {
-  std::vector<size_t> alloc_sizes = {
-    64, 128, 256,
-    KILOBYTES(1), KILOBYTES(4), KILOBYTES(64),
-    MEGABYTES(1)
-  };
-
-  // Allocate and free pages between 64 bytes and 32MB
-  {
-    for (size_t r = 0; r < 4; ++r) {
-      for (size_t i = 0; i < alloc_sizes.size(); ++i) {
-        Pointer ps[16];
-        for (size_t j = 0; j < 16; ++j) {
-          ps[j] = alloc->Allocate(alloc_sizes[i]);
-        }
-        for (size_t j = 0; j < 16; ++j) {
-          alloc->Free(ps[j]);
-        }
-      }
-    }
-  }
-}
-
-void ReallocationTest(Allocator *alloc) {
-  std::vector<std::pair<size_t, size_t>> sizes = {
-      {KILOBYTES(3), KILOBYTES(4)},
-      {KILOBYTES(4), MEGABYTES(1)}
-  };
-
-  // Reallocate a small page to a larger page
-  for (auto &[small_size, large_size] : sizes) {
-    Pointer p;
-    char *ptr = alloc->AllocatePtr<char>(small_size, p);
-    memset(ptr, 10, small_size);
-    char *new_ptr = alloc->ReallocatePtr<char>(p, large_size);
-    for (size_t i = 0; i < small_size; ++i) {
-      REQUIRE(ptr[i] == 10);
-    }
-    memset(new_ptr, 0, large_size);
-    alloc->Free(p);
-  }
-}
-
-void AlignedAllocationTest(Allocator *alloc) {
-  std::vector<std::pair<size_t, size_t>> sizes = {
-      {KILOBYTES(4), KILOBYTES(4)},
-  };
-
-  // Aligned allocate pages
-  for (auto &[size, alignment] : sizes) {
-    for (size_t i = 0; i < 1024; ++i) {
-      Pointer p;
-      char *ptr = alloc->AllocatePtr<char>(size, p, alignment);
-      REQUIRE(((size_t)ptr % alignment) == 0);
-      memset(alloc->Convert<void>(p), 0, size);
-      alloc->Free(p);
-    }
-  }
-}
-
-TEST_CASE("StackAllocator") {
-  auto alloc = Pretest<hipc::PosixShmMmap, hipc::StackAllocator>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  PageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  Posttest();
-}
-
-TEST_CASE("MallocAllocator") {
-  auto alloc = Pretest<hipc::NullBackend, hipc::MallocAllocator>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  PageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  MultiPageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-
-  Posttest();
-}
-
-TEST_CASE("ScalablePageAllocator") {
-  auto alloc = Pretest<hipc::PosixShmMmap, hipc::ScalablePageAllocator>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  PageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  MultiPageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ReallocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-
-  Posttest();
-}
diff --git a/hermes_shm/test/unit/allocators/allocator_thread.cc b/hermes_shm/test/unit/allocators/allocator_thread.cc
deleted file mode 100644
index 85efb0155..000000000
--- a/hermes_shm/test/unit/allocators/allocator_thread.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "test_init.h"
-
-void MultiThreadedPageAllocationTest(Allocator *alloc) {
-  size_t nthreads = 8;
-  omp_set_dynamic(0);
-#pragma omp parallel shared(alloc) num_threads(nthreads)
-  {
-#pragma omp barrier
-    PageAllocationTest(alloc);
-#pragma omp barrier
-    try {
-      MultiPageAllocationTest(alloc);
-    } catch (std::shared_ptr<hshm::Error> &err) {
-      err->print();
-      exit(1);
-    }
-#pragma omp barrier
-  }
-}
-
-TEST_CASE("StackAllocatorMultithreaded") {
-  auto alloc = Pretest<hipc::PosixShmMmap, hipc::StackAllocator>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  MultiThreadedPageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  Posttest();
-}
-
-TEST_CASE("ScalablePageAllocatorMultithreaded") {
-  auto alloc = Pretest<hipc::PosixShmMmap, hipc::ScalablePageAllocator>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  MultiThreadedPageAllocationTest(alloc);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  Posttest();
-}
diff --git a/hermes_shm/test/unit/allocators/test_init.h b/hermes_shm/test/unit/allocators/test_init.h
deleted file mode 100644
index 764adac1a..000000000
--- a/hermes_shm/test/unit/allocators/test_init.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_TEST_UNIT_ALLOCATORS_TEST_INIT_H_
-#define HERMES_TEST_UNIT_ALLOCATORS_TEST_INIT_H_
-
-#include "basic_test.h"
-#include "omp.h"
-#include "hermes_shm/memory/memory_manager.h"
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-#define HEADER_CHECKSUM 8482942
-
-struct SimpleAllocatorHeader {
-  int checksum_;
-};
-
-template<typename BackendT, typename AllocT>
-Allocator* Pretest() {
-  std::string shm_url = "test_allocators";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->CreateBackend<BackendT>(
-    MemoryManager::GetDefaultBackendSize(), shm_url);
-  mem_mngr->CreateAllocator<AllocT>(
-    shm_url, alloc_id, sizeof(SimpleAllocatorHeader));
-  auto alloc = mem_mngr->GetAllocator(alloc_id);
-  auto hdr = alloc->GetCustomHeader<SimpleAllocatorHeader>();
-  hdr->checksum_ = HEADER_CHECKSUM;
-  return alloc;
-}
-
-void Posttest();
-void PageAllocationTest(Allocator *alloc);
-void MultiPageAllocationTest(Allocator *alloc);
-
-#endif  // HERMES_TEST_UNIT_ALLOCATORS_TEST_INIT_H_
diff --git a/hermes_shm/test/unit/basic_test.h b/hermes_shm/test/unit/basic_test.h
deleted file mode 100644
index 814b1e510..000000000
--- a/hermes_shm/test/unit/basic_test.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TEST_UNIT_BASIC_TEST_H_
-#define HERMES_TEST_UNIT_BASIC_TEST_H_
-
-#define CATCH_CONFIG_RUNNER
-#include <catch2/catch_all.hpp>
-
-namespace cl = Catch::Clara;
-cl::Parser define_options();
-
-#include <iostream>
-#include <cstdlib>
-
-static inline bool VerifyBuffer(char *ptr, size_t size, char nonce) {
-  for (size_t i = 0; i < size; ++i) {
-    if (ptr[i] != nonce) {
-      std::cout << (int)ptr[i] << std::endl;
-      return false;
-    }
-  }
-  return true;
-}
-
-/** var = TYPE(val) */
-#define _CREATE_SET_VAR_TO_INT_OR_STRING(TYPE, VAR, TMP_VAR, VAL)\
-  if constexpr(std::is_same_v<TYPE, hipc::string>) {\
-    TMP_VAR = hipc::make_uptr<hipc::string>(std::to_string(VAL));\
-  } else if constexpr(std::is_same_v<TYPE, std::string>) {\
-    TMP_VAR = hipc::make_uptr<std::string>(std::to_string(VAL));\
-  } else {\
-    TMP_VAR = hipc::make_uptr<int>(VAL);\
-  }\
-  TYPE &VAR = *TMP_VAR;\
-  (void)VAR;
-
-/** TYPE VAR = TYPE(VAL) */
-#define CREATE_SET_VAR_TO_INT_OR_STRING(TYPE, VAR, VAL)\
-  hipc::uptr<TYPE> VAR##_tmp;\
-  _CREATE_SET_VAR_TO_INT_OR_STRING(TYPE, VAR, VAR##_tmp, VAL);
-
-/** RET = int(TYPE(VAR)); */
-#define GET_INT_FROM_VAR(TYPE, RET, VAR)\
-  if constexpr(std::is_same_v<TYPE, hipc::string>) {\
-    RET = atoi((VAR).str().c_str());\
-  } else if constexpr(std::is_same_v<TYPE, std::string>) {\
-    RET = atoi((VAR).c_str());\
-  } else {\
-    RET = VAR;\
-  }
-
-/** int RET = int(TYPE(VAR)); */
-#define CREATE_GET_INT_FROM_VAR(TYPE, RET, VAR)\
-  int RET;\
-  GET_INT_FROM_VAR(TYPE, RET, VAR)
-
-void MainPretest();
-void MainPosttest();
-
-#define PAGE_DIVIDE(TEXT)
-
-#endif  // HERMES_TEST_UNIT_BASIC_TEST_H_
diff --git a/hermes_shm/test/unit/data_structures/CMakeLists.txt b/hermes_shm/test/unit/data_structures/CMakeLists.txt
deleted file mode 100644
index 0166a9d6d..000000000
--- a/hermes_shm/test/unit/data_structures/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-include_directories(${HERMES_SHM_ROOT}/test/unit)
-add_subdirectory(backend)
-add_subdirectory(containers)
-#add_subdirectory(containers_mpi)
-add_subdirectory(serialize)
diff --git a/hermes_shm/test/unit/data_structures/backend/backend.cc b/hermes_shm/test/unit/data_structures/backend/backend.cc
deleted file mode 100644
index d5159c7aa..000000000
--- a/hermes_shm/test/unit/data_structures/backend/backend.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-
-#include "hermes_shm/memory/backend/posix_shm_mmap.h"
-
-using hshm::ipc::PosixShmMmap;
-
-TEST_CASE("BackendReserve") {
-  PosixShmMmap b1;
-
-  // Reserve + Map 8GB of memory
-  b1.shm_init(GIGABYTES(8), "shmem_test");
-
-  // Set 2GB of SHMEM
-  memset(b1.data_, 0, GIGABYTES(2));
-
-  // Destroy SHMEM
-  b1.shm_destroy();
-}
diff --git a/hermes_shm/test/unit/data_structures/backend/memory_manager.cc b/hermes_shm/test/unit/data_structures/backend/memory_manager.cc
deleted file mode 100644
index 421ca226c..000000000
--- a/hermes_shm/test/unit/data_structures/backend/memory_manager.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "basic_test.h"
-
-#include <mpi.h>
-#include "hermes_shm/memory/memory_manager.h"
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::MemoryManager;
-
-struct SimpleHeader {
-  hshm::ipc::Pointer p_;
-};
-
-TEST_CASE("MemoryManager") {
-  int rank;
-  char nonce = 8;
-  size_t page_size = KILOBYTES(4);
-  std::string shm_url = "test_mem_backend";
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  allocator_id_t alloc_id(0, 1);
-
-  HERMES_ERROR_HANDLE_START()
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-
-  if (rank == 0) {
-    std::cout << "Creating SHMEM (rank 0): " << shm_url << std::endl;
-    mem_mngr->CreateBackend<hipc::PosixShmMmap>(
-      MemoryManager::GetDefaultBackendSize(), shm_url);
-    mem_mngr->CreateAllocator<hipc::StackAllocator>(
-      shm_url, alloc_id, 0);
-    mem_mngr->ScanBackends();
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank != 0) {
-    std::cout << "Attaching SHMEM (rank 1): " << shm_url << std::endl;
-    mem_mngr->AttachBackend(MemoryBackendType::kPosixShmMmap, shm_url);
-    mem_mngr->ScanBackends();
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank == 0) {
-    std::cout << "Allocating pages (rank 0)" << std::endl;
-    hipc::Allocator *alloc = mem_mngr->GetAllocator(alloc_id);
-    char *page = alloc->AllocatePtr<char>(page_size);
-    memset(page, nonce, page_size);
-    auto header = alloc->GetCustomHeader<SimpleHeader>();
-    hipc::Pointer p1 = mem_mngr->Convert<void>(alloc_id, page);
-    hipc::Pointer p2 = mem_mngr->Convert<char>(page);
-    header->p_ = p1;
-    REQUIRE(p1 == p2);
-    REQUIRE(VerifyBuffer(page, page_size, nonce));
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank != 0) {
-    std::cout << "Finding and checking pages (rank 1)" << std::endl;
-    hipc::Allocator *alloc = mem_mngr->GetAllocator(alloc_id);
-    SimpleHeader *header = alloc->GetCustomHeader<SimpleHeader>();
-    char *page = alloc->Convert<char>(header->p_);
-    REQUIRE(VerifyBuffer(page, page_size, nonce));
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-
-  HERMES_ERROR_HANDLE_END()
-}
diff --git a/hermes_shm/test/unit/data_structures/backend/memory_slots.cc b/hermes_shm/test/unit/data_structures/backend/memory_slots.cc
deleted file mode 100644
index 8eeafd708..000000000
--- a/hermes_shm/test/unit/data_structures/backend/memory_slots.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-
-#include <mpi.h>
-#include <iostream>
-#include "hermes_shm/memory/backend/posix_shm_mmap.h"
-
-using hshm::ipc::PosixShmMmap;
-
-TEST_CASE("MemorySlot") {
-  int rank;
-  char nonce = 8;
-  std::string shm_url = "test_mem_backend";
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-
-  HERMES_ERROR_HANDLE_START()
-
-  PosixShmMmap backend;
-  if (rank == 0) {
-    {
-      std::cout << "Creating SHMEM (rank 0)" << std::endl;
-      if (!backend.shm_init(MEGABYTES(1), shm_url)) {
-        throw std::runtime_error("Couldn't create backend");
-      }
-      std::cout << "Backend data: " << (void*)backend.data_ << std::endl;
-      std::cout << "Backend sz: " << backend.data_size_ << std::endl;
-      memset(backend.data_, nonce, backend.data_size_);
-      std::cout << "Wrote backend data" << std::endl;
-    }
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank != 0) {
-    {
-      std::cout << "Attaching SHMEM (rank 1)" << std::endl;
-      backend.shm_deserialize(shm_url);
-      char *ptr = backend.data_;
-      REQUIRE(VerifyBuffer(ptr, backend.data_size_, nonce));
-    }
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank == 0) {
-    {
-      std::cout << "Destroying shmem (rank 1)" << std::endl;
-      backend.shm_destroy();
-    }
-  }
-
-  HERMES_ERROR_HANDLE_END()
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/CMakeLists.txt b/hermes_shm/test/unit/data_structures/containers/CMakeLists.txt
deleted file mode 100644
index b9269f98a..000000000
--- a/hermes_shm/test/unit/data_structures/containers/CMakeLists.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-#------------------------------------------------------------------------------
-# Build Tests
-#------------------------------------------------------------------------------
-
-add_executable(test_data_structure_exec
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        string.cc
-        pair.cc
-        #tuple.cc
-        list.cc
-        slist.cc
-        vector.cc
-        iqueue.cc
-        manual_ptr.cc
-        unique_ptr.cc
-        unordered_map.cc
-        mpsc_queue.cc
-)
-
-add_dependencies(test_data_structure_exec hermes_shm_data_structures)
-target_link_libraries(test_data_structure_exec
-        hermes_shm_data_structures Catch2::Catch2
-        MPI::MPI_CXX OpenMP::OpenMP_CXX)
-
-#------------------------------------------------------------------------------
-# Test Cases
-#------------------------------------------------------------------------------
-
-# STRING TESTS
-add_test(NAME test_string COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "String")
-
-# VECTOR TESTS
-add_test(NAME test_vector_of_int COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "VectorOfInt")
-add_test(NAME test_vector_of_string COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "VectorOfString")
-add_test(NAME test_vector_of_list_of_string COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "VectorOfListOfString")
-
-# LIST TESTS
-add_test(NAME test_list_of_int COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "ListOfInt")
-add_test(NAME test_list_of_string COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "ListOfString")
-
-# MANUAL PTR TESTS
-add_test(NAME test_manual_ptr_of_string COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "ManualPtrOfString")
-
-# UNIQUE PTR TESTS
-add_test(NAME test_unique_ptr_of_string COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "UniquePtrOfString")
-
-# UNORDERED_MAP TESTS
-add_test(NAME test_unordered_map_of_int_int COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "UnorderedMapOfIntInt")
-add_test(NAME test_unordered_map_of_int_str COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "UnorderedMapOfIntString")
-add_test(NAME test_unordered_map_of_str_int COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "UnorderedMapOfStringInt")
-add_test(NAME test_unordered_map_of_str_str COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_data_structure_exec "UnorderedMapOfStringString")
-
-#------------------------------------------------------------------------------
-# Install Targets
-#------------------------------------------------------------------------------
-install(TARGETS
-        test_data_structure_exec
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
diff --git a/hermes_shm/test/unit/data_structures/containers/iqueue.cc b/hermes_shm/test/unit/data_structures/containers/iqueue.cc
deleted file mode 100644
index a98672b02..000000000
--- a/hermes_shm/test/unit/data_structures/containers/iqueue.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "iqueue.h"
-#include "hermes_shm/data_structures/ipc/iqueue.h"
-#include "hermes_shm/data_structures/smart_ptr/smart_ptr_base.h"
-
-using hshm::ipc::mptr;
-using hshm::ipc::make_mptr;
-using hshm::ipc::iqueue;
-
-template<typename T>
-void IqueueTest() {
-  Allocator *alloc = alloc_g;
-  auto lp = hipc::make_uptr<iqueue<T>>(alloc);
-  IqueueTestSuite<T, iqueue<T>> test(*lp, alloc);
-
-  test.EnqueueTest(30);
-  test.ForwardIteratorTest();
-  test.ConstForwardIteratorTest();
-  test.DequeueTest(30);
-  test.DequeueMiddleTest();
-  test.EraseTest();
-}
-
-TEST_CASE("IqueueOfMpPage") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  IqueueTest<MpPage>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/iqueue.h b/hermes_shm/test/unit/data_structures/containers/iqueue.h
deleted file mode 100644
index 25e71a395..000000000
--- a/hermes_shm/test/unit/data_structures/containers/iqueue.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_IQUEUE_H_
-#define HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_IQUEUE_H_
-
-#include "basic_test.h"
-#include "test_init.h"
-#include <hermes_shm/memory/allocator/mp_page.h>
-
-using hipc::MpPage;
-
-template<typename T, typename Container>
-class IqueueTestSuite {
- public:
-  Container &obj_;
-  Allocator *alloc_;
-
-  /// Constructor
-  IqueueTestSuite(Container &obj, Allocator *alloc)
-  : obj_(obj), alloc_(alloc) {}
-
-  /// Enqueue elements
-  void EnqueueTest(size_t count = 30) {
-    for (size_t i = 0; i < count; ++i) {
-      hipc::OffsetPointer p;
-      auto page = alloc_->template
-        AllocateConstructObjs<T>(1, p);
-      page->page_size_ = count - i - 1;
-      obj_.enqueue(page);
-    }
-    REQUIRE(obj_.size() == count);
-  }
-
-  /// Dequeue and then re-enqueue
-  void DequeueTest(size_t count = 30) {
-    std::vector<T*> tmp(count);
-    for (size_t i = 0; i < count; ++i) {
-      tmp[i] = obj_.dequeue();
-    }
-    for (int i = count - 1; i >= 0; --i) {
-      obj_.enqueue(tmp[i]);
-    }
-    REQUIRE(obj_.size() == count);
-    ForwardIteratorTest(count);
-  }
-
-  /// Forward iterator
-  void ForwardIteratorTest(size_t count = 30) {
-    size_t fcur = 0;
-    for (T *page : obj_) {
-      REQUIRE(page->page_size_ == fcur);
-      ++fcur;
-    }
-  }
-
-  /// Constant Forward iterator
-  void ConstForwardIteratorTest(size_t count = 30) {
-    const Container &obj = obj_;
-    size_t fcur = 0;
-    for (auto iter = obj.cbegin(); iter != obj.cend(); ++iter) {
-      T *page = *iter;
-      REQUIRE(page->page_size_ == fcur);
-      ++fcur;
-    }
-  }
-
-  /// Dequeue an element in the middle of the queue
-  void DequeueMiddleTest() {
-    size_t count = obj_.size();
-    size_t mid = obj_.size() / 2;
-    auto iter = obj_.begin();
-    for (size_t i = 0; i < mid; ++i) {
-      ++iter;
-    }
-    auto page = obj_.dequeue(iter);
-    REQUIRE(page->page_size_ == mid);
-    REQUIRE(obj_.size() == count - 1);
-    for (T *page : obj_) {
-      REQUIRE(page->page_size_ != mid);
-    }
-    obj_.enqueue(page);
-  }
-
-  /// Verify erase
-  void EraseTest() {
-    std::vector<T*> tmp;
-    for (T *page : obj_) {
-      tmp.emplace_back(page);
-    }
-    obj_.clear();
-    for (T *page : tmp) {
-      alloc_->FreePtr(page);
-    }
-    REQUIRE(obj_.size() == 0);
-  }
-};
-
-#endif  // HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_IQUEUE_H_
diff --git a/hermes_shm/test/unit/data_structures/containers/list.cc b/hermes_shm/test/unit/data_structures/containers/list.cc
deleted file mode 100644
index fde1283d8..000000000
--- a/hermes_shm/test/unit/data_structures/containers/list.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "list.h"
-#include "hermes_shm/data_structures/ipc/list.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-using hshm::ipc::list;
-
-template<typename T>
-void ListTestRunner(ListTestSuite<T, list<T>> &test) {
-  test.EmplaceTest(15);
-  test.ForwardIteratorTest();
-  test.ConstForwardIteratorTest();
-  test.CopyConstructorTest();
-  test.CopyAssignmentTest();
-  test.MoveConstructorTest();
-  test.MoveAssignmentTest();
-  test.EmplaceFrontTest();
-  test.ModifyEntryCopyIntoTest();
-  test.ModifyEntryMoveIntoTest();
-  test.EraseTest();
-}
-
-template<typename T>
-void ListTest() {
-  Allocator *alloc = alloc_g;
-  auto lp = hipc::make_uptr<list<T>>(alloc);
-  ListTestSuite<T, list<T>> test(*lp, alloc);
-  ListTestRunner(test);
-}
-
-TEST_CASE("ListOfInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ListTest<int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("ListOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ListTest<hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("ListOfStdString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ListTest<std::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/list.h b/hermes_shm/test/unit/data_structures/containers/list.h
deleted file mode 100644
index 13dd93ad1..000000000
--- a/hermes_shm/test/unit/data_structures/containers/list.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_LIST_H_
-#define HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_LIST_H_
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-template<typename T, typename Container>
-class ListTestSuite {
- public:
-  Container &obj_;
-  Allocator *alloc_;
-
-  /// Constructor
-  ListTestSuite(Container &obj, Allocator *alloc)
-  : obj_(obj), alloc_(alloc) {}
-
-  /// Emplace elements
-  void EmplaceTest(size_t count = 30) {
-    for (size_t i = 0; i < count; ++i) {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, var, i);
-      obj_.emplace_back(var);
-    }
-    REQUIRE(obj_.size() == count);
-  }
-
-  /// Forward iterator
-  void ForwardIteratorTest(size_t count = 30) {
-    size_t fcur = 0;
-    for (auto &num : obj_) {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, fcur_conv, fcur);
-      REQUIRE(num == fcur_conv);
-      ++fcur;
-    }
-  }
-
-  /// Constant Forward iterator
-  void ConstForwardIteratorTest(size_t count = 30) {
-    const Container &obj = obj_;
-    size_t fcur = 0;
-    for (auto iter = obj.cbegin(); iter != obj.cend(); ++iter) {
-      T& num = *iter;
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, fcur_conv, fcur);
-      REQUIRE(num == fcur_conv);
-      ++fcur;
-    }
-  }
-
-  /// Copy constructor
-  void CopyConstructorTest() {
-    size_t count = obj_.size();
-    auto cpy = hipc::make_uptr<Container>(obj_);
-    VerifyCopy(obj_, *cpy, count);
-  }
-
-  /// Copy assignment
-  void CopyAssignmentTest() {
-    size_t count = obj_.size();
-    auto cpy = hipc::make_uptr<Container>();
-    *cpy = obj_;
-    VerifyCopy(obj_, *cpy, count);
-  }
-
-  /// Move constructor
-  void MoveConstructorTest() {
-    size_t count = obj_.size();
-    auto cpy = hipc::make_uptr<Container>(std::move(obj_));
-    VerifyMove(obj_, *cpy, count);
-    obj_ = std::move(*cpy);
-    VerifyMove(*cpy, obj_, count);
-  }
-
-  /// Move assignment
-  void MoveAssignmentTest() {
-    size_t count = obj_.size();
-    auto cpy = hipc::make_uptr<Container>();
-    (*cpy) = std::move(obj_);
-    VerifyMove(obj_, *cpy, count);
-    obj_ = std::move(*cpy);
-    VerifyMove(*cpy, obj_, count);
-  }
-
-  /// Emplace and erase front
-  void EmplaceFrontTest() {
-    CREATE_SET_VAR_TO_INT_OR_STRING(T, i0, 100);
-    size_t old_size = obj_.size();
-    obj_.emplace_front(i0);
-    REQUIRE(obj_.front() == i0);
-    REQUIRE(obj_.size() == old_size + 1);
-    obj_.erase(obj_.begin(), obj_.begin() + 1);
-  }
-
-  /// Copy an object into the container
-  void ModifyEntryCopyIntoTest() {
-    // Modify the fourth list entry
-    {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, i4, 25);
-      auto iter = obj_.begin() + 4;
-      (*iter) = i4;
-    }
-
-    // Verify the modification took place
-    {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, i4, 25);
-      auto iter = obj_.begin() + 4;
-      REQUIRE((*iter) == i4);
-    }
-  }
-
-  /// Move an object into the container
-  void ModifyEntryMoveIntoTest() {
-    // Modify the fourth list entry
-    {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, i4, 25);
-      auto iter = obj_.begin() + 4;
-      (*iter) = std::move(i4);
-    }
-
-    // Verify the modification took place
-    {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, i4, 25);
-      auto iter = obj_.begin() + 4;
-      REQUIRE((*iter) == i4);
-    }
-  }
-
-  /// Verify erase
-  void EraseTest() {
-    obj_.clear();
-    REQUIRE(obj_.size() == 0);
-  }
-
- private:
-  /// Verify copy construct/assign worked
-  void VerifyCopy(Container &obj,
-                  Container &cpy,
-                  size_t count) {
-    REQUIRE(obj_.size() == count);
-    REQUIRE(cpy.size() == count);
-
-    // Verify obj
-    {
-      size_t fcur = 0;
-      for (auto &num : obj_) {
-        CREATE_SET_VAR_TO_INT_OR_STRING(T, fcur_conv, fcur);
-        REQUIRE(num == fcur_conv);
-        ++fcur;
-      }
-    }
-
-    // Verify copy
-    {
-      size_t fcur = 0;
-      for (auto &num : cpy) {
-        CREATE_SET_VAR_TO_INT_OR_STRING(T, fcur_conv, fcur);
-        REQUIRE(num == fcur_conv);
-        ++fcur;
-      }
-    }
-  }
-
-  /// Verify move worked
-  void VerifyMove(Container &orig_obj,
-                  Container &new_obj,
-                  size_t count) {
-    // Verify move into cpy worked
-    {
-      size_t fcur = 0;
-      REQUIRE(orig_obj.IsNull());
-      REQUIRE(new_obj.size() == count);
-      for (auto &num : new_obj) {
-        CREATE_SET_VAR_TO_INT_OR_STRING(T, fcur_conv, fcur);
-        REQUIRE(num == fcur_conv);
-        ++fcur;
-      }
-    }
-  }
-};
-
-#endif  // HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_LIST_H_
diff --git a/hermes_shm/test/unit/data_structures/containers/manual_ptr.cc b/hermes_shm/test/unit/data_structures/containers/manual_ptr.cc
deleted file mode 100644
index f1b956df2..000000000
--- a/hermes_shm/test/unit/data_structures/containers/manual_ptr.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "hermes_shm/data_structures/smart_ptr/smart_ptr_base.h"
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "smart_ptr.h"
-
-using hshm::ipc::string;
-using hshm::ipc::mptr;
-using hshm::ipc::uptr;
-using hshm::ipc::mptr;
-using hshm::ipc::make_mptr;
-using hshm::ipc::TypedPointer;
-
-template<typename T>
-void ManualPtrTest() {
-  CREATE_SET_VAR_TO_INT_OR_STRING(T, num, 25);
-  auto ptr = hipc::make_mptr<T>(num);
-  hipc::mptr<T> ptr2;
-  hipc::SmartPtrTestSuite<T, mptr<T>> test(ptr, ptr2);
-  test.DereferenceTest(num);
-  test.MoveConstructorTest(num);
-  test.MoveAssignmentTest(num);
-  test.CopyConstructorTest(num);
-  test.CopyAssignmentTest(num);
-  test.SerializeationConstructorTest(num);
-  test.SerializeationOperatorTest(num);
-  ptr.shm_destroy();
-}
-
-TEST_CASE("ManualPtrOfInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ManualPtrTest<hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("ManualPtrOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ManualPtrTest<hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/mpsc_queue.cc b/hermes_shm/test/unit/data_structures/containers/mpsc_queue.cc
deleted file mode 100644
index d089f9e2c..000000000
--- a/hermes_shm/test/unit/data_structures/containers/mpsc_queue.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/mpsc_queue.h"
-
-template<typename QueueT, typename T>
-class QueueTestSuite {
- public:
-  hipc::uptr<QueueT> &queue_;
-
- public:
-  /** Constructor */
-  explicit QueueTestSuite(hipc::uptr<QueueT> &queue)
-  : queue_(queue) {}
-
-  /** Producer method */
-  void Produce(size_t count_per_rank) {
-    try {
-      int rank = omp_get_thread_num();
-      for (size_t i = 0; i < count_per_rank; ++i) {
-        size_t idx = rank * count_per_rank + i;
-        CREATE_SET_VAR_TO_INT_OR_STRING(T, var, idx);
-        queue_->emplace(var);
-      }
-    } catch (hshm::Error &e) {
-      HELOG(kFatal, e.what())
-    }
-  }
-
-  /** Consumer method */
-  void Consume(size_t nproducers, size_t count_per_rank,
-               bool inorder) {
-    std::vector<int> entries;
-    size_t total_size = nproducers * count_per_rank;
-    entries.reserve(count_per_rank);
-    auto entry = hipc::make_uptr<T>();
-    auto &entry_ref = *entry;
-
-    // Consume everything
-    while (entries.size() < total_size) {
-      auto qtok = queue_->pop(entry_ref);
-      if (qtok.IsNull()) {
-        HERMES_THREAD_MODEL->Yield();
-        continue;
-      }
-      CREATE_GET_INT_FROM_VAR(T, entry_int, entry_ref)
-      entries.emplace_back(entry_int);
-    }
-
-    // Ensure there's no data left in the queue
-    REQUIRE(queue_->pop(entry_ref).IsNull());
-
-    // Ensure that all elements are here
-    if (!inorder) {
-      std::sort(entries.begin(), entries.end());
-    }
-    for (int i = 0; i < (int)entries.size(); ++i) {
-      REQUIRE(entries[i] == i);
-    }
-  }
-};
-
-template<typename QueueT, typename T>
-void ProduceThenConsume(size_t nproducers, size_t count_per_rank) {
-  size_t depth = 32;
-  auto queue = hipc::make_uptr<QueueT>(depth);
-  QueueTestSuite<QueueT, T> q(queue);
-
-  // Produce all the data
-  omp_set_dynamic(0);
-#pragma omp parallel shared(nproducers, count_per_rank, q) num_threads(nproducers)  // NOLINT
-  {  // NOLINT
-#pragma omp barrier
-    q.Produce(count_per_rank);
-#pragma omp barrier
-  }
-
-  // Consume all the data
-  q.Consume(nproducers, count_per_rank, nproducers == 1);
-}
-
-template<typename QueueT, typename T>
-void ProduceAndConsume(size_t nproducers, size_t count_per_rank) {
-  size_t depth = 32;
-  auto queue = hipc::make_uptr<QueueT>(depth);
-  size_t nthreads = nproducers + 1;
-  QueueTestSuite<QueueT, T> q(queue);
-
-  // Produce all the data
-  omp_set_dynamic(0);
-#pragma omp parallel shared(nproducers, count_per_rank, q) num_threads(nthreads)  // NOLINT
-  {  // NOLINT
-#pragma omp barrier
-    size_t rank = omp_get_thread_num();
-    if (rank < nproducers) {
-      // Producer
-      q.Produce(count_per_rank);
-    } else {
-      // Consumer
-      q.Consume(nproducers, count_per_rank, false);
-    }
-#pragma omp barrier
-  }
-}
-
-/**
- * TEST MPSC EXTENSIBLE QUEUE
- * */
-
-TEST_CASE("TestMpscQueueExtInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceThenConsume<hipc::mpsc_queue_ext<int>, int>(1, 32);
-  ProduceThenConsume<hipc::mpsc_queue_ext<int>, int>(1, 64);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueExtString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceThenConsume<hipc::mpsc_queue_ext<hipc::string>, hipc::string>(1, 32);
-  ProduceThenConsume<hipc::mpsc_queue_ext<hipc::string>, hipc::string>(1, 64);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueExtIntMultiThreaded") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceThenConsume<hipc::mpsc_queue_ext<int>, int>(2, 16);
-  ProduceThenConsume<hipc::mpsc_queue_ext<int>, int>(4, 64);
-  ProduceThenConsume<hipc::mpsc_queue_ext<int>, int>(8, 256);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueExtStringMultiThreaded") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceThenConsume<hipc::mpsc_queue_ext<hipc::string>, hipc::string>(2, 16);
-  ProduceThenConsume<hipc::mpsc_queue_ext<hipc::string>, hipc::string>(4, 64);
-  ProduceThenConsume<hipc::mpsc_queue_ext<hipc::string>, hipc::string>(8, 256);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueExtStringMultiThreaded2") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceAndConsume<hipc::mpsc_queue_ext<hipc::string>, hipc::string>(8, 8192);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-/**
- * TEST MPSC QUEUE
- * */
-
-TEST_CASE("TestMpscQueueInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceThenConsume<hipc::mpsc_queue<int>, int>(1, 32);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceThenConsume<hipc::mpsc_queue<hipc::string>, hipc::string>(1, 32);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueIntMultiThreaded") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceAndConsume<hipc::mpsc_queue<int>, int>(8, 8192);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TestMpscQueueStringMultiThreaded") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ProduceAndConsume<hipc::mpsc_queue<hipc::string>, hipc::string>(8, 8192);
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/pair.cc b/hermes_shm/test/unit/data_structures/containers/pair.cc
deleted file mode 100644
index f6be33246..000000000
--- a/hermes_shm/test/unit/data_structures/containers/pair.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/pair.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-template<typename FirstT, typename SecondT>
-void PairTest() {
-  Allocator *alloc = alloc_g;
-
-  // Construct test
-  PAGE_DIVIDE("Construct") {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    auto data = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, first, second);
-    REQUIRE(*data->first_ == first);
-    REQUIRE(*data->second_ == second);
-  }
-
-  // Copy constructor test
-  PAGE_DIVIDE("Copy constructor") {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    auto data = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, first, second);
-    auto cpy = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, *data);
-    REQUIRE(*cpy->first_ == first);
-    REQUIRE(*cpy->second_ == second);
-  }
-
-  // Copy assignment test
-  PAGE_DIVIDE("Copy assignment operator") {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    auto data = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, first, second);
-    auto cpy = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc);
-    *cpy = *data;
-    REQUIRE(*cpy->first_ == first);
-    REQUIRE(*cpy->second_ == second);
-  }
-
-  // Move constructor test
-  PAGE_DIVIDE("Move constructor") {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    auto data = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, first, second);
-    auto cpy = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, std::move(*data));
-    REQUIRE(*cpy->first_ == first);
-    REQUIRE(*cpy->second_ == second);
-  }
-
-  // Move assignment test
-  PAGE_DIVIDE("Move assignment operator") {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    auto data = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc, first, second);
-    auto cpy = hipc::make_uptr<hipc::pair<FirstT, SecondT>>(
-      alloc);
-    *cpy = std::move(*data);
-    REQUIRE(*cpy->first_ == first);
-    REQUIRE(*cpy->second_ == second);
-  }
-}
-
-TEST_CASE("PairOfIntInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  PairTest<int, int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("PairOfIntString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  PairTest<int, hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/slist.cc b/hermes_shm/test/unit/data_structures/containers/slist.cc
deleted file mode 100644
index cb9667224..000000000
--- a/hermes_shm/test/unit/data_structures/containers/slist.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "list.h"
-#include "hermes_shm/data_structures/ipc/slist.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-using hshm::ipc::slist;
-
-template<typename T>
-void ListTest() {
-  Allocator *alloc = alloc_g;
-  auto lp = hipc::make_uptr<slist<T>>(alloc);
-  ListTestSuite<T, slist<T>> test(*lp, alloc);
-
-  test.EmplaceTest(30);
-  test.ForwardIteratorTest();
-  test.ConstForwardIteratorTest();
-  test.CopyConstructorTest();
-  test.CopyAssignmentTest();
-  test.MoveConstructorTest();
-  test.MoveAssignmentTest();
-  test.EmplaceFrontTest();
-  test.ModifyEntryCopyIntoTest();
-  test.ModifyEntryMoveIntoTest();
-  test.EraseTest();
-}
-
-TEST_CASE("SlistOfInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ListTest<int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("SlistOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ListTest<hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("SlistOfStdString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  ListTest<std::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/smart_ptr.h b/hermes_shm/test/unit/data_structures/containers/smart_ptr.h
deleted file mode 100644
index cc1253ab0..000000000
--- a/hermes_shm/test/unit/data_structures/containers/smart_ptr.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TEST_UNIT_ptr__STRUCTURES_CONTAINERS_SMART_PTR_H_
-#define HERMES_TEST_UNIT_ptr__STRUCTURES_CONTAINERS_SMART_PTR_H_
-
-#include "basic_test.h"
-#include "test_init.h"
-
-namespace hshm::ipc {
-
-template<typename T, typename PointerT>
-class SmartPtrTestSuite {
- public:
-  PointerT &ptr_;     /**< Allocated. Used for all tests. */
-  PointerT &ptr2_;    /**< Unallocated. Used for move tests. */
-
-  explicit SmartPtrTestSuite(PointerT &ptr,
-                             PointerT &ptr2) : ptr_(ptr), ptr2_(ptr2) {}
-
- public:
-  // Test dereference
-  void DereferenceTest(T &num) {
-    REQUIRE(*ptr_ == num);
-  }
-
-  // Test move constructor
-  void MoveConstructorTest(T &num) {
-    PointerT ptr2(std::move(ptr_));
-    // REQUIRE(ptr_.IsNull());
-    REQUIRE(std::hash<PointerT>{}(ptr2) == std::hash<T>{}(num));
-    ptr_ = std::move(ptr2);
-  }
-
-  // Test move assignment operator
-  void MoveAssignmentTest(T &num) {
-    ptr2_ = std::move(ptr_);
-    // REQUIRE(ptr_.IsNull());
-    REQUIRE(std::hash<PointerT>{}(ptr2_) == std::hash<T>{}(num));
-    ptr_ = std::move(ptr2_);
-  }
-
-  // Test copy constructor
-  void CopyConstructorTest(T &num) {
-    PointerT ptr2(ptr_);
-    REQUIRE(*ptr_ == num);
-    REQUIRE(*ptr2 == num);
-  }
-
-  // Test copy assignment
-  void CopyAssignmentTest(T &num) {
-    PointerT ptr2 = ptr_;
-    REQUIRE(*ptr_ == num);
-    REQUIRE(*ptr2 == num);
-  }
-
-  // Test serialization + deserialization (constructor)
-  void SerializeationConstructorTest(T &num) {
-    TypedPointer<T> ar;
-    ptr_ >> ar;
-    PointerT from_ar(ar);
-    REQUIRE(*from_ar == num);
-  }
-
-  // Test serialization + deserialization (operator)
-  void SerializeationOperatorTest(T &num) {
-    TypedPointer<T> ar;
-    ptr_ >> ar;
-    PointerT from_ar;
-    from_ar << ar;
-    REQUIRE(*from_ar == num);
-  }
-};
-
-}  // namespace hshm::ipc
-
-#endif  // HERMES_TEST_UNIT_ptr__STRUCTURES_CONTAINERS_SMART_PTR_H_
diff --git a/hermes_shm/test/unit/data_structures/containers/string.cc b/hermes_shm/test/unit/data_structures/containers/string.cc
deleted file mode 100644
index e82dab5c5..000000000
--- a/hermes_shm/test/unit/data_structures/containers/string.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-using hshm::ipc::string;
-
-void TestString() {
-  Allocator *alloc = alloc_g;
-
-  PAGE_DIVIDE("Test construction from const char*") {
-    auto text = hipc::make_uptr<hipc::string>(alloc, "hello1");
-    REQUIRE(*text == "hello1");
-    REQUIRE(*text != "h");
-    REQUIRE(*text != "asdfklaf");
-  }
-
-  PAGE_DIVIDE("Test construction from std::string") {
-    auto text = hipc::make_uptr<hipc::string>(alloc, std::string("hello1"));
-    REQUIRE(*text == "hello1");
-    REQUIRE(*text != "h");
-    REQUIRE(*text != "asdfklaf");
-  }
-
-  PAGE_DIVIDE("Test the mutability of the string") {
-    auto text = hipc::make_uptr<hipc::string>(alloc, 6);
-    memcpy(text->data(), "hello4", strlen("hello4"));
-    REQUIRE(*text == "hello4");
-  }
-
-  PAGE_DIVIDE("Test copy assign from hipc::string") {
-    auto text1 = hipc::make_uptr<hipc::string>(alloc, "hello");
-    auto text2 = hipc::make_uptr<hipc::string>(alloc);
-    (*text2) = (*text1);
-    REQUIRE(*text1 == "hello");
-  }
-
-  PAGE_DIVIDE("Test copy assign from std::string") {
-    auto text1 = hipc::make_uptr<hipc::string>(alloc, "hello");
-    (*text1) = std::string("hello2");
-    REQUIRE(*text1 == "hello2");
-  }
-
-  PAGE_DIVIDE("Test move assign from hipc::string") {
-    auto text1 = hipc::make_uptr<hipc::string>(alloc, "hello");
-    auto text2 = hipc::make_uptr<hipc::string>(alloc);
-    (*text2) = std::move(*text1);
-    REQUIRE(*text2 == "hello");
-  }
-
-  PAGE_DIVIDE("Move from a string. Re-assign moved string.") {
-    auto text1 = hipc::make_uptr<hipc::string>(alloc, "hello");
-    auto text2 = hipc::make_uptr<hipc::string>(alloc);
-    (*text2) = std::move(*text1);
-    (*text1) = "hello2";
-    REQUIRE(*text2 == "hello");
-    REQUIRE(*text1 == "hello2");
-  }
-}
-
-TEST_CASE("String") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(IS_SHM_ARCHIVEABLE(string));
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  TestString();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/test_init.h b/hermes_shm/test/unit/data_structures/containers/test_init.h
deleted file mode 100644
index 543d19d24..000000000
--- a/hermes_shm/test/unit/data_structures/containers/test_init.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_TEST_UNIT_DATA_STRUCTURES_TEST_INIT_H_
-#define HERMES_TEST_UNIT_DATA_STRUCTURES_TEST_INIT_H_
-
-#include "hermes_shm/data_structures/data_structure.h"
-
-using hshm::ipc::PosixShmMmap;
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::Pointer;
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-extern Allocator *alloc_g;
-
-template<typename AllocT>
-void Pretest() {
-  std::string shm_url = "test_allocators";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->CreateBackend<PosixShmMmap>(
-    MemoryManager::GetDefaultBackendSize(), shm_url);
-  mem_mngr->CreateAllocator<AllocT>(shm_url, alloc_id, 0);
-  alloc_g = mem_mngr->GetAllocator(alloc_id);
-}
-
-void Posttest();
-
-#endif  // HERMES_TEST_UNIT_DATA_STRUCTURES_TEST_INIT_H_
diff --git a/hermes_shm/test/unit/data_structures/containers/tuple.cc b/hermes_shm/test/unit/data_structures/containers/tuple.cc
deleted file mode 100644
index 864583288..000000000
--- a/hermes_shm/test/unit/data_structures/containers/tuple.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-template<typename FirstT, typename SecondT>
-void TupleTest() {
-  Allocator *alloc = alloc_g;
-
-  // Construct test
-  /*{
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    hipc::ShmHeader<hipc::ShmStruct<FirstT, SecondT>> hdr;
-    hipc::ShmStruct<FirstT, SecondT>
-      data(hdr, alloc,
-           hshm::make_argpack(first),
-           hshm::make_argpack(second));
-    REQUIRE(data.template Get<0>() == first);
-    REQUIRE(data.template Get<1>() == second);
-  }
-
-  // Copy test
-  {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    hipc::tuple<FirstT, SecondT> data(alloc, first, second);
-    hipc::tuple<FirstT, SecondT> cpy(data);
-    REQUIRE(cpy.template Get<0>() == first);
-    REQUIRE(cpy.template Get<1>() == second);
-  }
-
-  // Move test
-  {
-    CREATE_SET_VAR_TO_INT_OR_STRING(FirstT, first, 124);
-    CREATE_SET_VAR_TO_INT_OR_STRING(SecondT, second, 130);
-    hipc::tuple<FirstT, SecondT> data(alloc, first, second);
-    hipc::tuple<FirstT, SecondT> cpy(std::move(data));
-    REQUIRE(cpy.template Get<0>() == first);
-    REQUIRE(cpy.template Get<1>() == second);
-  }*/
-}
-
-#include <functional>
-
-int y() {
-  return 0;
-}
-
-
-class Y {
- public:
-  Y() = default;
-  explicit Y(int x) {}
-  explicit Y(int x, int w) {}
-};
-
-TEST_CASE("TupleOfIntInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-
-  TupleTest<int, int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("TupleOfIntString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  // TupleTest<int, hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/unique_ptr.cc b/hermes_shm/test/unit/data_structures/containers/unique_ptr.cc
deleted file mode 100644
index 5515c0b59..000000000
--- a/hermes_shm/test/unit/data_structures/containers/unique_ptr.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "hermes_shm/data_structures/smart_ptr/smart_ptr_base.h"
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "smart_ptr.h"
-
-using hshm::ipc::string;
-using hshm::ipc::uptr;
-using hshm::ipc::mptr;
-using hshm::ipc::TypedPointer;
-
-template<typename T>
-void UniquePtrTest() {
-  CREATE_SET_VAR_TO_INT_OR_STRING(T, num, 25);
-  auto ptr = hipc::make_uptr<T>(num);
-  hipc::uptr<T> ptr2;
-  hipc::SmartPtrTestSuite<T, uptr<T>> test(ptr, ptr2);
-  test.DereferenceTest(num);
-  test.MoveConstructorTest(num);
-  test.MoveAssignmentTest(num);
-  test.SerializeationConstructorTest(num);
-  test.SerializeationOperatorTest(num);
-}
-
-TEST_CASE("UniquePtrOfInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  UniquePtrTest<int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("UniquePtrOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  UniquePtrTest<hipc::string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/unordered_map.cc b/hermes_shm/test/unit/data_structures/containers/unordered_map.cc
deleted file mode 100644
index 32f6ff7e1..000000000
--- a/hermes_shm/test/unit/data_structures/containers/unordered_map.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/unordered_map.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-using hshm::ipc::unordered_map;
-using hshm::ipc::string;
-
-#define GET_INT_FROM_KEY(VAR) CREATE_GET_INT_FROM_VAR(Key, key_ret, VAR)
-#define GET_INT_FROM_VAL(VAR) CREATE_GET_INT_FROM_VAR(Val, val_ret, VAR)
-
-#define CREATE_KV_PAIR(KEY_NAME, KEY, VAL_NAME, VAL)\
-  CREATE_SET_VAR_TO_INT_OR_STRING(Key, KEY_NAME, KEY); \
-  CREATE_SET_VAR_TO_INT_OR_STRING(Val, VAL_NAME, VAL);
-
-template<typename Key, typename Val>
-void UnorderedMapOpTest() {
-  Allocator *alloc = alloc_g;
-  auto map_p = hipc::make_uptr<unordered_map<Key, Val>>(alloc, 5);
-  auto &map = *map_p;
-
-  // Insert 20 entries into the map (no growth trigger)
-  PAGE_DIVIDE("Insert entries") {
-    for (int i = 0; i < 20; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      map.emplace(key, val);
-    }
-  }
-
-  // Iterate over the map
-  PAGE_DIVIDE("Forward iterate") {
-    std::vector<int> keys, vals;
-    for (auto &entry : map) {
-      GET_INT_FROM_KEY(entry.GetKey());
-      GET_INT_FROM_VAL(entry.GetVal());
-      keys.emplace_back(key_ret);
-      vals.emplace_back(val_ret);
-    }
-    REQUIRE(keys.size() == 20);
-    REQUIRE(vals.size() == 20);
-    std::sort(keys.begin(), keys.end());
-    std::sort(vals.begin(), vals.end());
-    for (int i = 0; i < 20; ++i) {
-      REQUIRE(keys[i] == i);
-      REQUIRE(vals[i] == i);
-    }
-  }
-
-  // Check if the 20 entries are indexable
-  PAGE_DIVIDE("Check if entries are indexable") {
-    for (int i = 0; i < 20; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      REQUIRE((map[key]) == val);
-    }
-  }
-
-  // Check if 20 entries are findable
-  PAGE_DIVIDE("Check if entries are findable") {
-    for (int i = 0; i < 20; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      auto iter = map.find(key);
-      hipc::pair<Key, Val> &pair = *iter;
-      REQUIRE(pair.GetVal() == val);
-    }
-  }
-
-  // Re-emplace elements (adding 100 to i)
-  PAGE_DIVIDE("Re-emplace elements") {
-    for (int i = 0; i < 20; ++i) {
-      CREATE_KV_PAIR(key, i, val, i + 100);
-      map.emplace(key, val);
-      REQUIRE((map[key]) == val);
-    }
-  }
-
-  // Modify the fourth map entry (move assignment)
-  PAGE_DIVIDE("Modify the fourth map entry") {
-    CREATE_KV_PAIR(key, 4, val, 25);
-    auto iter = map.find(key);
-    hipc::pair<Key, Val>& pair = *iter;
-    pair.GetVal() = val;
-    REQUIRE(pair.GetVal() == val);
-  }
-
-  // Verify the modification took place
-  PAGE_DIVIDE("Verify the modification took place") {
-    CREATE_KV_PAIR(key, 4, val, 25);
-    REQUIRE((map[key]) == val);
-  }
-
-  // Modify the fourth map entry (copy assignment)
-  PAGE_DIVIDE("Copy assignment test") {
-    CREATE_KV_PAIR(key, 4, val, 50);
-    auto iter = map.find(key);
-    hipc::pair<Key, Val>& pair = *iter;
-    pair.GetVal() = val;
-    REQUIRE(pair.GetVal() == val);
-  }
-
-  // Verify the modification took place
-  PAGE_DIVIDE("Verify the copy assignment held") {
-    CREATE_KV_PAIR(key, 4, val, 50);
-    REQUIRE((map[key]) == val);
-  }
-
-  // Modify the fourth map entry (copy assignment)
-  PAGE_DIVIDE("Modify the fourth map entry (copy assignment)") {
-    CREATE_KV_PAIR(key, 4, val, 100);
-    auto &x = map[key];
-    x = val;
-  }
-
-  // Verify the modification took place
-  PAGE_DIVIDE("Verify the modification took place") {
-    CREATE_KV_PAIR(key, 4, val, 100);
-    REQUIRE(map[key] == val);
-  }
-
-  // Remove 15 entries from the map
-  PAGE_DIVIDE("Remove 15 entries from the map") {
-    for (int i = 0; i < 15; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      map.erase(key);
-    }
-    REQUIRE(map.size() == 5);
-    for (int i = 0; i < 15; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      REQUIRE(map.find(key) == map.end());
-    }
-  }
-
-  // Attempt to replace an existing key
-  PAGE_DIVIDE("Try emplace on an existing key") {
-    for (int i = 15; i < 20; ++i) {
-      CREATE_KV_PAIR(key, i, val, 100);
-      REQUIRE(map.try_emplace(key, val) == false);
-    }
-    for (int i = 15; i < 20; ++i) {
-      CREATE_KV_PAIR(key, i, val, 100);
-      GET_INT_FROM_VAL(map[key])
-      REQUIRE(val_ret == i + 100);
-    }
-  }
-
-  // Erase the entire map
-  PAGE_DIVIDE("Erase the entire map") {
-    map.clear();
-    REQUIRE(map.size() == 0);
-  }
-
-  // Add 100 entries to the map (should force a growth)
-  PAGE_DIVIDE("Add 100 entries to the map") {
-    for (int i = 0; i < 100; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      map.emplace(key, val);
-    }
-    for (int i = 0; i < 100; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      auto iter = map.find(key);
-      REQUIRE(iter != map.end());
-      hipc::pair<Key, Val>& pair = *iter;
-      REQUIRE(pair.GetKey() == key);
-      REQUIRE(pair.GetVal() == val);
-    }
-  }
-
-  // Copy assignment operator
-  PAGE_DIVIDE("Copy the map") {
-    auto cpy = hipc::make_uptr<unordered_map<Key, Val>>(alloc);
-    (*cpy) = map;
-    for (int i = 0; i < 100; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      auto iter1 = map.find(key);
-      auto iter2 = cpy->find(key);
-      REQUIRE(!iter1.is_end());
-      hipc::pair<Key, Val>& pair1 = *iter1;
-      REQUIRE(pair1.GetKey() == key);
-      REQUIRE(pair1.GetVal() == val);
-
-      REQUIRE(!iter2.is_end());
-      hipc::pair<Key, Val>& pair2 = *iter2;
-      REQUIRE(pair2.GetKey() == key);
-      REQUIRE(pair2.GetVal() == val);
-    }
-  }
-
-  // Move assignment operator
-  PAGE_DIVIDE("Move the map") {
-    auto cpy = hipc::make_uptr<unordered_map<Key, Val>>(alloc);
-    (*cpy) = std::move(map);
-    for (int i = 0; i < 100; ++i) {
-      CREATE_KV_PAIR(key, i, val, i);
-      auto iter = cpy->find(key);
-      REQUIRE(!iter.is_end());
-      hipc::pair<Key, Val>& pair = *iter;
-      REQUIRE(pair.GetKey() == key);
-      REQUIRE(pair.GetVal() == val);
-    }
-    map = std::move(*cpy);
-  }
-}
-
-TEST_CASE("UnorderedMapOfIntInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  UnorderedMapOpTest<int, int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("UnorderedMapOfIntString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  UnorderedMapOpTest<int, string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-
-TEST_CASE("UnorderedMapOfStringInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  UnorderedMapOpTest<string, int>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("UnorderedMapOfStringString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  UnorderedMapOpTest<string, string>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers/vector.cc b/hermes_shm/test/unit/data_structures/containers/vector.cc
deleted file mode 100644
index bf9f52c12..000000000
--- a/hermes_shm/test/unit/data_structures/containers/vector.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-#include "hermes_shm/data_structures/ipc/list.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "vector.h"
-
-using hshm::ipc::vector;
-using hshm::ipc::list;
-using hshm::ipc::string;
-
-template<typename T>
-void VectorTestRunner(VectorTestSuite<T, vector<T>> &test) {
-  test.EmplaceTest(15);
-  test.IndexTest();
-  test.ForwardIteratorTest();
-  test.ConstForwardIteratorTest();
-  test.CopyConstructorTest();
-  test.CopyAssignmentTest();
-  test.MoveConstructorTest();
-  test.MoveAssignmentTest();
-  test.EmplaceFrontTest();
-  test.ModifyEntryCopyIntoTest();
-  test.ModifyEntryMoveIntoTest();
-  test.EraseTest();
-}
-
-template<typename T, bool ptr>
-void VectorTest() {
-  Allocator *alloc = alloc_g;
-  auto vec = hipc::make_uptr<vector<T>>(alloc);
-  VectorTestSuite<T, vector<T>> test(*vec, alloc);
-  VectorTestRunner<T>(test);
-}
-
-void VectorOfVectorOfStringTest() {
-  Allocator *alloc = alloc_g;
-  auto vec = hipc::make_uptr<
-    vector<vector<string>>>(alloc);
-
-  vec->resize(10);
-  for (vector<string> &bkt : *vec) {
-    bkt.emplace_back("hello");
-  }
-  vec->clear();
-}
-
-void VectorOfListOfStringTest() {
-  Allocator *alloc = alloc_g;
-  auto vec = hipc::make_uptr<vector<list<string>>>(alloc);
-
-  vec->resize(10);
-
-  PAGE_DIVIDE("Emplace an element into each bucket") {
-    size_t count = 0;
-    for (list<string> &bkt : *vec) {
-      bkt.emplace_back(std::to_string(count));
-      count += 1;
-    }
-    REQUIRE(count == 10);
-  }
-
-  PAGE_DIVIDE("Get string from each bucket") {
-    size_t count = 0;
-    for (list<string> &bkt : *vec) {
-      for (string &val : bkt) {
-        REQUIRE(val == std::to_string(count));
-      }
-      count += 1;
-    }
-    REQUIRE(count == 10);
-  }
-
-  vec->clear();
-}
-
-TEST_CASE("VectorOfInt") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  VectorTest<int, false>();
-  VectorTest<int, true>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("VectorOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  VectorTest<hipc::string, false>();
-  VectorTest<int, true>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("VectorOfStdString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  VectorTest<std::string, false>();
-  VectorTest<int, true>();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("VectorOfVectorOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  VectorOfVectorOfStringTest();
-  VectorOfVectorOfStringTest();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
-
-TEST_CASE("VectorOfListOfString") {
-  Allocator *alloc = alloc_g;
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-  VectorOfListOfStringTest();
-  VectorOfListOfStringTest();
-  REQUIRE(alloc->GetCurrentlyAllocatedSize() == 0);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers_mpi/CMakeLists.txt b/hermes_shm/test/unit/data_structures/containers_mpi/CMakeLists.txt
deleted file mode 100644
index 422e9b27e..000000000
--- a/hermes_shm/test/unit/data_structures/containers_mpi/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-#------------------------------------------------------------------------------
-# Test Cases
-#------------------------------------------------------------------------------
-
-add_executable(test_data_structure_mpi_exec
-        ${TEST_MAIN}/main_mpi.cc
-        test_init.cc
-        list_vec_mpi.cc
-)
-
-add_dependencies(test_data_structure_mpi_exec hermes_shm_data_structures)
-target_link_libraries(test_data_structure_mpi_exec
-        hermes_shm_data_structures Catch2::Catch2 MPI::MPI_CXX OpenMP::OpenMP_CXX)
-
-#------------------------------------------------------------------------------
-# Build Tests
-#------------------------------------------------------------------------------
-
-# VECTOR TESTS
-add_test(NAME test_vector_of_int_mpi COMMAND
-        mpirun -n 4 ${CMAKE_BINARY_DIR}/bin/test_data_structure_mpi_exec "VectorOfIntMpi")
-add_test(NAME test_vector_of_string_mpi COMMAND
-        mpirun -n 1  ${CMAKE_BINARY_DIR}/bin/test_data_structure_mpi_exec "VectorOfStringMpi")
-
-# LIST TESTS
-add_test(NAME test_list_of_int_mpi COMMAND
-        mpirun -n 4 ${CMAKE_BINARY_DIR}/bin/test_data_structure_mpi_exec "ListOfIntMpi")
-add_test(NAME test_list_of_string_mpi COMMAND
-        mpirun -n 2 ${CMAKE_BINARY_DIR}/bin/test_data_structure_mpi_exec "ListOfStringMpi")
-
-message("mpirun -n 1 ${CMAKE_BINARY_DIR}/bin/test_data_structure_mpi_exec ListOfStringMpi")
-
-#------------------------------------------------------------------------------
-# Install Targets
-#------------------------------------------------------------------------------
-install(TARGETS
-        test_data_structure_mpi_exec
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
diff --git a/hermes_shm/test/unit/data_structures/containers_mpi/list_vec_mpi.cc b/hermes_shm/test/unit/data_structures/containers_mpi/list_vec_mpi.cc
deleted file mode 100644
index e672e63e1..000000000
--- a/hermes_shm/test/unit/data_structures/containers_mpi/list_vec_mpi.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "hermes_shm/data_structures/ipc/list.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-#include "hermes_shm/util/error.h"
-
-template<typename T, typename ContainerT>
-void ListVecTest(size_t count) {
-  int rank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  Allocator *alloc = alloc_g;
-  Pointer *header = alloc->GetCustomHeader<Pointer>();
-  ContainerT obj;
-
-  try {
-    if (rank == 0) {
-      obj.shm_init(alloc);
-      obj >> (*header);
-    }
-    MPI_Barrier(MPI_COMM_WORLD);
-    obj.shm_deserialize(*header);
-    MPI_Barrier(MPI_COMM_WORLD);
-
-    // Write 100 objects from rank 0
-    {
-      if (rank == 0) {
-        for (size_t i = 0; i < count; ++i) {
-          CREATE_SET_VAR_TO_INT_OR_STRING(T, var, i);
-          obj.emplace_back(var);
-        }
-      }
-      MPI_Barrier(MPI_COMM_WORLD);
-    }
-
-    // Read 100 objects from every rank
-    {
-      REQUIRE(obj.size() == count);
-      int i = 0;
-      for (hipc::Ref<T> var : obj) {
-        CREATE_SET_VAR_TO_INT_OR_STRING(T, orig, i);
-        REQUIRE(*var == orig);
-        ++i;
-      }
-      MPI_Barrier(MPI_COMM_WORLD);
-    }
-
-    // Modify an object in rank 0
-    {
-      if (rank == 0) {
-        CREATE_SET_VAR_TO_INT_OR_STRING(T, update, count);
-        hipc::Ref<T> first = *obj.begin();
-        (*first) = update;
-      }
-      MPI_Barrier(MPI_COMM_WORLD);
-    }
-
-    // Check if modification received
-    {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, update, count);
-      hipc::Ref<T> first = *obj.begin();
-      REQUIRE((*first) == update);
-      MPI_Barrier(MPI_COMM_WORLD);
-      MPI_Barrier(MPI_COMM_WORLD);
-    }
-  } catch(HERMES_ERROR_TYPE &HERMES_ERROR_PTR) {
-    std::cout << "HERE0" << std::endl;
-    err->print();
-  } catch(hshm::Error &err) {
-    std::cout << "HERE1" << std::endl;
-    err.print();
-  } catch(int err) {
-    std::cout << "HERE2" << std::endl;
-  } catch(std::runtime_error &err) {
-    std::cout << "HERE3" << std::endl;
-  } catch(std::logic_error &err) {
-    std::cout << "HERE4" << std::endl;
-  } catch(...) {
-    std::cout << "HERE5" << std::endl;
-  }
-}
-
-TEST_CASE("ListOfIntMpi") {
-  ListVecTest<int, hipc::list<int>>(100);
-}
-
-TEST_CASE("ListOfStringMpi") {
-  ListVecTest<hipc::string, hipc::list<hipc::string>>(100);
-}
-
-TEST_CASE("VectorOfIntMpi") {
-  ListVecTest<int, hipc::vector<int>>(100);
-}
-
-TEST_CASE("VectorOfStringMpi") {
-  ListVecTest<hipc::string, hipc::vector<hipc::string>>(100);
-}
diff --git a/hermes_shm/test/unit/data_structures/containers_mpi/test_init.cc b/hermes_shm/test/unit/data_structures/containers_mpi/test_init.cc
deleted file mode 100644
index b5d339ccd..000000000
--- a/hermes_shm/test/unit/data_structures/containers_mpi/test_init.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "basic_test.h"
-#include "test_init.h"
-
-Allocator *alloc_g = nullptr;
-
-template<typename AllocT>
-void PretestRank0() {
-  std::string shm_url = "test_allocators";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->CreateBackend<PosixShmMmap>(
-    MemoryManager::GetDefaultBackendSize(), shm_url);
-  mem_mngr->CreateAllocator<AllocT>(shm_url, alloc_id, sizeof(Pointer));
-  alloc_g = mem_mngr->GetAllocator(alloc_id);
-}
-
-void PretestRankN() {
-  std::string shm_url = "test_allocators";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->AttachBackend(MemoryBackendType::kPosixShmMmap, shm_url);
-  alloc_g = mem_mngr->GetAllocator(alloc_id);
-}
-
-void MainPretest() {
-  int rank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  if (rank == 0) {
-    PretestRank0<hipc::StackAllocator>();
-  }
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank != 0) {
-    PretestRankN();
-  }
-}
-
-void MainPosttest() {
-}
diff --git a/hermes_shm/test/unit/data_structures/containers_mpi/test_init.h b/hermes_shm/test/unit/data_structures/containers_mpi/test_init.h
deleted file mode 100644
index 5f1b52cd5..000000000
--- a/hermes_shm/test/unit/data_structures/containers_mpi/test_init.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef HERMES_TEST_UNIT_DATA_STRUCTURES_TEST_INIT_H_
-#define HERMES_TEST_UNIT_DATA_STRUCTURES_TEST_INIT_H_
-
-#include "hermes_shm/data_structures/data_structure.h"
-#include <mpi.h>
-
-using hshm::ipc::PosixShmMmap;
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::Pointer;
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-extern Allocator *alloc_g;
-
-void Posttest();
-
-#endif  // HERMES_TEST_UNIT_DATA_STRUCTURES_TEST_INIT_H_
diff --git a/hermes_shm/test/unit/data_structures/serialize/CMakeLists.txt b/hermes_shm/test/unit/data_structures/serialize/CMakeLists.txt
deleted file mode 100644
index 666c25541..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-add_subdirectory(shm)
-add_subdirectory(thallium)
\ No newline at end of file
diff --git a/hermes_shm/test/unit/data_structures/serialize/shm/CMakeLists.txt b/hermes_shm/test/unit/data_structures/serialize/shm/CMakeLists.txt
deleted file mode 100644
index a36d4b03e..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/shm/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-#------------------------------------------------------------------------------
-# Test Cases
-#------------------------------------------------------------------------------
-set (LIBS
-        hermes_shm_data_structures
-        Catch2::Catch2
-        MPI::MPI_CXX
-        OpenMP::OpenMP_CXX)
-add_executable(test_shm_exec
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        test_shm.cc)
-add_dependencies(test_shm_exec
-        hermes_shm_data_structures)
-target_link_libraries(test_shm_exec ${LIBS})
-
-add_test(NAME test_shm COMMAND ${CMAKE_BINARY_DIR}/bin/test_shm_exec)
-
-#------------------------------------------------------------------------------
-# Install Targets
-#------------------------------------------------------------------------------
-install(TARGETS
-        test_shm_exec
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
diff --git a/hermes_shm/test/unit/data_structures/serialize/shm/test_init.cc b/hermes_shm/test/unit/data_structures/serialize/shm/test_init.cc
deleted file mode 100644
index a723ac90f..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/shm/test_init.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <iostream>
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "hermes_shm/data_structures/serialization/thallium.h"
-#include "hermes_shm/data_structures/containers/charbuf.h"
-#include <memory>
-
-void MainPretest() {
-  std::string shm_url = "test_serializers";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->CreateBackend<PosixShmMmap>(
-      MemoryManager::GetDefaultBackendSize(), shm_url);
-  mem_mngr->CreateAllocator<hipc::ScalablePageAllocator>(shm_url, alloc_id, 0);
-}
-
-void MainPosttest() {
-}
diff --git a/hermes_shm/test/unit/data_structures/serialize/shm/test_init.h b/hermes_shm/test/unit/data_structures/serialize/shm/test_init.h
deleted file mode 100644
index d19ebf96a..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/shm/test_init.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_TEST_UNIT_DATA_STRUCTURES_SERIALIZE_THALLIUM_TEST_INIT_H_
-#define HERMES_SHM_TEST_UNIT_DATA_STRUCTURES_SERIALIZE_THALLIUM_TEST_INIT_H_
-
-#include "hermes_shm/data_structures/data_structure.h"
-#include "hermes_shm/data_structures/serialization/shm_serialize.h"
-
-using hshm::ipc::PosixShmMmap;
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::Pointer;
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-#endif  // HERMES_SHM_TEST_UNIT_DATA_STRUCTURES_SERIALIZE_THALLIUM_TEST_INIT_H_
diff --git a/hermes_shm/test/unit/data_structures/serialize/shm/test_shm.cc b/hermes_shm/test/unit/data_structures/serialize/shm/test_shm.cc
deleted file mode 100644
index d315c542d..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/shm/test_shm.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "hermes_shm/data_structures/data_structure.h"
-
-TEST_CASE("SerializePod") {
-  hipc::ShmSerializer istream;
-  Allocator *alloc = HERMES_MEMORY_MANAGER->GetDefaultAllocator();
-  int a = 1;
-  double b = 2;
-  float c = 3;
-  int size = sizeof(int) + sizeof(double) + sizeof(float) + sizeof(allocator_id_t);
-  REQUIRE(istream.shm_buf_size(alloc->GetId(), a, b, c) == size);
-  char *buf = istream.serialize(alloc, a, b, c);
-
-  hipc::ShmSerializer ostream;
-  Allocator *alloc2 = ostream.deserialize(buf);
-  REQUIRE(alloc == alloc2);
-  auto a2 = ostream.deserialize<int>(alloc2, buf);
-  REQUIRE(a2 == a);
-  auto b2 = ostream.deserialize<double>(alloc2, buf);
-  REQUIRE(b2 == b);
-  auto c2 = ostream.deserialize<float>(alloc2, buf);
-  REQUIRE(c2 == c);
-}
-
-TEST_CASE("SerializeString") {
-  hipc::ShmSerializer istream;
-  Allocator *alloc = HERMES_MEMORY_MANAGER->GetDefaultAllocator();
-  hipc::mptr<hipc::string> i;
-  bool string_ar = IS_SHM_ARCHIVEABLE(hipc::string);
-  bool string_star_ar = IS_SHM_ARCHIVEABLE(std::remove_reference<decltype(*i)>);
-  bool string_ar2 = IS_SHM_ARCHIVEABLE(std::remove_reference<hipc::string&>::type);
-
-  hipc::string &y = *i;
-
-
-  auto a = hipc::make_uptr<hipc::string>(alloc, "h1");
-  auto b = hipc::make_uptr<hipc::string>(alloc, "h2");
-  int c;
-  int size = 2 * sizeof(hipc::OffsetPointer) + sizeof(int) + sizeof(allocator_id_t);
-  REQUIRE(istream.shm_buf_size(alloc->GetId(), *a, *b, c) == size);
-  char *buf = istream.serialize(alloc, *a, *b, c);
-
-  hipc::ShmSerializer ostream;
-  Allocator *alloc2 = ostream.deserialize(buf);
-  REQUIRE(alloc == alloc2);
-  hipc::mptr<hipc::string> a2;
-  ostream.deserialize<hipc::string>(alloc2, buf, a2);
-  REQUIRE(*a2 == *a);
-  hipc::mptr<hipc::string> b2;
-  ostream.deserialize<hipc::string>(alloc2, buf, b2);
-  REQUIRE(*b2 == *b);
-  int c2 = ostream.deserialize<int>(alloc2, buf);
-  REQUIRE(c2 == c);
-}
-
diff --git a/hermes_shm/test/unit/data_structures/serialize/thallium/server.cc b/hermes_shm/test/unit/data_structures/serialize/thallium/server.cc
deleted file mode 100644
index c7c9d271e..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/thallium/server.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "hermes_shm/data_structures/serialization/thallium.h"
-#include "hermes_shm/data_structures/containers/charbuf.h"
-#include <memory>
-
-std::unique_ptr<tl::engine> client_;
-std::unique_ptr<tl::engine> server_;
-
-template<typename T>
-bool VerifyVector(hipc::vector<T> &vec) {
-  for (int i = 0; i < 20; ++i) {
-    if constexpr(std::is_same_v<T, int>) {
-      if (vec[i] != i) {
-        return false;
-      }
-    } else {
-      if (vec[i] != std::to_string(i)) {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-int main() {
-  // Pretest
-  ServerPretest<hipc::StackAllocator>();
-
-  // Create thallium server
-  server_ = std::make_unique<tl::engine>(
-    tcnst::kServerName,
-    THALLIUM_SERVER_MODE,
-    true, 1);
-  std::cout << "Server running at address " << server_->self() << std::endl;
-
-  // Test transfer of 0-length string
-  auto string_test0 = [](const request &req,
-                         hipc::uptr<hipc::string> &text) {
-    bool ret = (*text == "");
-    req.respond(ret);
-  };
-  server_->define(tcnst::kStringTest0, string_test0);
-
-  // Test transfer of long string
-  auto string_test1 = [](const request &req,
-                         hipc::uptr<hipc::string> &text) {
-    bool ret = (*text == tcnst::kTestString);
-    req.respond(ret);
-  };
-  server_->define(tcnst::kStringTestLarge, string_test1);
-
-  // Test transfer of 0-length charbuf
-  auto charbuf_test0 = [](const request &req,
-                          hshm::charbuf &text) {
-    bool ret = (text == "");
-    req.respond(ret);
-  };
-  server_->define(tcnst::kCharbufTest0, charbuf_test0);
-
-  // Test transfer of long charbuf
-  auto charbuf_test1 = [](const request &req,
-                          hshm::charbuf &text) {
-    bool ret = (text == tcnst::kTestString);
-    req.respond(ret);
-  };
-  server_->define(tcnst::kCharbufTestLarge, charbuf_test1);
-
-  // Test transfer of empty vector
-  auto vec_of_int0_test = [](const request &req,
-                             hipc::uptr<hipc::vector<int>> &vec) {
-    bool ret = vec->size() == 0;
-    req.respond(ret);
-  };
-  server_->define(tcnst::kVecOfInt0Test, vec_of_int0_test);
-
-  // Test transfer of large vector
-  auto vec_of_int_large_test = [](const request &req,
-                                  hipc::uptr<hipc::vector<int>> &vec) {
-    bool ret = VerifyVector(*vec);
-    req.respond(ret);
-  };
-  server_->define(tcnst::kVecOfIntLargeTest, vec_of_int_large_test);
-
-  // Test transfer of empty string vector
-  auto vec_of_string0_test = [](const request &req,
-                                hipc::uptr<hipc::vector<hipc::string>> &vec) {
-    bool ret = vec->size() == 0;
-    req.respond(ret);
-  };
-  server_->define(tcnst::kVecOfString0Test, vec_of_string0_test);
-
-  // Test transfer of large string vector
-  auto vec_of_string_large_test = [](
-    const request &req, hipc::uptr<hipc::vector<hipc::string>> &vec) {
-    bool ret = VerifyVector(*vec);
-    req.respond(ret);
-  };
-  server_->define(tcnst::kVecOfStringLargeTest, vec_of_string_large_test);
-
-  // Test transfer of bitfield
-  auto bitfield_test = [](const request &req, hshm::bitfield32_t &field) {
-    bool ret = field.Any(0x8);
-    req.respond(ret);
-  };
-  server_->define(tcnst::kBitfieldTest, bitfield_test);
-
-  // Start daemon
-  server_->enable_remote_shutdown();
-  server_->wait_for_finalize();
-}
diff --git a/hermes_shm/test/unit/data_structures/serialize/thallium/test_init.cc b/hermes_shm/test/unit/data_structures/serialize/thallium/test_init.cc
deleted file mode 100644
index a51194f45..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/thallium/test_init.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <iostream>
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-#include "hermes_shm/data_structures/serialization/thallium.h"
-#include "hermes_shm/data_structures/containers/charbuf.h"
-#include <memory>
-
-std::unique_ptr<tl::engine> client_;
-std::unique_ptr<tl::engine> server_;
-
-void MainPretest() {
-  ClientPretest<hipc::StackAllocator>();
-  client_ = std::make_unique<tl::engine>(
-    "ofi+sockets",
-    THALLIUM_CLIENT_MODE);
-}
-
-void MainPosttest() {
-  tl::endpoint server = client_->lookup(tcnst::kServerName);
-  client_->shutdown_remote_engine(server);
-}
diff --git a/hermes_shm/test/unit/data_structures/serialize/thallium/test_init.h b/hermes_shm/test/unit/data_structures/serialize/thallium/test_init.h
deleted file mode 100644
index f111e4580..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/thallium/test_init.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SHM_TEST_UNIT_DATA_STRUCTURES_SERIALIZE_THALLIUM_TEST_INIT_H_
-#define HERMES_SHM_TEST_UNIT_DATA_STRUCTURES_SERIALIZE_THALLIUM_TEST_INIT_H_
-
-#include <thallium.hpp>
-#include "hermes_shm/thread/thread_model_manager.h"
-#include "hermes_shm/thread/thread_model/thread_model_factory.h"
-#include "hermes_shm/data_structures/data_structure.h"
-#include "hermes_shm/data_structures/serialization/thallium.h"
-
-using hshm::ipc::PosixShmMmap;
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::Pointer;
-
-using hshm::ipc::MemoryBackendType;
-using hshm::ipc::MemoryBackend;
-using hshm::ipc::allocator_id_t;
-using hshm::ipc::AllocatorType;
-using hshm::ipc::Allocator;
-using hshm::ipc::MemoryManager;
-using hshm::ipc::Pointer;
-
-namespace thallium {
-class Constants {
- public:
-  static inline const char *kServerName = "ofi+sockets://127.0.0.1:8080";
-  static inline const char *kTestString = "012344823723642364723874623";
-
-  /** Test cases */
-  static inline const char *kStringTest0 = "kStringTest0";
-  static inline const char *kStringTestLarge = "kStringTestLarge";
-  static inline const char *kCharbufTest0 = "kCharbufTest0";
-  static inline const char *kCharbufTestLarge = "kCharbufTestLarge";
-  static inline const char *kVecOfInt0Test = "kVecOfInt0Test";
-  static inline const char *kVecOfIntLargeTest = "kVecOfIntLargeTest";
-  static inline const char *kVecOfString0Test = "kVecOfString0Test";
-  static inline const char *kVecOfStringLargeTest = "kVecOfStringLargeTest";
-  static inline const char *kBitfieldTest = "kBitfieldTest";
-};
-}  // namespace thallium
-using tcnst = thallium::Constants;
-
-namespace tl = thallium;
-using thallium::request;
-
-/** Test init */
-template<typename AllocT>
-void ServerPretest() {
-  std::string shm_url = "test_serializers";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->CreateBackend<PosixShmMmap>(
-    MemoryManager::GetDefaultBackendSize(), shm_url);
-  mem_mngr->CreateAllocator<AllocT>(shm_url, alloc_id, 0);
-}
-
-template<typename AllocT>
-void ClientPretest() {
-  std::string shm_url = "test_serializers";
-  allocator_id_t alloc_id(0, 1);
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->AttachBackend(MemoryBackendType::kPosixShmMmap, shm_url);
-}
-
-extern std::unique_ptr<tl::engine> client_;
-extern std::unique_ptr<tl::engine> server_;
-
-#endif  // HERMES_SHM_TEST_UNIT_DATA_STRUCTURES_SERIALIZE_THALLIUM_TEST_INIT_H_
diff --git a/hermes_shm/test/unit/data_structures/serialize/thallium/test_thallium.cc b/hermes_shm/test/unit/data_structures/serialize/thallium/test_thallium.cc
deleted file mode 100644
index 46eea911d..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/thallium/test_thallium.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "test_init.h"
-#include "hermes_shm/data_structures/ipc/string.h"
-
-TEST_CASE("SerializeString") {
-  tl::endpoint server = client_->lookup(tcnst::kServerName);
-  tl::remote_procedure string0_proc = client_->define(tcnst::kStringTest0);
-  tl::remote_procedure string_large_proc = client_->define(
-    tcnst::kStringTestLarge);
-
-  auto empty_str = hipc::make_uptr<hipc::string>("");
-  auto large_str = hipc::make_uptr<hipc::string>(tcnst::kTestString);
-
-  REQUIRE(string0_proc.on(server)(empty_str));
-  REQUIRE(string_large_proc.on(server)(large_str));
-}
-
-TEST_CASE("SerializeCharBuf") {
-  tl::endpoint server = client_->lookup(tcnst::kServerName);
-  tl::remote_procedure string0_proc = client_->define(
-    tcnst::kCharbufTest0);
-  tl::remote_procedure string_large_proc = client_->define(
-    tcnst::kCharbufTestLarge);
-
-  hshm::charbuf empty_str("");
-  hshm::charbuf large_str(tcnst::kTestString);
-
-  REQUIRE(string0_proc.on(server)(empty_str));
-  REQUIRE(string_large_proc.on(server)(large_str));
-}
-
-TEST_CASE("SerializeVectorOfInt") {
-  tl::endpoint server = client_->lookup(tcnst::kServerName);
-  tl::remote_procedure vec_int0_proc = client_->define(
-    tcnst::kVecOfInt0Test);
-  tl::remote_procedure vec_int_proc = client_->define(
-    tcnst::kVecOfIntLargeTest);
-
-  // Send empty vector
-  auto vec_int = hipc::make_uptr<hipc::vector<int>>();
-  REQUIRE(vec_int0_proc.on(server)(vec_int));
-
-  // Send initialized vector
-  for (int i = 0; i < 20; ++i) {
-    vec_int->emplace_back(i);
-  }
-  REQUIRE(vec_int_proc.on(server)(vec_int));
-}
-
-TEST_CASE("SerializeVectorOfString") {
-  tl::endpoint server = client_->lookup(tcnst::kServerName);
-  tl::remote_procedure vec_string0_proc = client_->define(
-    tcnst::kVecOfString0Test);
-  tl::remote_procedure vec_string_proc = client_->define(
-    tcnst::kVecOfStringLargeTest);
-
-  // Send empty vector
-  auto vec_string = hipc::make_uptr<hipc::vector<hipc::string>>();
-  REQUIRE(vec_string0_proc.on(server)(vec_string));
-
-  // Send initialized vector
-  for (int i = 0; i < 20; ++i) {
-    vec_string->emplace_back(std::to_string(i));
-  }
-  REQUIRE(vec_string_proc.on(server)(vec_string));
-}
-
-TEST_CASE("SerializeBitfield") {
-  tl::endpoint server = client_->lookup(
-    tcnst::kServerName);
-  tl::remote_procedure bitfield_proc = client_->define(
-    tcnst::kBitfieldTest);
-
-  // Send bitfield
-  hshm::bitfield32_t field;
-  field.SetBits(0x8);
-  REQUIRE(bitfield_proc.on(server)(field));
-}
-
diff --git a/hermes_shm/test/unit/data_structures/serialize/thallium/test_thallium.sh b/hermes_shm/test/unit/data_structures/serialize/thallium/test_thallium.sh
deleted file mode 100644
index b5e914cc3..000000000
--- a/hermes_shm/test/unit/data_structures/serialize/thallium/test_thallium.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-CMAKE_BINARY_DIR=$1
-
-# Start thallium server
-echo "Starting thallium server: ${CMAKE_BINARY_DIR}/bin/test_thallium_server"
-${CMAKE_BINARY_DIR}/bin/test_thallium_server &
-
-# Wait for it to start
-sleep 1
-
-# Run test
-echo "Thallium test: ${CMAKE_BINARY_DIR}/bin/test_thallium_exec"
-${CMAKE_BINARY_DIR}/bin/test_thallium_exec
-
diff --git a/hermes_shm/test/unit/main.cc b/hermes_shm/test/unit/main.cc
deleted file mode 100644
index bd480daba..000000000
--- a/hermes_shm/test/unit/main.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "basic_test.h"
-#include <mpi.h>
-
-int main(int argc, char **argv) {
-  int rc;
-  Catch::Session session;
-  auto cli = session.cli();
-  session.cli(cli);
-  rc = session.applyCommandLine(argc, argv);
-  if (rc != 0) return rc;
-  MainPretest();
-  rc = session.run();
-  MainPosttest();
-  if (rc != 0) return rc;
-  return rc;
-}
diff --git a/hermes_shm/test/unit/main_mpi.cc b/hermes_shm/test/unit/main_mpi.cc
deleted file mode 100644
index c2a3249a6..000000000
--- a/hermes_shm/test/unit/main_mpi.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "basic_test.h"
-#include <mpi.h>
-
-int main(int argc, char **argv) {
-  int rc;
-  MPI_Init(&argc, &argv);
-  Catch::Session session;
-  auto cli = session.cli();
-  session.cli(cli);
-  rc = session.applyCommandLine(argc, argv);
-  if (rc != 0) return rc;
-  MainPretest();
-  rc = session.run();
-  MainPosttest();
-  if (rc != 0) return rc;
-  MPI_Finalize();
-  return rc;
-}
diff --git a/hermes_shm/test/unit/thread/test_lock.cc b/hermes_shm/test/unit/thread/test_lock.cc
deleted file mode 100644
index 7997adb13..000000000
--- a/hermes_shm/test/unit/thread/test_lock.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#include "basic_test.h"
-#include "omp.h"
-#include "hermes_shm/thread/lock.h"
-
-using hshm::Mutex;
-using hshm::RwLock;
-
-void MutexTest() {
-  size_t nthreads = 8;
-  size_t loop_count = 10000;
-  size_t count = 0;
-  Mutex lock;
-
-  omp_set_dynamic(0);
-#pragma omp parallel shared(lock) num_threads(nthreads)
-  {
-    // Support parallel write
-#pragma omp barrier
-    for (size_t i = 0; i < loop_count; ++i) {
-      lock.Lock(i);
-      count += 1;
-      lock.Unlock();
-    }
-#pragma omp barrier
-    REQUIRE(count == loop_count * nthreads);
-#pragma omp barrier
-  }
-}
-
-void barrier_for_reads(std::vector<int> &tid_start, size_t left) {
-  size_t count;
-  do {
-    count = 0;
-    for (size_t i = 0; i < left; ++i) {
-      count += tid_start[i];
-    }
-  } while (count < left);
-}
-
-void RwLockTest(int producers, int consumers) {
-  size_t nthreads = producers + consumers;
-  size_t loop_count = 100000;
-  size_t count = 0;
-  RwLock lock;
-
-  omp_set_dynamic(0);
-#pragma omp parallel \
-  shared(lock, nthreads, producers, consumers, loop_count, count) \
-  num_threads(nthreads)
-  {  // NOLINT
-    int tid = omp_get_thread_num();
-
-#pragma omp barrier
-    size_t total_size = producers * loop_count;
-    if (tid < consumers) {
-      // The left 2 threads will be readers
-      lock.ReadLock(tid);
-      for (size_t i = 0; i < loop_count; ++i) {
-        REQUIRE(count < total_size);
-      }
-      lock.ReadUnlock();
-    } else {
-      // The right 4 threads will be writers
-      lock.WriteLock(tid);
-      for (size_t i = 0; i < loop_count; ++i) {
-        count += 1;
-      }
-      lock.WriteUnlock();
-    }
-
-#pragma omp barrier
-    REQUIRE(count == total_size);
-  }
-}
-
-TEST_CASE("Mutex") {
-  MutexTest();
-}
-
-TEST_CASE("RwLock") {
-  RwLockTest(8, 0);
-  RwLockTest(7, 1);
-  RwLockTest(4, 4);
-}
diff --git a/hermes_shm/test/unit/thread/test_thread.cc b/hermes_shm/test/unit/thread/test_thread.cc
deleted file mode 100644
index 7e39052cf..000000000
--- a/hermes_shm/test/unit/thread/test_thread.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "omp.h"
-#include "hermes_shm/thread/thread_model_manager.h"
-
-TEST_CASE("TestPthread") {
-  HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kPthread);
-}
-
-TEST_CASE("TestArgobots") {
-  HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kArgobots);
-}
diff --git a/hermes_shm/test/unit/types/CMakeLists.txt b/hermes_shm/test/unit/types/CMakeLists.txt
deleted file mode 100644
index f4b7cd5d7..000000000
--- a/hermes_shm/test/unit/types/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
-
-set(CMAKE_CXX_STANDARD 17)
-
-#------------------------------------------------------------------------------
-# Build Tests
-#------------------------------------------------------------------------------
-add_executable(test_types
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        test_argpack.cc
-        test_util.cc)
-add_dependencies(test_types hermes_shm_data_structures)
-target_link_libraries(test_types
-        hermes_shm_data_structures Catch2::Catch2 MPI::MPI_CXX OpenMP::OpenMP_CXX)
-
-#------------------------------------------------------------------------------
-# Install Targets
-#------------------------------------------------------------------------------
-install(TARGETS
-        test_types
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
diff --git a/hermes_shm/test/unit/types/test_argpack.cc b/hermes_shm/test/unit/types/test_argpack.cc
deleted file mode 100644
index 2f75dbe3b..000000000
--- a/hermes_shm/test/unit/types/test_argpack.cc
+++ /dev/null
@@ -1,180 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "basic_test.h"
-#include "hermes_shm/data_structures/containers/tuple_base.h"
-#include <utility>
-
-void test_argpack0_pass() {
-  std::cout << "HERE0" << std::endl;
-}
-
-void test_argpack0() {
-  hshm::PassArgPack::Call(hshm::ArgPack<>(), test_argpack0_pass);
-}
-
-template<typename T1, typename T2, typename T3>
-void test_argpack3_pass(T1 x, T2 y, T3 z) {
-  REQUIRE(x == 0);
-  REQUIRE(y == 1);
-  REQUIRE(z == 0);
-  std::cout << "HERE3" << std::endl;
-}
-
-void test_product1(int b, int c) {
-  REQUIRE(b == 1);
-  REQUIRE(c == 2);
-}
-
-void test_product2(double d, double e) {
-  REQUIRE(d == 3);
-  REQUIRE(e == 4);
-}
-
-template<typename Pack1, typename Pack2>
-void test_product(int a, Pack1 &&pack1, int a2, Pack2 &&pack2) {
-  REQUIRE(a == 0);
-  REQUIRE(a2 == 0);
-  hshm::PassArgPack::Call(
-      std::forward<Pack1>(pack1),
-      test_product1);
-  hshm::PassArgPack::Call(
-      std::forward<Pack2>(pack2),
-      test_product2);
-}
-
-template<typename T1, typename T2, typename T3>
-void verify_tuple3(hshm::tuple<T1, T2, T3> &x) {
-  REQUIRE(x.Size() == 3);
-  REQUIRE(x.template Get<0>() == 0);
-  REQUIRE(x.template Get<1>() == 1);
-  REQUIRE(x.template Get<2>() == 0);
-#ifdef TEST_COMPILER_ERROR
-  std::cout << x.Get<3>() << std::endl;
-#endif
-}
-
-template<typename T1, typename T2, typename T3>
-void test_argpack3() {
-  // Pass an argpack to a function
-  PAGE_DIVIDE("") {
-    hshm::PassArgPack::Call(
-        hshm::make_argpack(T1(0), T2(1), T3(0)),
-        test_argpack3_pass<T1, T2, T3>);
-  }
-
-  // Pass an argpack containing references to a function
-  PAGE_DIVIDE("") {
-    T2 y = 1;
-    hshm::PassArgPack::Call(
-        hshm::make_argpack(0, y, 0),
-        test_argpack3_pass<T1, T2, T3>);
-  }
-
-  // Create a 3-tuple
-  PAGE_DIVIDE("") {
-    hshm::tuple<T1, T2, T3> x(0, 1, 0);
-    verify_tuple3(x);
-  }
-
-  // Copy a tuple
-  PAGE_DIVIDE("") {
-    hshm::tuple<T1, T2, T3> y(0, 1, 0);
-    hshm::tuple<T1, T2, T3> x(y);
-    verify_tuple3(x);
-  }
-
-  // Copy assign tuple
-  PAGE_DIVIDE("") {
-    hshm::tuple<T1, T2, T3> y(0, 1, 0);
-    hshm::tuple<T1, T2, T3> x;
-    x = y;
-    verify_tuple3(x);
-  }
-
-  // Move tuple
-  PAGE_DIVIDE("") {
-    hshm::tuple<T1, T2, T3> y(0, 1, 0);
-    hshm::tuple<T1, T2, T3> x(std::move(y));
-    verify_tuple3(x);
-  }
-
-  // Move assign tuple
-  PAGE_DIVIDE("") {
-    hshm::tuple<T1, T2, T3> y(0, 1, 0);
-    hshm::tuple<T1, T2, T3> x;
-    x = std::move(y);
-    verify_tuple3(x);
-  }
-
-  // Iterate over a tuple
-  PAGE_DIVIDE("") {
-    hshm::tuple<T1, T2, T3> x(0, 1, 0);
-    hshm::ForwardIterateTuple::Apply(
-        x,
-        [](auto i, auto &arg) constexpr {
-          std::cout << "lambda: " << i.Get() << std::endl;
-        });
-  }
-
-  // Merge two argpacks into a single pack
-  PAGE_DIVIDE("") {
-    size_t y = hshm::MergeArgPacks::Merge(
-                   hshm::make_argpack(T1(0)),
-                   hshm::make_argpack(T2(1), T2(0))).Size();
-    REQUIRE(y == 3);
-  }
-
-  // Pass a merged argpack to a function
-  PAGE_DIVIDE("") {
-    hshm::PassArgPack::Call(
-        hshm::MergeArgPacks::Merge(
-            hshm::make_argpack(0),
-            hshm::make_argpack(1, 0)),
-        test_argpack3_pass<T1, T2, T3>);
-  }
-
-  // Construct tuple from argpack
-  PAGE_DIVIDE("") {
-    hshm::tuple<int, int, int> x(
-        hshm::make_argpack(10, 11, 12));
-    REQUIRE(x.Get<0>() == 10);
-    REQUIRE(x.Get<1>() == 11);
-    REQUIRE(x.Get<2>() == 12);
-  }
-
-  // Product an argpack
-  PAGE_DIVIDE("") {
-    auto&& pack = hshm::ProductArgPacks::Product(
-        0,
-        hshm::make_argpack(1, 2),
-        hshm::make_argpack<double, double>(3, 4));
-    REQUIRE(pack.Size() == 4);
-  }
-
-  // Product an argpack
-  PAGE_DIVIDE("") {
-    hshm::PassArgPack::Call(
-        hshm::ProductArgPacks::Product(
-            0,
-            hshm::make_argpack(1, 2),
-            hshm::make_argpack(3.0, 4.0)),
-        test_product<
-            hshm::ArgPack<int&&, int&&>,
-            hshm::ArgPack<double&&, double&&>>);
-  }
-}
-
-TEST_CASE("TestArgpack") {
-  test_argpack0();
-  test_argpack3<int, double, float>();
-}
diff --git a/hermes_shm/test/unit/types/test_util.cc b/hermes_shm/test/unit/types/test_util.cc
deleted file mode 100644
index 283636699..000000000
--- a/hermes_shm/test/unit/types/test_util.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <hermes_shm/util/formatter.h>
-#include <hermes_shm/util/config_parse.h>
-#include <hermes_shm/util/auto_trace.h>
-#include <hermes_shm/util/logging.h>
-#include "basic_test.h"
-#include "hermes_shm/util/singleton.h"
-#include "hermes_shm/util/type_switch.h"
-#include <unistd.h>
-
-TEST_CASE("TypeSwitch") {
-  typedef hshm::type_switch<int, int,
-    std::string, std::string,
-    size_t, size_t>::type internal_t;
-  REQUIRE(std::is_same_v<internal_t, int>);
-
-  typedef hshm::type_switch<size_t, int,
-                            std::string, std::string,
-                            size_t, size_t>::type internal2_t;
-  REQUIRE(std::is_same_v<internal2_t, size_t>);
-
-  typedef hshm::type_switch<std::string, int,
-                            std::string, std::string,
-                            size_t, size_t>::type internal3_t;
-  REQUIRE(std::is_same_v<internal3_t, std::string>);
-
-  typedef hshm::type_switch<std::vector<int>, int,
-                            std::string, std::string,
-                            size_t, size_t>::type internal4_t;
-  REQUIRE(std::is_same_v<internal4_t, int>);
-}
-
-TEST_CASE("TestPathParser") {
-  setenv("PATH_PARSER_TEST", "HOME", true);
-  auto x = hshm::ConfigParse::ExpandPath("${PATH_PARSER_TEST}/hello");
-  unsetenv("PATH_PARSER_TEST");
-  auto y = hshm::ConfigParse::ExpandPath("${PATH_PARSER_TEST}/hello");
-  auto z = hshm::ConfigParse::ExpandPath("${HOME}/hello");
-  REQUIRE(x == "HOME/hello");
-  REQUIRE(y == "${PATH_PARSER_TEST}/hello");
-  REQUIRE(z != "${HOME}/hello");
-}
-
-TEST_CASE("TestNumberParser") {
-  REQUIRE(KILOBYTES(1.5) == 1536);
-  REQUIRE(MEGABYTES(1.5) == 1572864);
-  REQUIRE(GIGABYTES(1.5) == 1610612736);
-  REQUIRE(TERABYTES(1.5) == 1649267441664);
-  REQUIRE(PETABYTES(1.5) == 1688849860263936);
-
-  std::pair<std::string, size_t> sizes[] = {
-    {"1", 1},
-    {"1.5", 1},
-    {"1KB", KILOBYTES(1)},
-    {"1.5MB", MEGABYTES(1.5)},
-    {"1.5GB", GIGABYTES(1.5)},
-    {"2TB", TERABYTES(2)},
-    {"1.5PB", PETABYTES(1.5)},
-  };
-
-  for (auto &[text, val] : sizes) {
-    REQUIRE(hshm::ConfigParse::ParseSize(text) == val);
-  }
-  REQUIRE(hshm::ConfigParse::ParseSize("inf"));
-}
-
-TEST_CASE("TestTerminal") {
-  std::cout << "\033[1m" << "Bold text" << "\033[0m" << std::endl;
-  std::cout << "\033[4m" << "Underlined text" << "\033[0m" << std::endl;
-  std::cout << "\033[31m" << "Red text" << "\033[0m" << std::endl;
-  std::cout << "\033[32m" << "Green text" << "\033[0m" << std::endl;
-  std::cout << "\033[33m" << "Yellow text" << "\033[0m" << std::endl;
-  std::cout << "\033[34m" << "Blue text" << "\033[0m" << std::endl;
-  std::cout << "\033[35m" << "Magenta text" << "\033[0m" << std::endl;
-  std::cout << "\033[36m" << "Cyan text" << "\033[0m" << std::endl;
-}
-
-TEST_CASE("TestAutoTrace") {
-  AUTO_TRACE(0)
-
-  TIMER_START("Example")
-  sleep(1);
-  TIMER_END()
-}
-
-TEST_CASE("TestLogger") {
-  HILOG(kInfo, "I'm more likely to be printed: {}", 0)
-  HILOG(kDebug, "I'm not likely to be printed: {}", 10)
-
-  HERMES_LOG->SetVerbosity(kInfo);
-  HILOG(kInfo, "I'm more likely to be printed (2): {}", 0)
-  HILOG(kDebug, "I won't be printed: {}", 10)
-
-#ifdef TEST_ERRORS
-  HELOG(kError, "I will NOT cause an EXIT!")
-  HELOG(kFatal, "I will cause an EXIT!")
-#endif
-}
-
-TEST_CASE("TestFormatter") {
-  int rank = 0;
-  int i = 0;
-
-  PAGE_DIVIDE("Test with equivalent parameters") {
-    std::string name = hshm::Formatter::format("bucket{}_{}",
-                                               rank, i);
-    REQUIRE(name == "bucket0_0");
-  }
-
-  PAGE_DIVIDE("Test with equivalent parameters at start") {
-    std::string name = hshm::Formatter::format("{}bucket{}",
-                                               rank, i);
-    REQUIRE(name == "0bucket0");
-  }
-
-  PAGE_DIVIDE("Test with too many parameters") {
-    std::string name = hshm::Formatter::format("bucket",
-                                               rank, i);
-    REQUIRE(name == "bucket");
-  }
-
-  PAGE_DIVIDE("Test with fewer parameters") {
-    std::string name = hshm::Formatter::format("bucket{}_{}",
-                                               rank);
-    REQUIRE(name == "bucket{}_{}");
-  }
-
-  PAGE_DIVIDE("Test with parameters next to each other") {
-    std::string name = hshm::Formatter::format("bucket{}{}",
-                                               rank, i);
-    REQUIRE(name == "bucket00");
-  }
-}
-
-struct SimpleClass {
-  int a_;
-
-  SimpleClass() {
-    a_ = 100;
-  }
-};
-
-DEFINE_SINGLETON_CC(SimpleClass)
-DEFINE_GLOBAL_SINGLETON_CC(SimpleClass)
-
-TEST_CASE("Singleton") {
-  SimpleClass *cls[4];
-
-  cls[0] = hshm::Singleton<SimpleClass>::GetInstance();
-  cls[1] = hshm::GlobalSingleton<SimpleClass>::GetInstance();
-  cls[2] = hshm::EasySingleton<SimpleClass>::GetInstance();
-  cls[3] = hshm::EasyGlobalSingleton<SimpleClass>::GetInstance();
-
-  for (int i = 0; i < 4; ++i) {
-    REQUIRE(cls[i]->a_ == 100);
-  }
-}
diff --git a/hrun/CMakeLists.txt b/hrun/CMakeLists.txt
new file mode 100644
index 000000000..76c70b8a1
--- /dev/null
+++ b/hrun/CMakeLists.txt
@@ -0,0 +1,160 @@
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
+
+#-----------------------------------------------------------------------------
+# Define Options
+#-----------------------------------------------------------------------------
+option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+option(BUILD_MPI_TESTS "Build tests which depend on MPI" ON)
+option(BUILD_OpenMP_TESTS "Build tests which depend on OpenMP" ON)
+option(HERMES_ENABLE_COVERAGE "Check how well tests cover code" OFF)
+option(HERMES_ENABLE_DOXYGEN "Check how well the code is documented" OFF)
+
+#-----------------------------------------------------------------------------
+# Compiler Optimization
+#-----------------------------------------------------------------------------
+set(CMAKE_CXX_STANDARD 17)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message("IN DEBUG MODE")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
+    add_compile_definitions(HERMES_LOG_VERBOSITY=10)
+else()
+    message("IN RELEASE MODE")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3")
+    add_compile_definitions(HERMES_LOG_VERBOSITY=1)
+endif()
+add_compile_options(-march=native -fomit-frame-pointer)
+
+#-----------------------------------------------------------------------------
+# Targets built within this project are exported at Install time for use
+# by other projects.
+#-----------------------------------------------------------------------------
+if(NOT HERMES_EXPORTED_TARGETS)
+    set(HERMES_EXPORTED_TARGETS "hrun-targets")
+endif()
+
+#-----------------------------------------------------------------------------
+# Find Packages
+#-----------------------------------------------------------------------------
+
+# HermesShm
+find_package(HermesShm CONFIG REQUIRED)
+message(STATUS "found hermes_shm.h at ${HermesShm_INCLUDE_DIRS}")
+
+# YAML-CPP
+find_package(yaml-cpp REQUIRED)
+message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
+
+# Catch2
+find_package(Catch2 3.0.1 REQUIRED)
+message(STATUS "found catch2.h at ${Catch2_CXX_INCLUDE_DIRS}")
+
+# MPICH
+if(BUILD_MPI_TESTS)
+    find_package(MPI REQUIRED COMPONENTS C CXX)
+    message(STATUS "found mpi.h at ${MPI_CXX_INCLUDE_DIRS}")
+endif()
+
+# OpenMP
+if(BUILD_OpenMP_TESTS)
+    find_package(OpenMP REQUIRED COMPONENTS C CXX)
+    message(STATUS "found omp.h at ${OpenMP_CXX_INCLUDE_DIRS}")
+endif()
+
+# Cereal
+find_package(cereal REQUIRED)
+if(cereal)
+    message(STATUS "found cereal")
+endif()
+
+# Pkg-Config
+find_package(PkgConfig REQUIRED)
+if(PkgConfig)
+    message(STATUS "found pkg config")
+endif()
+
+# Zeromq
+#pkg_check_modules(ZMQ REQUIRED libzmq)
+#include_directories(${ZMQ_INCLUDE_DIRS})
+#message("Found libzmq at: ${ZMQ_INCLUDE_DIRS}")
+
+# Thallium
+find_package(thallium CONFIG REQUIRED)
+if(thallium_FOUND)
+    message(STATUS "found thallium at ${thallium_DIR}")
+endif()
+
+# Boost
+find_package(Boost REQUIRED COMPONENTS regex system filesystem fiber REQUIRED)
+if (Boost_FOUND)
+    message(STATUS "found boost at ${Boost_INCLUDE_DIRS}")
+endif()
+include_directories(${Boost_INCLUDE_DIRS})
+message("Boost: ${Boost_LIBRARIES}")
+
+#------------------------------------------------------------------------------
+# Setup CMake Environment
+#------------------------------------------------------------------------------
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables.")
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries.")
+
+#------------------------------------------------------------------------------
+# Setup install and output Directories
+#------------------------------------------------------------------------------
+if(NOT HERMES_INSTALL_BIN_DIR)
+    set(HERMES_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+endif()
+if(NOT HERMES_INSTALL_LIB_DIR)
+    set(HERMES_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+endif()
+if(NOT HERMES_INSTALL_INCLUDE_DIR)
+    set(HERMES_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
+endif()
+if(NOT HERMES_INSTALL_DATA_DIR)
+    set(HERMES_INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share)
+endif()
+
+#-----------------------------------------------------------------------------
+# Build Hermes Main Packages
+#-----------------------------------------------------------------------------
+# Main includes
+include_directories(${HermesShm_INCLUDE_DIRS})
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+# Task includes
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required)
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required/hrun_admin/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required/small_message/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required/remote_queue/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required/worch_proc_round_robin/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required/worch_queue_round_robin/include)
+include_directories(${CMAKE_SOURCE_DIR}/tasks_required/proc_queue/include)
+
+
+set(TEST_MAIN ${CMAKE_SOURCE_DIR}/test/unit)
+add_subdirectory(tasks_required)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Build + Enable Testing
+#-----------------------------------------------------------------------------
+# General function used to hook ctest to python test tool lib
+function(pytest test_type test_name)
+    set(script ${CMAKE_SOURCE_DIR}/scripts/ci/py_hermes_ci/bin/run_test)
+    add_test(NAME ${test_name}
+            COMMAND ${script} ${test_type} ${test_name} ${CMAKE_BINARY_DIR} ${HERMES_USE_ADDRESS_SANITIZER})
+endfunction()
+
+enable_testing()
+
+#-----------------------------------------------------------------------------
+# Install HRUN Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/config/hrun_client_default.yaml b/hrun/config/hrun_client_default.yaml
new file mode 100644
index 000000000..0cb21544a
--- /dev/null
+++ b/hrun/config/hrun_client_default.yaml
@@ -0,0 +1 @@
+thread_model: kStd
\ No newline at end of file
diff --git a/hrun/config/hrun_server_default.yaml b/hrun/config/hrun_server_default.yaml
new file mode 100644
index 000000000..f31f30ce0
--- /dev/null
+++ b/hrun/config/hrun_server_default.yaml
@@ -0,0 +1,57 @@
+### Runtime orchestration settings
+work_orchestrator:
+  # The number of worker threads to spawn
+  max_workers: 4
+
+### Queue Manager settings
+queue_manager:
+  # The default depth of allocated queues
+  queue_depth: 256
+  # The maximum number of lanes per queue
+  max_lanes: 16
+  # The maximum number of queues
+  max_queues: 1024
+  # The shared memory allocator to use
+  shm_allocator: kScalablePageAllocator
+  # The name of the shared memory region to create
+  shm_name: "hrun_shm"
+  # The size of the shared memory region to allocate for general data structures
+  shm_size: 0g
+  # The size of the shared memory to allocate for data buffers
+
+### Define properties of RPCs
+rpc:
+  # A path to a file containing a list of server names, 1 per line. If your
+  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
+  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
+  # option is not empty, it will override anything in `rpc_server_base_name`.
+  host_file: ""
+
+  # Host names can be defined using the following syntax:
+  # ares-comp-[0-9]-40g will convert to ares-comp-0-40g, ares-comp-1-40g, ...
+  # ares-comp[00-09] will convert to ares-comp-00, ares-comp-01, ...
+  host_names: ["localhost"]
+
+  # The RPC protocol. This must come from the documentation of the specific RPC
+  # library in use.
+  protocol: "ofi+sockets"
+
+  # RPC domain name for verbs transport. Blank for tcp.
+  domain: ""
+
+  # Desired RPC port number.
+  port: 8080
+
+  # The number of handler threads for each RPC server.
+  num_threads: 4
+
+### Task Registry
+task_registry: [
+  'hermes_mdm',
+  'hermes_blob_mdm',
+  'hermes_bucket_mdm',
+  'hermes_data_op',
+  'data_stager',
+  'posix_bdev',
+  'ram_bdev'
+]
\ No newline at end of file
diff --git a/hrun/include/hrun/api/hrun_client.h b/hrun/include/hrun/api/hrun_client.h
new file mode 100644
index 000000000..202259052
--- /dev/null
+++ b/hrun/include/hrun/api/hrun_client.h
@@ -0,0 +1,381 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_CLIENT_HRUN_CLIENT_H_
+#define HRUN_INCLUDE_HRUN_CLIENT_HRUN_CLIENT_H_
+
+#include <string>
+#include "manager.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+
+// Singleton macros
+#define HRUN_CLIENT hshm::Singleton<hrun::Client>::GetInstance()
+#define HRUN_CLIENT_T hrun::Client*
+
+namespace hrun {
+
+class Client : public ConfigurationManager {
+ public:
+  int data_;
+  QueueManagerClient queue_manager_;
+  std::atomic<u64> *unique_;
+  u32 node_id_;
+
+ public:
+  /** Default constructor */
+  Client() {}
+
+  /** Initialize the client */
+  Client* Create(std::string server_config_path = "",
+                 std::string client_config_path = "",
+                 bool server = false) {
+    hshm::ScopedMutex lock(lock_, 1);
+    if (is_initialized_) {
+      return this;
+    }
+    mode_ = HrunMode::kClient;
+    is_being_initialized_ = true;
+    ClientInit(std::move(server_config_path),
+               std::move(client_config_path),
+               server);
+    is_initialized_ = true;
+    is_being_initialized_ = false;
+    return this;
+  }
+
+ private:
+  /** Initialize client */
+  void ClientInit(std::string server_config_path,
+                  std::string client_config_path,
+                  bool server) {
+    LoadServerConfig(server_config_path);
+    LoadClientConfig(client_config_path);
+    LoadSharedMemory(server);
+    queue_manager_.ClientInit(main_alloc_,
+                              header_->queue_manager_,
+                              header_->node_id_);
+    if (!server) {
+      HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kPthread);
+    }
+  }
+
+ public:
+  /** Connect to a Daemon's shared memory */
+  void LoadSharedMemory(bool server) {
+    // Load shared-memory allocator
+    auto mem_mngr = HERMES_MEMORY_MANAGER;
+    if (!server) {
+      mem_mngr->AttachBackend(hipc::MemoryBackendType::kPosixShmMmap,
+                              server_config_.queue_manager_.shm_name_);
+    }
+    main_alloc_ = mem_mngr->GetAllocator(main_alloc_id_);
+    header_ = main_alloc_->GetCustomHeader<HrunShm>();
+    unique_ = &header_->unique_;
+    node_id_ = header_->node_id_;
+  }
+
+  /** Finalize Hermes explicitly */
+  void Finalize() {}
+
+  /** Create task node id */
+  TaskNode MakeTaskNodeId() {
+    return TaskId(header_->node_id_, unique_->fetch_add(1));;
+  }
+
+  /** Create a unique ID */
+  TaskStateId MakeTaskStateId() {
+    return TaskStateId(header_->node_id_, unique_->fetch_add(1));
+  }
+
+  /** Create a default-constructed task */
+  template<typename TaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  TaskT* NewEmptyTask(hipc::Pointer &p) {
+    TaskT *task = main_alloc_->NewObj<TaskT>(p, main_alloc_);
+    if (task == nullptr) {
+      throw std::runtime_error("Could not allocate buffer");
+    }
+    return task;
+  }
+
+  /** Create a default-constructed task */
+  template<typename TaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  LPointer<TaskT> NewEmptyTask() {
+    LPointer<TaskT> task = main_alloc_->NewObjLocal<TaskT>(main_alloc_);
+    if (task.ptr_ == nullptr) {
+      throw std::runtime_error("Could not allocate buffer");
+    }
+    return task;
+  }
+
+  /** Allocate task */
+  template<typename TaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  hipc::LPointer<TaskT> AllocateTask() {
+    hipc::LPointer<TaskT> task = main_alloc_->AllocateLocalPtr<TaskT>(sizeof(TaskT));
+    if (task.ptr_ == nullptr) {
+      throw std::runtime_error("Could not allocate buffer");
+    }
+    return task;
+  }
+
+  /** Construct task */
+  template<typename TaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void ConstructTask(TaskT *task, Args&& ...args) {
+    return hipc::Allocator::ConstructObj<TaskT>(
+        *task, main_alloc_, std::forward<Args>(args)...);
+  }
+
+  /** Create a task */
+  template<typename TaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  LPointer<TaskT> NewTask(const TaskNode &task_node, Args&& ...args) {
+    LPointer<TaskT> ptr = main_alloc_->NewObjLocal<TaskT>(
+        main_alloc_, task_node, std::forward<Args>(args)...);
+    if (ptr.ptr_ == nullptr) {
+      throw std::runtime_error("Could not allocate buffer");
+    }
+    return ptr;
+  }
+
+  /** Create a root task */
+  template<typename TaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  LPointer<TaskT> NewTaskRoot(Args&& ...args) {
+    TaskNode task_node = MakeTaskNodeId();
+    LPointer<TaskT> ptr = main_alloc_->NewObjLocal<TaskT>(
+        main_alloc_, task_node, std::forward<Args>(args)...);
+    if (ptr.ptr_ == nullptr) {
+      throw std::runtime_error("Could not allocate buffer");
+    }
+    return ptr;
+  }
+
+  /** Destroy a task */
+  template<typename TaskT>
+  HSHM_ALWAYS_INLINE
+  void DelTask(TaskT *task) {
+    // TODO(llogan): verify leak
+#ifdef TASK_DEBUG
+    task->delcnt_++;
+    if (task->delcnt_ != 1) {
+      HELOG(kFatal, "Freed task {} times: node={}, state={}. method={}",
+            task->delcnt_.load(), task->task_node_, task->task_state_, task->method_)
+    }
+#endif
+    main_alloc_->DelObj<TaskT>(task);
+  }
+
+  /** Destroy a task */
+  template<typename TaskT>
+  HSHM_ALWAYS_INLINE
+  void DelTask(LPointer<TaskT> &task) {
+#ifdef TASK_DEBUG
+    task->delcnt_++;
+    if (task->delcnt_ != 1) {
+      HELOG(kFatal, "Freed task {} times: node={}, state={}. method={}",
+            task->delcnt_.load(), task->task_node_, task->task_state_, task->method_)
+    }
+#endif
+    main_alloc_->DelObjLocal<TaskT>(task);
+  }
+
+  /** Destroy a task */
+  template<typename TaskStateT, typename TaskT>
+  HSHM_ALWAYS_INLINE
+  void DelTask(TaskStateT *exec, TaskT *task) {
+    exec->Del(task->method_, task);
+  }
+
+  /** Destroy a task */
+  template<typename TaskStateT, typename TaskT>
+  HSHM_ALWAYS_INLINE
+  void DelTask(TaskStateT *exec, LPointer<TaskT> &task) {
+    exec->Del(task->method_, task);
+  }
+
+  /** Get a queue by its ID */
+  HSHM_ALWAYS_INLINE
+  MultiQueue* GetQueue(const QueueId &queue_id) {
+    return queue_manager_.GetQueue(queue_id);
+  }
+
+  /** Detect if a task is local or remote */
+  HSHM_ALWAYS_INLINE
+  bool IsRemote(Task *task) {
+    if (task->domain_id_.IsNode()) {
+      return task->domain_id_.GetId() != header_->node_id_;
+    } else if (task->domain_id_.IsGlobal()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /** Allocate a buffer */
+  HSHM_ALWAYS_INLINE
+  LPointer<char> AllocateBuffer(size_t size) {
+    LPointer<char> p = main_alloc_->AllocateLocalPtr<char>(size);
+    if (p.ptr_ == nullptr) {
+      throw std::runtime_error("Could not allocate buffer");
+    }
+    return p;
+  }
+
+  /** Convert pointer to char* */
+  template<typename T = char>
+  HSHM_ALWAYS_INLINE
+  T* GetPrivatePointer(const hipc::Pointer &p) {
+    return main_alloc_->Convert<T, hipc::Pointer>(p);
+  }
+
+  /** Free a buffer */
+  HSHM_ALWAYS_INLINE
+  void FreeBuffer(hipc::Pointer &p) {
+     main_alloc_->Free(p);
+  }
+
+  /** Free a buffer */
+  HSHM_ALWAYS_INLINE
+  void FreeBuffer(LPointer<char> &p) {
+     main_alloc_->FreeLocalPtr(p);
+  }
+};
+
+/** A function which creates a new TaskNode value */
+#define HRUN_TASK_NODE_ROOT(CUSTOM)\
+  template<typename ...Args>\
+  auto CUSTOM##Root(Args&& ...args) {\
+    TaskNode task_node = HRUN_CLIENT->MakeTaskNodeId();\
+    return CUSTOM(task_node, std::forward<Args>(args)...);\
+  }
+
+/** Fill in common default parameters for task client wrapper function */
+#define HRUN_TASK_NODE_ADMIN_ROOT(CUSTOM)\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Alloc(const TaskNode &task_node,\
+                                                    Args&& ...args) {\
+    hipc::LPointer<CUSTOM##Task> task = HRUN_CLIENT->AllocateTask<CUSTOM##Task>();\
+    Async##CUSTOM##Construct(task.ptr_, task_node, std::forward<Args>(args)...);\
+    return task;\
+  }\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM(const TaskNode &task_node, \
+                                             Args&& ...args) {\
+    hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);\
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);\
+    queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);\
+    return task;\
+  }\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Emplace(MultiQueue *queue,\
+                                                      const TaskNode &task_node,\
+                                                      Args&& ...args) {\
+    hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);\
+    queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);\
+    return task;\
+  }\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Root(Args&& ...args) {\
+    TaskNode task_node = HRUN_CLIENT->MakeTaskNodeId();\
+    hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM(task_node + 1, std::forward<Args>(args)...);\
+    return task;\
+  }
+
+/** The default asynchronous method behavior */
+#define HRUN_TASK_NODE_PUSH_ROOT(CUSTOM)\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Alloc(const TaskNode &task_node,\
+                                                    Args&& ...args) {\
+    hipc::LPointer<CUSTOM##Task> task = HRUN_CLIENT->AllocateTask<CUSTOM##Task>();\
+    Async##CUSTOM##Construct(task.ptr_, task_node, std::forward<Args>(args)...);\
+    return task;\
+  }\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM(const TaskNode &task_node, \
+                                             Args&& ...args) {\
+    hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);\
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);\
+    queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);\
+    return task;\
+  }\
+  template<typename ...Args>\
+  hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Emplace(MultiQueue *queue,\
+                                                      const TaskNode &task_node,\
+                                                      Args&& ...args) {\
+    hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);\
+    queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);\
+    return task;\
+  }\
+  template<typename ...Args>\
+  hipc::LPointer<hrunpq::TypedPushTask<CUSTOM##Task>> Async##CUSTOM##Root(Args&& ...args) {\
+    TaskNode task_node = HRUN_CLIENT->MakeTaskNodeId();\
+    hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node + 1, std::forward<Args>(args)...);\
+    hipc::LPointer<hrunpq::TypedPushTask<CUSTOM##Task>> push_task =\
+      HRUN_PROCESS_QUEUE->AsyncPush<CUSTOM##Task>(task_node,\
+                                                     DomainId::GetLocal(),\
+                                                     task);\
+      return push_task;\
+  }
+
+/** Call duplicate if applicable */
+template<typename TaskT>
+constexpr inline void CALL_DUPLICATE(TaskT *orig_task, std::vector<LPointer<Task>> &dups) {
+  if constexpr(TaskT::REPLICA) {
+    for (LPointer<Task> &dup : dups) {
+      LPointer<TaskT> task = HRUN_CLIENT->NewEmptyTask<TaskT>();
+      task.ptr_->Dup(HRUN_CLIENT->main_alloc_, *orig_task);
+      dup.ptr_ = task.ptr_;
+      dup.shm_ = task.shm_;
+    }
+  }
+}
+/** Call duplicate if applicable */
+template<typename TaskT>
+constexpr inline void CALL_DUPLICATE_END(u32 replica, TaskT *orig_task, TaskT *dup_task) {
+  if constexpr(TaskT::REPLICA) {
+    orig_task->DupEnd(replica, *dup_task);
+  }
+}
+/** Call replica start if applicable */
+template<typename TaskT>
+constexpr inline void CALL_REPLICA_START(u32 count, TaskT *task) {
+  if constexpr(TaskT::REPLICA) {
+    task->ReplicateStart(count);
+  }
+}
+/** Call replica end if applicable */
+template<typename TaskT>
+constexpr inline void CALL_REPLICA_END(TaskT *task) {
+  if constexpr(TaskT::REPLICA) {
+    task->ReplicateEnd();
+  }
+}
+
+}  // namespace hrun
+
+static inline bool TRANSPARENT_HRUN() {
+  if (!HRUN_CLIENT->IsInitialized() &&
+      !HRUN_CLIENT->IsBeingInitialized() &&
+      !HRUN_CLIENT->IsTerminated()) {
+    HRUN_CLIENT->Create();
+    HRUN_CLIENT->is_transparent_ = true;
+    return true;
+  }
+  return false;
+}
+
+#define HASH_TO_NODE_ID(hash) (1 + ((hash) % HRUN_CLIENT->GetNumNodes()))
+
+#endif  // HRUN_INCLUDE_HRUN_CLIENT_HRUN_CLIENT_H_
diff --git a/hrun/include/hrun/api/hrun_runtime.h b/hrun/include/hrun/api/hrun_runtime.h
new file mode 100644
index 000000000..d6d949b83
--- /dev/null
+++ b/hrun/include/hrun/api/hrun_runtime.h
@@ -0,0 +1,196 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_
+#define HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_
+
+#include "hrun/task_registry/task_registry.h"
+#include "hrun/work_orchestrator/work_orchestrator.h"
+#include "hrun/queue_manager/queue_manager_runtime.h"
+#include "hrun_admin/hrun_admin.h"
+#include "remote_queue/remote_queue.h"
+#include "hrun_client.h"
+#include "manager.h"
+#include "hrun/network/rpc.h"
+#include "hrun/network/rpc_thallium.h"
+
+// Singleton macros
+#define HRUN_RUNTIME hshm::Singleton<hrun::Runtime>::GetInstance()
+#define HRUN_RUNTIME_T hrun::Runtime*
+#define HRUN_REMOTE_QUEUE (&HRUN_RUNTIME->remote_queue_)
+#define HRUN_THALLIUM (&HRUN_RUNTIME->thallium_)
+#define HRUN_RPC (&HRUN_RUNTIME->rpc_)
+
+namespace hrun {
+
+class Runtime : public ConfigurationManager {
+ public:
+  int data_;
+  TaskRegistry task_registry_;
+  WorkOrchestrator work_orchestrator_;
+  QueueManagerRuntime queue_manager_;
+  remote_queue::Client remote_queue_;
+  RpcContext rpc_;
+  ThalliumRpc thallium_;
+  bool remote_created_ = false;
+
+ public:
+  /** Default constructor */
+  Runtime() = default;
+
+  /** Create the server-side API */
+  Runtime* Create(std::string server_config_path = "") {
+    hshm::ScopedMutex lock(lock_, 1);
+    if (is_initialized_) {
+      return this;
+    }
+    mode_ = HrunMode::kServer;
+    is_being_initialized_ = true;
+    ServerInit(std::move(server_config_path));
+    is_initialized_ = true;
+    is_being_initialized_ = false;
+    return this;
+  }
+
+ private:
+  /** Initialize */
+  void ServerInit(std::string server_config_path) {
+    LoadServerConfig(server_config_path);
+    InitSharedMemory();
+    rpc_.ServerInit(&server_config_);
+    thallium_.ServerInit(&rpc_);
+    header_->node_id_ = rpc_.node_id_;
+    header_->unique_ = 0;
+    header_->num_nodes_ = server_config_.rpc_.host_names_.size();
+    task_registry_.ServerInit(&server_config_, rpc_.node_id_, header_->unique_);
+    // Queue manager + client must be initialized before Work Orchestrator
+    queue_manager_.ServerInit(main_alloc_,
+                              rpc_.node_id_,
+                              &server_config_,
+                              header_->queue_manager_);
+    HRUN_CLIENT->Create(server_config_path, "", true);
+    HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kPthread);
+    work_orchestrator_.ServerInit(&server_config_, queue_manager_);
+    hipc::mptr<Admin::CreateTaskStateTask> admin_task;
+
+    // Create the admin library
+    HRUN_CLIENT->MakeTaskStateId();
+    admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>();
+    task_registry_.RegisterTaskLib("hrun_admin");
+    task_registry_.CreateTaskState(
+        "hrun_admin",
+        "hrun_admin",
+        HRUN_QM_CLIENT->admin_task_state_,
+        admin_task.get());
+
+    // Create the process queue
+    HRUN_CLIENT->MakeTaskStateId();
+    admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>();
+    task_registry_.RegisterTaskLib("proc_queue");
+    task_registry_.CreateTaskState(
+        "proc_queue",
+        "proc_queue",
+        HRUN_QM_CLIENT->process_queue_,
+        admin_task.get());
+
+    // Create the work orchestrator queue scheduling library
+    TaskStateId queue_sched_id = HRUN_CLIENT->MakeTaskStateId();
+    admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>();
+    task_registry_.RegisterTaskLib("worch_queue_round_robin");
+    task_registry_.CreateTaskState(
+        "worch_queue_round_robin",
+        "worch_queue_round_robin",
+        queue_sched_id,
+        admin_task.get());
+
+    // Create the work orchestrator process scheduling library
+    TaskStateId proc_sched_id = HRUN_CLIENT->MakeTaskStateId();
+    admin_task = hipc::make_mptr<Admin::CreateTaskStateTask>();
+    task_registry_.RegisterTaskLib("worch_proc_round_robin");
+    task_registry_.CreateTaskState(
+        "worch_proc_round_robin",
+        "worch_proc_round_robin",
+        proc_sched_id,
+        admin_task.get());
+
+    // Set the work orchestrator queue scheduler
+    HRUN_ADMIN->SetWorkOrchQueuePolicyRoot(hrun::DomainId::GetLocal(), queue_sched_id);
+    HRUN_ADMIN->SetWorkOrchProcPolicyRoot(hrun::DomainId::GetLocal(), proc_sched_id);
+
+    // Create the remote queue library
+    task_registry_.RegisterTaskLib("remote_queue");
+    remote_queue_.CreateRoot(DomainId::GetLocal(), "remote_queue",
+                             HRUN_CLIENT->MakeTaskStateId());
+    remote_created_ = true;
+  }
+
+ public:
+  /** Initialize shared-memory between daemon and client */
+  void InitSharedMemory() {
+    // Create shared-memory allocator
+    auto mem_mngr = HERMES_MEMORY_MANAGER;
+    if (server_config_.queue_manager_.shm_size_ == 0) {
+      server_config_.queue_manager_.shm_size_ =
+          hipc::MemoryManager::GetDefaultBackendSize();
+    }
+    mem_mngr->CreateBackend<hipc::PosixShmMmap>(
+        server_config_.queue_manager_.shm_size_,
+        server_config_.queue_manager_.shm_name_);
+    main_alloc_ =
+        mem_mngr->CreateAllocator<hipc::ScalablePageAllocator>(
+            server_config_.queue_manager_.shm_name_,
+            main_alloc_id_,
+            sizeof(HrunShm));
+    header_ = main_alloc_->GetCustomHeader<HrunShm>();
+  }
+
+  /** Finalize Hermes explicitly */
+  void Finalize() {}
+
+  /** Run the Hermes core Daemon */
+  void RunDaemon() {
+    thallium_.RunDaemon();
+    HILOG(kInfo, "Daemon is running")
+//    while (HRUN_WORK_ORCHESTRATOR->IsRuntimeAlive()) {
+//      // Scheduler callbacks?
+//      HERMES_THREAD_MODEL->SleepForUs(1000);
+//    }
+    HILOG(kInfo, "Finishing up last requests")
+    HRUN_WORK_ORCHESTRATOR->Join();
+    HILOG(kInfo, "Daemon is exiting")
+  }
+
+  /** Stop the Hermes core Daemon */
+  void StopDaemon() {
+    HRUN_WORK_ORCHESTRATOR->FinalizeRuntime();
+  }
+
+  /** Get the set of DomainIds */
+  std::vector<DomainId> ResolveDomainId(const DomainId &domain_id) {
+    std::vector<DomainId> ids;
+    if (domain_id.IsGlobal()) {
+      ids.reserve(rpc_.hosts_.size());
+      for (HostInfo &host_info : rpc_.hosts_) {
+        ids.push_back(DomainId::GetNode(host_info.node_id_));
+      }
+    } else if (domain_id.IsNode()) {
+      ids.reserve(1);
+      ids.push_back(domain_id);
+    }
+    // TODO(llogan): handle named domain ID sets
+    return ids;
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_CLIENT_HRUN_SERVER_H_
diff --git a/hrun/include/hrun/api/manager.h b/hrun/include/hrun/api/manager.h
new file mode 100644
index 000000000..0f2ee22c9
--- /dev/null
+++ b/hrun/include/hrun/api/manager.h
@@ -0,0 +1,93 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_MANAGER_MANAGER_H_
+#define HRUN_INCLUDE_HRUN_MANAGER_MANAGER_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/hrun_constants.h"
+#include "hrun/config/config_client.h"
+#include "hrun/config/config_server.h"
+#include "hrun/queue_manager/queue_manager.h"
+
+namespace hrun {
+
+/** Shared-memory header for HRUN */
+struct HrunShm {
+  u32 node_id_;
+  QueueManagerShm queue_manager_;
+  std::atomic<u64> unique_;
+  u64 num_nodes_;
+};
+
+/** The configuration used inherited by runtime + client */
+class ConfigurationManager {
+ public:
+  HrunMode mode_;
+  HrunShm *header_;
+  ClientConfig client_config_;
+  ServerConfig server_config_;
+  static inline const hipc::allocator_id_t main_alloc_id_ =
+      hipc::allocator_id_t(0, 1);
+  hipc::Allocator *main_alloc_;
+  bool is_being_initialized_;
+  bool is_initialized_;
+  bool is_terminated_;
+  bool is_transparent_;
+  hshm::Mutex lock_;
+  hshm::ThreadType thread_type_;
+
+  /** Default constructor */
+  ConfigurationManager() : is_being_initialized_(false),
+                           is_initialized_(false),
+                           is_terminated_(false),
+                           is_transparent_(false) {}
+
+  /** Destructor */
+  ~ConfigurationManager() {}
+
+  /** Whether or not Hrun is currently being initialized */
+  bool IsBeingInitialized() { return is_being_initialized_; }
+
+  /** Whether or not Hrun is initialized */
+  bool IsInitialized() { return is_initialized_; }
+
+  /** Whether or not Hrun is finalized */
+  bool IsTerminated() { return is_terminated_; }
+
+  /** Load the server-side configuration */
+  void LoadServerConfig(std::string config_path) {
+    if (config_path.empty()) {
+      config_path = Constants::GetEnvSafe(Constants::kServerConfEnv);
+    }
+    HILOG(kInfo, "Loading server configuration: {}", config_path);
+    server_config_.LoadFromFile(config_path);
+  }
+
+  /** Load the client-side configuration */
+  void LoadClientConfig(std::string config_path) {
+    if (config_path.empty()) {
+      config_path = Constants::GetEnvSafe(Constants::kClientConfEnv);
+    }
+    HILOG(kDebug, "Loading client configuration: {}", config_path);
+    client_config_.LoadFromFile(config_path);
+  }
+
+  /** Get number of nodes */
+  HSHM_ALWAYS_INLINE int GetNumNodes() {
+    return server_config_.rpc_.host_names_.size();
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_MANAGER_MANAGER_H_
diff --git a/hrun/include/hrun/api/template/hrun_task_node_admin_root.template b/hrun/include/hrun/api/template/hrun_task_node_admin_root.template
new file mode 100644
index 000000000..7df57a967
--- /dev/null
+++ b/hrun/include/hrun/api/template/hrun_task_node_admin_root.template
@@ -0,0 +1,29 @@
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Alloc(const TaskNode &task_node,
+                                                  Args&& ...args) {
+  hipc::LPointer<CUSTOM##Task> task = HRUN_CLIENT->AllocateTask<CUSTOM##Task>();
+  Async##CUSTOM##Construct(task.ptr_, task_node, std::forward<Args>(args)...);
+  return task;
+}
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM(const TaskNode &task_node, 
+                                           Args&& ...args) {
+  hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);
+  MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+  queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);
+  return task;
+}
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Emplace(MultiQueue *queue,
+                                                    const TaskNode &task_node,
+                                                    Args&& ...args) {
+  hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);
+  queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);
+  return task;
+}
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Root(Args&& ...args) {
+  TaskNode task_node = HRUN_CLIENT->MakeTaskNodeId();
+  hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM(task_node + 1, std::forward<Args>(args)...);
+  return task;
+}
\ No newline at end of file
diff --git a/hrun/include/hrun/api/template/hrun_task_node_push_root.template b/hrun/include/hrun/api/template/hrun_task_node_push_root.template
new file mode 100644
index 000000000..ab274c4e8
--- /dev/null
+++ b/hrun/include/hrun/api/template/hrun_task_node_push_root.template
@@ -0,0 +1,33 @@
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Alloc(const TaskNode &task_node,
+                                                  Args&& ...args) {
+  hipc::LPointer<CUSTOM##Task> task = HRUN_CLIENT->AllocateTask<CUSTOM##Task>();
+  Async##CUSTOM##Construct(task.ptr_, task_node, std::forward<Args>(args)...);
+  return task;
+}
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM(const TaskNode &task_node, 
+                                           Args&& ...args) {
+  hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);
+  MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+  queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);
+  return task;
+}
+template<typename ...Args>
+hipc::LPointer<CUSTOM##Task> Async##CUSTOM##Emplace(MultiQueue *queue,
+                                                    const TaskNode &task_node,
+                                                    Args&& ...args) {
+  hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node, std::forward<Args>(args)...);
+  queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);
+  return task;
+}
+template<typename ...Args>
+hipc::LPointer<hrunpq::TypedPushTask<CUSTOM##Task>> Async##CUSTOM##Root(Args&& ...args) {
+  TaskNode task_node = HRUN_CLIENT->MakeTaskNodeId();
+  hipc::LPointer<CUSTOM##Task> task = Async##CUSTOM##Alloc(task_node + 1, std::forward<Args>(args)...);
+  hipc::LPointer<hrunpq::TypedPushTask<CUSTOM##Task>> push_task =
+    HRUN_PROCESS_QUEUE->AsyncPush<CUSTOM##Task>(task_node,
+                                                   DomainId::GetLocal(),
+                                                   task);
+    return push_task;
+}
\ No newline at end of file
diff --git a/hrun/include/hrun/config/config.h b/hrun/include/hrun/config/config.h
new file mode 100644
index 000000000..08c3d9942
--- /dev/null
+++ b/hrun/include/hrun/config/config.h
@@ -0,0 +1,81 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_SRC_CONFIG_H_
+#define HRUN_SRC_CONFIG_H_
+
+#include <string.h>
+#include <yaml-cpp/yaml.h>
+#include <iomanip>
+#include <ostream>
+#include <vector>
+#include <sstream>
+#include <limits>
+#include "hermes_shm/util/config_parse.h"
+
+namespace hrun::config {
+
+/**
+ * Base class for configuration files
+ * */
+class BaseConfig {
+ public:
+  /** load configuration from a string */
+  void LoadText(const std::string &config_string, bool with_default = true) {
+    if (with_default) {
+      LoadDefault();
+    }
+    if (config_string.size() == 0) {
+      return;
+    }
+    YAML::Node yaml_conf = YAML::Load(config_string);
+    ParseYAML(yaml_conf);
+  }
+
+  /** load configuration from file */
+  void LoadFromFile(const std::string &path, bool with_default = true) {
+    if (with_default) {
+      LoadDefault();
+    }
+    if (path.size() == 0) {
+      return;
+    }
+    auto real_path = hshm::ConfigParse::ExpandPath(path);
+    HILOG(kDebug, "Start load config {}", real_path)
+    try {
+      YAML::Node yaml_conf = YAML::LoadFile(real_path);
+      HILOG(kDebug, "Complete load config {}", real_path)
+      ParseYAML(yaml_conf);
+    } catch (std::exception &e) {
+      HELOG(kFatal, e.what())
+    }
+  }
+
+  /** load the default configuration */
+  virtual void LoadDefault() = 0;
+
+ public:
+  /** parse \a list_node vector from configuration file in YAML */
+  template<typename T, typename VEC_TYPE = std::vector<T>>
+  static void ParseVector(YAML::Node list_node, VEC_TYPE &list) {
+    for (auto val_node : list_node) {
+      list.emplace_back(val_node.as<T>());
+    }
+  }
+
+ private:
+  virtual void ParseYAML(YAML::Node &yaml_conf) = 0;
+};
+
+}  // namespace hrun::config
+
+#endif  // HRUN_SRC_CONFIG_H_
diff --git a/src/borg_io_clients/borg_io_client.h b/hrun/include/hrun/config/config_client.h
similarity index 60%
rename from src/borg_io_clients/borg_io_client.h
rename to hrun/include/hrun/config/config_client.h
index deb7cf363..49e2e0f2f 100644
--- a/src/borg_io_clients/borg_io_client.h
+++ b/hrun/include/hrun/config/config_client.h
@@ -10,24 +10,33 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_SRC_BORG_IO_CLIENTS_IO_CLIENT_H
-#define HERMES_SRC_BORG_IO_CLIENTS_IO_CLIENT_H
+#ifndef HRUN_SRC_CONFIG_CLIENT_H_
+#define HRUN_SRC_CONFIG_CLIENT_H_
 
-#include "hermes_types.h"
-#include "metadata_types.h"
+#include <filesystem>
+#include "config.h"
 
-namespace hermes {
+namespace stdfs = std::filesystem;
 
-class BorgIoClient {
+namespace hrun::config {
+
+/**
+ * Configuration used to intialize client
+ * */
+class ClientConfig : public BaseConfig {
  public:
-  virtual ~BorgIoClient() = default;
-  virtual bool Init(DeviceInfo &dev_info) = 0;
-  virtual bool Write(DeviceInfo &dev_info,
-                     const char *data, size_t off, size_t size) = 0;
-  virtual bool Read(DeviceInfo &dev_info,
-                    char *data, size_t off, size_t size) = 0;
+  /** The thread model of the application */
+  std::string thread_model_;
+
+ private:
+  void ParseYAML(YAML::Node &yaml_conf) override;
+  void LoadDefault() override;
 };
 
-}  // namespace hermes
+}  // namespace hrun::config
+
+namespace hrun {
+using ClientConfig = config::ClientConfig;
+}  // namespace hrun
 
-#endif  // HERMES_SRC_BORG_IO_CLIENTS_IO_CLIENT_H
+#endif  // HRUN_SRC_CONFIG_CLIENT_H_
diff --git a/hrun/include/hrun/config/config_client_default.h b/hrun/include/hrun/config/config_client_default.h
new file mode 100644
index 000000000..7b188d56a
--- /dev/null
+++ b/hrun/include/hrun/config/config_client_default.h
@@ -0,0 +1,5 @@
+#ifndef HRUN_SRC_CONFIG_HRUN_CLIENT_DEFAULT_H_
+#define HRUN_SRC_CONFIG_HRUN_CLIENT_DEFAULT_H_
+const inline char* kHrunClientDefaultConfigStr = 
+"thread_model: kStd\n";
+#endif  // HRUN_SRC_CONFIG_HRUN_CLIENT_DEFAULT_H_
\ No newline at end of file
diff --git a/hrun/include/hrun/config/config_server.h b/hrun/include/hrun/config/config_server.h
new file mode 100644
index 000000000..e72183548
--- /dev/null
+++ b/hrun/include/hrun/config/config_server.h
@@ -0,0 +1,96 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_SRC_CONFIG_SERVER_H_
+#define HRUN_SRC_CONFIG_SERVER_H_
+
+#include "config.h"
+#include "hrun/hrun_types.h"
+
+namespace hrun::config {
+
+/**
+ * Work orchestrator information defined in server config
+ * */
+struct WorkOrchestratorInfo {
+  /** Maximum number of workers to spawn */
+  size_t max_workers_;
+};
+
+/**
+ * Queue manager information defined in server config
+ * */
+struct QueueManagerInfo {
+  /** Maximum depth of IPC queues */
+  u32 queue_depth_;
+  /** Maximum number of lanes per IPC queue */
+  u32 max_lanes_;
+  /** Maximum number of allocatable IPC queues */
+  u32 max_queues_;
+  /** Shared memory allocator */
+  std::string shm_allocator_;
+  /** Shared memory region name */
+  std::string shm_name_;
+  /** Shared memory region size */
+  size_t shm_size_;
+};
+
+/**
+ * RPC information defined in server config
+ * */
+struct RpcInfo {
+  /** The name of a file that contains host names, 1 per line */
+  std::string host_file_;
+  /** The parsed hostnames from the hermes conf */
+  std::vector<std::string> host_names_;
+  /** The RPC protocol to be used. */
+  std::string protocol_;
+  /** The RPC domain name for verbs transport. */
+  std::string domain_;
+  /** The RPC port number. */
+  int port_;
+  /** Number of RPC threads */
+  int num_threads_;
+};
+
+/**
+ * System configuration for Hermes
+ */
+class ServerConfig : public BaseConfig {
+ public:
+  /** Work orchestrator info */
+  WorkOrchestratorInfo wo_;
+  /** Queue manager info */
+  QueueManagerInfo queue_manager_;
+  /** The RPC information */
+  RpcInfo rpc_;
+  /** Bootstrap task registry */
+  std::vector<std::string> task_libs_;
+
+ public:
+  ServerConfig() = default;
+  void LoadDefault();
+
+ private:
+  void ParseYAML(YAML::Node &yaml_conf);
+  void ParseWorkOrchestrator(YAML::Node yaml_conf);
+  void ParseQueueManager(YAML::Node yaml_conf);
+  void ParseRpcInfo(YAML::Node yaml_conf);
+};
+
+}  // namespace hrun::config
+
+namespace hrun {
+using ServerConfig = config::ServerConfig;
+}  // namespace hrun
+
+#endif  // HRUN_SRC_CONFIG_SERVER_H_
diff --git a/hrun/include/hrun/config/config_server_default.h b/hrun/include/hrun/config/config_server_default.h
new file mode 100644
index 000000000..f8e5c5334
--- /dev/null
+++ b/hrun/include/hrun/config/config_server_default.h
@@ -0,0 +1,61 @@
+#ifndef HRUN_SRC_CONFIG_HRUN_SERVER_DEFAULT_H_
+#define HRUN_SRC_CONFIG_HRUN_SERVER_DEFAULT_H_
+const inline char* kHrunServerDefaultConfigStr = 
+"### Runtime orchestration settings\n"
+"work_orchestrator:\n"
+"  # The number of worker threads to spawn\n"
+"  max_workers: 4\n"
+"\n"
+"### Queue Manager settings\n"
+"queue_manager:\n"
+"  # The default depth of allocated queues\n"
+"  queue_depth: 256\n"
+"  # The maximum number of lanes per queue\n"
+"  max_lanes: 16\n"
+"  # The maximum number of queues\n"
+"  max_queues: 1024\n"
+"  # The shared memory allocator to use\n"
+"  shm_allocator: kScalablePageAllocator\n"
+"  # The name of the shared memory region to create\n"
+"  shm_name: \"hrun_shm\"\n"
+"  # The size of the shared memory region to allocate for general data structures\n"
+"  shm_size: 0g\n"
+"  # The size of the shared memory to allocate for data buffers\n"
+"\n"
+"### Define properties of RPCs\n"
+"rpc:\n"
+"  # A path to a file containing a list of server names, 1 per line. If your\n"
+"  # servers are named according to a pattern (e.g., server-1, server-2, etc.),\n"
+"  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this\n"
+"  # option is not empty, it will override anything in `rpc_server_base_name`.\n"
+"  host_file: \"\"\n"
+"\n"
+"  # Host names can be defined using the following syntax:\n"
+"  # ares-comp-[0-9]-40g will convert to ares-comp-0-40g, ares-comp-1-40g, ...\n"
+"  # ares-comp[00-09] will convert to ares-comp-00, ares-comp-01, ...\n"
+"  host_names: [\"localhost\"]\n"
+"\n"
+"  # The RPC protocol. This must come from the documentation of the specific RPC\n"
+"  # library in use.\n"
+"  protocol: \"ofi+sockets\"\n"
+"\n"
+"  # RPC domain name for verbs transport. Blank for tcp.\n"
+"  domain: \"\"\n"
+"\n"
+"  # Desired RPC port number.\n"
+"  port: 8080\n"
+"\n"
+"  # The number of handler threads for each RPC server.\n"
+"  num_threads: 4\n"
+"\n"
+"### Task Registry\n"
+"task_registry: [\n"
+"  \'hermes_mdm\',\n"
+"  \'hermes_blob_mdm\',\n"
+"  \'hermes_bucket_mdm\',\n"
+"  \'hermes_data_op\',\n"
+"  \'data_stager\',\n"
+"  \'posix_bdev\',\n"
+"  \'ram_bdev\'\n"
+"]\n";
+#endif  // HRUN_SRC_CONFIG_HRUN_SERVER_DEFAULT_H_
\ No newline at end of file
diff --git a/src/api/hermes_daemon.cc b/hrun/include/hrun/hrun_constants.h
similarity index 62%
rename from src/api/hermes_daemon.cc
rename to hrun/include/hrun/hrun_constants.h
index 4c6d199ec..621cf625d 100644
--- a/src/api/hermes_daemon.cc
+++ b/hrun/include/hrun/hrun_constants.h
@@ -10,32 +10,28 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <cstdlib>
-#include <string>
-#include "hermes_shm/util/logging.h"
-#include "hermes.h"
+#ifndef HRUN_INCLUDE_HRUN_HRUN_CONSTANTS_H_
+#define HRUN_INCLUDE_HRUN_HRUN_CONSTANTS_H_
 
-#include <mpi.h>
+namespace hrun {
 
-namespace hapi = hermes::api;
+#include <string>
 
-/**
- * */
+class Constants {
+ public:
+  inline static const std::string kClientConfEnv = "HERMES_CLIENT_CONF";
+  inline static const std::string kServerConfEnv = "HERMES_CONF";
 
-int main(int argc, char* argv[]) {
-  MPI_Init(&argc, &argv);
-  HILOG(kDebug, "Hermes start daemon begins")
-  std::string hermes_config = "";
-  if (argc == 2) {
-    hermes_config = argv[1];
+  static std::string GetEnvSafe(const std::string &env_name) {
+    char *data = getenv(env_name.c_str());
+    if (data == nullptr) {
+      return "";
+    } else {
+      return data;
+    }
   }
+};
 
-  auto hermes = hapi::Hermes::Create(
-      hermes::HermesType::kServer,
-      hermes_config);
+}  // namespace hrun
 
-  hermes->RunDaemon();
-  hermes->Finalize();
-  MPI_Finalize();
-  return 0;
-}
+#endif  // HRUN_INCLUDE_HRUN_HRUN_CONSTANTS_H_
diff --git a/src/data_structures.h b/hrun/include/hrun/hrun_namespace.h
similarity index 52%
rename from src/data_structures.h
rename to hrun/include/hrun/hrun_namespace.h
index d2380ccc5..88ec1e8a1 100644
--- a/src/data_structures.h
+++ b/hrun/include/hrun/hrun_namespace.h
@@ -10,34 +10,38 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_SRC_DATA_STRUCTURES_H_
-#define HERMES_SRC_DATA_STRUCTURES_H_
+#ifndef HRUN_INCLUDE_HRUN_HRUN_NAMESPACE_H_
+#define HRUN_INCLUDE_HRUN_HRUN_NAMESPACE_H_
 
-#include <hermes_shm/data_structures/ipc/unordered_map.h>
-#include <hermes_shm/data_structures/ipc/vector.h>
-#include <hermes_shm/data_structures/ipc/list.h>
-#include <hermes_shm/data_structures/ipc/slist.h>
-#include <hermes_shm/data_structures/data_structure.h>
-#include <hermes_shm/data_structures/ipc/string.h>
-#include <hermes_shm/data_structures/ipc/mpsc_queue.h>
-#include <hermes_shm/data_structures/containers/charbuf.h>
-#include <hermes_shm/data_structures/containers/converters.h>
-#include <hermes_shm/util/auto_trace.h>
-#include <hermes_shm/thread/lock.h>
-#include <hermes_shm/thread/thread_model_manager.h>
-#include <hermes_shm/types/atomic.h>
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+
+using hrun::TaskMethod;
+using hrun::BinaryOutputArchive;
+using hrun::BinaryInputArchive;
+using hrun::Task;
+using hrun::TaskPointer;
+using hrun::MultiQueue;
+using hrun::PriorityInfo;
+using hrun::TaskNode;
+using hrun::DomainId;
+using hrun::TaskStateId;
+using hrun::QueueId;
+using hrun::TaskFlags;
+using hrun::DataTransfer;
+using hrun::TaskLib;
+using hrun::TaskLibClient;
+using hrun::config::QueueManagerInfo;
+using hrun::TaskPrio;
+using hrun::RunContext;
 
 using hshm::RwLock;
 using hshm::Mutex;
+using hshm::bitfield;
 using hshm::bitfield32_t;
+typedef hshm::bitfield<uint64_t> bitfield64_t;
 using hshm::ScopedRwReadLock;
 using hshm::ScopedRwWriteLock;
+using hipc::LPointer;
 
-#include <unordered_map>
-#include <unordered_set>
-#include <set>
-#include <vector>
-#include <list>
-#include <queue>
-
-#endif  // HERMES_SRC_DATA_STRUCTURES_H_
+#endif  // HRUN_INCLUDE_HRUN_HRUN_NAMESPACE_H_
diff --git a/hrun/include/hrun/hrun_types.h b/hrun/include/hrun/hrun_types.h
new file mode 100644
index 000000000..2e0952d9d
--- /dev/null
+++ b/hrun/include/hrun/hrun_types.h
@@ -0,0 +1,400 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_HRUN_TYPES_H_
+#define HRUN_INCLUDE_HRUN_HRUN_TYPES_H_
+
+#include <hermes_shm/data_structures/ipc/unordered_map.h>
+#include <hermes_shm/data_structures/ipc/pod_array.h>
+#include <hermes_shm/data_structures/ipc/vector.h>
+#include <hermes_shm/data_structures/ipc/list.h>
+#include <hermes_shm/data_structures/ipc/slist.h>
+#include <hermes_shm/data_structures/data_structure.h>
+#include <hermes_shm/data_structures/ipc/string.h>
+#include <hermes_shm/data_structures/ipc/mpsc_queue.h>
+#include <hermes_shm/data_structures/ipc/mpsc_ptr_queue.h>
+#include <hermes_shm/data_structures/ipc/ticket_queue.h>
+#include <hermes_shm/data_structures/containers/converters.h>
+#include <hermes_shm/data_structures/containers/charbuf.h>
+#include <hermes_shm/data_structures/containers/spsc_queue.h>
+#include <hermes_shm/data_structures/containers/split_ticket_queue.h>
+#include <hermes_shm/data_structures/containers/converters.h>
+#include "hermes_shm/data_structures/serialization/shm_serialize.h"
+#include <hermes_shm/util/auto_trace.h>
+#include <hermes_shm/thread/lock.h>
+#include <hermes_shm/thread/thread_model_manager.h>
+#include <hermes_shm/types/atomic.h>
+#include "hermes_shm/util/singleton.h"
+#include "hermes_shm/constants/macros.h"
+
+#include <boost/context/fiber_fcontext.hpp>
+
+namespace bctx = boost::context::detail;
+
+typedef uint8_t u8;   /**< 8-bit unsigned integer */
+typedef uint16_t u16; /**< 16-bit unsigned integer */
+typedef uint32_t u32; /**< 32-bit unsigned integer */
+typedef uint64_t u64; /**< 64-bit unsigned integer */
+typedef int8_t i8;    /**< 8-bit signed integer */
+typedef int16_t i16;  /**< 16-bit signed integer */
+typedef int32_t i32;  /**< 32-bit signed integer */
+typedef int64_t i64;  /**< 64-bit signed integer */
+typedef float f32;    /**< 32-bit float */
+typedef double f64;   /**< 64-bit float */
+
+namespace hrun {
+
+using hshm::RwLock;
+using hshm::Mutex;
+using hshm::bitfield;
+using hshm::bitfield32_t;
+typedef hshm::bitfield<uint64_t> bitfield64_t;
+using hshm::ScopedRwReadLock;
+using hshm::ScopedRwWriteLock;
+using hipc::LPointer;
+
+/** Determine the mode that HRUN is initialized for */
+enum class HrunMode {
+  kNone,
+  kClient,
+  kServer
+};
+
+#define DOMAIN_FLAG_T static inline const int
+
+/**
+ * Represents a unique ID for a scheduling domain
+ * There are a few domain types:
+ * 1. A node domain, which is a single node
+ * 2. A global domain, which is all nodes
+ * 3. A specific domain, which is a subset of nodes
+ * 4. A specific domain + node, temporarily includes this node in a domain
+ * */
+struct DomainId {
+  bitfield32_t flags_;  /**< Flags indicating how to interpret id */
+  u32 id_;              /**< The domain id, 0 is NULL */
+  DOMAIN_FLAG_T kLocal = BIT_OPT(u32, 0);   /**< Include local node in scheduling decision */
+  DOMAIN_FLAG_T kGlobal = BIT_OPT(u32, 1);  /**< Use all nodes in scheduling decision */
+  DOMAIN_FLAG_T kSet = BIT_OPT(u32, 2);     /**< ID represents node set ID, not a single node */
+  DOMAIN_FLAG_T kNode = BIT_OPT(u32, 3);    /**< ID represents a specific node */
+
+  /** Serialize domain id */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(flags_, id_);
+  }
+
+  /** Default constructor. */
+  HSHM_ALWAYS_INLINE
+  DomainId() : id_(0) {}
+
+  /** Domain has the local node */
+  HSHM_ALWAYS_INLINE
+  bool IsRemote(size_t num_hosts, u32 this_node) const {
+    if (num_hosts == 1) {
+      return false;
+    } else {
+      return (flags_.Any(kGlobal | kSet) || (flags_.Any(kNode) && id_ != this_node));
+    }
+    // return flags_.Any(kGlobal | kSet | kNode);
+  }
+
+  /** DomainId representing the local node */
+  HSHM_ALWAYS_INLINE
+  static DomainId GetLocal() {
+      DomainId id;
+      id.id_ = 0;
+      id.flags_.SetBits(kLocal);
+      return id;
+  }
+
+  /** Get the ID */
+  HSHM_ALWAYS_INLINE
+  u32 GetId() const {
+    return id_;
+  }
+
+  /** Domain is a specific node */
+  HSHM_ALWAYS_INLINE
+  bool IsNode() const {
+    return flags_.Any(kNode);
+  }
+
+  /** DomainId representing a specific node */
+  HSHM_ALWAYS_INLINE
+  static DomainId GetNode(u32 node_id) {
+    DomainId id;
+    id.id_ = node_id;
+    id.flags_.SetBits(kNode);
+    return id;
+  }
+
+  /** DomainId representing a specific node + local node */
+  HSHM_ALWAYS_INLINE
+  static DomainId GetNodeWithLocal(u32 node_id) {
+    DomainId id;
+    id.id_ = node_id;
+    id.flags_.SetBits(kLocal);
+    return id;
+  }
+
+  /** Domain represents all nodes */
+  HSHM_ALWAYS_INLINE
+  bool IsGlobal() const {
+    return flags_.Any(kGlobal);
+  }
+
+  /** DomainId representing all nodes */
+  HSHM_ALWAYS_INLINE
+  static DomainId GetGlobal() {
+      DomainId id;
+      id.id_ = 0;
+      id.flags_.SetBits(kGlobal);
+      return id;
+  }
+
+  /** DomainId represents a named node set */
+  HSHM_ALWAYS_INLINE
+  bool IsSet() const {
+    return flags_.Any(kSet);
+  }
+
+  /** DomainId representing a named node set */
+  HSHM_ALWAYS_INLINE
+  static DomainId GetSet(u32 domain_id) {
+    DomainId id;
+    id.id_ = domain_id;
+    id.flags_.SetBits(kSet);
+    return id;
+  }
+
+  /** DomainId representing a node set + local node */
+  HSHM_ALWAYS_INLINE
+  static DomainId GetSetWithLocal(u32 domain_id) {
+    DomainId id;
+    id.id_ = domain_id;
+    id.flags_.SetBits(kSet | kLocal);
+    return id;
+  }
+
+  /** Copy constructor */
+  HSHM_ALWAYS_INLINE
+  DomainId(const DomainId &other) {
+    id_ = other.id_;
+    flags_ = other.flags_;
+  }
+
+  /** Copy operator */
+  HSHM_ALWAYS_INLINE
+  DomainId& operator=(const DomainId &other) {
+    if (this != &other) {
+      id_ = other.id_;
+      flags_ = other.flags_;
+    }
+    return *this;
+  }
+
+  /** Move constructor */
+  HSHM_ALWAYS_INLINE
+  DomainId(DomainId &&other) noexcept {
+    id_ = other.id_;
+    flags_ = other.flags_;
+  }
+
+  /** Move operator */
+  HSHM_ALWAYS_INLINE
+  DomainId& operator=(DomainId &&other) noexcept {
+    if (this != &other) {
+      id_ = other.id_;
+      flags_ = other.flags_;
+    }
+    return *this;
+  }
+
+  /** Equality operator */
+  HSHM_ALWAYS_INLINE
+  bool operator==(const DomainId &other) const {
+    return id_ == other.id_ && flags_.bits_ == other.flags_.bits_;
+  }
+
+  /** Inequality operator */
+  HSHM_ALWAYS_INLINE
+  bool operator!=(const DomainId &other) const {
+    return id_ != other.id_ || flags_.bits_ != other.flags_.bits_;
+  }
+};
+
+/** Represents unique ID for states + queues */
+template<int TYPE>
+struct UniqueId {
+  u32 node_id_;  /**< The node the content is on */
+  u32 hash_;     /**< The hash of the content the ID represents */
+  u64 unique_;   /**< A unique id for the blob */
+
+  /** Serialization */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar & node_id_;
+    ar & hash_;
+    ar & unique_;
+  }
+
+  /** Default constructor */
+  HSHM_ALWAYS_INLINE
+  UniqueId() = default;
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UniqueId(u32 node_id, u64 unique)
+  : node_id_(node_id), hash_(0), unique_(unique) {}
+
+  /** Emplace constructor (+hash) */
+  HSHM_ALWAYS_INLINE explicit
+  UniqueId(u32 node_id, u32 hash, u64 unique)
+  : node_id_(node_id), hash_(hash), unique_(unique) {}
+
+  /** Copy constructor */
+  HSHM_ALWAYS_INLINE
+  UniqueId(const UniqueId &other) {
+    node_id_ = other.node_id_;
+    hash_ = other.hash_;
+    unique_ = other.unique_;
+  }
+
+  /** Copy constructor */
+  template<int OTHER_TYPE=TYPE>
+  HSHM_ALWAYS_INLINE
+  UniqueId(const UniqueId<OTHER_TYPE> &other) {
+    node_id_ = other.node_id_;
+    hash_ = other.hash_;
+    unique_ = other.unique_;
+  }
+
+  /** Copy assignment */
+  HSHM_ALWAYS_INLINE
+  UniqueId& operator=(const UniqueId &other) {
+    if (this != &other) {
+      node_id_ = other.node_id_;
+      hash_ = other.hash_;
+      unique_ = other.unique_;
+    }
+    return *this;
+  }
+
+  /** Move constructor */
+  HSHM_ALWAYS_INLINE
+  UniqueId(UniqueId &&other) noexcept {
+    node_id_ = other.node_id_;
+    hash_ = other.hash_;
+    unique_ = other.unique_;
+  }
+
+  /** Move assignment */
+  HSHM_ALWAYS_INLINE
+  UniqueId& operator=(UniqueId &&other) noexcept {
+    if (this != &other) {
+      node_id_ = other.node_id_;
+      hash_ = other.hash_;
+      unique_ = other.unique_;
+    }
+    return *this;
+  }
+
+  /** Check if null */
+  [[nodiscard]]
+  HSHM_ALWAYS_INLINE bool IsNull() const {
+    return node_id_ == 0;
+  }
+
+  /** Get null id */
+  HSHM_ALWAYS_INLINE
+  static UniqueId GetNull() {
+    static const UniqueId id(0, 0);
+    return id;
+  }
+
+  /** Set to null id */
+  HSHM_ALWAYS_INLINE
+  void SetNull() {
+    node_id_ = 0;
+    hash_ = 0;
+    unique_ = 0;
+  }
+
+  /** Get id of node from this id */
+  [[nodiscard]]
+  HSHM_ALWAYS_INLINE
+  u32 GetNodeId() const { return node_id_; }
+
+  /** Compare two ids for equality */
+  HSHM_ALWAYS_INLINE
+  bool operator==(const UniqueId &other) const {
+    return unique_ == other.unique_ && node_id_ == other.node_id_;
+  }
+
+  /** Compare two ids for inequality */
+  HSHM_ALWAYS_INLINE
+  bool operator!=(const UniqueId &other) const {
+    return unique_ != other.unique_ || node_id_ != other.node_id_;
+  }
+};
+
+/** Uniquely identify a task state */
+using TaskStateId = UniqueId<1>;
+/** Uniquely identify a queue */
+using QueueId = UniqueId<2>;
+/** Uniquely identify a task */
+using TaskId = UniqueId<3>;
+
+/** Allow unique ids to be printed as strings */
+template<int num>
+std::ostream &operator<<(std::ostream &os, UniqueId<num> const &obj) {
+  return os << (std::to_string(obj.node_id_) + "."
+      + std::to_string(obj.unique_));
+}
+
+/** The types of I/O that can be performed (for IoCall RPC) */
+enum class IoType {
+  kRead,
+  kWrite,
+  kNone
+};
+
+}  // namespace hrun
+
+namespace std {
+
+/** Hash function for UniqueId */
+template <int TYPE>
+struct hash<hrun::UniqueId<TYPE>> {
+  HSHM_ALWAYS_INLINE
+  std::size_t operator()(const hrun::UniqueId<TYPE> &key) const {
+    return
+      std::hash<u64>{}(key.unique_) +
+      std::hash<u32>{}(key.node_id_);
+  }
+};
+
+/** Hash function for DomainId */
+template<>
+struct hash<hrun::DomainId> {
+  HSHM_ALWAYS_INLINE
+  std::size_t operator()(const hrun::DomainId &key) const {
+    return
+        std::hash<u32>{}(key.id_) +
+        std::hash<u32>{}(key.flags_.bits_);
+  }
+};
+
+}  // namespace std
+
+#endif  // HRUN_INCLUDE_HRUN_HRUN_TYPES_H_
diff --git a/hrun/include/hrun/network/local_serialize.h b/hrun/include/hrun/network/local_serialize.h
new file mode 100644
index 000000000..f0a870be9
--- /dev/null
+++ b/hrun/include/hrun/network/local_serialize.h
@@ -0,0 +1,84 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_NETWORK_LOCAL_SERIALIZE_H_
+#define HRUN_INCLUDE_HRUN_NETWORK_LOCAL_SERIALIZE_H_
+
+#include "hermes_shm/data_structures/data_structure.h"
+
+namespace hrun {
+
+/** A class for serializing simple objects into private memory */
+template<typename DataT = hshm::charbuf>
+class LocalSerialize {
+ public:
+  DataT &data_;
+ public:
+  LocalSerialize(DataT &data) : data_(data) {
+    data_.resize(0);
+  }
+
+  /** left shift operator */
+  template<typename T>
+  HSHM_ALWAYS_INLINE
+  LocalSerialize& operator<<(const T &obj) {
+    if constexpr(std::is_arithmetic<T>::value) {
+      size_t size = sizeof(T);
+      size_t off = data_.size();
+      data_.resize(off + size);
+      memcpy(data_.data() + off, &obj, size);
+    } else if constexpr (std::is_same<T, std::string>::value || std::is_same<T, hshm::charbuf>::value) {
+      size_t size = obj.size();
+      size_t off = data_.size();
+      data_.resize(off + size);
+      memcpy(data_.data() + off, obj.data(), size);
+    } else {
+      throw std::runtime_error("Cannot serialize object");
+    }
+    return *this;
+  }
+};
+
+/** A class for serializing simple objects into private memory */
+template<typename DataT = hshm::charbuf>
+class LocalDeserialize {
+ public:
+  const DataT &data_;
+  size_t cur_off_ = 0;
+ public:
+  LocalDeserialize(const DataT &data) : data_(data) {
+    cur_off_ = 0;
+  }
+
+  /** right shift operator */
+  template<typename T>
+  HSHM_ALWAYS_INLINE
+  LocalDeserialize& operator>>(T &obj) {
+    size_t size;
+    size_t off = cur_off_;
+    if constexpr(std::is_arithmetic<T>::value) {
+      size = sizeof(T);
+      memcpy(&obj, data_.data() + off, size);
+    } else if constexpr (std::is_same<T, std::string>::value || std::is_same<T, hshm::charbuf>::value) {
+      size = obj.size();
+      memcpy(obj.data(), data_.data() + off, size);
+    } else {
+      throw std::runtime_error("Cannot serialize object");
+    }
+    cur_off_ += size;
+    return *this;
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_NETWORK_LOCAL_SERIALIZE_H_
diff --git a/hrun/include/hrun/network/rpc.h b/hrun/include/hrun/network/rpc.h
new file mode 100644
index 000000000..27f655342
--- /dev/null
+++ b/hrun/include/hrun/network/rpc.h
@@ -0,0 +1,226 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_RPC_H_
+#define HRUN_RPC_H_
+
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+
+#include <functional>
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "hrun/hrun_types.h"
+#include "hrun/config/config_server.h"
+
+namespace hrun {
+
+/** RPC types */
+enum class RpcType {
+  kThallium
+};
+
+/** Uniquely identify a host machine */
+struct HostInfo {
+  u32 node_id_;           /**< Hermes-assigned node id */
+  std::string hostname_;  /**< Host name */
+  std::string ip_addr_;   /**< Host IP address */
+
+  HostInfo() = default;
+  explicit HostInfo(const std::string &hostname,
+                    const std::string &ip_addr,
+                    u32 node_id)
+      : hostname_(hostname), ip_addr_(ip_addr), node_id_(node_id) {}
+};
+
+/** Fabric protocols */
+
+
+/** A structure to represent RPC context. */
+class RpcContext {
+ public:
+  ServerConfig *config_;
+  int port_;  /**< port number */
+  std::string protocol_;  /**< Libfabric provider */
+  std::string domain_;    /**< Libfabric domain */
+  u32 node_id_;           /**< the ID of this node */
+  int num_threads_;       /**< Number of RPC threads */
+  std::vector<HostInfo> hosts_; /**< Hostname and ip addr per-node */
+
+ public:
+  /** Default constructor */
+  RpcContext() = default;
+
+  /** Get the nubmer of hosts */
+  HSHM_ALWAYS_INLINE
+  size_t GetNumHosts() {
+    return hosts_.size();
+  }
+
+  /** initialize host info list */
+  void ServerInit(ServerConfig *config) {
+    config_ = config;
+    port_ = config_->rpc_.port_;
+    protocol_ = config_->rpc_.protocol_;
+    domain_ = config_->rpc_.domain_;
+    num_threads_ = config_->rpc_.num_threads_;
+    if (hosts_.size()) { return; }
+    // Uses hosts produced by host_names
+    auto &hosts = config_->rpc_.host_names_;
+
+    // Get all host info
+    hosts_.reserve(hosts.size());
+    u32 node_id = 1;
+    for (const auto& name : hosts) {
+      hosts_.emplace_back(name, _GetIpAddress(name), node_id++);
+    }
+
+    // Get id of current host
+    node_id_ = _FindThisHost();
+    if (node_id_ == 0 || node_id_ > (u32)hosts_.size()) {
+      HELOG(kFatal, "Couldn't identify this host.")
+    }
+  }
+
+  /** get RPC address */
+  std::string GetRpcAddress(const DomainId &domain_id, int port) {
+    std::string result = config_->rpc_.protocol_ + "://";
+    if (!config_->rpc_.domain_.empty()) {
+      result += config_->rpc_.domain_ + "/";
+    }
+    std::string host_name = GetHostNameFromNodeId(domain_id);
+    result += host_name + ":" + std::to_string(port);
+    return result;
+  }
+
+  /** Get RPC address for this node */
+  std::string GetMyRpcAddress() {
+    return GetRpcAddress(DomainId::GetNode(node_id_), port_);
+  }
+
+  /** get host name from node ID */
+  std::string GetHostNameFromNodeId(const DomainId &domain_id) {
+    // NOTE(llogan): node_id 0 is reserved as the NULL node
+    u32 node_id = domain_id.id_;
+    if (node_id <= 0 || node_id > (i32)hosts_.size()) {
+      HELOG(kFatal, "Attempted to get from node {}, which is out of "
+                    "the range 1-{}", node_id, hosts_.size() + 1)
+    }
+    u32 index = node_id - 1;
+    return hosts_[index].hostname_;
+  }
+
+  /** get host name from node ID */
+  std::string GetIpAddressFromNodeId(const DomainId &domain_id){
+    // NOTE(llogan): node_id 0 is reserved as the NULL node
+    u32 node_id = domain_id.id_;
+    if (node_id <= 0 || node_id > (u32)hosts_.size()) {
+      HELOG(kFatal, "Attempted to get from node {}, which is out of "
+                    "the range 1-{}", node_id, hosts_.size() + 1)
+    }
+    u32 index = node_id - 1;
+    return hosts_[index].ip_addr_;
+  }
+
+  /** Get RPC protocol */
+  std::string GetProtocol() {
+    return config_->rpc_.protocol_;
+  }
+
+ private:
+  /** Get the node ID of this machine according to hostfile */
+  int _FindThisHost() {
+    int node_id = 1;
+    for (HostInfo &host : hosts_) {
+      if (_IsAddressLocal(host.ip_addr_)) {
+        return node_id;
+      }
+      ++node_id;
+    }
+    HELOG(kFatal, "Could not identify this host");
+    return -1;
+  }
+
+  /** Check if an IP address is local */
+  bool _IsAddressLocal(const std::string &addr) {
+    struct ifaddrs* ifAddrList = nullptr;
+    bool found = false;
+
+    if (getifaddrs(&ifAddrList) == -1) {
+      perror("getifaddrs");
+      return false;
+    }
+
+    for (struct ifaddrs* ifAddr = ifAddrList;
+         ifAddr != nullptr; ifAddr = ifAddr->ifa_next) {
+      if (ifAddr->ifa_addr == nullptr ||
+          ifAddr->ifa_addr->sa_family != AF_INET) {
+        continue;
+      }
+
+      struct sockaddr_in* sin =
+          reinterpret_cast<struct sockaddr_in*>(ifAddr->ifa_addr);
+      char ipAddress[INET_ADDRSTRLEN] = {0};
+      inet_ntop(AF_INET, &(sin->sin_addr), ipAddress, INET_ADDRSTRLEN);
+
+      if (addr == ipAddress) {
+        found = true;
+        break;
+      }
+    }
+
+    freeifaddrs(ifAddrList);
+    return found;
+  }
+
+  /** Get IPv4 address from the host with "host_name" */
+  std::string _GetIpAddress(const std::string &host_name) {
+    struct hostent hostname_info = {};
+    struct hostent *hostname_result;
+    int hostname_error = 0;
+    char hostname_buffer[4096] = {};
+#ifdef __APPLE__
+    hostname_result = gethostbyname(host_name.c_str());
+  in_addr **addr_list = (struct in_addr **)hostname_result->h_addr_list;
+#else
+    int gethostbyname_result =
+        gethostbyname_r(host_name.c_str(), &hostname_info, hostname_buffer,
+                        4096, &hostname_result, &hostname_error);
+    if (gethostbyname_result != 0) {
+      HELOG(kFatal, hstrerror(h_errno))
+    }
+    in_addr **addr_list = (struct in_addr **)hostname_info.h_addr_list;
+#endif
+    if (!addr_list[0]) {
+      HELOG(kFatal, hstrerror(h_errno))
+    }
+
+    char ip_address[INET_ADDRSTRLEN] = {0};
+    const char *inet_result =
+        inet_ntop(AF_INET, addr_list[0], ip_address, INET_ADDRSTRLEN);
+    if (!inet_result) {
+      perror("inet_ntop");
+      HELOG(kFatal, "inet_ntop failed");
+    }
+    return ip_address;
+  }
+};
+
+}  // namespace hermes
+
+#endif  // HRUN_RPC_H_
diff --git a/hrun/include/hrun/network/rpc_thallium.h b/hrun/include/hrun/network/rpc_thallium.h
new file mode 100644
index 000000000..58873283e
--- /dev/null
+++ b/hrun/include/hrun/network/rpc_thallium.h
@@ -0,0 +1,321 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HERMES_RPC_THALLIUM_H_
+#define HERMES_RPC_THALLIUM_H_
+
+#include <thallium.hpp>
+#include <string>
+#include "hermes_shm/util/singleton.h"
+
+#include "rpc.h"
+
+namespace tl = thallium;
+
+namespace hrun {
+
+/**
+   A structure to represent Thallium state
+*/
+class ThalliumRpc {
+ public:
+  std::atomic<bool> kill_requested_; /**< is kill requested? */
+  std::unique_ptr<tl::engine> client_engine_; /**< pointer to client engine */
+  std::unique_ptr<tl::engine> server_engine_; /**< pointer to server engine */
+  RpcContext *rpc_;
+
+  /** initialize RPC context  */
+  ThalliumRpc() {}
+
+  /** Initialize server */
+  void ServerInit(RpcContext *rpc) {
+    rpc_ = rpc;
+    HILOG(kInfo, "Initializing RPC server");
+    std::string addr = rpc->GetMyRpcAddress();
+    HILOG(kInfo, "Attempting to start server on: {}", addr);
+    try {
+      server_engine_ = std::make_unique<tl::engine>(
+          addr, THALLIUM_SERVER_MODE, true, rpc->num_threads_);
+    } catch (std::exception &e) {
+      HELOG(kFatal, "RPC init failed for host: {}\n{}", addr, e.what());
+    }
+    std::string rpc_server_name = server_engine_->self();
+    HILOG(kInfo, "Serving {} (i.e., {}) with {} RPC threads as node id {}",
+          rpc_server_name,
+          addr,
+          rpc->num_threads_,
+          rpc->node_id_);
+    ClientInit(rpc);
+  }
+
+  /** Initialize client */
+  void ClientInit(RpcContext *rpc) {
+    rpc_ = rpc;
+    std::string protocol = rpc->GetProtocol();
+    client_engine_ = std::make_unique<tl::engine>(protocol,
+                                                  THALLIUM_CLIENT_MODE,
+                                                  true, 1);
+    HILOG(kInfo, "This client is on node {} (i.e., {}, proto: {})",
+          rpc->node_id_, rpc->GetHostNameFromNodeId(DomainId::GetNode(rpc->node_id_)), protocol);
+  }
+
+  /** Run the daemon */
+  void RunDaemon() {
+    HILOG(kInfo, "Starting the daemon on node: {}", rpc_->node_id_);
+    server_engine_->enable_remote_shutdown();
+    auto prefinalize_callback = [this]() {
+      HILOG(kInfo, "Finalizing RPCs on node: {}", rpc_->node_id_);
+    };
+    server_engine_->push_prefinalize_callback(prefinalize_callback);
+    server_engine_->wait_for_finalize();
+    HILOG(kInfo, "Daemon has stopped on node: {}", rpc_->node_id_);
+  }
+
+  /** Stop this daemon */
+  void StopThisDaemon() {
+    StopDaemon(rpc_->node_id_);
+  }
+
+  /** Stop a thallium daemon */
+  void StopDaemon(u32 node_id) {
+    try {
+      HILOG(kInfo, "Sending stop signal to: {}", node_id);
+      std::string server_name = GetServerName(node_id);
+      tl::endpoint server = client_engine_->lookup(server_name.c_str());
+      client_engine_->shutdown_remote_engine(server);
+    } catch (std::exception &e) {
+      HELOG(kFatal, "Stop daemon failed: {}", e.what());
+    }
+  }
+
+  /** Stop the thallium daemon */
+  void StopAllDaemons() {
+    for (u32 node_id = 1; node_id < (int)rpc_->hosts_.size() + 1; ++node_id) {
+      StopDaemon(node_id);
+    }
+  }
+
+  /** Thallium-compatible server name */
+  std::string GetServerName(u32 node_id) {
+    std::string ip_address = rpc_->GetIpAddressFromNodeId(DomainId::GetNode(node_id));
+    return rpc_->protocol_ + "://" +
+        std::string(ip_address) +
+        ":" + std::to_string(rpc_->port_);
+  }
+
+  /** Register an RPC with thallium */
+  template<typename RpcLambda>
+  void RegisterRpc(const char *name, RpcLambda &&lambda) {
+    server_engine_->define(name, std::forward<RpcLambda>(lambda));
+  }
+
+  /** RPC call */
+  template <typename RetT, bool ASYNC, typename... Args>
+  RetT Call(u32 node_id, const std::string &func_name, Args&&... args) {
+    HILOG(kDebug, "Calling {} {} -> {}", func_name, rpc_->node_id_, node_id)
+    try {
+      std::string server_name = GetServerName(node_id);
+      tl::remote_procedure remote_proc = client_engine_->define(func_name);
+      tl::endpoint server = client_engine_->lookup(server_name);
+      HILOG(kDebug, "Found the server: {}={}", node_id, server_name)
+      if constexpr(!ASYNC) {
+        if constexpr (std::is_same<RetT, void>::value) {
+          remote_proc.disable_response();
+          remote_proc.on(server)(std::forward<Args>(args)...);
+        } else {
+          RetT result = remote_proc.on(server)(std::forward<Args>(args)...);
+          return result;
+        }
+      } else {
+        return remote_proc.on(server).async(std::forward<Args>(args)...);
+      }
+    } catch (tl::margo_exception &err) {
+      HELOG(kFatal, "(node {} -> {}) Thallium failed on function: {}: {}",
+            rpc_->node_id_, node_id, func_name, err.what())
+      exit(1);
+    }
+  }
+
+  /** RPC call */
+  template <typename RetT, typename... Args>
+  RetT SyncCall(u32 node_id, const std::string &func_name, Args&&... args) {
+    return Call<RetT, false>(
+        node_id, func_name, std::forward<Args>(args)...);
+  }
+
+  /** Async RPC call */
+  template <typename... Args>
+  thallium::async_response AsyncCall(u32 node_id, const std::string &func_name, Args&&... args) {
+    return Call<thallium::async_response, true>(
+        node_id, func_name, std::forward<Args>(args)...);
+  }
+
+  /** I/O transfers */
+  template<typename RetT, bool ASYNC, typename ...Args>
+  RetT IoCall(i32 node_id, const std::string &func_name,
+              IoType type, char *data, size_t size, Args&& ...args) {
+    HILOG(kDebug, "Calling {} {} -> {}", func_name, rpc_->node_id_, node_id)
+    try {
+      std::string server_name = GetServerName(node_id);
+      tl::bulk_mode flag;
+      switch (type) {
+        case IoType::kRead: {
+          // The "bulk" object will be modified
+          flag = tl::bulk_mode::write_only;
+          break;
+        }
+        case IoType::kWrite: {
+          // The "bulk" object will only be read from
+          flag = tl::bulk_mode::read_only;
+          break;
+        }
+        case IoType::kNone: {
+          // TODO(llogan)
+          HELOG(kFatal, "Cannot have none I/O type")
+          exit(1);
+        }
+      }
+
+      tl::remote_procedure remote_proc = client_engine_->define(func_name);
+      tl::endpoint server = client_engine_->lookup(server_name);
+
+      std::vector<std::pair<void *, size_t>> segments(1);
+      segments[0].first = data;
+      segments[0].second = size;
+
+      tl::bulk bulk = client_engine_->expose(segments, flag);
+      if constexpr (!ASYNC) {
+        if constexpr (std::is_same_v<RetT, void>) {
+          remote_proc.on(server)(bulk, std::forward<Args>(args)...);
+        } else {
+          return remote_proc.on(server)(bulk, std::forward<Args>(args)...);
+        }
+      } else {
+        return remote_proc.on(server).async(bulk, std::forward<Args>(args)...);
+      }
+    } catch (tl::margo_exception &err) {
+      HELOG(kFatal, "(node {} -> {}) Thallium failed on function: {}: {}",
+            rpc_->node_id_, node_id, func_name, err.what())
+      exit(1);
+    }
+  }
+
+  /** Synchronous I/O transfer */
+  template<typename RetT, typename ...Args>
+  RetT SyncIoCall(i32 node_id, const std::string &func_name,
+                  IoType type, char *data, size_t size, Args&& ...args) {
+    return IoCall<RetT, false>(
+        node_id, func_name, type, data, size, std::forward<Args>(args)...);
+  }
+
+  /** I/O transfers */
+  template<typename ...Args>
+  thallium::async_response AsyncIoCall(u32 node_id, const char *func_name,
+                                       IoType type, char *data, size_t size,
+                                       Args&& ...args) {
+    return IoCall<thallium::async_response, true>(
+        node_id, func_name, type, data, size, std::forward<Args>(args)...);
+  }
+
+  /** Io transfer at the server */
+  size_t IoCallServer(const tl::request &req, const tl::bulk &bulk,
+                      IoType type, char *data, size_t size) {
+    tl::bulk_mode flag = tl::bulk_mode::write_only;
+    switch (type) {
+      case IoType::kRead: {
+        // The "local_bulk" object will only be read from
+        flag = tl::bulk_mode::read_only;
+        // flag = tl::bulk_mode::read_write;
+        HILOG(kDebug, "(node {}) Reading {} bytes from the server",
+              rpc_->node_id_, size)
+        break;
+      }
+      case IoType::kWrite: {
+        // The "local_bulk" object will only be written to
+        flag = tl::bulk_mode::write_only;
+        // flag = tl::bulk_mode::read_write;
+        HILOG(kDebug, "(node {}) Writing {} bytes to the server",
+              rpc_->node_id_, size)
+        break;
+      }
+      default: {
+        // NOTE(llogan): Avoids "uninitalized" warning
+        HELOG(kFatal, "Cannot have none I/O type")
+      }
+    }
+
+    tl::endpoint endpoint = req.get_endpoint();
+    std::vector<std::pair<void*, size_t>> segments(1);
+    segments[0].first  = data;
+    segments[0].second = size;
+    tl::bulk local_bulk = server_engine_->expose(segments, flag);
+    size_t io_bytes = 0;
+
+    try {
+      switch (type) {
+        case IoType::kRead: {
+          // Read from "local_bulk" to "bulk"
+          io_bytes = bulk.on(endpoint) << local_bulk;
+          break;
+        }
+        case IoType::kWrite: {
+          // Write to "local_bulk" from "bulk"
+          io_bytes = bulk.on(endpoint) >> local_bulk;
+          break;
+        }
+        case IoType::kNone: {
+          HELOG(kFatal, "Cannot have none I/O type")
+        }
+      }
+    } catch (std::exception &e) {
+      HELOG(kFatal, "(node {}) Failed to perform bulk I/O thallium: {} (type={})",
+            rpc_->node_id_, e.what(), (type==IoType::kRead)?"read":"write");
+    }
+    if (io_bytes != size) {
+      HELOG(kFatal, "Failed to perform bulk I/O thallium")
+    }
+    return io_bytes;
+  }
+
+  /** Check if request is complete */
+  bool IsDone(thallium::async_response &req) {
+    return req.received();
+  }
+
+  /** Wait for thallium to complete */
+  template<typename RetT>
+  RetT Wait(thallium::async_response &req) {
+    if constexpr(std::is_same_v<void, RetT>) {
+      req.wait().as<RetT>();
+    } else {
+      return req.wait();
+    }
+  }
+};
+
+}  // namespace hermes
+
+/** Lets thallium know how to serialize an enum */
+#define SERIALIZE_ENUM(T)\
+  template <typename A>\
+  void save(A &ar, T &mode) {\
+    int cast = static_cast<int>(mode);\
+    ar << cast;\
+  }\
+  template <typename A>\
+  void load(A &ar, T &mode) {\
+    int cast;\
+    ar >> cast;\
+    mode = static_cast<T>(cast);\
+  }
+
+#endif  // HERMES_RPC_THALLIUM_H_
diff --git a/hrun/include/hrun/network/serialize.h b/hrun/include/hrun/network/serialize.h
new file mode 100644
index 000000000..873d03a57
--- /dev/null
+++ b/hrun/include/hrun/network/serialize.h
@@ -0,0 +1,289 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_NETWORK_SERIALIZE_H_
+#define HRUN_INCLUDE_HRUN_NETWORK_SERIALIZE_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/task_registry/task.h"
+#include <sstream>
+#include <cereal/archives/binary.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/list.hpp>
+#include <cereal/types/unordered_map.hpp>
+#include <cereal/types/unordered_set.hpp>
+#include <cereal/types/atomic.hpp>
+
+namespace hrun {
+
+/** Receiver will read from data_ */
+#define DT_RECEIVER_READ BIT_OPT(u32, 0)
+
+/** Receiver will write to data_ */
+#define DT_RECEIVER_WRITE BIT_OPT(u32, 1)
+
+/** Free data_ when the data transfer is complete */
+#define DT_FREE_DATA BIT_OPT(u32, 2)
+
+/** Indicate how data should be transferred over network */
+template<bool NO_XFER>
+struct DataTransferBase {
+  hshm::bitfield32_t flags_;  /**< Indicates how data will be accessed */
+  void *data_;                /**< The virtual address of data on the node */
+  size_t data_size_;          /**< The amount of data to transfer */
+  DomainId node_id_;          /**< The node data is located */
+
+  /** Serialize a data transfer object */
+  template<typename Ar>
+  void serialize(Ar &ar) const {
+    ar(flags_, (size_t)data_, data_size_, node_id_);
+  }
+
+  /** Default constructor */
+  DataTransferBase() = default;
+
+  /** Emplace constructor */
+  DataTransferBase(u32 flags, void *data, size_t data_size,
+                   const DomainId &node_id = DomainId::GetLocal()) :
+  flags_(flags), data_(data), data_size_(data_size), node_id_(node_id) {}
+
+  /** Copy constructor */
+  DataTransferBase(const DataTransferBase &xfer) :
+  flags_(xfer.flags_), data_(xfer.data_),
+  data_size_(xfer.data_size_), node_id_(xfer.node_id_) {}
+
+  /** Copy assignment */
+  DataTransferBase& operator=(const DataTransferBase &xfer) {
+    flags_ = xfer.flags_;
+    data_ = xfer.data_;
+    data_size_ = xfer.data_size_;
+    node_id_ = xfer.node_id_;
+    return *this;
+  }
+
+  /** Move constructor */
+  DataTransferBase(DataTransferBase &&xfer) noexcept :
+  flags_(xfer.flags_), data_(xfer.data_),
+  data_size_(xfer.data_size_), node_id_(xfer.node_id_) {}
+
+  /** Equality operator */
+  bool operator==(const DataTransferBase &other) const {
+    return flags_.bits_ == other.flags_.bits_ &&
+         data_ == other.data_ &&
+         data_size_ == other.data_size_ &&
+         node_id_ == other.node_id_;
+  }
+};
+
+/** A sized data pointer indicating data I/O direction */
+struct DataPointer {
+  hshm::bitfield32_t flags_;  /**< Indicates how data will be accessed */
+  hipc::Pointer data_;        /**< The SHM address of data on the node */
+  size_t data_size_;          /**< The amount of data to transfer */
+};
+
+using DataTransfer = DataTransferBase<true>;
+using PassDataTransfer = DataTransferBase<false>;
+
+/** Serialize a data structure */
+template<bool is_start>
+class BinaryOutputArchive {
+ public:
+  std::vector<DataTransfer> xfer_;
+  std::stringstream ss_;
+  cereal::BinaryOutputArchive ar_;
+  DomainId node_id_;
+
+ public:
+  /** Default constructor */
+  BinaryOutputArchive(const DomainId &node_id)
+  : node_id_(node_id), ar_(ss_) {}
+
+  /** Serialize using call */
+  template<typename T, typename ...Args>
+  BinaryOutputArchive& operator()(T &var, Args &&...args) {
+    return Serialize(0, var, std::forward<Args>(args)...);
+  }
+
+  /** Serialize using left shift */
+  template<typename T>
+  BinaryOutputArchive& operator<<(T &var) {
+    return Serialize(0, var);
+  }
+
+  /** Serialize using ampersand */
+  template<typename T>
+  BinaryOutputArchive& operator&(T &var) {
+    return Serialize(0, var);
+  }
+
+  /** Serialize using left shift */
+  template<typename T>
+  BinaryOutputArchive& operator<<(T &&var) {
+    return Serialize(0, var);
+  }
+
+  /** Serialize using ampersand */
+  template<typename T>
+  BinaryOutputArchive& operator&(T &&var) {
+    return Serialize(0, var);
+  }
+
+  /** Serialize an array */
+  template<typename T>
+  BinaryOutputArchive& write(T *data, size_t count) {
+    size_t size = count * sizeof(T);
+    return Serialize(0, cereal::binary_data(data, size));
+  }
+
+  /** Serialize a parameter */
+  template<typename T, typename ...Args>
+  BinaryOutputArchive& Serialize(u32 replica, T &var, Args&& ...args) {
+    if constexpr (IS_TASK(T)) {
+      if constexpr (IS_SRL(T)) {
+        if constexpr (is_start) {
+          if constexpr (USES_SRL_START(T)) {
+            var.SerializeStart(*this);
+          } else {
+            var.SaveStart(*this);
+          }
+        } else {
+          if constexpr (USES_SRL_END(T)) {
+            var.SerializeEnd(replica, *this);
+          } else {
+            var.SaveEnd(*this);
+          }
+        }
+      }
+    } else if constexpr (std::is_same_v<T, DataTransfer>){
+      var.node_id_ = node_id_;
+      xfer_.emplace_back(var);
+    } else if constexpr(std::is_same_v<T, DataPointer>) {
+      DataTransfer xfer;
+      xfer.flags_ = var.flags_;
+      xfer.data_ = HERMES_MEMORY_MANAGER->Convert<char>(var.data_);
+      xfer.data_size_ = var.size_;
+      xfer_.emplace_back(var);
+    } else {
+      ar_ << var;
+    }
+    return Serialize(replica, std::forward<Args>(args)...);
+  }
+
+  /** End serialization recursion */
+  BinaryOutputArchive& Serialize(u32 replica) {
+    (void) replica;
+    return *this;
+  }
+
+  /** Get serialized data */
+  std::vector<DataTransfer> Get() {
+    // Serialize metadata parameters
+    std::string str = ss_.str();
+    void *data = nullptr;
+    if (str.size() > 0) {
+      data = malloc(str.size());
+      memcpy(data, str.data(), str.size());
+      ss_.clear();
+    }
+    xfer_.emplace_back(DT_RECEIVER_READ | DT_FREE_DATA, data, str.size(), node_id_);
+
+    // Return transfer buffers
+    return std::move(xfer_);
+  }
+};
+
+/** Desrialize a data structure */
+template<bool is_start>
+class BinaryInputArchive {
+ public:
+  std::vector<DataTransfer> xfer_;
+  std::stringstream ss_;
+  cereal::BinaryInputArchive ar_;
+  int xfer_off_;
+
+ public:
+  /** Default constructor */
+  BinaryInputArchive(std::vector<DataTransfer> &xfer)
+  : xfer_(std::move(xfer)), xfer_off_(0), ss_(), ar_(ss_) {
+    auto &param_xfer = xfer_.back();
+    ss_.str(std::string((char*)param_xfer.data_, param_xfer.data_size_));
+  }
+
+  /** Deserialize using call */
+  template<typename T, typename ...Args>
+  BinaryInputArchive& operator()(T &var, Args &&...args) {
+    return Deserialize(0, var, std::forward<Args>(args)...);
+  }
+
+  /** Deserialize using right shift */
+  template<typename T>
+  BinaryInputArchive& operator>>(T &var) {
+    return Deserialize(0, var);
+  }
+
+  /** Deserialize using ampersand */
+  template<typename T>
+  BinaryInputArchive& operator&(T &var) {
+    return Deserialize(0, var);
+  }
+
+  /** Deserialize an array */
+  template<typename T>
+  BinaryInputArchive& read(T *data, size_t count) {
+    size_t size = count * sizeof(T);
+    Deserialize(0, cereal::binary_data(data, size));
+  }
+
+  /** Deserialize a parameter */
+  template<typename T, typename ...Args>
+  BinaryInputArchive& Deserialize(u32 replica, T &var, Args&& ...args) {
+    if constexpr (IS_TASK(T)) {
+      if constexpr (IS_SRL(T)) {
+        if constexpr (is_start) {
+          if constexpr (USES_SRL_START(T)) {
+            var.SerializeStart(*this);
+          } else {
+            var.LoadStart(*this);
+          }
+        } else {
+          if constexpr (USES_SRL_END(T)) {
+            var.SerializeEnd(replica, *this);
+          } else {
+            var.LoadEnd(replica, *this);
+          }
+        }
+      }
+    } else if constexpr (std::is_same_v<T, DataTransfer>) {
+      var = xfer_[xfer_off_++];
+    } else if constexpr(std::is_same_v<T, DataPointer>) {
+      DataTransfer &xfer = xfer_[xfer_off_++];
+      var.shm_ = HERMES_MEMORY_MANAGER->Convert<char>(xfer.data_);
+      var.size_ = xfer.data_size_;
+      var.flags_ = xfer.flags_;
+    } else {
+      ar_ >> var;
+    }
+    return Deserialize(replica, std::forward<Args>(args)...);
+  }
+
+  /** End deserialize recursion */
+  HSHM_ALWAYS_INLINE
+  BinaryInputArchive& Deserialize(u32 replica) {
+    return *this;
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_NETWORK_SERIALIZE_H_
diff --git a/hrun/include/hrun/queue_manager/queue.h b/hrun/include/hrun/queue_manager/queue.h
new file mode 100644
index 000000000..09fd3213a
--- /dev/null
+++ b/hrun/include/hrun/queue_manager/queue.h
@@ -0,0 +1,115 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/task_registry/task.h"
+#include <vector>
+
+/** Requests in this queue can be processed in any order */
+#define QUEUE_READY BIT_OPT(u32, 0)
+/** This queue contains only latency-sensitive tasks */
+#define QUEUE_LOW_LATENCY BIT_OPT(u32, 1)
+/** This queue is currently being resized */
+#define QUEUE_RESIZE BIT_OPT(u32, 2)
+/** This queue is currently processing updates */
+#define QUEUE_UPDATE BIT_OPT(u32, 3)
+/** Requests in this queue can be processed in any order */
+#define QUEUE_UNORDERED BIT_OPT(u32, 4)
+/** Requests in this queue are long-running */
+#define QUEUE_LONG_RUNNING BIT_OPT(u32, 5)
+
+namespace hrun {
+
+/** Prioritization info needed to be set by client */
+struct PriorityInfo {
+  u32 max_lanes_;       /**< Maximum number of lanes in the queue */
+  u32 num_lanes_;       /**< Current number of lanes in use */
+  u32 depth_;           /**< The maximum depth of individual lanes */
+  bitfield32_t flags_;  /**< Scheduling hints for the queue */
+
+  /** Default constructor */
+  PriorityInfo() = default;
+
+  /** Emplace constructor */
+  PriorityInfo(u32 num_lanes, u32 max_lanes, u32 depth, u32 flags) {
+    max_lanes_ = max_lanes;
+    num_lanes_ = num_lanes;
+    depth_ = depth;
+    flags_ = bitfield32_t(flags);
+  }
+
+  /** Emplace constructor */
+  PriorityInfo(u32 num_lanes, u32 max_lanes, u32 depth, bitfield32_t flags) {
+    max_lanes_ = max_lanes;
+    num_lanes_ = num_lanes;
+    depth_ = depth;
+    flags_ = flags;
+  }
+
+  /** Copy constructor */
+  PriorityInfo(const PriorityInfo &priority) {
+    max_lanes_ = priority.max_lanes_;
+    num_lanes_ = priority.num_lanes_;
+    depth_ = priority.depth_;
+    flags_ = priority.flags_;
+  }
+
+  /** Move constructor */
+  PriorityInfo(PriorityInfo &&priority) noexcept {
+    max_lanes_ = priority.max_lanes_;
+    num_lanes_ = priority.num_lanes_;
+    depth_ = priority.depth_;
+    flags_ = priority.flags_;
+  }
+
+  /** Copy assignment operator */
+  PriorityInfo& operator=(const PriorityInfo &priority) {
+    if (this != &priority) {
+      max_lanes_ = priority.max_lanes_;
+      num_lanes_ = priority.num_lanes_;
+      depth_ = priority.depth_;
+      flags_ = priority.flags_;
+    }
+    return *this;
+  }
+
+  /** Move assignment operator */
+  PriorityInfo& operator=(PriorityInfo &&priority) noexcept {
+    if (this != &priority) {
+      max_lanes_ = priority.max_lanes_;
+      num_lanes_ = priority.num_lanes_;
+      depth_ = priority.depth_;
+      flags_ = priority.flags_;
+    }
+    return *this;
+  }
+
+  /** Serialize Priority Info */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar & max_lanes_;
+    ar & num_lanes_;
+    ar & depth_;
+    ar & flags_;
+  }
+};
+
+/** Forward declaration of the queue type */
+template <typename QueueT>
+class MultiQueueT;
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_H_
diff --git a/hermes_shm/test/unit/data_structures/containers/test_init.cc b/hrun/include/hrun/queue_manager/queue_factory.h
similarity index 71%
rename from hermes_shm/test/unit/data_structures/containers/test_init.cc
rename to hrun/include/hrun/queue_manager/queue_factory.h
index be6a85f13..9f712c893 100644
--- a/hermes_shm/test/unit/data_structures/containers/test_init.cc
+++ b/hrun/include/hrun/queue_manager/queue_factory.h
@@ -10,22 +10,18 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_FACTORY_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_FACTORY_H_
 
-#include "basic_test.h"
-#include "test_init.h"
-#include <mpi.h>
+#include "queues/hshm_queue.h"
 
-Allocator *alloc_g = nullptr;
+namespace hrun {
 
-void Posttest() {
-  std::string shm_url = "test_allocators";
-  alloc_g = nullptr;
-}
+#ifdef QUEUE_TYPE
+using MultiQueue = MultiQueueT<QUEUE_TYPE>;
+#else
+using MultiQueue = MultiQueueT<Hshm>;
+#endif
+}  // namespace hrun
 
-void MainPretest() {
-  Pretest<hipc::StackAllocator>();
-}
-
-void MainPosttest() {
-  Posttest();
-}
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_FACTORY_H_
diff --git a/hrun/include/hrun/queue_manager/queue_manager.h b/hrun/include/hrun/queue_manager/queue_manager.h
new file mode 100644
index 000000000..1a714e0b3
--- /dev/null
+++ b/hrun/include/hrun/queue_manager/queue_manager.h
@@ -0,0 +1,57 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_H_
+
+#include "hrun/config/config_server.h"
+#include "hrun/hrun_types.h"
+#include "queue_factory.h"
+
+namespace hrun {
+
+/** Shared-memory representation of the QueueManager */
+struct QueueManagerShm {
+  hipc::ShmArchive<hipc::vector<MultiQueue>> queue_map_;
+  hipc::ShmArchive<hipc::split_ticket_queue<size_t>> tickets_;
+};
+
+/** A base class inherited by Client & Server QueueManagers */
+class QueueManager {
+ public:
+  hipc::vector<MultiQueue> *queue_map_;   /**< Queues which directly interact with tasks states */
+  u32 node_id_;             /**< The ID of the node this QueueManager is on */
+  QueueId admin_queue_;     /**< The queue used to submit administrative requests */
+  QueueId process_queue_;   /**< The queue used to submit tasks from clients */
+  TaskStateId admin_task_state_;  /**< The ID of the admin queue */
+
+ public:
+  void Init(u32 node_id) {
+    node_id_ = node_id;
+    admin_queue_ = QueueId(1, 0);
+    admin_task_state_ = TaskStateId(1, 0);
+    process_queue_ = QueueId(1, 1);
+  }
+
+  /**
+   * Get a queue by ID
+   *
+   * TODO(llogan): Maybe make a local hashtable to map id -> ticket?
+   * */
+  HSHM_ALWAYS_INLINE MultiQueue* GetQueue(const QueueId &id) {
+    return &(*queue_map_)[id.unique_];
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_H_
diff --git a/hermes_shm/test/unit/data_structures/containers/vector.h b/hrun/include/hrun/queue_manager/queue_manager_client.h
similarity index 54%
rename from hermes_shm/test/unit/data_structures/containers/vector.h
rename to hrun/include/hrun/queue_manager/queue_manager_client.h
index ae9cdad98..0ff0111e9 100644
--- a/hermes_shm/test/unit/data_structures/containers/vector.h
+++ b/hrun/include/hrun/queue_manager/queue_manager_client.h
@@ -10,28 +10,36 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_VECTOR_H_
-#define HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_VECTOR_H_
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_CLIENT_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_CLIENT_H_
 
-#include "list.h"
+#include "queue_manager.h"
 
-template<typename T, typename Container>
-class VectorTestSuite : public ListTestSuite<T, Container> {
+namespace hrun {
+
+#define HRUN_QM_CLIENT \
+  (&HRUN_CLIENT->queue_manager_)
+
+/** Enable client programs to access queues */
+class QueueManagerClient : public QueueManager {
  public:
-  using ListTestSuite<T, Container>::obj_;
+  hipc::Allocator *alloc_;
 
  public:
-  /// Constructor
-  VectorTestSuite(Container &obj, Allocator *alloc)
-  : ListTestSuite<T, Container>(obj, alloc) {}
-
-  /// Test vector index operator
-  void IndexTest() {
-    for (size_t i = 0; i < obj_.size(); ++i) {
-      CREATE_SET_VAR_TO_INT_OR_STRING(T, var, i);
-      REQUIRE(obj_[i] == var);
-    }
+  /** Default constructor */
+  QueueManagerClient() = default;
+
+  /** Destructor*/
+  ~QueueManagerClient() = default;
+
+  /** Initialize client */
+  void ClientInit(hipc::Allocator *alloc, QueueManagerShm &shm, u32 node_id) {
+    alloc_ = alloc;
+    queue_map_ = shm.queue_map_.get();
+    Init(node_id);
   }
 };
 
-#endif  // HERMES_TEST_UNIT_DATA_STRUCTURES_CONTAINERS_VECTOR_H_
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_CLIENT_H_
diff --git a/hrun/include/hrun/queue_manager/queue_manager_runtime.h b/hrun/include/hrun/queue_manager/queue_manager_runtime.h
new file mode 100644
index 000000000..f60f55b6c
--- /dev/null
+++ b/hrun/include/hrun/queue_manager/queue_manager_runtime.h
@@ -0,0 +1,100 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_SERVER_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_SERVER_H_
+
+#include "queue_manager.h"
+#include "queue_manager_client.h"
+
+namespace hrun {
+
+#define HRUN_QM_RUNTIME \
+  (&HRUN_RUNTIME->queue_manager_)
+
+/** Administrative queuing actions */
+class QueueManagerRuntime : public QueueManager {
+ public:
+  ServerConfig *config_;
+  size_t max_queues_;
+  size_t max_lanes_;
+  hipc::split_ticket_queue<u64> *tickets_;
+  u32 node_id_;
+
+ public:
+  /** Default constructor */
+  QueueManagerRuntime() = default;
+
+  /** Destructor*/
+  ~QueueManagerRuntime() = default;
+
+  /** Create queues in shared memory */
+  void ServerInit(hipc::Allocator *alloc, u32 node_id, ServerConfig *config, QueueManagerShm &shm) {
+    config_ = config;
+    Init(node_id);
+    QueueManagerInfo &qm = config_->queue_manager_;
+    // Initialize ticket queue (ticket 0 is for admin queue)
+    max_queues_ = qm.max_queues_;
+    max_lanes_ = qm.max_lanes_;
+    HSHM_MAKE_AR(shm.tickets_, alloc, max_queues_)
+    for (u64 i = 1; i <= max_queues_; ++i) {
+      shm.tickets_->emplace(i);
+    }
+    // Initialize queue map
+    HSHM_MAKE_AR0(shm.queue_map_, alloc)
+    queue_map_ = shm.queue_map_.get();
+    queue_map_->resize(max_queues_);
+    // Create the admin queue
+    MultiQueue *queue;
+    queue = CreateQueue(admin_queue_, {
+      {1, 1, qm.queue_depth_, QUEUE_UNORDERED}
+    });
+    queue->flags_.SetBits(QUEUE_READY);
+    queue = CreateQueue(process_queue_, {
+        {1, 1, qm.queue_depth_, QUEUE_UNORDERED},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    });
+    queue->flags_.SetBits(QUEUE_READY);
+  }
+
+  /** Create a new queue (with pre-allocated ID) in the map */
+  MultiQueue* CreateQueue(const QueueId &id, const std::vector<PriorityInfo> &queue_info) {
+    MultiQueue *queue = GetQueue(id);
+    if (id.IsNull()) {
+      HELOG(kError, "Cannot create null queue {}", id);
+      return nullptr;
+    }
+    if (!queue->id_.IsNull()) {
+      HELOG(kError, "Queue {} already exists", id);
+      return nullptr;
+    }
+    // HILOG(kDebug, "Creating queue {}", id);
+    queue_map_->replace(queue_map_->begin() + id.unique_, id, queue_info);
+    return queue;
+  }
+
+  /**
+   * Remove a queue
+   *
+   * For now, this function assumes that the queue is not in use.
+   * TODO(llogan): don't assume this
+   * */
+  void DestroyQueue(QueueId &id) {
+    queue_map_->erase(queue_map_->begin() + id.unique_);
+    tickets_->emplace(id.unique_);
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_QUEUE_MANAGER_SERVER_H_
diff --git a/hrun/include/hrun/queue_manager/queues/hshm_queue.h b/hrun/include/hrun/queue_manager/queues/hshm_queue.h
new file mode 100644
index 000000000..94e921527
--- /dev/null
+++ b/hrun/include/hrun/queue_manager/queues/hshm_queue.h
@@ -0,0 +1,294 @@
+//
+// Created by llogan on 7/1/23.
+//
+
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_HSHM_QUEUE_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_HSHM_QUEUE_H_
+
+#include "hrun/queue_manager/queue.h"
+
+namespace hrun {
+
+/** The data stored in a lane */
+struct LaneData {
+  hipc::Pointer p_;
+  bool complete_;
+  ABT_thread thread_;
+
+  LaneData() = default;
+
+  LaneData(hipc::Pointer &p, bool complete) {
+    p_ = p;
+    complete_ = complete;
+  }
+};
+
+/** Represents a lane tasks can be stored */
+typedef hipc::mpsc_queue<LaneData> Lane;
+
+/** Prioritization of different lanes in the queue */
+struct LaneGroup : public PriorityInfo {
+  u32 prio_;            /**< The priority of the lane group */
+  u32 num_scheduled_;   /**< The number of lanes currently scheduled on workers */
+  hipc::ShmArchive<hipc::vector<Lane>> lanes_;  /**< The lanes of the queue */
+
+  /** Default constructor */
+  HSHM_ALWAYS_INLINE
+  LaneGroup() = default;
+
+  /** Set priority info */
+  HSHM_ALWAYS_INLINE
+  LaneGroup(const PriorityInfo &priority) {
+    max_lanes_ = priority.max_lanes_;
+    num_lanes_ = priority.num_lanes_;
+    num_scheduled_ = 0;
+    depth_ = priority.depth_;
+    flags_ = priority.flags_;
+    // prio_ is set externally
+  }
+
+  /** Copy constructor. Should never actually be called. */
+  HSHM_ALWAYS_INLINE
+  LaneGroup(const LaneGroup &priority) {
+    max_lanes_ = priority.max_lanes_;
+    num_lanes_ = priority.num_lanes_;
+    num_scheduled_ = priority.num_scheduled_;
+    depth_ = priority.depth_;
+    flags_ = priority.flags_;
+    // prio_ is set externally
+  }
+
+  /** Move constructor. Should never actually be called. */
+  HSHM_ALWAYS_INLINE
+  LaneGroup(LaneGroup &&priority) noexcept {
+    max_lanes_ = priority.max_lanes_;
+    num_lanes_ = priority.num_lanes_;
+    num_scheduled_ = priority.num_scheduled_;
+    depth_ = priority.depth_;
+    flags_ = priority.flags_;
+    // prio_ is set externally
+  }
+
+  /** Check if this group is long-running or ADMIN */
+  HSHM_ALWAYS_INLINE
+  bool IsLowPriority() {
+    return flags_.Any(QUEUE_LONG_RUNNING) || prio_ == 0;
+  }
+
+  /** Get lane */
+  Lane& GetLane(u32 lane_id) {
+    return (*lanes_)[lane_id];
+  }
+};
+
+/** Represents the HSHM queue type */
+class Hshm {};
+
+/**
+ * The shared-memory representation of a Queue
+ * */
+template<>
+struct MultiQueueT<Hshm> : public hipc::ShmContainer {
+  SHM_CONTAINER_TEMPLATE((MultiQueueT), (MultiQueueT))
+  QueueId id_;          /**< Globally unique ID of this queue */
+  hipc::ShmArchive<hipc::vector<LaneGroup>> groups_;  /**< Divide the lanes into groups */
+  bitfield32_t flags_;  /**< Flags for the queue */
+
+ public:
+  /**====================================
+   * Constructor
+   * ===================================*/
+
+  /** SHM constructor. Default. */
+  explicit MultiQueueT(hipc::Allocator *alloc) {
+    shm_init_container(alloc);
+    SetNull();
+  }
+
+  /** SHM constructor. */
+  explicit MultiQueueT(hipc::Allocator *alloc, const QueueId &id,
+                       const std::vector<PriorityInfo> &prios) {
+    shm_init_container(alloc);
+    id_ = id;
+    HSHM_MAKE_AR0(groups_, GetAllocator());
+    groups_->reserve(prios.size());
+    for (u32 prio = 0; prio < prios.size(); ++prio) {
+      const PriorityInfo &prio_info = prios[prio];
+      groups_->emplace_back(prio_info);
+      LaneGroup &lane_group = (*groups_)[prio];
+      // Initialize lanes
+      HSHM_MAKE_AR0(lane_group.lanes_, GetAllocator());
+      lane_group.lanes_->reserve(prio_info.max_lanes_);
+      lane_group.prio_ = prio;
+      for (u32 lane_id = 0; lane_id < lane_group.num_lanes_; ++lane_id) {
+        lane_group.lanes_->emplace_back(lane_group.depth_);
+        Lane &lane = lane_group.lanes_->back();
+        lane.flags_ = prio_info.flags_;
+      }
+    }
+    SetNull();
+  }
+
+  /**====================================
+   * Copy Constructors
+   * ===================================*/
+
+  /** SHM copy constructor */
+  explicit MultiQueueT(hipc::Allocator *alloc, const MultiQueueT &other) {
+    shm_init_container(alloc);
+    SetNull();
+    shm_strong_copy_construct_and_op(other);
+  }
+
+  /** SHM copy assignment operator */
+  MultiQueueT& operator=(const MultiQueueT &other) {
+    if (this != &other) {
+      shm_destroy();
+      shm_strong_copy_construct_and_op(other);
+    }
+    return *this;
+  }
+
+  /** SHM copy constructor + operator main */
+  void shm_strong_copy_construct_and_op(const MultiQueueT &other) {
+    (*groups_) = (*other.groups_);
+  }
+
+  /**====================================
+   * Move Constructors
+   * ===================================*/
+
+  /** SHM move constructor. */
+  MultiQueueT(hipc::Allocator *alloc,
+              MultiQueueT &&other) noexcept {
+    shm_init_container(alloc);
+    if (GetAllocator() == other.GetAllocator()) {
+      (*groups_) = std::move(*other.groups_);
+      other.SetNull();
+    } else {
+      shm_strong_copy_construct_and_op(other);
+      other.shm_destroy();
+    }
+  }
+
+  /** SHM move assignment operator. */
+  MultiQueueT& operator=(MultiQueueT &&other) noexcept {
+    if (this != &other) {
+      shm_destroy();
+      if (GetAllocator() == other.GetAllocator()) {
+        (*groups_) = std::move(*other.groups_);
+        other.SetNull();
+      } else {
+        shm_strong_copy_construct_and_op(other);
+        other.shm_destroy();
+      }
+    }
+    return *this;
+  }
+
+  /**====================================
+   * Destructor
+   * ===================================*/
+
+  /** SHM destructor.  */
+  void shm_destroy_main() {
+    (*groups_).shm_destroy();
+  }
+
+  /** Check if the list is empty */
+  HSHM_ALWAYS_INLINE
+  bool IsNull() const {
+    return (*groups_).IsNull();
+  }
+
+  /** Sets this list as empty */
+  HSHM_ALWAYS_INLINE
+  void SetNull() {}
+
+  /**====================================
+   * Helpers
+   * ===================================*/
+
+  /** Get the priority struct */
+  HSHM_ALWAYS_INLINE LaneGroup& GetGroup(u32 prio) {
+    return (*groups_)[prio];
+  }
+
+  /** Get a lane of the queue */
+  HSHM_ALWAYS_INLINE Lane& GetLane(u32 prio, u32 lane_id) {
+    return (*(*groups_)[prio].lanes_)[lane_id];
+  }
+
+  /** Get a lane of the queue */
+  HSHM_ALWAYS_INLINE Lane& GetLane(LaneGroup &lane_group, u32 lane_id) {
+    return (*lane_group.lanes_)[lane_id];
+  }
+
+  /** Emplace a SHM pointer to a task */
+  HSHM_ALWAYS_INLINE
+  bool Emplace(u32 prio, u32 lane_hash, hipc::Pointer &p, bool complete = false) {
+    return Emplace(prio, lane_hash, LaneData(p, complete));
+  }
+
+  /** Emplace a SHM pointer to a task */
+  bool Emplace(u32 prio, u32 lane_hash, const LaneData &data) {
+    if (IsEmplacePlugged()) {
+      WaitForEmplacePlug();
+    }
+    LaneGroup &lane_group = GetGroup(prio);
+    u32 lane_id = lane_hash % lane_group.num_lanes_;
+    Lane &lane = GetLane(lane_group, lane_id);
+    hshm::qtok_t ret = lane.emplace(data);
+    return !ret.IsNull();
+  }
+
+  /**
+   * Change the number of active lanes
+   * This assumes that PlugForResize and UnplugForResize are called externally.
+   * */
+  void Resize(u32 num_lanes) {
+  }
+
+  /** Begin plugging the queue for resize */
+  HSHM_ALWAYS_INLINE bool PlugForResize() {
+    return true;
+  }
+
+  /** Begin plugging the queue for update tasks */
+  HSHM_ALWAYS_INLINE bool PlugForUpdateTask() {
+    return true;
+  }
+
+  /** Check if emplace operations are plugged */
+  HSHM_ALWAYS_INLINE bool IsEmplacePlugged() {
+    return flags_.Any(QUEUE_RESIZE);
+  }
+
+  /** Check if pop operations are plugged */
+  HSHM_ALWAYS_INLINE bool IsPopPlugged() {
+    return flags_.Any(QUEUE_UPDATE | QUEUE_RESIZE);
+  }
+
+  /** Wait for emplace plug to complete */
+  void WaitForEmplacePlug() {
+    // NOTE(llogan): will this infinite loop due to CPU caching?
+    while (flags_.Any(QUEUE_UPDATE)) {
+      HERMES_THREAD_MODEL->Yield();
+    }
+  }
+
+  /** Enable emplace & pop */
+  HSHM_ALWAYS_INLINE void UnplugForResize() {
+    flags_.UnsetBits(QUEUE_RESIZE);
+  }
+
+  /** Enable pop */
+  HSHM_ALWAYS_INLINE void UnplugForUpdateTask() {
+    flags_.UnsetBits(QUEUE_UPDATE);
+  }
+};
+
+}  // namespace hrun
+
+
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_HSHM_QUEUE_H_
diff --git a/hrun/include/hrun/task_registry/task.h b/hrun/include/hrun/task_registry/task.h
new file mode 100644
index 000000000..6a6a3d451
--- /dev/null
+++ b/hrun/include/hrun/task_registry/task.h
@@ -0,0 +1,611 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_QUEUE_MANAGER_REQUEST_H_
+#define HRUN_INCLUDE_HRUN_QUEUE_MANAGER_REQUEST_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/network/local_serialize.h"
+#include <thallium.hpp>
+
+namespace hrun {
+
+class TaskLib;
+
+/** This task reads a state */
+#define TASK_READ BIT_OPT(u32, 0)
+/** This task writes to a state */
+#define TASK_WRITE BIT_OPT(u32, 1)
+/** This task fundamentally updates a state */
+#define TASK_UPDATE BIT_OPT(u32, 2)
+/** This task is paused until a set of tasks complete */
+#define TASK_BLOCKED BIT_OPT(u32, 3)
+/** This task is latency-sensitive */
+#define TASK_LOW_LATENCY BIT_OPT(u32, 4)
+/** This task makes system calls and may hurt caching */
+#define TASK_SYSCALL BIT_OPT(u32, 5)
+/** This task does not depend on state */
+#define TASK_STATELESS BIT_OPT(u32, 6)
+/** This task does not depend on its position in the queue */
+#define TASK_UNORDERED BIT_OPT(u32, 7)
+/** This task has began execution */
+#define TASK_HAS_STARTED BIT_OPT(u32, 8)
+/** This task is completed */
+#define TASK_COMPLETE BIT_OPT(u32, 9)
+/** This task was marked completed outside of the worker thread */
+#define TASK_MODULE_COMPLETE BIT_OPT(u32, 10)
+/** This task is long-running */
+#define TASK_LONG_RUNNING (BIT_OPT(u32, 11) | TASK_UNORDERED)
+/** This task is fire and forget. Free when completed */
+#define TASK_FIRE_AND_FORGET BIT_OPT(u32, 12)
+/** This task should not be run at this time */
+#define TASK_DISABLE_RUN BIT_OPT(u32, 13)
+/** This task owns the data in the task */
+#define TASK_DATA_OWNER BIT_OPT(u32, 14)
+/** This task uses co-routine wait */
+#define TASK_COROUTINE BIT_OPT(u32, 15)
+/** This task uses argobot wait */
+#define TASK_PREEMPTIVE BIT_OPT(u32, 17)
+/** This task can be scheduled on any lane */
+#define TASK_LANE_ANY BIT_OPT(u32, 18)
+/** This task should be scheduled on all lanes */
+#define TASK_LANE_ALL BIT_OPT(u32, 19)
+/** This task flushes the runtime */
+#define TASK_FLUSH BIT_OPT(u32, 20)
+/** This task is apart of remote debugging */
+#define TASK_REMOTE_DEBUG_MARK BIT_OPT(u32, 31)
+
+/** Used to define task methods */
+#define TASK_METHOD_T static inline const u32
+
+/** Used to indicate Yield to use */
+#define TASK_YIELD_STD 0
+#define TASK_YIELD_CO 1
+#define TASK_YIELD_ABT 2
+
+/** The baseline set of tasks */
+struct TaskMethod {
+  TASK_METHOD_T kConstruct = 0; /**< The constructor of the task */
+  TASK_METHOD_T kDestruct = 1;  /**< The destructor of the task */
+  TASK_METHOD_T kLast = 2;    /**< Where the next method should take place */
+};
+
+/**
+ * Let's say we have an I/O request to a device
+ * I/O requests + MD operations need to be controlled for correctness
+ * Is there a case where root tasks from different TaskStates need to be ordered? No.
+ * Tasks spawned from the same root task need to be keyed to the same worker stack
+ * Tasks apart of the same task group need to be ordered
+ * */
+
+/** An identifier used for representing the location of a task in a task graph */
+struct TaskNode {
+  TaskId root_;         /**< The id of the root task */
+  u32 node_depth_;      /**< The depth of the task in the task graph */
+
+  /** Default constructor */
+  HSHM_ALWAYS_INLINE
+  TaskNode() = default;
+
+  /** Emplace constructor for root task */
+  HSHM_ALWAYS_INLINE
+  TaskNode(TaskId root) {
+    root_ = root;
+    node_depth_ = 0;
+  }
+
+  /** Copy constructor */
+  HSHM_ALWAYS_INLINE
+  TaskNode(const TaskNode &other) {
+    root_ = other.root_;
+    node_depth_ = other.node_depth_;
+  }
+
+  /** Copy assignment operator */
+  HSHM_ALWAYS_INLINE
+  TaskNode& operator=(const TaskNode &other) {
+    root_ = other.root_;
+    node_depth_ = other.node_depth_;
+    return *this;
+  }
+
+  /** Move constructor */
+  HSHM_ALWAYS_INLINE
+  TaskNode(TaskNode &&other) noexcept {
+    root_ = other.root_;
+    node_depth_ = other.node_depth_;
+  }
+
+  /** Move assignment operator */
+  HSHM_ALWAYS_INLINE
+  TaskNode& operator=(TaskNode &&other) noexcept {
+    root_ = other.root_;
+    node_depth_ = other.node_depth_;
+    return *this;
+  }
+
+  /** Addition operator*/
+  HSHM_ALWAYS_INLINE
+  TaskNode operator+(int i) const {
+    TaskNode ret;
+    ret.root_ = root_;
+    ret.node_depth_ = node_depth_ + i;
+    return ret;
+  }
+
+  /** Null task node */
+  HSHM_ALWAYS_INLINE
+  static TaskNode GetNull() {
+    TaskNode ret;
+    ret.root_ = TaskId::GetNull();
+    ret.node_depth_ = 0;
+    return ret;
+  }
+
+  /** Check if null */
+  HSHM_ALWAYS_INLINE
+  bool IsNull() const {
+    return root_.IsNull();
+  }
+
+  /** Check if the root task */
+  HSHM_ALWAYS_INLINE
+  bool IsRoot() const {
+    return node_depth_ == 0;
+  }
+
+  /** Serialization*/
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(root_, node_depth_);
+  }
+};
+
+/** Allow TaskNode to be printed as strings */
+static inline std::ostream &operator<<(std::ostream &os, const TaskNode &obj) {
+  return os << obj.root_ << "/" << std::to_string(obj.node_depth_);
+}
+
+/** This task uses SerializeStart */
+#define TF_SRL_SYM_START BIT_OPT(u32, 0)
+/** This task uses SaveStart + LoadStart */
+#define TF_SRL_ASYM_START BIT_OPT(u32, 1)
+/** This task uses SerializeEnd */
+#define TF_SRL_SYM_END BIT_OPT(u32, 2)
+/** This task uses SaveEnd + LoadEnd */
+#define TF_SRL_ASYM_END BIT_OPT(u32, 3)
+/** This task uses symmetric serialization */
+#define TF_SRL_SYM (TF_SRL_SYM_START | TF_SRL_SYM_END)
+/** This task uses asymmetric serialization */
+#define TF_SRL_ASYM (TF_SRL_ASYM_START | TF_SRL_ASYM_END)
+/** This task uses replication */
+#define TF_REPLICA BIT_OPT(u32, 31)
+/** This task uses duplication */
+/** This task is intended to be used only locally */
+#define TF_LOCAL BIT_OPT(u32, 5)
+
+/** All tasks inherit this to easily check if a class is a task using SFINAE */
+class IsTask {};
+/** The type of a compile-time task flag */
+#define TASK_FLAG_T constexpr inline static bool
+/** Determine this is a task */
+#define IS_TASK(T) \
+  std::is_base_of_v<hrun::IsTask, T>
+/** Determine this task supports serialization */
+#define IS_SRL(T) \
+  T::SUPPORTS_SRL
+/** Determine this task uses SerializeStart */
+#define USES_SRL_START(T) \
+  T::SRL_SYM_START
+/** Determine this task uses SerializeEnd */
+#define USES_SRL_END(T) \
+  T::SRL_SYM_END
+
+/** Compile-time flags indicating task methods and operation support */
+template<u32 FLAGS>
+struct TaskFlags : public IsTask {
+ public:
+  TASK_FLAG_T IS_LOCAL = FLAGS & TF_LOCAL;
+  TASK_FLAG_T SUPPORTS_SRL = FLAGS & (TF_SRL_SYM | TF_SRL_ASYM);
+  TASK_FLAG_T SRL_SYM_START = FLAGS & TF_SRL_SYM_START;
+  TASK_FLAG_T SRL_SYM_END = FLAGS & TF_SRL_SYM_END;
+  TASK_FLAG_T REPLICA = FLAGS & TF_REPLICA;
+};
+
+/** The type of a compile-time task flag */
+#define TASK_PRIO_T constexpr inline static int
+
+/** Prioritization of tasks */
+class TaskPrio {
+ public:
+  TASK_PRIO_T kAdmin = 0;
+  TASK_PRIO_T kLongRunning = 1;
+  TASK_PRIO_T kLowLatency = 2;
+};
+
+
+/** Used to indicate the amount of work remaining to do when flushing */
+struct WorkPending {
+  bool flushing_;
+  std::atomic<int> pending_;
+
+  /** Default constructor */
+  WorkPending()
+  : flushing_(false), pending_(0) {}
+
+  /** Copy constructor */
+  WorkPending(const WorkPending &other)
+  : flushing_(other.flushing_), pending_(other.pending_.load()) {}
+};
+
+/** Context passed to the Run method of a task */
+struct RunContext {
+  u32 lane_id_;  /**< The lane id of the task */
+  bctx::transfer_t jmp_;  /**< Current execution state of the task (runtime) */
+  size_t stack_size_ = KILOBYTES(64);  /**< The size of the stack for the task (runtime) */
+  void *stack_ptr_;                    /**< The pointer to the stack (runtime) */
+  TaskLib *exec_;
+  WorkPending *flush_;
+
+  /** Default constructor */
+  RunContext() {}
+
+  /** Emplace constructor */
+  RunContext(u32 lane_id) : lane_id_(lane_id) {}
+};
+
+/** A generic task base class */
+struct Task : public hipc::ShmContainer {
+ SHM_CONTAINER_TEMPLATE((Task), (Task))
+ public:
+  TaskStateId task_state_;     /**< The unique name of a task state */
+  TaskNode task_node_;         /**< The unique ID of this task in the graph */
+  DomainId domain_id_;         /**< The nodes that the task should run on */
+  u32 prio_;                   /**< An indication of the priority of the request */
+  u32 lane_hash_;              /**< Determine the lane a task is keyed to */
+  u32 method_;                 /**< The method to call in the state */
+  bitfield32_t task_flags_;    /**< Properties of the task */
+  double period_ns_;           /**< The period of the task */
+  hshm::Timepoint start_;      /**< The time the task started */
+  RunContext ctx_;
+#ifdef TASK_DEBUG
+  std::atomic<int> delcnt_ = 0;    /**< # of times deltask called */
+#endif
+
+  /**====================================
+   * Task Helpers
+   * ===================================*/
+
+  /** Set task as externally complete */
+  HSHM_ALWAYS_INLINE void SetModuleComplete() {
+    task_flags_.SetBits(TASK_MODULE_COMPLETE);
+  }
+
+  /** Check if a task marked complete externally */
+  HSHM_ALWAYS_INLINE bool IsModuleComplete() {
+    return task_flags_.Any(TASK_MODULE_COMPLETE);
+  }
+
+  /** Check if a task is fire & forget */
+  HSHM_ALWAYS_INLINE bool IsFireAndForget() {
+    return task_flags_.Any(TASK_FIRE_AND_FORGET);
+  }
+
+  /** Unset fire & forget */
+  HSHM_ALWAYS_INLINE void UnsetFireAndForget() {
+    task_flags_.UnsetBits(TASK_FIRE_AND_FORGET);
+  }
+
+  /** Check if task is long running */
+  HSHM_ALWAYS_INLINE bool IsLongRunning() {
+    return task_flags_.Any(TASK_LONG_RUNNING);
+  }
+
+  /** Check if task is unordered */
+  HSHM_ALWAYS_INLINE bool IsUnordered() {
+    return task_flags_.Any(TASK_UNORDERED);
+  }
+
+  /** Set task as unordered */
+  HSHM_ALWAYS_INLINE bool SetUnordered() {
+    return task_flags_.Any(TASK_UNORDERED);
+  }
+
+  /** Set task as complete */
+  HSHM_ALWAYS_INLINE void SetComplete() {
+    task_flags_.SetBits(TASK_MODULE_COMPLETE | TASK_COMPLETE);
+  }
+
+  /** Check if task is complete */
+  HSHM_ALWAYS_INLINE bool IsComplete() {
+    return task_flags_.Any(TASK_COMPLETE);
+  }
+
+  /** Disable the running of a task */
+  HSHM_ALWAYS_INLINE void SetDisableRun() {
+    task_flags_.SetBits(TASK_DISABLE_RUN);
+  }
+
+  /** Enable the running of a task */
+  HSHM_ALWAYS_INLINE void UnsetDisableRun() {
+    task_flags_.UnsetBits(TASK_DISABLE_RUN);
+  }
+
+  /** Check if running task is disable */
+  HSHM_ALWAYS_INLINE bool IsRunDisabled() {
+    return task_flags_.Any(TASK_DISABLE_RUN);
+  }
+
+  /** Set task as data owner */
+  HSHM_ALWAYS_INLINE void SetDataOwner() {
+    task_flags_.SetBits(TASK_DATA_OWNER);
+  }
+
+  /** Check if task is data owner */
+  HSHM_ALWAYS_INLINE bool IsDataOwner() {
+    return task_flags_.Any(TASK_DATA_OWNER);
+  }
+
+  /** Unset task as data owner */
+  HSHM_ALWAYS_INLINE void UnsetDataOwner() {
+    task_flags_.UnsetBits(TASK_DATA_OWNER);
+  }
+
+  /** Set this task as started */
+  HSHM_ALWAYS_INLINE void SetStarted() {
+    task_flags_.SetBits(TASK_HAS_STARTED);
+  }
+
+  /** Set this task as started */
+  HSHM_ALWAYS_INLINE void UnsetStarted() {
+    task_flags_.UnsetBits(TASK_HAS_STARTED);
+  }
+
+  /** Check if task has started */
+  HSHM_ALWAYS_INLINE bool IsStarted() {
+    return task_flags_.Any(TASK_HAS_STARTED);
+  }
+
+  /** Set this task as started */
+  HSHM_ALWAYS_INLINE void UnsetLongRunning() {
+    task_flags_.UnsetBits(TASK_LONG_RUNNING);
+  }
+
+  /** Set this task as blocking */
+  HSHM_ALWAYS_INLINE bool IsCoroutine() {
+    return task_flags_.Any(TASK_COROUTINE);
+  }
+
+  /** Set this task as blocking */
+  HSHM_ALWAYS_INLINE void UnsetCoroutine() {
+    task_flags_.UnsetBits(TASK_COROUTINE);
+  }
+
+  /** Set this task as blocking */
+  HSHM_ALWAYS_INLINE bool IsPreemptive() {
+    return task_flags_.Any(TASK_PREEMPTIVE);
+  }
+
+  /** This task should be dispersed across all lanes */
+  HSHM_ALWAYS_INLINE bool IsLaneAll() {
+    return task_flags_.Any(TASK_LANE_ALL);
+  }
+
+  /** Unset this task as lane-dispersable */
+  HSHM_ALWAYS_INLINE void UnsetLaneAll() {
+    task_flags_.UnsetBits(TASK_LANE_ALL);
+  }
+
+  /** Set period in nanoseconds */
+  HSHM_ALWAYS_INLINE void SetPeriodNs(double ns) {
+    period_ns_ = ns;
+  }
+
+  /** Set period in microseconds */
+  HSHM_ALWAYS_INLINE void SetPeriodUs(double us) {
+    period_ns_ = us * 1000;
+  }
+
+  /** Set period in milliseconds */
+  HSHM_ALWAYS_INLINE void SetPeriodMs(double ms) {
+    period_ns_ = ms * 1000000;
+  }
+
+  /** Set period in seconds */
+  HSHM_ALWAYS_INLINE void SetPeriodSec(double sec) {
+    period_ns_ = sec * 1000000000;
+  }
+
+  /** Set period in minutes */
+  HSHM_ALWAYS_INLINE void SetPeriodMin(double min) {
+    period_ns_ = min * 60000000000;
+  }
+
+  /** This task flushes the runtime */
+  HSHM_ALWAYS_INLINE bool IsFlush() {
+    return task_flags_.Any(TASK_FLUSH);
+  }
+
+  /** Determine if time has elapsed */
+  HSHM_ALWAYS_INLINE bool ShouldRun(hshm::Timepoint &cur_time, bool flushing) {
+    if (!IsStarted() || flushing) {
+      start_ = cur_time;
+      return true;
+    }
+    if (IsLongRunning()) {
+      return start_.GetNsecFromStart(cur_time) >= period_ns_;
+    } else {
+      return true;
+    }
+  }
+
+  /** Mark this task as having been run */
+  HSHM_ALWAYS_INLINE void DidRun(hshm::Timepoint &cur_time) {
+    start_ = cur_time;
+  }
+
+  /** Yield the task */
+  template<int THREAD_MODEL = 0>
+  HSHM_ALWAYS_INLINE
+  void Yield() {
+    if constexpr (THREAD_MODEL == TASK_YIELD_STD) {
+      HERMES_THREAD_MODEL->Yield();
+    } else if constexpr (THREAD_MODEL == TASK_YIELD_CO) {
+      ctx_.jmp_ = bctx::jump_fcontext(ctx_.jmp_.fctx, nullptr);
+    } else if constexpr (THREAD_MODEL == TASK_YIELD_ABT) {
+      ABT_thread_yield();
+    }
+  }
+
+  /** Wait for task to complete */
+  template<int THREAD_MODEL = 0>
+  void Wait() {
+    while (!IsComplete()) {
+//      for (int i = 0; i < 100000; ++i) {
+//        if (IsComplete()) {
+//          return;
+//        }
+//      }
+      Yield<THREAD_MODEL>();
+    }
+  }
+
+  /** Wait for task to complete */
+  template<int THREAD_MODEL = 0>
+  void Wait(Task *yield_task) {
+    while (!IsComplete()) {
+//      for (int i = 0; i < 100000; ++i) {
+//        if (IsComplete()) {
+//          return;
+//        }
+//      }
+      yield_task->Yield<THREAD_MODEL>();
+    }
+  }
+
+  /**====================================
+   * Default Constructor
+   * ===================================*/
+
+  /** Default SHM constructor */
+  HSHM_ALWAYS_INLINE explicit
+  Task(hipc::Allocator *alloc) {
+    shm_init_container(alloc);
+  }
+
+  /** SHM constructor */
+  HSHM_ALWAYS_INLINE explicit
+  Task(hipc::Allocator *alloc,
+       const TaskNode &task_node) {
+    shm_init_container(alloc);
+    task_node_ = task_node;
+  }
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  Task(hipc::Allocator *alloc,
+       const TaskNode &task_node,
+       const DomainId &domain_id,
+       const TaskStateId &task_state,
+       u32 lane_hash,
+       u32 method,
+       bitfield32_t task_flags) {
+    shm_init_container(alloc);
+    task_node_ = task_node;
+    lane_hash_ = lane_hash;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = task_state;
+    method_ = method;
+    domain_id_ = domain_id;
+    task_flags_ = task_flags;
+  }
+
+  /**====================================
+   * Copy Constructors
+   * ===================================*/
+
+  /** SHM copy constructor */
+  HSHM_ALWAYS_INLINE explicit Task(hipc::Allocator *alloc, const Task &other) {}
+
+  /** SHM copy assignment operator */
+  HSHM_ALWAYS_INLINE Task& operator=(const Task &other) {
+    return *this;
+  }
+
+  /**====================================
+   * Move Constructors
+   * ===================================*/
+
+  /** SHM move constructor. */
+  HSHM_ALWAYS_INLINE Task(hipc::Allocator *alloc, Task &&other) noexcept {}
+
+  /** SHM move assignment operator. */
+  HSHM_ALWAYS_INLINE Task& operator=(Task &&other) noexcept {
+    return *this;
+  }
+
+  /**====================================
+   * Destructor
+   * ===================================*/
+
+  /** SHM destructor.  */
+  HSHM_ALWAYS_INLINE void shm_destroy_main() {}
+
+  /** Check if the Task is empty */
+  HSHM_ALWAYS_INLINE bool IsNull() const { return false; }
+
+  /** Sets this Task as empty */
+  HSHM_ALWAYS_INLINE void SetNull() {}
+
+  /**====================================
+   * Serialization
+   * ===================================*/
+  template<typename Ar>
+  void task_serialize(Ar &ar) {
+    // NOTE(llogan): don't serialize start_ because of clock drift
+    ar(task_state_, task_node_, domain_id_, lane_hash_, prio_, method_,
+       task_flags_, period_ns_);
+  }
+
+  template<typename TaskT>
+  void task_dup(TaskT &other) {
+    task_state_ = other.task_state_;
+    task_node_ = other.task_node_;
+    domain_id_ = other.domain_id_;
+    lane_hash_ = other.lane_hash_;
+    prio_ = other.prio_;
+    method_ = other.method_;
+    task_flags_ = other.task_flags_;
+    period_ns_ = other.period_ns_;
+    start_ = other.start_;
+  }
+
+  /**====================================
+   * Grouping
+   * ===================================*/
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** Decorator macros */
+#define IN
+#define OUT
+#define INOUT
+#define TEMP
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_QUEUE_MANAGER_REQUEST_H_
diff --git a/hrun/include/hrun/task_registry/task_lib.h b/hrun/include/hrun/task_registry/task_lib.h
new file mode 100644
index 000000000..a6cce4743
--- /dev/null
+++ b/hrun/include/hrun/task_registry/task_lib.h
@@ -0,0 +1,123 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_TASK_TASK_H_
+#define HRUN_INCLUDE_HRUN_TASK_TASK_H_
+
+#include <dlfcn.h>
+#include "hrun/hrun_types.h"
+#include "hrun/queue_manager/queue_factory.h"
+#include "hrun/network/serialize.h"
+#include "task.h"
+
+namespace hrun {
+
+typedef LPointer<Task> TaskPointer;
+
+/**
+ * Represents a custom operation to perform.
+ * Tasks are independent of Hermes.
+ * */
+class TaskLib {
+ public:
+  TaskStateId id_;    /**< The unique name of a task state */
+  QueueId queue_id_;  /**< The queue id of a task state */
+  std::string name_; /**< The unique semantic name of a task state */
+
+  /** Default constructor */
+  TaskLib() : id_(TaskStateId::GetNull()) {}
+
+  /** Emplace Constructor */
+  void Init(const TaskStateId &id, const std::string &name) {
+    id_ = id;
+    queue_id_ = QueueId(id);
+    name_ = name;
+  }
+
+  /** Virtual destructor */
+  virtual ~TaskLib() = default;
+
+  /** Run a method of the task */
+  virtual void Run(u32 method, Task *task, RunContext &rctx) = 0;
+
+  /** Delete a task */
+  virtual void Del(u32 method, Task *task) = 0;
+
+  /** Duplicate a task */
+  virtual void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) = 0;
+
+  /** Register end of duplicate */
+  virtual void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) = 0;
+
+  /** Allow task to store replicas of completion */
+  virtual void ReplicateStart(u32 method, u32 count, Task *task) = 0;
+
+  /** Can be used to summarize the completions */
+  virtual void ReplicateEnd(u32 method, Task *task) = 0;
+
+  /** Serialize a task when initially pushing into remote */
+  virtual std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) = 0;
+
+  /** Deserialize a task when popping from remote queue */
+  virtual TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) = 0;
+
+  /** Serialize a task when returning from remote queue */
+  virtual std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) = 0;
+
+  /** Deserialize a task when returning from remote queue */
+  virtual void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) = 0;
+
+  /** Deserialize a task when returning from remote queue */
+  virtual u32 GetGroup(u32 method, Task *task, hshm::charbuf &buf) = 0;
+};
+
+/** Represents a TaskLib in action */
+typedef TaskLib TaskState;
+
+/** Represents the TaskLib client-side */
+class TaskLibClient {
+ public:
+  TaskStateId id_;
+  QueueId queue_id_;
+
+ public:
+  /** Init from existing ID */
+  void Init(const TaskStateId &id) {
+    id_ = id;
+    queue_id_ = QueueId(id_);
+  }
+};
+
+extern "C" {
+/** The two methods provided by all tasks */
+typedef TaskState* (*create_state_t)(Task *task, const char *state_name);
+/** Get the name of a task */
+typedef const char* (*get_task_lib_name_t)(void);
+}  // extern c
+
+/** Used internally by task source file */
+#define HRUN_TASK_CC(TRAIT_CLASS, TASK_NAME) \
+    extern "C" {                              \
+        void* create_state(hrun::Admin::CreateTaskStateTask *task, const char *state_name) { \
+          hrun::TaskState *exec = reinterpret_cast<hrun::TaskState*>( \
+            new TYPE_UNWRAP(TRAIT_CLASS)()); \
+          exec->Init(task->id_, state_name); \
+          RunContext rctx(0); \
+          exec->Run(hrun::TaskMethod::kConstruct, task, rctx); \
+          return exec; \
+        } \
+        const char* get_task_lib_name(void) { return TASK_NAME; } \
+        bool is_hrun_task_ = true; \
+    }
+}   // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_TASK_TASK_H_
diff --git a/hrun/include/hrun/task_registry/task_registry.h b/hrun/include/hrun/task_registry/task_registry.h
new file mode 100644
index 000000000..af7a9ddaa
--- /dev/null
+++ b/hrun/include/hrun/task_registry/task_registry.h
@@ -0,0 +1,307 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_TASK_TASK_REGISTRY_H_
+#define HRUN_INCLUDE_HRUN_TASK_TASK_REGISTRY_H_
+
+#include <string>
+#include <cstdlib>
+#include <sstream>
+#include <unordered_map>
+#include <filesystem>
+#include "task_lib.h"
+#include "hrun/config/config_server.h"
+#include "hrun_admin/hrun_admin.h"
+
+namespace stdfs = std::filesystem;
+
+namespace hrun {
+
+/** All information needed to create a trait */
+struct TaskLibInfo {
+  void *lib_;  /**< The dlfcn library */
+  create_state_t create_state_;   /**< The create task function */
+  get_task_lib_name_t get_task_lib_name; /**< The get task name function */
+
+  /** Default constructor */
+  TaskLibInfo() = default;
+
+  /** Destructor */
+  ~TaskLibInfo() {
+    if (lib_) {
+      dlclose(lib_);
+    }
+  }
+
+  /** Emplace constructor */
+  explicit TaskLibInfo(void *lib,
+                       create_state_t create_task,
+                       get_task_lib_name_t get_task_name)
+      : lib_(lib), create_state_(create_task), get_task_lib_name(get_task_name) {}
+
+  /** Copy constructor */
+  TaskLibInfo(const TaskLibInfo &other)
+      : lib_(other.lib_),
+        create_state_(other.create_state_),
+        get_task_lib_name(other.get_task_lib_name) {}
+
+  /** Move constructor */
+  TaskLibInfo(TaskLibInfo &&other) noexcept
+      : lib_(other.lib_),
+        create_state_(other.create_state_),
+        get_task_lib_name(other.get_task_lib_name) {
+    other.lib_ = nullptr;
+    other.create_state_ = nullptr;
+    other.get_task_lib_name = nullptr;
+  }
+};
+
+/**
+ * Stores the registered set of TaskLibs and TaskStates
+ * */
+class TaskRegistry {
+ public:
+  /** The node the registry is on */
+  u32 node_id_;
+  /** The dirs to search for task libs */
+  std::vector<std::string> lib_dirs_;
+  /** Map of a semantic lib name to lib info */
+  std::unordered_map<std::string, TaskLibInfo> libs_;
+  /** Map of a semantic exec name to exec id */
+  std::unordered_map<std::string, TaskStateId> task_state_ids_;
+  /** Map of a semantic exec id to state */
+  std::unordered_map<TaskStateId, TaskState*> task_states_;
+  /** A unique identifier counter */
+  std::atomic<u64> *unique_;
+
+ public:
+  /** Default constructor */
+  TaskRegistry() {}
+
+  /** Initialize the Task Registry */
+  void ServerInit(ServerConfig *config, u32 node_id, std::atomic<u64> &unique) {
+    node_id_ = node_id;
+    unique_ = &unique;
+
+    // Load the LD_LIBRARY_PATH variable
+    auto ld_lib_path_env = getenv("LD_LIBRARY_PATH");
+    std::string ld_lib_path;
+    if (ld_lib_path_env) {
+      ld_lib_path = ld_lib_path_env;
+    }
+
+    // Load the HRUN_TASK_PATH variable
+    std::string hermes_lib_path;
+    auto hermes_lib_path_env = getenv("HRUN_TASK_PATH");
+    if (hermes_lib_path_env) {
+      hermes_lib_path = hermes_lib_path_env;
+    }
+
+    // Combine LD_LIBRARY_PATH and HRUN_TASK_PATH
+    std::string paths = hermes_lib_path + ":" + ld_lib_path;
+    std::stringstream ss(paths);
+    std::string lib_dir;
+    while (std::getline(ss, lib_dir, ':')) {
+      lib_dirs_.emplace_back(lib_dir);
+    }
+
+    // Find each lib in LD_LIBRARY_PATH
+    for (const std::string &lib_name : config->task_libs_) {
+      if (!RegisterTaskLib(lib_name)) {
+        HELOG(kWarning, "Failed to load the lib: {}", lib_name);
+      }
+    }
+  }
+
+  /** Load a task lib */
+  bool RegisterTaskLib(const std::string &lib_name) {
+    std::string lib_dir;
+    for (const std::string &lib_dir : lib_dirs_) {
+      // Determine if this directory contains the library
+      std::string lib_path1 = hshm::Formatter::format("{}/{}.so",
+                                                      lib_dir,
+                                                      lib_name);
+      std::string lib_path2 = hshm::Formatter::format("{}/lib{}.so",
+                                                      lib_dir,
+                                                      lib_name);
+      std::string lib_path;
+      if (stdfs::exists(lib_path1)) {
+        lib_path = std::move(lib_path1);
+      } else if (stdfs::exists(lib_path2)) {
+        lib_path = std::move(lib_path2);
+      } else {
+        continue;
+      }
+
+      // Load the library
+      TaskLibInfo info;
+      info.lib_ = dlopen(lib_path.c_str(), RTLD_GLOBAL | RTLD_NOW);
+      if (!info.lib_) {
+        HELOG(kError, "Could not open the lib library: {}. Reason: {}", lib_path, dlerror());
+        return false;
+      }
+      info.create_state_ = (create_state_t)dlsym(
+          info.lib_, "create_state");
+      if (!info.create_state_) {
+        HELOG(kError, "The lib {} does not have create_state symbol",
+              lib_path);
+        return false;
+      }
+      info.get_task_lib_name = (get_task_lib_name_t)dlsym(
+          info.lib_, "get_task_lib_name");
+      if (!info.get_task_lib_name) {
+        HELOG(kError, "The lib {} does not have get_task_lib_name symbol",
+              lib_path);
+        return false;
+      }
+      std::string task_lib_name = info.get_task_lib_name();
+      HILOG(kInfo, "Finished loading the lib: {}", task_lib_name)
+      libs_.emplace(task_lib_name, std::move(info));
+      return true;
+    }
+    HELOG(kError, "Could not find the lib: {}", lib_name);
+    return false;
+  }
+
+  /** Destroy a task lib */
+  void DestroyTaskLib(const std::string &lib_name) {
+    auto it = libs_.find(lib_name);
+    if (it == libs_.end()) {
+      HELOG(kError, "Could not find the task lib: {}", lib_name);
+      return;
+    }
+    libs_.erase(it);
+  }
+
+  /** Allocate a task state ID */
+  HSHM_ALWAYS_INLINE
+  TaskStateId CreateTaskStateId() {
+    return TaskStateId(node_id_, unique_->fetch_add(1));
+  }
+
+  /** Check if task state exists by ID */
+  HSHM_ALWAYS_INLINE
+  bool TaskStateExists(const TaskStateId &state_id) {
+    auto it = task_states_.find(state_id);
+    return it != task_states_.end();
+  }
+
+  /**
+   * Create a task state
+   * state_id must not be NULL.
+   * */
+  bool CreateTaskState(const char *lib_name,
+                       const char *state_name,
+                       const TaskStateId &state_id,
+                       Admin::CreateTaskStateTask *task) {
+    // Ensure state_id is not NULL
+    if (state_id.IsNull()) {
+      HILOG(kError, "The task state ID cannot be null");
+      task->SetModuleComplete();
+      return false;
+    }
+//    HILOG(kInfo, "(node {}) Creating an instance of {} with name {}",
+//          HRUN_CLIENT->node_id_, lib_name, state_name)
+
+    // Find the task library to instantiate
+    auto it = libs_.find(lib_name);
+    if (it == libs_.end()) {
+      HELOG(kError, "Could not find the task lib: {}", lib_name);
+      task->SetModuleComplete();
+      return false;
+    }
+
+    // Ensure the task state does not already exist
+    if (TaskStateExists(state_id)) {
+      HELOG(kError, "The task state already exists: {}", state_name);
+      task->SetModuleComplete();
+      return true;
+    }
+
+    // Create the state instance
+    task->id_ = state_id;
+    TaskLibInfo &info = it->second;
+    TaskState *task_state = info.create_state_(task, state_name);
+    if (!task_state) {
+      HELOG(kError, "Could not create the task state: {}", state_name);
+      task->SetModuleComplete();
+      return false;
+    }
+
+    // Add the state to the registry
+    task_state->id_ = state_id;
+    task_state->name_ = state_name;
+    task_state_ids_.emplace(state_name, state_id);
+    task_states_.emplace(state_id, task_state);
+    HILOG(kInfo, "(node {})  Created an instance of {} with name {} and ID {}",
+          HRUN_CLIENT->node_id_, lib_name, state_name, state_id)
+    return true;
+  }
+
+  /** Get or create a task state's ID */
+  TaskStateId GetOrCreateTaskStateId(const std::string &state_name) {
+    auto it = task_state_ids_.find(state_name);
+    if (it == task_state_ids_.end()) {
+      TaskStateId state_id = CreateTaskStateId();
+      task_state_ids_.emplace(state_name, state_id);
+      return state_id;
+    }
+    return it->second;
+  }
+
+  /** Get a task state's ID */
+  TaskStateId GetTaskStateId(const std::string &state_name) {
+    auto it = task_state_ids_.find(state_name);
+    if (it == task_state_ids_.end()) {
+      return TaskStateId::GetNull();
+    }
+    return it->second;
+  }
+
+  /** Get a task state instance */
+  TaskState* GetTaskState(const TaskStateId &task_state_id) {
+    auto it = task_states_.find(task_state_id);
+    if (it == task_states_.end()) {
+      return nullptr;
+    }
+    return it->second;
+  }
+
+  /** Get task state instance by name OR by ID */
+  TaskState* GetTaskState(const std::string &task_name, const TaskStateId &task_state_id) {
+    TaskStateId id = GetTaskStateId(task_name);
+    if (id.IsNull()) {
+      id = task_state_id;
+    }
+    return GetTaskState(id);
+  }
+
+  /** Destroy a task state */
+  void DestroyTaskState(const TaskStateId &task_state_id) {
+    auto it = task_states_.find(task_state_id);
+    if (it == task_states_.end()) {
+      HELOG(kWarning, "Could not find the task state");
+      return;
+    }
+    TaskState *task_state = it->second;
+    task_state_ids_.erase(task_state->name_);
+    task_states_.erase(it);
+    delete task_state;
+  }
+};
+
+/** Singleton macro for task registry */
+#define HRUN_TASK_REGISTRY \
+  (&HRUN_RUNTIME->task_registry_)
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_TASK_TASK_REGISTRY_H_
diff --git a/data_stager/data_stager_factory.h b/hrun/include/hrun/work_orchestrator/affinity.h
similarity index 58%
rename from data_stager/data_stager_factory.h
rename to hrun/include/hrun/work_orchestrator/affinity.h
index 371942869..55f54fc1f 100644
--- a/data_stager/data_stager_factory.h
+++ b/hrun/include/hrun/work_orchestrator/affinity.h
@@ -10,32 +10,26 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_DATA_STAGER_STAGE_FACTORY_H_
-#define HERMES_DATA_STAGER_STAGE_FACTORY_H_
+#ifndef HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_AFFINITY_H_
+#define HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_AFFINITY_H_
 
-#include "data_stager.h"
-#include "stagers/posix_stager.h"
+#include <sched.h>
 
-namespace hermes {
-
-class DataStagerFactory {
+class ProcessAffiner {
  public:
-  static std::unique_ptr<DataStager> Get(const std::string& url) {
-    return Get(DataStagerTypeConv::from_url(url));
-  }
+  /** Set the CPU affinity of a process */
+  static void SetCpuAffinity(int pid, int cpu_id) {
+    // Create a CPU set and set CPU affinity to CPU 0
+    cpu_set_t cpuset;
+    CPU_ZERO(&cpuset);
+    CPU_SET(cpu_id, &cpuset);
 
-  static std::unique_ptr<DataStager> Get(DataStagerType stager) {
-    switch (stager) {
-      case DataStagerType::kPosix: {
-        return std::make_unique<PosixStager>();
-      }
-      default: {
-        return nullptr;
-      }
+    // Set the CPU affinity of the process
+    int result = sched_setaffinity(pid, sizeof(cpuset), &cpuset);
+    if (result == -1) {
+      // HELOG(kError, "Failed to set CPU affinity for process {}", pid);
     }
   }
 };
 
-}  // namespace hermes
-
-#endif  // HERMES_DATA_STAGER_STAGE_FACTORY_H_
+#endif  // HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_AFFINITY_H_
diff --git a/hrun/include/hrun/work_orchestrator/scheduler.h b/hrun/include/hrun/work_orchestrator/scheduler.h
new file mode 100644
index 000000000..25bdca4c8
--- /dev/null
+++ b/hrun/include/hrun/work_orchestrator/scheduler.h
@@ -0,0 +1,62 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_SCHEDULER_H_
+#define HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_SCHEDULER_H_
+
+#include "hrun/task_registry/task.h"
+
+namespace hrun {
+
+/** The set of methods in the admin task */
+struct SchedulerMethod : public TaskMethod {
+  TASK_METHOD_T kSchedule = TaskMethod::kLast;
+};
+
+/** The task type used for scheduling */
+struct ScheduleTask : public Task, TaskFlags<TF_LOCAL> {
+  OUT hipc::pod_array<int, 1> ret_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ScheduleTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ScheduleTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLongRunning;
+    task_state_ = state_id;
+    method_ = SchedulerMethod::kSchedule;
+    task_flags_.SetBits(TASK_LONG_RUNNING | TASK_REMOTE_DEBUG_MARK);
+    SetPeriodSec(1);
+    domain_id_ = domain_id;
+
+    // Custom params
+    ret_.construct(alloc, 1);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_SCHEDULER_H_
diff --git a/hrun/include/hrun/work_orchestrator/work_orchestrator.h b/hrun/include/hrun/work_orchestrator/work_orchestrator.h
new file mode 100644
index 000000000..33d2182e1
--- /dev/null
+++ b/hrun/include/hrun/work_orchestrator/work_orchestrator.h
@@ -0,0 +1,134 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_WORK_ORCHESTRATOR_H_
+#define HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_WORK_ORCHESTRATOR_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/api/hrun_runtime.h"
+#include "hrun/queue_manager/queue_manager_runtime.h"
+#include "worker.h"
+#include "hrun/network/rpc_thallium.h"
+#include <thread>
+
+namespace hrun {
+
+class WorkOrchestrator {
+ public:
+  ServerConfig *config_;  /**< The server configuration */
+  std::vector<Worker> workers_;  /**< Workers execute tasks */
+  std::atomic<bool> stop_runtime_;  /**< Begin killing the runtime */
+  std::atomic<bool> kill_requested_;  /**< Kill flushing threads eventually */
+  ABT_xstream xstream_;
+
+ public:
+  /** Default constructor */
+  WorkOrchestrator() = default;
+
+  /** Destructor */
+  ~WorkOrchestrator() = default;
+
+  /** Create thread pool */
+  void ServerInit(ServerConfig *config, QueueManager &qm) {
+    config_ = config;
+
+    // Initialize argobots
+    ABT_init(0, nullptr);
+
+    // Create argobots xstream
+    int ret = ABT_xstream_create(ABT_SCHED_NULL, &xstream_);
+    if (ret != ABT_SUCCESS) {
+      HELOG(kFatal, "Could not create argobots xstream");
+    }
+
+    // Spawn workers on the stream
+    size_t num_workers = config_->wo_.max_workers_;
+    workers_.reserve(num_workers);
+    for (u32 worker_id = 0; worker_id < num_workers; ++worker_id) {
+      workers_.emplace_back(worker_id, xstream_);
+    }
+    stop_runtime_ = false;
+    kill_requested_ = false;
+
+    // Schedule admin queue on worker 0
+    MultiQueue *admin_queue = qm.GetQueue(qm.admin_queue_);
+    LaneGroup *admin_group = &admin_queue->GetGroup(0);
+    for (u32 lane_id = 0; lane_id < admin_group->num_lanes_; ++lane_id) {
+      Worker &worker = workers_[0];
+      worker.PollQueues({WorkEntry(0, lane_id, admin_queue)});
+    }
+    admin_group->num_scheduled_ = admin_group->num_lanes_;
+
+    HILOG(kInfo, "Started {} workers", num_workers);
+  }
+
+  /** Get worker with this id */
+  Worker& GetWorker(u32 worker_id) {
+    return workers_[worker_id];
+  }
+
+  /** Get the number of workers */
+  size_t GetNumWorkers() {
+    return workers_.size();
+  }
+
+  /** Begin finalizing the runtime */
+  void FinalizeRuntime() {
+    stop_runtime_.store(true);
+  }
+
+  /** Finalize thread pool */
+  void Join() {
+    kill_requested_.store(true);
+    for (Worker &worker : workers_) {
+      worker.thread_->join();
+      ABT_xstream_join(xstream_);
+      ABT_xstream_free(&xstream_);
+    }
+  }
+
+  /** Whether threads should still be executing */
+  bool IsAlive() {
+    return !kill_requested_.load();
+  }
+
+  /** Whether runtime should still be executing */
+  bool IsRuntimeAlive() {
+    return !stop_runtime_.load();
+  }
+
+  /** Spawn an argobots thread */
+  template<typename FUNC, typename TaskT>
+  ABT_thread SpawnAsyncThread(FUNC &&func, TaskT *data) {
+    ABT_thread tl_thread;
+    int ret = ABT_thread_create_on_xstream(xstream_,
+                                           func, (void*) data,
+                                           ABT_THREAD_ATTR_NULL,
+                                           &tl_thread);
+    if (ret != ABT_SUCCESS) {
+      HELOG(kFatal, "Couldn't spawn worker");
+    }
+    return tl_thread;
+  }
+
+  /** Wait for argobots thread */
+  void JoinAsyncThread(ABT_thread tl_thread) {
+    ABT_thread_join(tl_thread);
+  }
+};
+
+}  // namespace hrun
+
+#define HRUN_WORK_ORCHESTRATOR \
+  (&HRUN_RUNTIME->work_orchestrator_)
+
+#endif  // HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_WORK_ORCHESTRATOR_H_
diff --git a/hrun/include/hrun/work_orchestrator/worker.h b/hrun/include/hrun/work_orchestrator/worker.h
new file mode 100644
index 000000000..92e29aeb6
--- /dev/null
+++ b/hrun/include/hrun/work_orchestrator/worker.h
@@ -0,0 +1,391 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_WORKER_H_
+#define HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_WORKER_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/queue_manager/queue_manager_runtime.h"
+#include <thread>
+#include <queue>
+#include "affinity.h"
+#include "hrun/network/rpc_thallium.h"
+
+static inline pid_t GetLinuxTid() {
+  return syscall(SYS_gettid);
+}
+
+namespace hrun {
+
+#define WORKER_CONTINUOUS_POLLING BIT_OPT(u32, 0)
+
+/** Uniquely identify a queue lane */
+struct WorkEntry {
+  u32 prio_;
+  u32 lane_id_;
+  u32 count_;
+  Lane *lane_;
+  LaneGroup *group_;
+  MultiQueue *queue_;
+  hshm::Timepoint last_monitor_;
+  hshm::Timepoint cur_time_;
+  double sample_epoch_;
+
+  /** Default constructor */
+  HSHM_ALWAYS_INLINE
+  WorkEntry() = default;
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE
+  WorkEntry(u32 prio, u32 lane_id, MultiQueue *queue)
+  : prio_(prio), lane_id_(lane_id), queue_(queue) {
+    group_ = &queue->GetGroup(prio);
+    lane_ = &queue->GetLane(*group_, lane_id);
+    count_ = 0;
+    cur_time_.Now();
+  }
+
+  /** Copy constructor */
+  HSHM_ALWAYS_INLINE
+  WorkEntry(const WorkEntry &other) {
+    prio_ = other.prio_;
+    lane_id_ = other.lane_id_;
+    lane_ = other.lane_;
+    group_ = other.group_;
+    queue_ = other.queue_;
+    cur_time_.Now();
+  }
+
+  /** Copy assignment */
+  HSHM_ALWAYS_INLINE
+  WorkEntry& operator=(const WorkEntry &other) {
+    if (this != &other) {
+      prio_ = other.prio_;
+      lane_id_ = other.lane_id_;
+      lane_ = other.lane_;
+      group_ = other.group_;
+      queue_ = other.queue_;
+      cur_time_.Now();
+    }
+    return *this;
+  }
+
+  /** Move constructor */
+  HSHM_ALWAYS_INLINE
+  WorkEntry(WorkEntry &&other) noexcept {
+    prio_ = other.prio_;
+    lane_id_ = other.lane_id_;
+    lane_ = other.lane_;
+    group_ = other.group_;
+    queue_ = other.queue_;
+    cur_time_.Now();
+  }
+
+  /** Move assignment */
+  HSHM_ALWAYS_INLINE
+  WorkEntry& operator=(WorkEntry &&other) noexcept {
+    if (this != &other) {
+      prio_ = other.prio_;
+      lane_id_ = other.lane_id_;
+      lane_ = other.lane_;
+      group_ = other.group_;
+      queue_ = other.queue_;
+      cur_time_.Now();
+    }
+    return *this;
+  }
+
+  /** Check if null */
+  [[nodiscard]]
+  HSHM_ALWAYS_INLINE bool IsNull() const {
+    return queue_->IsNull();
+  }
+
+  /** Equality operator */
+  HSHM_ALWAYS_INLINE
+  bool operator==(const WorkEntry &other) const {
+    return queue_ == other.queue_ && lane_id_ == other.lane_id_ &&
+        prio_ == other.prio_;
+  }
+};
+
+}  // namespace hrun
+
+namespace std {
+/** Hash function for WorkEntry */
+template<>
+struct hash<hrun::WorkEntry> {
+  HSHM_ALWAYS_INLINE
+      std::size_t
+  operator()(const hrun::WorkEntry &key) const {
+    return std::hash<hrun::MultiQueue*>{}(key.queue_) +
+        std::hash<u32>{}(key.lane_id_) + std::hash<u64>{}(key.prio_);
+  }
+};
+}  // namespace std
+
+namespace hrun {
+
+class Worker {
+ public:
+  u32 id_;  /**< Unique identifier of this worker */
+  std::unique_ptr<std::thread> thread_;  /**< The worker thread handle */
+  int pthread_id_;      /**< The worker pthread handle */
+  // ABT_thread tl_thread_;
+  int pid_;             /**< The worker process id */
+  u32 numa_node_;       // TODO(llogan): track NUMA affinity
+  std::vector<WorkEntry> work_queue_;  /**< The set of queues to poll */
+  /** A set of queues to begin polling in a worker */
+  hshm::spsc_queue<std::vector<WorkEntry>> poll_queues_;
+  /** A set of queues to stop polling in a worker */
+  hshm::spsc_queue<std::vector<WorkEntry>> relinquish_queues_;
+  size_t sleep_us_;     /** Time the worker should sleep after a run */
+  u32 retries_;         /** The number of times to repeat the internal run loop before sleeping */
+  bitfield32_t flags_;  /** Worker metadata flags */
+  std::unordered_map<hshm::charbuf, TaskNode>
+      group_map_;        /** Determine if a task can be executed right now */
+  hshm::charbuf group_;  /** The current group */
+  WorkPending flush_;    /** Info needed for flushing ops */
+
+
+ public:
+  /** Constructor */
+  Worker(u32 id, ABT_xstream &xstream) {
+    poll_queues_.Resize(1024);
+    relinquish_queues_.Resize(1024);
+    id_ = id;
+    sleep_us_ = 0;
+    EnableContinuousPolling();
+    retries_ = 1;
+    pid_ = 0;
+    thread_ = std::make_unique<std::thread>(&Worker::Loop, this);
+    pthread_id_ = thread_->native_handle();
+    // TODO(llogan): implement reserve for group
+    group_.resize(512);
+    group_.resize(0);
+    /* int ret = ABT_thread_create_on_xstream(xstream,
+                                           [](void *args) { ((Worker*)args)->Loop(); }, this,
+                                           ABT_THREAD_ATTR_NULL, &tl_thread_);
+    if (ret != ABT_SUCCESS) {
+      HELOG(kFatal, "Couldn't spawn worker");
+    }*/
+  }
+
+  /** Constructor without threading */
+  Worker(u32 id) {
+    poll_queues_.Resize(1024);
+    relinquish_queues_.Resize(1024);
+    id_ = id;
+    sleep_us_ = 0;
+    EnableContinuousPolling();
+    retries_ = 1;
+    pid_ = 0;
+    pthread_id_ = GetLinuxTid();
+    // TODO(llogan): implement reserve for group
+    group_.resize(512);
+    group_.resize(0);
+  }
+
+  /**
+   * Tell worker to poll a set of queues
+   * */
+  void PollQueues(const std::vector<WorkEntry> &queues) {
+    poll_queues_.emplace(queues);
+  }
+
+  /**
+   * Tell worker to start relinquishing some of its queues
+   * This function must be called from a single thread (outside of worker)
+   * */
+  void RelinquishingQueues(const std::vector<WorkEntry> &queues) {
+    relinquish_queues_.emplace(queues);
+  }
+
+  /** Check if worker is still stealing queues */
+  bool IsRelinquishingQueues() {
+    return relinquish_queues_.size() > 0;
+  }
+
+  /** Set the sleep cycle */
+  void SetPollingFrequency(size_t sleep_us, u32 num_retries) {
+    sleep_us_ = sleep_us;
+    retries_ = num_retries;
+    flags_.UnsetBits(WORKER_CONTINUOUS_POLLING);
+  }
+
+  /** Enable continuous polling */
+  void EnableContinuousPolling() {
+    flags_.SetBits(WORKER_CONTINUOUS_POLLING);
+  }
+
+  /** Disable continuous polling */
+  void DisableContinuousPolling() {
+    flags_.UnsetBits(WORKER_CONTINUOUS_POLLING);
+  }
+
+  /** Set the CPU affinity of this worker */
+  void SetCpuAffinity(int cpu_id) {
+    ProcessAffiner::SetCpuAffinity(pid_, cpu_id);
+  }
+
+  /** The work loop */
+  void Loop();
+
+  /** Worker yields for a period of time */
+  void Yield() {
+    if (flags_.Any(WORKER_CONTINUOUS_POLLING)) {
+      return;
+    }
+    if (sleep_us_ > 0) {
+      HERMES_THREAD_MODEL->SleepForUs(sleep_us_);
+    } else {
+      HERMES_THREAD_MODEL->Yield();
+    }
+  }
+
+  /** Worker merges the set of queues to poll */
+  void _PollQueues() {
+    std::vector<WorkEntry> work_queue;
+    while (!poll_queues_.pop(work_queue).IsNull()) {
+      for (const WorkEntry &entry : work_queue) {
+        // HILOG(kDebug, "Scheduled queue {} (lane {})", entry.queue_->id_, entry.lane_);
+        work_queue_.emplace_back(entry);
+      }
+    }
+  }
+
+  /** Relinquish queues. Called from wihtin Worker */
+  void _RelinquishQueues() {
+    std::vector<WorkEntry> work_queue;
+    while (!poll_queues_.pop(work_queue).IsNull()) {
+      for (auto &entry : work_queue) {
+        work_queue_.erase(std::find(work_queue_.begin(),
+                                    work_queue_.end(), entry));
+      }
+    }
+  }
+
+  /**
+   * Poll work queue
+   *
+   * @return true if work was found, false otherwise
+   * */
+  void Run();
+
+  HSHM_ALWAYS_INLINE
+  bool CheckTaskGroup(Task *task, TaskState *exec,
+                      u32 lane_id,
+                      TaskNode node, const bool &is_remote) {
+    if (is_remote || task->IsStarted() || task->IsLaneAll()) {
+      return true;
+    }
+    int ret = exec->GetGroup(task->method_, task, group_);
+    if (ret == TASK_UNORDERED || task->IsUnordered()) {
+//      HILOG(kDebug, "(node {}) Task {} is unordered, so count remains 0 worker={}",
+//            HRUN_CLIENT->node_id_, task->task_node_, id_);
+      return true;
+    }
+
+#ifdef DEBUG
+    // TODO(llogan): remove
+    std::stringstream ss;
+    for (int i = 0; i < group_.size(); ++i) {
+      ss << std::to_string((int)group_[i]);
+    }
+#endif
+
+    // Ensure that concurrent requests are not serialized
+    LocalSerialize srl(group_);
+    srl << lane_id;
+
+    auto it = group_map_.find(group_);
+    if (it == group_map_.end()) {
+      node.node_depth_ = 1;
+      group_map_.emplace(group_, node);
+//      HILOG(kDebug, "(node {}) Increasing depth of group to {} worker={}",
+//            HRUN_CLIENT->node_id_, node.node_depth_, id_);
+      return true;
+    }
+    TaskNode &node_cmp = it->second;
+    if (node_cmp.root_ == node.root_) {
+      node_cmp.node_depth_ += 1;
+//      HILOG(kDebug, "(node {}) Increasing depth of group to {} worker={}",
+//            HRUN_CLIENT->node_id_, node_cmp.node_depth_, id_);
+      return true;
+    }
+    return false;
+  }
+
+  HSHM_ALWAYS_INLINE
+  void RemoveTaskGroup(Task *task, TaskState *exec,
+                       u32 lane_id, const bool &is_remote) {
+    if (is_remote) {
+      return;
+    }
+    int ret = exec->GetGroup(task->method_, task, group_);
+    if (ret == TASK_UNORDERED || task->IsUnordered()) {
+//      HILOG(kDebug, "(node {}) Decreasing depth of group remains 0 (task_node={} worker={})",
+//            HRUN_CLIENT->node_id_, task->task_node_, id_);
+      return;
+    }
+
+#ifdef DEBUG
+    // TODO(llogan): remove
+    std::stringstream ss;
+    for (int i = 0; i < group_.size(); ++i) {
+      ss << std::to_string((int)group_[i]);
+    }
+#endif
+    // Ensure that concurrent requests are not serialized
+    LocalSerialize srl(group_);
+    srl << lane_id;
+
+    TaskNode &node_cmp = group_map_[group_];
+    if (node_cmp.node_depth_ == 0) {
+      HELOG(kFatal, "(node {}) Group {} depth is already 0 (task_node={} worker={})",
+            HRUN_CLIENT->node_id_, task->task_node_, id_);
+    }
+    node_cmp.node_depth_ -= 1;
+//    HILOG(kDebug, "(node {}) Decreasing depth of to {} (task_node={} worker={})",
+//          HRUN_CLIENT->node_id_, node_cmp.node_depth_, task->task_node_, id_);
+    if (node_cmp.node_depth_ == 0) {
+      group_map_.erase(group_);
+    }
+  }
+
+  HSHM_ALWAYS_INLINE
+  void EndTask(Lane *lane, TaskState *exec, Task *task, int &off) {
+    PopTask(lane, off);
+    if (exec && task->IsFireAndForget()) {
+      HRUN_CLIENT->DelTask<TaskState>(exec, task);
+    } else {
+      task->SetComplete();
+    }
+  }
+
+  HSHM_ALWAYS_INLINE
+  void PopTask(Lane *lane, int &off) {
+    if (off == 0) {
+      lane->pop();
+    } else {
+      off += 1;
+    }
+  }
+
+  void PollGrouped(WorkEntry &entry);
+  static void RunCoroutine(bctx::transfer_t t);
+  static void RunPreemptive(void *data);
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_INCLUDE_HRUN_WORK_ORCHESTRATOR_WORKER_H_
diff --git a/hrun/src/CMakeLists.txt b/hrun/src/CMakeLists.txt
new file mode 100644
index 000000000..c7e819a91
--- /dev/null
+++ b/hrun/src/CMakeLists.txt
@@ -0,0 +1,110 @@
+#------------------------------------------------------------------------------
+# External dependencies
+#------------------------------------------------------------------------------
+# None for now
+
+#------------------------------------------------------------------------------
+# Build Hrun Client Library
+#------------------------------------------------------------------------------
+add_library(hrun_client SHARED
+        ${CMAKE_CURRENT_SOURCE_DIR}/config_client.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/config_server.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/hrun_client.cc)
+target_link_libraries(hrun_client
+  ${HermesShm_LIBRARIES}
+  yaml-cpp
+  cereal::cereal
+  thallium
+  -ldl -lrt -lc -pthread)
+
+#------------------------------------------------------------------------------
+# Build Hrun Runtime Library
+#------------------------------------------------------------------------------
+add_library(hrun_runtime
+        worker.cc
+        hrun_runtime.cc)
+add_dependencies(hrun_runtime ${Hermes_CLIENT_DEPS})
+target_link_libraries(hrun_runtime thallium ${Hermes_CLIENT_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Build Hrun Runtime Start Function
+#------------------------------------------------------------------------------
+add_executable(hrun_start_runtime
+        hrun_start_runtime.cc)
+add_dependencies(hrun_start_runtime ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hrun_start_runtime ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Build HRUN Runtime Stop Function
+#------------------------------------------------------------------------------
+add_executable(hrun_stop_runtime hrun_stop_runtime.cc)
+add_dependencies(hrun_stop_runtime ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hrun_stop_runtime ${Hermes_RUNTIME_LIBRARIES})
+
+#-----------------------------------------------------------------------------
+# Add file(s) to CMake Install
+#-----------------------------------------------------------------------------
+install(
+  FILES
+    ${HERMES_HEADERS}
+  DESTINATION
+    ${HERMES_INSTALL_INCLUDE_DIR}
+  COMPONENT
+    headers
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install
+#-----------------------------------------------------------------------------
+install(
+  TARGETS
+    hrun_client
+    hrun_runtime
+    hrun_start_runtime
+    hrun_stop_runtime
+  EXPORT
+  ${HERMES_EXPORTED_TARGETS}
+  LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+  ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+  RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hrun_client
+        hrun_runtime
+        hrun_start_runtime
+        hrun_stop_runtime
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+  EXPORT (
+          TARGETS
+          ${HERMES_EXPORTED_LIBS}
+          FILE
+          ${HERMES_EXPORTED_TARGETS}.cmake
+  )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+  set_coverage_flags(hrun_client)
+  set_coverage_flags(hrun_runtime)
+  set_coverage_flags(hrun_start_runtime)
+  set_coverage_flags(hrun_stop_runtime)
+endif()
\ No newline at end of file
diff --git a/hermes_shm/src/memory/memory_manager.cc b/hrun/src/config_client.cc
similarity index 61%
rename from hermes_shm/src/memory/memory_manager.cc
rename to hrun/src/config_client.cc
index 0be31f6ed..abc17d266 100644
--- a/hermes_shm/src/memory/memory_manager.cc
+++ b/hrun/src/config_client.cc
@@ -10,20 +10,25 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include "hrun/config/config_client.h"
+#include "hrun/config/config_client_default.h"
+#include "hermes_shm/util/config_parse.h"
+#include <filesystem>
 
-#include <hermes_shm/memory/memory_manager.h>
-#include "hermes_shm/memory/backend/memory_backend_factory.h"
-#include "hermes_shm/memory/allocator/allocator_factory.h"
-#include <hermes_shm/introspect/system_info.h>
-#include "hermes_shm/constants/data_structure_singleton_macros.h"
+namespace stdfs = std::filesystem;
 
-namespace hshm::ipc {
+namespace hrun::config {
 
-void MemoryManager::ScanBackends() {
-  for (auto &[url, backend] : HERMES_MEMORY_REGISTRY->backends_) {
-    auto alloc = AllocatorFactory::shm_deserialize(backend.get());
-    RegisterAllocator(alloc);
+/** parse the YAML node */
+void ClientConfig::ParseYAML(YAML::Node &yaml_conf) {
+  if (yaml_conf["thread_model"]) {
+    thread_model_ = yaml_conf["thread_model"].as<std::string>();
   }
 }
 
-}  // namespace hshm::ipc
+/** Load the default configuration */
+void ClientConfig::LoadDefault() {
+  LoadText(kHrunClientDefaultConfigStr, false);
+}
+
+}  // namespace hrun::config
diff --git a/hrun/src/config_server.cc b/hrun/src/config_server.cc
new file mode 100644
index 000000000..5cb7a478c
--- /dev/null
+++ b/hrun/src/config_server.cc
@@ -0,0 +1,106 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <string.h>
+#include <yaml-cpp/yaml.h>
+#include <ostream>
+#include "hermes_shm/util/logging.h"
+#include "hermes_shm/util/config_parse.h"
+#include "hrun/config/config.h"
+#include "hrun/config/config_server.h"
+#include "hrun/config/config_server_default.h"
+
+namespace hrun::config {
+
+/** parse work orchestrator info from YAML config */
+void ServerConfig::ParseWorkOrchestrator(YAML::Node yaml_conf) {
+  if (yaml_conf["max_workers"]) {
+    wo_.max_workers_ = yaml_conf["max_workers"].as<size_t>();
+  }
+}
+
+/** parse work orchestrator info from YAML config */
+void ServerConfig::ParseQueueManager(YAML::Node yaml_conf) {
+  if (yaml_conf["queue_depth"]) {
+    queue_manager_.queue_depth_ = yaml_conf["queue_depth"].as<size_t>();
+  }
+  if (yaml_conf["max_lanes"]) {
+    queue_manager_.max_lanes_ = yaml_conf["max_lanes"].as<size_t>();
+  }
+  if (yaml_conf["max_queues"]) {
+    queue_manager_.max_queues_ = yaml_conf["max_queues"].as<size_t>();
+  }
+  if (yaml_conf["shm_allocator"]) {
+    queue_manager_.shm_allocator_ = yaml_conf["shm_allocator"].as<std::string>();
+  }
+  if (yaml_conf["shm_name"]) {
+    queue_manager_.shm_name_ = yaml_conf["shm_name"].as<std::string>();
+  }
+  if (yaml_conf["shm_size"]) {
+    queue_manager_.shm_size_ = hshm::ConfigParse::ParseSize(
+        yaml_conf["shm_size"].as<std::string>());
+  }
+}
+
+/** parse RPC information from YAML config */
+void ServerConfig::ParseRpcInfo(YAML::Node yaml_conf) {
+  std::string suffix;
+  rpc_.host_names_.clear();
+  if (yaml_conf["host_file"]) {
+    rpc_.host_file_ =
+        hshm::ConfigParse::ExpandPath(yaml_conf["host_file"].as<std::string>());
+    if (rpc_.host_file_.size() > 0) {
+      rpc_.host_names_ = hshm::ConfigParse::ParseHostfile(rpc_.host_file_);
+    }
+  }
+  if (yaml_conf["host_names"] && rpc_.host_names_.size() == 0) {
+    for (YAML::Node host_name_gen : yaml_conf["host_names"]) {
+      std::string host_names = host_name_gen.as<std::string>();
+      hshm::ConfigParse::ParseHostNameString(host_names, rpc_.host_names_);
+    }
+  }
+  if (yaml_conf["domain"]) {
+    rpc_.domain_ = yaml_conf["domain"].as<std::string>();
+  }
+  if (yaml_conf["protocol"]) {
+    rpc_.protocol_ = yaml_conf["protocol"].as<std::string>();
+  }
+  if (yaml_conf["port"]) {
+    rpc_.port_ = yaml_conf["port"].as<int>();
+  }
+  if (yaml_conf["num_threads"]) {
+    rpc_.num_threads_ = yaml_conf["num_threads"].as<int>();
+  }
+}
+
+/** parse the YAML node */
+void ServerConfig::ParseYAML(YAML::Node &yaml_conf) {
+  if (yaml_conf["work_orchestrator"]) {
+    ParseWorkOrchestrator(yaml_conf["work_orchestrator"]);
+  }
+  if (yaml_conf["queue_manager"]) {
+    ParseQueueManager(yaml_conf["queue_manager"]);
+  }
+  if (yaml_conf["rpc"]) {
+    ParseRpcInfo(yaml_conf["rpc"]);
+  }
+  if (yaml_conf["task_registry"]) {
+    ParseVector<std::string>(yaml_conf["task_registry"], task_libs_);
+  }
+}
+
+/** Load the default configuration */
+void ServerConfig::LoadDefault() {
+  LoadText(kHrunServerDefaultConfigStr, false);
+}
+
+}  // namespace hrun::config
diff --git a/hrun/src/hrun_client.cc b/hrun/src/hrun_client.cc
new file mode 100644
index 000000000..55aaeaf47
--- /dev/null
+++ b/hrun/src/hrun_client.cc
@@ -0,0 +1,17 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hermes_shm/util/singleton.h"
+#include "hrun/api/hrun_client.h"
+
+/** Runtime singleton */
+DEFINE_SINGLETON_CC(hrun::Client)
\ No newline at end of file
diff --git a/hrun/src/hrun_runtime.cc b/hrun/src/hrun_runtime.cc
new file mode 100644
index 000000000..6484ff3df
--- /dev/null
+++ b/hrun/src/hrun_runtime.cc
@@ -0,0 +1,17 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hermes_shm/util/singleton.h"
+#include "hrun/api/hrun_runtime.h"
+
+/** Runtime singleton */
+DEFINE_SINGLETON_CC(hrun::Runtime)
\ No newline at end of file
diff --git a/src/api/hermes_singleton.cc b/hrun/src/hrun_start_runtime.cc
similarity index 84%
rename from src/api/hermes_singleton.cc
rename to hrun/src/hrun_start_runtime.cc
index 6edfc7a67..8562f2be9 100644
--- a/src/api/hermes_singleton.cc
+++ b/hrun/src/hrun_start_runtime.cc
@@ -11,11 +11,11 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hermes_shm/util/singleton.h"
+#include "hrun/api/hrun_runtime.h"
 
-#include "hermes.h"
-DEFINE_SINGLETON_CC(hermes::api::Hermes)
-
-/** Finalize hermes when program exits */
-void __attribute__((destructor)) Finalize() {
-  HERMES->Finalize();
+int main(int argc, char **argv) {
+  HRUN_RUNTIME->Create();
+  HRUN_RUNTIME->RunDaemon();
+  HRUN_RUNTIME->Finalize();
+  return 0;
 }
diff --git a/ci/external/test_install.cc b/hrun/src/hrun_stop_runtime.cc
similarity index 87%
rename from ci/external/test_install.cc
rename to hrun/src/hrun_stop_runtime.cc
index f7cbe04ac..079533cab 100644
--- a/ci/external/test_install.cc
+++ b/hrun/src/hrun_stop_runtime.cc
@@ -10,9 +10,9 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "hermes.h"
+#include "hrun_admin/hrun_admin.h"
 
 int main() {
-  HERMES->Create(hermes::HermesType::kClient);
-  hapi::Bucket bkt = HERMES->GetBucket("hi");
-}
+  TRANSPARENT_HRUN();
+  HRUN_ADMIN->AsyncStopRuntimeRoot(hrun::DomainId::GetLocal());
+}
\ No newline at end of file
diff --git a/hrun/src/worker.cc b/hrun/src/worker.cc
new file mode 100644
index 000000000..0b191b680
--- /dev/null
+++ b/hrun/src/worker.cc
@@ -0,0 +1,194 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hrun/api/hrun_runtime.h"
+#include "hrun/work_orchestrator/worker.h"
+#include "hrun/work_orchestrator/work_orchestrator.h"
+
+namespace hrun {
+
+void Worker::Loop() {
+  pid_ = GetLinuxTid();
+  WorkOrchestrator *orchestrator = HRUN_WORK_ORCHESTRATOR;
+  while (orchestrator->IsAlive()) {
+    try {
+      flush_.pending_ = 0;
+      Run();
+      if (flush_.flushing_ && flush_.pending_ == 0) {
+        flush_.flushing_ = false;
+      }
+    } catch (hshm::Error &e) {
+      HELOG(kFatal, "(node {}) Worker {} caught an error: {}", HRUN_CLIENT->node_id_, id_, e.what());
+    }
+    // Yield();
+  }
+  Run();
+}
+
+void Worker::Run() {
+  if (poll_queues_.size() > 0) {
+    _PollQueues();
+  }
+  if (relinquish_queues_.size() > 0) {
+    _RelinquishQueues();
+  }
+  hshm::Timepoint now;
+  now.Now();
+  for (WorkEntry &work_entry : work_queue_) {
+//    if (!work_entry.lane_->flags_.Any(QUEUE_LOW_LATENCY)) {
+//      work_entry.count_ += 1;
+//      if (work_entry.count_ % 4096 != 0) {
+//        continue;
+//      }
+//    }
+    work_entry.cur_time_ = now;
+    PollGrouped(work_entry);
+  }
+}
+
+void Worker::PollGrouped(WorkEntry &work_entry) {
+  int off = 0;
+  Lane *&lane = work_entry.lane_;
+  Task *task;
+  LaneData *entry;
+  for (int i = 0; i < 1024; ++i) {
+    // Get the task message
+    if (lane->peek(entry, off).IsNull()) {
+      return;
+    }
+    if (entry->complete_) {
+      PopTask(lane, off);
+      continue;
+    }
+    task = HRUN_CLIENT->GetPrivatePointer<Task>(entry->p_);
+    RunContext &rctx = task->ctx_;
+    rctx.lane_id_ = work_entry.lane_id_;
+    rctx.flush_ = &flush_;
+    // Get the task state
+    TaskState *&exec = rctx.exec_;
+    exec = HRUN_TASK_REGISTRY->GetTaskState(task->task_state_);
+    if (!exec) {
+      HELOG(kFatal, "(node {}) Could not find the task state: {}",
+            HRUN_CLIENT->node_id_, task->task_state_);
+      entry->complete_ = true;
+      EndTask(lane, exec, task, off);
+      continue;
+    }
+    // Attempt to run the task if it's ready and runnable
+    bool is_remote = task->domain_id_.IsRemote(HRUN_RPC->GetNumHosts(), HRUN_CLIENT->node_id_);
+    if (!task->IsRunDisabled() &&
+        CheckTaskGroup(task, exec, work_entry.lane_id_, task->task_node_, is_remote) &&
+        task->ShouldRun(work_entry.cur_time_, flush_.flushing_)) {
+#ifdef REMOTE_DEBUG
+      if (task->task_state_ != HRUN_QM_CLIENT->admin_task_state_ &&
+          !task->task_flags_.Any(TASK_REMOTE_DEBUG_MARK) &&
+          task->method_ != TaskMethod::kConstruct &&
+          HRUN_RUNTIME->remote_created_) {
+        is_remote = true;
+      }
+      task->task_flags_.SetBits(TASK_REMOTE_DEBUG_MARK);
+#endif
+      // Execute or schedule task
+      if (is_remote) {
+        auto ids = HRUN_RUNTIME->ResolveDomainId(task->domain_id_);
+        HRUN_REMOTE_QUEUE->Disperse(task, exec, ids);
+        task->SetDisableRun();
+        task->SetUnordered();
+        task->UnsetCoroutine();
+      } else if (task->IsLaneAll()) {
+        HRUN_REMOTE_QUEUE->DisperseLocal(task, exec, work_entry.queue_, work_entry.group_);
+        task->SetDisableRun();
+        task->SetUnordered();
+        task->UnsetCoroutine();
+        task->UnsetLaneAll();
+      } else if (task->IsCoroutine()) {
+        if (!task->IsStarted()) {
+          rctx.stack_ptr_ = malloc(rctx.stack_size_);
+          if (rctx.stack_ptr_ == nullptr) {
+            HILOG(kFatal, "The stack pointer of size {} is NULL",
+                  rctx.stack_size_, rctx.stack_ptr_);
+          }
+          rctx.jmp_.fctx = bctx::make_fcontext(
+              (char*)rctx.stack_ptr_ + rctx.stack_size_,
+              rctx.stack_size_, &RunCoroutine);
+          task->SetStarted();
+        }
+        rctx.jmp_ = bctx::jump_fcontext(rctx.jmp_.fctx, task);
+        if (!task->IsStarted()) {
+          rctx.jmp_.fctx = bctx::make_fcontext(
+              (char*)rctx.stack_ptr_ + rctx.stack_size_,
+              rctx.stack_size_, &RunCoroutine);
+          task->SetStarted();
+        }
+      } else if (task->IsPreemptive()) {
+        task->SetDisableRun();
+        entry->thread_ = HRUN_WORK_ORCHESTRATOR->SpawnAsyncThread(&Worker::RunPreemptive, task);
+      } else {
+        task->SetStarted();
+        exec->Run(task->method_, task, rctx);
+      }
+      task->DidRun(work_entry.cur_time_);
+      if (!task->IsModuleComplete() && !task->IsFlush()) {
+        flush_.pending_ += 1;
+      }
+    }
+    // Cleanup on task completion
+    if (task->IsModuleComplete()) {
+//      HILOG(kDebug, "(node {}) Ending task: task_node={} task_state={} lane={} queue={} worker={}",
+//            HRUN_CLIENT->node_id_, task->task_node_, task->task_state_, lane_id, queue->id_, id_);
+      entry->complete_ = true;
+      if (task->IsCoroutine()) {
+        free(rctx.stack_ptr_);
+      } else if (task->IsPreemptive()) {
+        ABT_thread_join(entry->thread_);
+      }
+      RemoveTaskGroup(task, exec, work_entry.lane_id_, is_remote);
+      EndTask(lane, exec, task, off);
+    } else {
+      off += 1;
+    }
+  }
+}
+
+void Worker::RunCoroutine(bctx::transfer_t t) {
+  Task *task = reinterpret_cast<Task*>(t.data);
+  RunContext &rctx = task->ctx_;
+  TaskState *&exec = rctx.exec_;
+  rctx.jmp_ = t;
+  exec->Run(task->method_, task, rctx);
+  task->UnsetStarted();
+  if (task->IsLongRunning()) {
+    rctx.flush_->pending_ -= 1;
+  }
+  task->Yield<TASK_YIELD_CO>();
+}
+
+void Worker::RunPreemptive(void *data) {
+  Task *task = reinterpret_cast<Task *>(data);
+  TaskState *exec = HRUN_TASK_REGISTRY->GetTaskState(task->task_state_);
+  RunContext &real_rctx = task->ctx_;
+  RunContext rctx(0);
+  do {
+    hshm::Timepoint now;
+    now.Now();
+    if (task->ShouldRun(now, real_rctx.flush_->flushing_)) {
+      exec->Run(task->method_, task, rctx);
+      task->DidRun(now);
+    }
+    if (task->IsLongRunning()) {
+      real_rctx.flush_->pending_ -= 1;
+    }
+    task->Yield<TASK_YIELD_ABT>();
+  } while(!task->IsModuleComplete());
+}
+
+}  // namespace hrun
\ No newline at end of file
diff --git a/hrun/tasks_required/CMakeLists.txt b/hrun/tasks_required/CMakeLists.txt
new file mode 100644
index 000000000..cb3e75dd7
--- /dev/null
+++ b/hrun/tasks_required/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(TASK_NAME)
+add_subdirectory(small_message)
+add_subdirectory(hrun_admin)
+add_subdirectory(remote_queue)
+add_subdirectory(worch_proc_round_robin)
+add_subdirectory(worch_queue_round_robin)
+add_subdirectory(proc_queue)
\ No newline at end of file
diff --git a/hrun/tasks_required/TASK_NAME/CMakeLists.txt b/hrun/tasks_required/TASK_NAME/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/hrun/tasks_required/TASK_NAME/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME.h b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME.h
new file mode 100644
index 000000000..e2f541956
--- /dev/null
+++ b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME.h
@@ -0,0 +1,81 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASK_NAME_H_
+#define HRUN_TASK_NAME_H_
+
+#include "TASK_NAME_tasks.h"
+
+namespace hrun::TASK_NAME {
+
+/** Create TASK_NAME requests */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Async create a task state */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, id_, queue_info);
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreate)
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task =
+        AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    id_ = task->id_;
+    queue_id_ = QueueId(id_);
+    HRUN_CLIENT->DelTask(task);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /** Call a custom method */
+  HSHM_ALWAYS_INLINE
+  void AsyncCustomConstruct(CustomTask *task,
+                            const TaskNode &task_node,
+                            const DomainId &domain_id) {
+    HRUN_CLIENT->ConstructTask<CustomTask>(
+        task, task_node, domain_id, id_);
+  }
+  HSHM_ALWAYS_INLINE
+  void CustomRoot(const DomainId &domain_id) {
+    LPointer<hrunpq::TypedPushTask<CustomTask>> task = AsyncCustomRoot(domain_id);
+    task.ptr_->Wait();
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Custom);
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_TASK_NAME_H_
diff --git a/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_lib_exec.h b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_lib_exec.h
new file mode 100644
index 000000000..0f75fae53
--- /dev/null
+++ b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_lib_exec.h
@@ -0,0 +1,197 @@
+#ifndef HRUN_TASK_NAME_LIB_EXEC_H_
+#define HRUN_TASK_NAME_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kCustom: {
+      Custom(reinterpret_cast<CustomTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kCustom: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<CustomTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kCustom: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<CustomTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kCustom: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<CustomTask*>(orig_task), reinterpret_cast<CustomTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kCustom: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<CustomTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kCustom: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<CustomTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kCustom: {
+      ar << *reinterpret_cast<CustomTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kCustom: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<CustomTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<CustomTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kCustom: {
+      ar << *reinterpret_cast<CustomTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kCustom: {
+      ar.Deserialize(replica, *reinterpret_cast<CustomTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kCustom: {
+      return reinterpret_cast<CustomTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_TASK_NAME_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_methods.h b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_methods.h
new file mode 100644
index 000000000..66e99a6cd
--- /dev/null
+++ b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_methods.h
@@ -0,0 +1,9 @@
+#ifndef HRUN_TASK_NAME_METHODS_H_
+#define HRUN_TASK_NAME_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kCustom = kLast + 0;
+};
+
+#endif  // HRUN_TASK_NAME_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_methods.yaml b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_methods.yaml
new file mode 100644
index 000000000..b1b54e2a4
--- /dev/null
+++ b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_methods.yaml
@@ -0,0 +1 @@
+kCustom: 0
\ No newline at end of file
diff --git a/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_tasks.h b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_tasks.h
new file mode 100644
index 000000000..3f528d97d
--- /dev/null
+++ b/hrun/tasks_required/TASK_NAME/include/TASK_NAME/TASK_NAME_tasks.h
@@ -0,0 +1,135 @@
+//
+// Created by lukemartinlogan on 8/11/23.
+//
+
+#ifndef HRUN_TASKS_TASK_TEMPL_INCLUDE_TASK_NAME_TASK_NAME_TASKS_H_
+#define HRUN_TASKS_TASK_TEMPL_INCLUDE_TASK_NAME_TASK_NAME_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hrun::TASK_NAME {
+
+#include "TASK_NAME_methods.h"
+#include "hrun/hrun_namespace.h"
+using hrun::proc_queue::TypedPushTask;
+using hrun::proc_queue::PushTask;
+
+/**
+ * A task to create TASK_NAME
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc)
+  : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "TASK_NAME", id, queue_info) {
+    // Custom params
+  }
+
+  HSHM_ALWAYS_INLINE
+  ~ConstructTask() {
+    // Custom params
+  }
+};
+
+/** A task to destroy TASK_NAME */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc)
+  : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+  : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in TASK_NAME
+ * */
+struct CustomTask : public Task, TaskFlags<TF_SRL_SYM> {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  CustomTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  CustomTask(hipc::Allocator *alloc,
+             const TaskNode &task_node,
+             const DomainId &domain_id,
+             const TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kCustom;
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Custom params
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, CustomTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, CustomTask &dup_task) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {
+  }
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hrun::TASK_NAME
+
+#endif  // HRUN_TASKS_TASK_TEMPL_INCLUDE_TASK_NAME_TASK_NAME_TASKS_H_
diff --git a/wrapper/c/CMakeLists.txt b/hrun/tasks_required/TASK_NAME/src/CMakeLists.txt
similarity index 53%
rename from wrapper/c/CMakeLists.txt
rename to hrun/tasks_required/TASK_NAME/src/CMakeLists.txt
index a81c4fc12..c4339eea4 100644
--- a/wrapper/c/CMakeLists.txt
+++ b/hrun/tasks_required/TASK_NAME/src/CMakeLists.txt
@@ -1,29 +1,41 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(TASK_NAME SHARED
+        TASK_NAME.cc)
+add_dependencies(TASK_NAME ${Hermes_RUNTIME_DEPS})
+target_link_libraries(TASK_NAME ${Hermes_RUNTIME_LIBRARIES})
 
-
-# Creates an example trait
-add_library(hermes_c_wrapper SHARED
-        c_wrapper.cc)
-add_dependencies(hermes_c_wrapper hermes)
-target_link_libraries(hermes_c_wrapper
-        hermes MPI::MPI_CXX stdc++fs dl)
-
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
 install(
         TARGETS
-        hermes_c_wrapper
+        TASK_NAME
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
 )
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
 #-----------------------------------------------------------------------------
 # Export all exported targets to the build tree for use by parent project
 #-----------------------------------------------------------------------------
 set(HERMES_EXPORTED_LIBS
-        hermes_c_wrapper
+        TASK_NAME
         ${HERMES_EXPORTED_LIBS})
 if(NOT HERMES_EXTERNALLY_CONFIGURED)
     EXPORT (
@@ -33,9 +45,10 @@ if(NOT HERMES_EXTERNALLY_CONFIGURED)
             ${HERMES_EXPORTED_TARGETS}.cmake
     )
 endif()
-#-----------------------------------------------------------------------------
-# Add Target(s) to Coverage
-#-----------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
 if(HERMES_ENABLE_COVERAGE)
-    set_coverage_flags(hermes_example_trait)
+    set_coverage_flags(TASK_NAME)
 endif()
diff --git a/src/dpe/minimize_io_time.h b/hrun/tasks_required/TASK_NAME/src/TASK_NAME.cc
similarity index 59%
rename from src/dpe/minimize_io_time.h
rename to hrun/tasks_required/TASK_NAME/src/TASK_NAME.cc
index 94fe957e6..43c5aec9f 100644
--- a/src/dpe/minimize_io_time.h
+++ b/hrun/tasks_required/TASK_NAME/src/TASK_NAME.cc
@@ -10,25 +10,32 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_SRC_DPE_MINIMIZE_IO_TIME_H_
-#define HERMES_SRC_DPE_MINIMIZE_IO_TIME_H_
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "TASK_NAME/TASK_NAME.h"
 
-#include "data_placement_engine.h"
+namespace hrun::TASK_NAME {
 
-namespace hermes {
-/**
- A class to represent data placement engine that minimizes I/O time.
-*/
-class MinimizeIoTime : public DPE {
+class Server : public TaskLib {
  public:
-  MinimizeIoTime() = default;
-  ~MinimizeIoTime() = default;
-  Status Placement(const std::vector<size_t> &blob_sizes,
-                   std::vector<TargetInfo> &targets,
-                   api::Context &ctx,
-                   std::vector<PlacementSchema> &output);
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Custom(CustomTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "TASK_NAME/TASK_NAME_lib_exec.h"
 };
 
-}  // namespace hermes
+}  // namespace hrun::TASK_NAME
 
-#endif  // HERMES_SRC_DPE_MINIMIZE_IO_TIME_H_
+HRUN_TASK_CC(hrun::TASK_NAME::Server, "TASK_NAME");
diff --git a/hrun/tasks_required/hrun_admin/CMakeLists.txt b/hrun/tasks_required/hrun_admin/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin.h b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin.h
new file mode 100644
index 000000000..0762ba70f
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin.h
@@ -0,0 +1,236 @@
+#ifndef HRUN_TASKS_HRUN_ADMIN_HRUN_ADMIN_H_
+#define HRUN_TASKS_HRUN_ADMIN_HRUN_ADMIN_H_
+
+#include "hrun_admin_tasks.h"
+
+namespace hrun::Admin {
+
+/** Create admin requests */
+class Client : public TaskLibClient {
+ public:
+  /** Default constructor */
+  Client() {
+    id_ = TaskStateId(HRUN_QM_CLIENT->admin_queue_);
+    queue_id_ = HRUN_QM_CLIENT->admin_queue_;
+  }
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Register a task library */
+  HSHM_ALWAYS_INLINE
+  void AsyncRegisterTaskLibConstruct(RegisterTaskLibTask *task,
+                                     const TaskNode &task_node,
+                                     const DomainId &domain_id,
+                                     const std::string &lib_name) {
+    HRUN_CLIENT->ConstructTask<RegisterTaskLibTask>(
+        task, task_node, domain_id, lib_name);
+  }
+  HSHM_ALWAYS_INLINE
+  void RegisterTaskLibRoot(const DomainId &domain_id,
+                           const std::string &lib_name) {
+    LPointer<RegisterTaskLibTask> task = AsyncRegisterTaskLibRoot(domain_id, lib_name);
+    task->Wait();
+    HRUN_CLIENT->DelTask(task);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(RegisterTaskLib)
+
+  /** Unregister a task */
+  HSHM_ALWAYS_INLINE
+  void AsyncDestroyTaskLibConstruct(DestroyTaskLibTask *task,
+                                    const TaskNode &task_node,
+                                    const DomainId &domain_id,
+                                    const std::string &lib_name) {
+    HRUN_CLIENT->ConstructTask<DestroyTaskLibTask>(
+        task, task_node, domain_id, lib_name);
+  }
+  HSHM_ALWAYS_INLINE
+  void DestroyTaskLibRoot(const TaskNode &task_node,
+                              const DomainId &domain_id,
+                              const std::string &lib_name) {
+    LPointer<DestroyTaskLibTask> task =
+        AsyncDestroyTaskLibRoot(domain_id, lib_name);
+    task->Wait();
+    HRUN_CLIENT->DelTask(task);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(DestroyTaskLib)
+
+  /** Spawn a task state */
+  template<typename CreateTaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void AsyncCreateTaskStateConstruct(CreateTaskT *task,
+                                     const TaskNode &task_node,
+                                     const DomainId &domain_id,
+                                     Args&& ...args) {
+    HRUN_CLIENT->ConstructTask<CreateTaskT>(
+        task, task_node, domain_id, std::forward<Args>(args)...);
+  }
+  template<typename CreateTaskT, typename ...Args>
+  HSHM_ALWAYS_INLINE
+  TaskStateId CreateTaskStateRoot(const DomainId &domain_id,
+                                  Args&& ...args) {
+    LPointer<CreateTaskT> task = AsyncCreateTaskStateRoot<CreateTaskT>(
+        domain_id, std::forward<Args>(args)...);
+    task->Wait();
+    TaskStateId new_id = task->id_;
+    HRUN_CLIENT->DelTask(task);
+    if (new_id.IsNull()) {
+      HELOG(kWarning, "Failed to create task state");
+    }
+    return new_id;
+  }
+  template<typename CreateTaskT, typename ...Args>
+  hipc::LPointer<CreateTaskT> AsyncCreateTaskStateAlloc(const TaskNode &task_node,
+                                                        Args&& ...args) {
+    hipc::LPointer<CreateTaskT> task = HRUN_CLIENT->AllocateTask<CreateTaskT>();
+    AsyncCreateTaskStateConstruct<CreateTaskT>(task.ptr_, task_node, std::forward<Args>(args)...);
+    return task;
+  }
+  template<typename CreateTaskT, typename ...Args>
+  hipc::LPointer<CreateTaskT> AsyncCreateTaskState(const TaskNode &task_node,
+                                                   Args&& ...args) {
+    hipc::LPointer<CreateTaskT> task =
+        AsyncCreateTaskStateAlloc<CreateTaskT>(task_node, std::forward<Args>(args)...);
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);
+    return task;
+  }
+  template<typename CreateTaskT, typename ...Args>
+  hipc::LPointer<CreateTaskT> AsyncCreateTaskStateEmplace(MultiQueue *queue,
+                                                      const TaskNode &task_node,
+                                                      Args&& ...args) {
+    hipc::LPointer<CreateTaskT> task =
+        AsyncCreateTaskStateAllocCreateTaskT(task_node, std::forward<Args>(args)...);
+    queue->Emplace(task.ptr_->prio_, task.ptr_->lane_hash_, task.shm_);
+    return task;
+  }
+  template<typename CreateTaskT, typename ...Args>
+  hipc::LPointer<CreateTaskT> AsyncCreateTaskStateRoot(Args&& ...args) {
+    TaskNode task_node = HRUN_CLIENT->MakeTaskNodeId();
+    hipc::LPointer<CreateTaskT> task =
+        AsyncCreateTaskState<CreateTaskT>(task_node, std::forward<Args>(args)...);
+    return task;
+  }
+
+  /** Get the ID of a task state */
+  void AsyncGetOrCreateTaskStateIdConstruct(GetOrCreateTaskStateIdTask *task,
+                                            const TaskNode &task_node,
+                                            const DomainId &domain_id,
+                                            const std::string &state_name) {
+    HRUN_CLIENT->ConstructTask<GetOrCreateTaskStateIdTask>(
+        task, task_node, domain_id, state_name);
+  }
+  TaskStateId GetOrCreateTaskStateIdRoot(const DomainId &domain_id,
+                                         const std::string &state_name) {
+    LPointer<GetOrCreateTaskStateIdTask> task =
+        AsyncGetOrCreateTaskStateIdRoot(domain_id, state_name);
+    task->Wait();
+    TaskStateId new_id = task->id_;
+    HRUN_CLIENT->DelTask(task);
+    return new_id;
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(GetOrCreateTaskStateId)
+
+  /** Get the ID of a task state */
+  void AsyncGetTaskStateIdConstruct(GetTaskStateIdTask *task,
+                                    const TaskNode &task_node,
+                                    const DomainId &domain_id,
+                                    const std::string &state_name) {
+    HRUN_CLIENT->ConstructTask<GetTaskStateIdTask>(
+        task, task_node, domain_id, state_name);
+  }
+  TaskStateId GetTaskStateIdRoot(const DomainId &domain_id,
+                                 const std::string &state_name) {
+    LPointer<GetTaskStateIdTask> task =
+        AsyncGetTaskStateIdRoot(domain_id, state_name);
+    task->Wait();
+    TaskStateId new_id = task->id_;
+    HRUN_CLIENT->DelTask(task);
+    return new_id;
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(GetTaskStateId)
+
+  /** Terminate a task state */
+  HSHM_ALWAYS_INLINE
+  void AsyncDestroyTaskStateConstruct(DestroyTaskStateTask *task,
+                                      const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const TaskStateId &id) {
+    HRUN_CLIENT->ConstructTask<DestroyTaskStateTask>(
+        task, task_node, domain_id, id);
+  }
+  HSHM_ALWAYS_INLINE
+  void DestroyTaskStateRoot(const DomainId &domain_id,
+                            const TaskStateId &id) {
+    LPointer<DestroyTaskStateTask> task =
+        AsyncDestroyTaskStateRoot(domain_id, id);
+    task->Wait();
+    HRUN_CLIENT->DelTask(task);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(DestroyTaskState)
+
+  /** Terminate the runtime */
+  void AsyncStopRuntimeConstruct(StopRuntimeTask *task,
+                                 const TaskNode &task_node,
+                                 const DomainId &domain_id) {
+    HRUN_CLIENT->ConstructTask<StopRuntimeTask>(
+        task, task_node, domain_id);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(StopRuntime);
+
+  /** Set work orchestrator queue policy */
+  void AsyncSetWorkOrchQueuePolicyConstruct(SetWorkOrchQueuePolicyTask *task,
+                                            const TaskNode &task_node,
+                                            const DomainId &domain_id,
+                                            const TaskStateId &policy) {
+    HRUN_CLIENT->ConstructTask<SetWorkOrchQueuePolicyTask>(
+        task, task_node, domain_id, policy);
+  }
+  void SetWorkOrchQueuePolicyRoot(const DomainId &domain_id,
+                                  const TaskStateId &policy) {
+    LPointer<SetWorkOrchQueuePolicyTask> task =
+        AsyncSetWorkOrchQueuePolicyRoot(domain_id, policy);
+    task->Wait();
+    HRUN_CLIENT->DelTask(task);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(SetWorkOrchQueuePolicy);
+
+  /** Set work orchestrator process policy */
+  void AsyncSetWorkOrchProcPolicyConstruct(SetWorkOrchProcPolicyTask *task,
+                                           const TaskNode &task_node,
+                                           const DomainId &domain_id,
+                                           const TaskStateId &policy) {
+    HRUN_CLIENT->ConstructTask<SetWorkOrchProcPolicyTask>(
+        task, task_node, domain_id, policy);
+  }
+  void SetWorkOrchProcPolicyRoot(const DomainId &domain_id,
+                                 const TaskStateId &policy) {
+    LPointer<SetWorkOrchProcPolicyTask> task =
+        AsyncSetWorkOrchProcPolicyRoot(domain_id, policy);
+    task->Wait();
+    HRUN_CLIENT->DelTask(task);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(SetWorkOrchProcPolicy);
+
+  /** Flush the runtime */
+  void AsyncFlushConstruct(FlushTask *task,
+                           const TaskNode &task_node,
+                           const DomainId &domain_id) {
+    HRUN_CLIENT->ConstructTask<FlushTask>(
+        task, task_node, domain_id);
+  }
+  void FlushRoot(const DomainId &domain_id) {
+    LPointer<FlushTask> task =
+        AsyncFlushRoot(domain_id);
+    task->Wait();
+    HRUN_CLIENT->DelTask(task);
+  }
+  HRUN_TASK_NODE_ADMIN_ROOT(Flush);
+};
+
+}  // namespace hrun::Admin
+
+#define HRUN_ADMIN \
+  hshm::EasySingleton<hrun::Admin::Client>::GetInstance()
+
+#endif  // HRUN_TASKS_HRUN_ADMIN_HRUN_ADMIN_H_
diff --git a/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_lib_exec.h b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_lib_exec.h
new file mode 100644
index 000000000..22f34312c
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_lib_exec.h
@@ -0,0 +1,505 @@
+#ifndef HRUN_HRUN_ADMIN_LIB_EXEC_H_
+#define HRUN_HRUN_ADMIN_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      CreateTaskState(reinterpret_cast<CreateTaskStateTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      DestroyTaskState(reinterpret_cast<DestroyTaskStateTask *>(task), rctx);
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      RegisterTaskLib(reinterpret_cast<RegisterTaskLibTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      DestroyTaskLib(reinterpret_cast<DestroyTaskLibTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      GetOrCreateTaskStateId(reinterpret_cast<GetOrCreateTaskStateIdTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      GetTaskStateId(reinterpret_cast<GetTaskStateIdTask *>(task), rctx);
+      break;
+    }
+    case Method::kStopRuntime: {
+      StopRuntime(reinterpret_cast<StopRuntimeTask *>(task), rctx);
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      SetWorkOrchQueuePolicy(reinterpret_cast<SetWorkOrchQueuePolicyTask *>(task), rctx);
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      SetWorkOrchProcPolicy(reinterpret_cast<SetWorkOrchProcPolicyTask *>(task), rctx);
+      break;
+    }
+    case Method::kFlush: {
+      Flush(reinterpret_cast<FlushTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<CreateTaskStateTask *>(task));
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestroyTaskStateTask *>(task));
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RegisterTaskLibTask *>(task));
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestroyTaskLibTask *>(task));
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetOrCreateTaskStateIdTask *>(task));
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetTaskStateIdTask *>(task));
+      break;
+    }
+    case Method::kStopRuntime: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<StopRuntimeTask *>(task));
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<SetWorkOrchQueuePolicyTask *>(task));
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<SetWorkOrchProcPolicyTask *>(task));
+      break;
+    }
+    case Method::kFlush: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<FlushTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<CreateTaskStateTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestroyTaskStateTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RegisterTaskLibTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestroyTaskLibTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetOrCreateTaskStateIdTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetTaskStateIdTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kStopRuntime: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<StopRuntimeTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<SetWorkOrchQueuePolicyTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<SetWorkOrchProcPolicyTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kFlush: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<FlushTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<CreateTaskStateTask*>(orig_task), reinterpret_cast<CreateTaskStateTask*>(dup_task));
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestroyTaskStateTask*>(orig_task), reinterpret_cast<DestroyTaskStateTask*>(dup_task));
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RegisterTaskLibTask*>(orig_task), reinterpret_cast<RegisterTaskLibTask*>(dup_task));
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestroyTaskLibTask*>(orig_task), reinterpret_cast<DestroyTaskLibTask*>(dup_task));
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetOrCreateTaskStateIdTask*>(orig_task), reinterpret_cast<GetOrCreateTaskStateIdTask*>(dup_task));
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetTaskStateIdTask*>(orig_task), reinterpret_cast<GetTaskStateIdTask*>(dup_task));
+      break;
+    }
+    case Method::kStopRuntime: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<StopRuntimeTask*>(orig_task), reinterpret_cast<StopRuntimeTask*>(dup_task));
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<SetWorkOrchQueuePolicyTask*>(orig_task), reinterpret_cast<SetWorkOrchQueuePolicyTask*>(dup_task));
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<SetWorkOrchProcPolicyTask*>(orig_task), reinterpret_cast<SetWorkOrchProcPolicyTask*>(dup_task));
+      break;
+    }
+    case Method::kFlush: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<FlushTask*>(orig_task), reinterpret_cast<FlushTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<CreateTaskStateTask*>(task));
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestroyTaskStateTask*>(task));
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RegisterTaskLibTask*>(task));
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestroyTaskLibTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetOrCreateTaskStateIdTask*>(task));
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetTaskStateIdTask*>(task));
+      break;
+    }
+    case Method::kStopRuntime: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<StopRuntimeTask*>(task));
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task));
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<SetWorkOrchProcPolicyTask*>(task));
+      break;
+    }
+    case Method::kFlush: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<FlushTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<CreateTaskStateTask*>(task));
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestroyTaskStateTask*>(task));
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RegisterTaskLibTask*>(task));
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestroyTaskLibTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetOrCreateTaskStateIdTask*>(task));
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetTaskStateIdTask*>(task));
+      break;
+    }
+    case Method::kStopRuntime: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<StopRuntimeTask*>(task));
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task));
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<SetWorkOrchProcPolicyTask*>(task));
+      break;
+    }
+    case Method::kFlush: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<FlushTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      ar << *reinterpret_cast<CreateTaskStateTask*>(task);
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      ar << *reinterpret_cast<DestroyTaskStateTask*>(task);
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      ar << *reinterpret_cast<RegisterTaskLibTask*>(task);
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      ar << *reinterpret_cast<DestroyTaskLibTask*>(task);
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      ar << *reinterpret_cast<GetOrCreateTaskStateIdTask*>(task);
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      ar << *reinterpret_cast<GetTaskStateIdTask*>(task);
+      break;
+    }
+    case Method::kStopRuntime: {
+      ar << *reinterpret_cast<StopRuntimeTask*>(task);
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      ar << *reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task);
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      ar << *reinterpret_cast<SetWorkOrchProcPolicyTask*>(task);
+      break;
+    }
+    case Method::kFlush: {
+      ar << *reinterpret_cast<FlushTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kCreateTaskState: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<CreateTaskStateTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<CreateTaskStateTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestroyTaskStateTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestroyTaskStateTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RegisterTaskLibTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RegisterTaskLibTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestroyTaskLibTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestroyTaskLibTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetOrCreateTaskStateIdTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetOrCreateTaskStateIdTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetTaskStateIdTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetTaskStateIdTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kStopRuntime: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<StopRuntimeTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<StopRuntimeTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<SetWorkOrchQueuePolicyTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<SetWorkOrchProcPolicyTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<SetWorkOrchProcPolicyTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kFlush: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<FlushTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<FlushTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      ar << *reinterpret_cast<CreateTaskStateTask*>(task);
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      ar << *reinterpret_cast<DestroyTaskStateTask*>(task);
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      ar << *reinterpret_cast<RegisterTaskLibTask*>(task);
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      ar << *reinterpret_cast<DestroyTaskLibTask*>(task);
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      ar << *reinterpret_cast<GetOrCreateTaskStateIdTask*>(task);
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      ar << *reinterpret_cast<GetTaskStateIdTask*>(task);
+      break;
+    }
+    case Method::kStopRuntime: {
+      ar << *reinterpret_cast<StopRuntimeTask*>(task);
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      ar << *reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task);
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      ar << *reinterpret_cast<SetWorkOrchProcPolicyTask*>(task);
+      break;
+    }
+    case Method::kFlush: {
+      ar << *reinterpret_cast<FlushTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      ar.Deserialize(replica, *reinterpret_cast<CreateTaskStateTask*>(task));
+      break;
+    }
+    case Method::kDestroyTaskState: {
+      ar.Deserialize(replica, *reinterpret_cast<DestroyTaskStateTask*>(task));
+      break;
+    }
+    case Method::kRegisterTaskLib: {
+      ar.Deserialize(replica, *reinterpret_cast<RegisterTaskLibTask*>(task));
+      break;
+    }
+    case Method::kDestroyTaskLib: {
+      ar.Deserialize(replica, *reinterpret_cast<DestroyTaskLibTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      ar.Deserialize(replica, *reinterpret_cast<GetOrCreateTaskStateIdTask*>(task));
+      break;
+    }
+    case Method::kGetTaskStateId: {
+      ar.Deserialize(replica, *reinterpret_cast<GetTaskStateIdTask*>(task));
+      break;
+    }
+    case Method::kStopRuntime: {
+      ar.Deserialize(replica, *reinterpret_cast<StopRuntimeTask*>(task));
+      break;
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      ar.Deserialize(replica, *reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task));
+      break;
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      ar.Deserialize(replica, *reinterpret_cast<SetWorkOrchProcPolicyTask*>(task));
+      break;
+    }
+    case Method::kFlush: {
+      ar.Deserialize(replica, *reinterpret_cast<FlushTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kCreateTaskState: {
+      return reinterpret_cast<CreateTaskStateTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestroyTaskState: {
+      return reinterpret_cast<DestroyTaskStateTask*>(task)->GetGroup(group);
+    }
+    case Method::kRegisterTaskLib: {
+      return reinterpret_cast<RegisterTaskLibTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestroyTaskLib: {
+      return reinterpret_cast<DestroyTaskLibTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetOrCreateTaskStateId: {
+      return reinterpret_cast<GetOrCreateTaskStateIdTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetTaskStateId: {
+      return reinterpret_cast<GetTaskStateIdTask*>(task)->GetGroup(group);
+    }
+    case Method::kStopRuntime: {
+      return reinterpret_cast<StopRuntimeTask*>(task)->GetGroup(group);
+    }
+    case Method::kSetWorkOrchQueuePolicy: {
+      return reinterpret_cast<SetWorkOrchQueuePolicyTask*>(task)->GetGroup(group);
+    }
+    case Method::kSetWorkOrchProcPolicy: {
+      return reinterpret_cast<SetWorkOrchProcPolicyTask*>(task)->GetGroup(group);
+    }
+    case Method::kFlush: {
+      return reinterpret_cast<FlushTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_HRUN_ADMIN_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_methods.h b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_methods.h
new file mode 100644
index 000000000..882809459
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_methods.h
@@ -0,0 +1,18 @@
+#ifndef HRUN_HRUN_ADMIN_METHODS_H_
+#define HRUN_HRUN_ADMIN_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kCreateTaskState = kLast + 0;
+  TASK_METHOD_T kDestroyTaskState = kLast + 1;
+  TASK_METHOD_T kRegisterTaskLib = kLast + 2;
+  TASK_METHOD_T kDestroyTaskLib = kLast + 3;
+  TASK_METHOD_T kGetOrCreateTaskStateId = kLast + 4;
+  TASK_METHOD_T kGetTaskStateId = kLast + 5;
+  TASK_METHOD_T kStopRuntime = kLast + 6;
+  TASK_METHOD_T kSetWorkOrchQueuePolicy = kLast + 7;
+  TASK_METHOD_T kSetWorkOrchProcPolicy = kLast + 8;
+  TASK_METHOD_T kFlush = kLast + 9;
+};
+
+#endif  // HRUN_HRUN_ADMIN_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_methods.yaml b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_methods.yaml
new file mode 100644
index 000000000..a314374b5
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_methods.yaml
@@ -0,0 +1,10 @@
+kCreateTaskState: 0
+kDestroyTaskState: 1
+kRegisterTaskLib: 2
+kDestroyTaskLib: 3
+kGetOrCreateTaskStateId: 4
+kGetTaskStateId: 5
+kStopRuntime: 6
+kSetWorkOrchQueuePolicy: 7
+kSetWorkOrchProcPolicy: 8
+kFlush: 9
\ No newline at end of file
diff --git a/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_tasks.h b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_tasks.h
new file mode 100644
index 000000000..602185310
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/include/hrun_admin/hrun_admin_tasks.h
@@ -0,0 +1,471 @@
+#ifndef HRUN_TASKS_HRUN_ADMIN_INCLUDE_HRUN_ADMIN_HRUN_ADMIN_TASKS_H_
+#define HRUN_TASKS_HRUN_ADMIN_INCLUDE_HRUN_ADMIN_HRUN_ADMIN_TASKS_H_
+
+#include "hrun/work_orchestrator/scheduler.h"
+#include "hrun/api/hrun_client.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hrun/hrun_namespace.h"
+
+namespace hrun::Admin {
+
+#include "hrun_admin_methods.h"
+
+/** A template to register or destroy a task library */
+template<int method>
+struct RegisterTaskLibTaskTempl : public Task, TaskFlags<TF_SRL_SYM> {
+  IN hipc::ShmArchive<hipc::string> lib_name_;
+  OUT TaskStateId id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterTaskLibTaskTempl(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterTaskLibTaskTempl(hipc::Allocator *alloc,
+                           const TaskNode &task_node,
+                           const DomainId &domain_id,
+                           const std::string &lib_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    if constexpr(method == 0)
+    {
+      method_ = Method::kRegisterTaskLib;
+    } else {
+      method_ = Method::kDestroyTaskLib;
+    }
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Initialize QueueManager task
+    HSHM_MAKE_AR(lib_name_, alloc, lib_name);
+  }
+
+  /** Destructor */
+  ~RegisterTaskLibTaskTempl() {
+    HSHM_DESTROY_AR(lib_name_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(lib_name_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to register a Task Library */
+using RegisterTaskLibTask = RegisterTaskLibTaskTempl<0>;
+
+/** A task to destroy a Task Library */
+using DestroyTaskLibTask = RegisterTaskLibTaskTempl<1>;
+
+class CreateTaskStatePhase {
+ public:
+  // NOTE(llogan): kLast is intentially 0 so that the constructor
+  // can seamlessly pass data to submethods
+  TASK_METHOD_T kIdAllocStart = 0;
+  TASK_METHOD_T kIdAllocWait = 1;
+  TASK_METHOD_T kStateCreate = 2;
+  TASK_METHOD_T kLast = 0;
+};
+
+/** A task to get or retrieve the ID of a task */
+struct GetOrCreateTaskStateIdTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN hipc::ShmArchive<hipc::string> state_name_;
+  OUT TaskStateId id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetOrCreateTaskStateIdTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetOrCreateTaskStateIdTask(hipc::Allocator *alloc,
+                             const TaskNode &task_node,
+                             const DomainId &domain_id,
+                             const std::string &state_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    method_ = Method::kGetOrCreateTaskStateId;
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Initialize
+    HSHM_MAKE_AR(state_name_, alloc, state_name);
+  }
+
+  ~GetOrCreateTaskStateIdTask() {
+    HSHM_DESTROY_AR(state_name_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(state_name_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to register a Task state + Create a queue */
+struct CreateTaskStateTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  IN hipc::ShmArchive<hipc::string> lib_name_;
+  IN hipc::ShmArchive<hipc::string> state_name_;
+  IN hipc::ShmArchive<hipc::vector<PriorityInfo>> queue_info_;
+  INOUT TaskStateId id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  CreateTaskStateTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  CreateTaskStateTask(hipc::Allocator *alloc,
+                      const TaskNode &task_node,
+                      const DomainId &domain_id,
+                      const std::string &state_name,
+                      const std::string &lib_name,
+                      const TaskStateId &id,
+                      const std::vector<PriorityInfo> &queue_info) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    method_ = Method::kCreateTaskState;
+    task_flags_.SetBits(TASK_COROUTINE);
+    domain_id_ = domain_id;
+
+    // Initialize
+    HSHM_MAKE_AR(state_name_, alloc, state_name);
+    HSHM_MAKE_AR(lib_name_, alloc, lib_name);
+    HSHM_MAKE_AR(queue_info_, alloc, queue_info);
+    id_ = id;
+  }
+
+  /** Destructor */
+  ~CreateTaskStateTask() {
+    HSHM_DESTROY_AR(state_name_);
+    HSHM_DESTROY_AR(lib_name_);
+    HSHM_DESTROY_AR(queue_info_);
+  }
+
+  /** Duplicate message */
+  template<typename TaskT>
+  void Dup(hipc::Allocator *alloc, TaskT &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  template<typename TaskT>
+  void DupEnd(u32 replica, TaskT &dup_task) {
+  }
+
+  /** Replication (does nothing) */
+  void ReplicateStart(u32 count) {
+  }
+
+  /** Replicate end (does nothing) */
+  void ReplicateEnd() {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(lib_name_, state_name_, id_, queue_info_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    LocalSerialize srl(group);
+    srl << 16;
+    return 0;
+  }
+};
+
+/** A task to retrieve the ID of a task */
+struct GetTaskStateIdTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN hipc::ShmArchive<hipc::string>
+      state_name_;
+  OUT TaskStateId
+      id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetTaskStateIdTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetTaskStateIdTask(hipc::Allocator *alloc,
+                     const TaskNode &task_node,
+                     const DomainId &domain_id,
+                     const std::string &state_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    method_ = Method::kGetTaskStateId;
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Initialize
+    HSHM_MAKE_AR(state_name_, alloc, state_name);
+  }
+
+  ~GetTaskStateIdTask() {
+    HSHM_DESTROY_AR(state_name_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(state_name_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to destroy a Task state */
+struct DestroyTaskStateTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TaskStateId id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestroyTaskStateTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestroyTaskStateTask(hipc::Allocator *alloc,
+                       const TaskNode &task_node,
+                       const DomainId &domain_id,
+                       const TaskStateId &id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    method_ = Method::kDestroyTaskState;
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Initialize
+    id_ = id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar & id_;
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to destroy a Task state */
+struct StopRuntimeTask : public Task, TaskFlags<TF_SRL_SYM> {
+  /** SHM default constructor */
+  StopRuntimeTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  StopRuntimeTask(hipc::Allocator *alloc,
+                  const TaskNode &task_node,
+                  const DomainId &domain_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    method_ = Method::kStopRuntime;
+    task_flags_.SetBits(TASK_FIRE_AND_FORGET);
+    domain_id_ = domain_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to destroy a Task state */
+template<int method>
+struct SetWorkOrchestratorPolicyTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TaskStateId policy_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  SetWorkOrchestratorPolicyTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  SetWorkOrchestratorPolicyTask(hipc::Allocator *alloc,
+                                const TaskNode &task_node,
+                                const DomainId &domain_id,
+                                const TaskStateId &policy_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    if constexpr(method == 0) {
+      method_ = Method::kSetWorkOrchQueuePolicy;
+    } else {
+      method_ = Method::kSetWorkOrchProcPolicy;
+    }
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Initialize
+    policy_id_ = policy_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(policy_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+using SetWorkOrchQueuePolicyTask = SetWorkOrchestratorPolicyTask<0>;
+using SetWorkOrchProcPolicyTask = SetWorkOrchestratorPolicyTask<1>;
+
+/** A task to destroy a Task state */
+struct FlushTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  /** SHM default constructor */
+  FlushTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  FlushTask(hipc::Allocator *alloc,
+            const TaskNode &task_node,
+            const DomainId &domain_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = HRUN_QM_CLIENT->admin_task_state_;
+    method_ = Method::kFlush;
+    task_flags_.SetBits(TASK_FLUSH | TASK_COROUTINE);
+    domain_id_ = domain_id;
+  }
+
+  /** Duplicate message */
+  template<typename TaskT>
+  void Dup(hipc::Allocator *alloc, TaskT &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  template<typename TaskT>
+  void DupEnd(u32 replica, TaskT &dup_task) {}
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+
+}  // namespace hrun::Admin
+
+#endif  // HRUN_TASKS_HRUN_ADMIN_INCLUDE_HRUN_ADMIN_HRUN_ADMIN_TASKS_H_
diff --git a/hrun/tasks_required/hrun_admin/src/CMakeLists.txt b/hrun/tasks_required/hrun_admin/src/CMakeLists.txt
new file mode 100644
index 000000000..bd40c8706
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+add_library(hrun_admin SHARED
+        ${CMAKE_CURRENT_SOURCE_DIR}/hrun_admin.cc)
+add_dependencies(hrun_admin ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hrun_admin ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Hrun Admin Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        hrun_admin
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hrun_admin
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(hrun_admin)
+endif()
diff --git a/hrun/tasks_required/hrun_admin/src/hrun_admin.cc b/hrun/tasks_required/hrun_admin/src/hrun_admin.cc
new file mode 100644
index 000000000..193125aab
--- /dev/null
+++ b/hrun/tasks_required/hrun_admin/src/hrun_admin.cc
@@ -0,0 +1,174 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "hrun/work_orchestrator/scheduler.h"
+
+namespace hrun::Admin {
+
+class Server : public TaskLib {
+ public:
+  Task *queue_sched_;
+  Task *proc_sched_;
+
+ public:
+  Server() : queue_sched_(nullptr), proc_sched_(nullptr) {}
+
+  void RegisterTaskLib(RegisterTaskLibTask *task, RunContext &rctx) {
+    std::string lib_name = task->lib_name_->str();
+    HRUN_TASK_REGISTRY->RegisterTaskLib(lib_name);
+    task->SetModuleComplete();
+  }
+
+  void DestroyTaskLib(DestroyTaskLibTask *task, RunContext &rctx) {
+    std::string lib_name = task->lib_name_->str();
+    HRUN_TASK_REGISTRY->DestroyTaskLib(lib_name);
+    task->SetModuleComplete();
+  }
+
+  void GetOrCreateTaskStateId(GetOrCreateTaskStateIdTask *task, RunContext &rctx) {
+    std::string state_name = task->state_name_->str();
+    task->id_ = HRUN_TASK_REGISTRY->GetOrCreateTaskStateId(state_name);
+    task->SetModuleComplete();
+  }
+
+  void CreateTaskState(CreateTaskStateTask *task, RunContext &rctx) {
+    std::string lib_name = task->lib_name_->str();
+    std::string state_name = task->state_name_->str();
+    // Check local registry for task state
+    TaskState *task_state = HRUN_TASK_REGISTRY->GetTaskState(state_name, task->id_);
+    if (task_state) {
+      task->id_ = task_state->id_;
+      task->SetModuleComplete();
+      return;
+    }
+    // Check global registry for task state
+    if (task->id_.IsNull()) {
+      DomainId domain = DomainId::GetNode(1);
+      LPointer<GetOrCreateTaskStateIdTask> get_id =
+          HRUN_ADMIN->AsyncGetOrCreateTaskStateId(task->task_node_ + 1, domain, state_name);
+      get_id->Wait<TASK_YIELD_CO>(task);
+      task->id_ = get_id->id_;
+      HRUN_CLIENT->DelTask(get_id);
+    }
+    // Create the task state
+    HILOG(kInfo, "(node {}) Creating task state {} with id {} (task_node={})",
+          HRUN_CLIENT->node_id_, state_name, task->id_, task->task_node_);
+    if (task->id_.IsNull()) {
+      HELOG(kError, "(node {}) The task state {} with id {} is NULL.",
+            HRUN_CLIENT->node_id_, state_name, task->id_);
+      task->SetModuleComplete();
+      return;
+    }
+    // Verify the state doesn't exist
+    if (HRUN_TASK_REGISTRY->TaskStateExists(task->id_)) {
+      HILOG(kInfo, "(node {}) The task state {} with id {} exists",
+            HRUN_CLIENT->node_id_, state_name, task->id_);
+      task->SetModuleComplete();
+      return;
+    }
+    // Create the task queue for the state
+    QueueId qid(task->id_);
+    MultiQueue *queue = HRUN_QM_RUNTIME->CreateQueue(
+        qid, task->queue_info_->vec());
+    // Run the task state's submethod
+    task->method_ = Method::kConstruct;
+    bool ret = HRUN_TASK_REGISTRY->CreateTaskState(
+        lib_name.c_str(),
+        state_name.c_str(),
+        task->id_,
+        task);
+    queue->flags_.SetBits(QUEUE_READY);
+    task->SetModuleComplete();
+    HILOG(kInfo, "(node {}) Allocated task state {} with id {}",
+          HRUN_CLIENT->node_id_, state_name, task->task_state_);
+  }
+
+  void GetTaskStateId(GetTaskStateIdTask *task, RunContext &rctx) {
+    std::string state_name = task->state_name_->str();
+    task->id_ = HRUN_TASK_REGISTRY->GetTaskStateId(state_name);
+    task->SetModuleComplete();
+  }
+
+  void DestroyTaskState(DestroyTaskStateTask *task, RunContext &rctx) {
+    HRUN_TASK_REGISTRY->DestroyTaskState(task->id_);
+    task->SetModuleComplete();
+  }
+
+  void StopRuntime(StopRuntimeTask *task, RunContext &rctx) {
+    HILOG(kInfo, "Stopping (server mode)");
+    HRUN_WORK_ORCHESTRATOR->FinalizeRuntime();
+    HRUN_THALLIUM->StopThisDaemon();
+    task->SetModuleComplete();
+  }
+
+  void SetWorkOrchQueuePolicy(SetWorkOrchQueuePolicyTask *task, RunContext &rctx) {
+    if (queue_sched_) {
+      queue_sched_->SetModuleComplete();
+    }
+    if (queue_sched_ && !queue_sched_->IsComplete()) {
+      return;
+    }
+    auto queue_sched = HRUN_CLIENT->NewTask<ScheduleTask>(
+        task->task_node_, DomainId::GetLocal(), task->policy_id_);
+    queue_sched_ = queue_sched.ptr_;
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    queue->Emplace(0, 0, queue_sched.shm_);
+    task->SetModuleComplete();
+  }
+
+  void SetWorkOrchProcPolicy(SetWorkOrchProcPolicyTask *task, RunContext &rctx) {
+    if (proc_sched_) {
+      proc_sched_->SetModuleComplete();
+    }
+    if (proc_sched_ && !proc_sched_->IsComplete()) {
+      return;
+    }
+    auto proc_sched = HRUN_CLIENT->NewTask<ScheduleTask>(
+        task->task_node_, DomainId::GetLocal(), task->policy_id_);
+    proc_sched_ = proc_sched.ptr_;
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    queue->Emplace(0, 0, proc_sched.shm_);
+    task->SetModuleComplete();
+  }
+
+  void Flush(FlushTask *task, RunContext &rctx) {
+    HILOG(kDebug, "Beginning to flush runtime");
+    for (Worker &worker : HRUN_WORK_ORCHESTRATOR->workers_) {
+      worker.flush_.flushing_ = true;
+    }
+    while (true) {
+      int count = 0;
+      for (Worker &worker : HRUN_WORK_ORCHESTRATOR->workers_) {
+        if (worker.flush_.flushing_) {
+          count += 1;
+          break;
+        }
+      }
+      if (count) {
+        task->Yield<TASK_YIELD_CO>();
+      } else {
+        break;
+      }
+    }
+    HILOG(kDebug, "Flushing completed");
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "hrun_admin/hrun_admin_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hrun::Admin::Server, "hrun_admin");
diff --git a/hrun/tasks_required/proc_queue/CMakeLists.txt b/hrun/tasks_required/proc_queue/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue.h b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue.h
new file mode 100644
index 000000000..1db95bc66
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue.h
@@ -0,0 +1,96 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_proc_queue_H_
+#define HRUN_proc_queue_H_
+
+#include "proc_queue_tasks.h"
+
+namespace hrun::proc_queue {
+
+/** Create proc_queue requests */
+class Client : public TaskLibClient {
+ public:
+  /** Default constructor */
+  Client() {
+    id_ = TaskStateId(HRUN_QM_CLIENT->process_queue_);
+    queue_id_ = HRUN_QM_CLIENT->process_queue_;
+  }
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Async create a task state */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, id_, queue_info);
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreate);
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task =
+        AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    id_ = task->id_;
+    queue_id_ = QueueId(id_);
+    HRUN_CLIENT->DelTask(task);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /** Call a custom method */
+  template<typename TaskT>
+  HSHM_ALWAYS_INLINE
+  void AsyncPushConstruct(hrunpq::TypedPushTask<TaskT> *task,
+                          const TaskNode &task_node,
+                          const DomainId &domain_id,
+                          const hipc::LPointer<TaskT> &subtask) {
+    HRUN_CLIENT->ConstructTask(
+        task, task_node, domain_id, id_, subtask);
+  }
+  template<typename TaskT>
+  HSHM_ALWAYS_INLINE
+  LPointer<hrunpq::TypedPushTask<TaskT>>
+  AsyncPush(const TaskNode &task_node,
+            const DomainId &domain_id,
+            const hipc::LPointer<TaskT> &subtask) {
+    LPointer<hrunpq::TypedPushTask<TaskT>> push_task =
+        HRUN_CLIENT->AllocateTask<hrunpq::TypedPushTask<TaskT>>();
+    AsyncPushConstruct(push_task.ptr_, task_node, domain_id, subtask);
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    queue->Emplace(push_task->prio_, push_task->lane_hash_, push_task.shm_);
+    return push_task;
+  }
+  HRUN_TASK_NODE_ROOT(AsyncPush);
+};
+
+}  // namespace hrun
+
+#define HRUN_PROCESS_QUEUE \
+  hshm::EasySingleton<hrun::proc_queue::Client>::GetInstance()
+
+#endif  // HRUN_proc_queue_H_
diff --git a/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_lib_exec.h b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_lib_exec.h
new file mode 100644
index 000000000..7033c12e5
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_lib_exec.h
@@ -0,0 +1,197 @@
+#ifndef HRUN_PROC_QUEUE_LIB_EXEC_H_
+#define HRUN_PROC_QUEUE_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kPush: {
+      Push(reinterpret_cast<PushTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kPush: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<PushTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<PushTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<PushTask*>(orig_task), reinterpret_cast<PushTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<PushTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<PushTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kPush: {
+      ar << *reinterpret_cast<PushTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kPush: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<PushTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<PushTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kPush: {
+      ar << *reinterpret_cast<PushTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPush: {
+      ar.Deserialize(replica, *reinterpret_cast<PushTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kPush: {
+      return reinterpret_cast<PushTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_PROC_QUEUE_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_methods.h b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_methods.h
new file mode 100644
index 000000000..f18c5072e
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_methods.h
@@ -0,0 +1,9 @@
+#ifndef HRUN_PROC_QUEUE_METHODS_H_
+#define HRUN_PROC_QUEUE_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kPush = kLast + 0;
+};
+
+#endif  // HRUN_PROC_QUEUE_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_methods.yaml b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_methods.yaml
new file mode 100644
index 000000000..fb48aa97f
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_methods.yaml
@@ -0,0 +1 @@
+kPush: 0
\ No newline at end of file
diff --git a/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_tasks.h b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_tasks.h
new file mode 100644
index 000000000..94a8406a8
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/include/proc_queue/proc_queue_tasks.h
@@ -0,0 +1,148 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASKS_TASK_TEMPL_INCLUDE_proc_queue_proc_queue_TASKS_H_
+#define HRUN_TASKS_TASK_TEMPL_INCLUDE_proc_queue_proc_queue_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+
+namespace hrun::proc_queue {
+
+#include "hrun/hrun_namespace.h"
+#include "proc_queue_methods.h"
+
+/**
+ * A task to create proc_queue
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc)
+  : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "proc_queue", id, queue_info) {
+    // Custom params
+  }
+
+  HSHM_ALWAYS_INLINE
+  ~ConstructTask() {
+    // Custom params
+  }
+};
+
+/** A task to destroy proc_queue */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc)
+  : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+  : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+class PushTaskPhase {
+ public:
+  TASK_METHOD_T kSchedule = 0;
+  TASK_METHOD_T kWaitSchedule = 1;
+};
+
+/**
+ * Push a task into the per-process queue
+ * */
+template<typename TaskT>
+struct TypedPushTask : public Task, TaskFlags<TF_LOCAL> {
+  IN LPointer<TaskT> sub_cli_;  /**< Pointer to the subtask (client + SHM) */
+  TEMP LPointer<TaskT> sub_run_;  /**< Pointer to the subtask (runtime) */
+  TEMP int phase_ = PushTaskPhase::kSchedule;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TypedPushTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TypedPushTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const TaskStateId &state_id,
+                const hipc::LPointer<TaskT> &subtask) : Task(alloc) {
+    // Initialize task
+    hshm::NodeThreadId tid;
+    task_node_ = task_node;
+    lane_hash_ = tid.bits_.tid_ + tid.bits_.pid_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kPush;
+    task_flags_.SetBits(TASK_DATA_OWNER | TASK_LOW_LATENCY | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = domain_id;
+
+    // Custom params
+    sub_cli_ = subtask;
+  }
+
+  /** Destructor */
+  ~TypedPushTask() {
+    if (!IsFireAndForget()) {
+      HRUN_CLIENT->DelTask(sub_cli_);
+    } else {
+      HRUN_CLIENT->DelTask(sub_run_);
+    }
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    group.resize(sizeof(u32));
+    memcpy(group.data(), &lane_hash_, sizeof(u32));
+    return 0;
+  }
+
+  /** Get the task address */
+  HSHM_ALWAYS_INLINE
+  TaskT* get() {
+    return sub_cli_.ptr_;
+  }
+};
+
+using PushTask = hrun::proc_queue::TypedPushTask<Task>;
+
+}  // namespace hrun::proc_queue
+
+namespace hrunpq = hrun::proc_queue;
+
+#endif  // HRUN_TASKS_TASK_TEMPL_INCLUDE_proc_queue_proc_queue_TASKS_H_
diff --git a/traits/prefetcher/CMakeLists.txt b/hrun/tasks_required/proc_queue/src/CMakeLists.txt
similarity index 52%
rename from traits/prefetcher/CMakeLists.txt
rename to hrun/tasks_required/proc_queue/src/CMakeLists.txt
index 7a8ec1efd..79d810195 100644
--- a/traits/prefetcher/CMakeLists.txt
+++ b/hrun/tasks_required/proc_queue/src/CMakeLists.txt
@@ -1,29 +1,41 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(proc_queue SHARED
+        proc_queue.cc)
+add_dependencies(proc_queue ${Hermes_RUNTIME_DEPS})
+target_link_libraries(proc_queue ${Hermes_RUNTIME_LIBRARIES})
 
-
-# Creates an example trait
-add_library(hermes_prefetcher_trait SHARED
-        prefetcher_trait.cc)
-add_dependencies(hermes_prefetcher_trait hermes)
-target_link_libraries(hermes_prefetcher_trait
-        hermes MPI::MPI_CXX stdc++fs dl)
-
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
 install(
         TARGETS
-        hermes_prefetcher_trait
+        proc_queue
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
 )
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
 #-----------------------------------------------------------------------------
 # Export all exported targets to the build tree for use by parent project
 #-----------------------------------------------------------------------------
 set(HERMES_EXPORTED_LIBS
-        hermes_prefetcher_trait
+        proc_queue
         ${HERMES_EXPORTED_LIBS})
 if(NOT HERMES_EXTERNALLY_CONFIGURED)
     EXPORT (
@@ -33,9 +45,10 @@ if(NOT HERMES_EXTERNALLY_CONFIGURED)
             ${HERMES_EXPORTED_TARGETS}.cmake
     )
 endif()
-#-----------------------------------------------------------------------------
-# Add Target(s) to Coverage
-#-----------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
 if(HERMES_ENABLE_COVERAGE)
-    set_coverage_flags(hermes_prefetcher_trait)
+    set_coverage_flags(proc_queue)
 endif()
diff --git a/hrun/tasks_required/proc_queue/src/proc_queue.cc b/hrun/tasks_required/proc_queue/src/proc_queue.cc
new file mode 100644
index 000000000..95a6c3260
--- /dev/null
+++ b/hrun/tasks_required/proc_queue/src/proc_queue.cc
@@ -0,0 +1,63 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hrun::proc_queue {
+
+class Server : public TaskLib {
+ public:
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Push(PushTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case PushTaskPhase::kSchedule: {
+        task->sub_run_.shm_ = task->sub_cli_.shm_;
+        task->sub_run_.ptr_ = HRUN_CLIENT->GetPrivatePointer<Task>(task->sub_cli_.shm_);
+        Task *&ptr = task->sub_run_.ptr_;
+//        HILOG(kDebug, "Scheduling task {} on state {} tid {}",
+//              ptr->task_node_, ptr->task_state_, GetLinuxTid());
+        if (ptr->IsFireAndForget()) {
+          ptr->UnsetFireAndForget();
+        }
+        MultiQueue *real_queue = HRUN_CLIENT->GetQueue(QueueId(ptr->task_state_));
+        real_queue->Emplace(ptr->prio_, ptr->lane_hash_, task->sub_run_.shm_);
+        task->phase_ = PushTaskPhase::kWaitSchedule;
+      }
+      case PushTaskPhase::kWaitSchedule: {
+        Task *&ptr = task->sub_run_.ptr_;
+        if (!ptr->IsComplete()) {
+          return;
+        }
+        // TODO(llogan): handle fire & forget tasks gracefully
+        task->SetModuleComplete();
+      }
+    }
+  }
+
+ public:
+#include "proc_queue/proc_queue_lib_exec.h"
+};
+
+}  // namespace hrun::proc_queue
+
+HRUN_TASK_CC(hrun::proc_queue::Server, "proc_queue");
diff --git a/hrun/tasks_required/remote_queue/CMakeLists.txt b/hrun/tasks_required/remote_queue/CMakeLists.txt
new file mode 100644
index 000000000..00c53a80d
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/CMakeLists.txt
@@ -0,0 +1,14 @@
+# find_package(PkgConfig REQUIRED)
+# pkg_search_module(libfabric REQUIRED libfabric)
+# message("LibFabric found at: ${libfabric_INCLUDE_DIRS} with libs ${libfabric_LIBRARIES} in dir ${libfabric_LIBRARY_DIRS}")
+
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue.h b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue.h
new file mode 100644
index 000000000..a12c4586d
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue.h
@@ -0,0 +1,123 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_remote_queue_H_
+#define HRUN_remote_queue_H_
+
+#include "remote_queue_tasks.h"
+
+namespace hrun::remote_queue {
+
+/**
+ * Create remote_queue requests
+ *
+ * This is ONLY used in the Hermes runtime, and
+ * should never be called in client programs!!!
+ * */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Async create a task state */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name,
+                                      const TaskStateId &state_id) {
+    id_ = state_id;
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        // {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+        {1, 1, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, id_, queue_info);
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreate);
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task =
+        AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    id_ = task->id_;
+    queue_id_ = QueueId(id_);
+    HRUN_CLIENT->DelTask(task);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /** Disperse a task among a domain of nodes */
+  HSHM_ALWAYS_INLINE
+  void Disperse(Task *orig_task,
+                TaskState *exec,
+                std::vector<DomainId> &domain_ids) {
+    // Serialize task + create the wait task
+    HILOG(kDebug, "Beginning dispersion for (task_node={}, task_state={}, method={})",
+          orig_task->task_node_ + 1, orig_task->task_state_, orig_task->method_)
+    BinaryOutputArchive<true> ar(DomainId::GetNode(HRUN_CLIENT->node_id_));
+    std::vector<DataTransfer> xfer =
+        exec->SaveStart(orig_task->method_, ar, orig_task);
+
+    // Create subtasks
+    exec->ReplicateStart(orig_task->method_, domain_ids.size(), orig_task);
+    LPointer<PushTask> push_task = HRUN_CLIENT->NewTask<PushTask>(
+        orig_task->task_node_ + 1, DomainId::GetLocal(), id_,
+        domain_ids, orig_task, exec, orig_task->method_, xfer);
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    queue->Emplace(TaskPrio::kLowLatency, orig_task->lane_hash_, push_task.shm_);
+  }
+
+  /** Disperse a task among each lane of this node */
+  HSHM_ALWAYS_INLINE
+  void DisperseLocal(Task *orig_task, TaskState *exec,
+                     MultiQueue *orig_queue, LaneGroup *lane_group) {
+    // Duplicate task
+//    HILOG(kDebug, "Beginning duplication for (task_node={}, task_state={}, method={})",
+//          orig_task->task_node_ + 1, orig_task->task_state_, orig_task->method_);
+    std::vector<LPointer<Task>> dups(lane_group->num_lanes_);
+    exec->Dup(orig_task->method_, orig_task, dups);
+    for (size_t i = 0; i < dups.size(); ++i) {
+      LPointer<Task> &task = dups[i];
+      task->UnsetFireAndForget();
+      task->lane_hash_ = i;
+      task->UnsetLaneAll();
+      orig_queue->Emplace(task->prio_, task->lane_hash_, task.shm_);
+    }
+
+    // Create duplicate task
+    exec->ReplicateStart(orig_task->method_, lane_group->num_lanes_, orig_task);
+    LPointer<DupTask> dup_task = HRUN_CLIENT->NewTask<DupTask>(
+        orig_task->task_node_ + 1, id_,
+        orig_task, exec, orig_task->method_, dups);
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    queue->Emplace(orig_task->prio_, orig_task->lane_hash_, dup_task.shm_);
+  }
+
+  /** Spawn task to accept new connections */
+//  HSHM_ALWAYS_INLINE
+//  AcceptTask* AsyncAcceptThread() {
+//    hipc::Pointer p;
+//    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+//    auto *task = HRUN_CLIENT->NewTask<AcceptTask>(
+//        p, TaskNode::GetNull(), DomainId::GetLocal(), id_);
+//    queue->Emplace(0, 0, p);
+//    return task;
+//  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_remote_queue_H_
diff --git a/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_lib_exec.h b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_lib_exec.h
new file mode 100644
index 000000000..aa55b5fdb
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_lib_exec.h
@@ -0,0 +1,241 @@
+#ifndef HRUN_REMOTE_QUEUE_LIB_EXEC_H_
+#define HRUN_REMOTE_QUEUE_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kPush: {
+      Push(reinterpret_cast<PushTask *>(task), rctx);
+      break;
+    }
+    case Method::kDup: {
+      Dup(reinterpret_cast<DupTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kPush: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<PushTask *>(task));
+      break;
+    }
+    case Method::kDup: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DupTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<PushTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDup: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DupTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<PushTask*>(orig_task), reinterpret_cast<PushTask*>(dup_task));
+      break;
+    }
+    case Method::kDup: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DupTask*>(orig_task), reinterpret_cast<DupTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<PushTask*>(task));
+      break;
+    }
+    case Method::kDup: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DupTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPush: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<PushTask*>(task));
+      break;
+    }
+    case Method::kDup: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DupTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kPush: {
+      ar << *reinterpret_cast<PushTask*>(task);
+      break;
+    }
+    case Method::kDup: {
+      ar << *reinterpret_cast<DupTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kPush: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<PushTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<PushTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDup: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DupTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DupTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kPush: {
+      ar << *reinterpret_cast<PushTask*>(task);
+      break;
+    }
+    case Method::kDup: {
+      ar << *reinterpret_cast<DupTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPush: {
+      ar.Deserialize(replica, *reinterpret_cast<PushTask*>(task));
+      break;
+    }
+    case Method::kDup: {
+      ar.Deserialize(replica, *reinterpret_cast<DupTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kPush: {
+      return reinterpret_cast<PushTask*>(task)->GetGroup(group);
+    }
+    case Method::kDup: {
+      return reinterpret_cast<DupTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_REMOTE_QUEUE_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_methods.h b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_methods.h
new file mode 100644
index 000000000..d401adc2b
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_methods.h
@@ -0,0 +1,10 @@
+#ifndef HRUN_REMOTE_QUEUE_METHODS_H_
+#define HRUN_REMOTE_QUEUE_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kPush = kLast + 0;
+  TASK_METHOD_T kDup = kLast + 1;
+};
+
+#endif  // HRUN_REMOTE_QUEUE_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_methods.yaml b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_methods.yaml
new file mode 100644
index 000000000..fc6f10549
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_methods.yaml
@@ -0,0 +1,2 @@
+kPush: 0
+kDup: 1
\ No newline at end of file
diff --git a/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_tasks.h b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_tasks.h
new file mode 100644
index 000000000..673ce7c88
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/include/remote_queue/remote_queue_tasks.h
@@ -0,0 +1,199 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_TASKS_REMOTE_QUEUE_INCLUDE_REMOTE_QUEUE_REMOTE_QUEUE_TASKS_H_
+#define HRUN_TASKS_REMOTE_QUEUE_INCLUDE_REMOTE_QUEUE_REMOTE_QUEUE_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+
+#include <thallium.hpp>
+#include <thallium/serialization/stl/pair.hpp>
+#include <thallium/serialization/stl/string.hpp>
+#include <thallium/serialization/stl/vector.hpp>
+#include <thallium/serialization/stl/list.hpp>
+
+namespace tl = thallium;
+
+namespace hrun::remote_queue {
+
+#include "hrun/hrun_namespace.h"
+#include "remote_queue_methods.h"
+
+/**
+ * A task to create remote_queue
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "remote_queue", id, queue_info) {
+    // Custom params
+  }
+};
+
+/** A task to destroy remote_queue */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * Phases of the push task
+ * */
+class PushPhase {
+ public:
+  TASK_METHOD_T kStart = 0;
+  TASK_METHOD_T kWait = 1;
+};
+
+
+/**
+ * A task to push a serialized task onto the remote queue
+ * */
+struct PushTask : public Task, TaskFlags<TF_LOCAL> {
+  IN std::vector<DomainId> domain_ids_;
+  IN Task *orig_task_;
+  IN TaskState *exec_;
+  IN u32 exec_method_;
+  IN std::vector<DataTransfer> xfer_;
+  TEMP std::string params_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PushTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PushTask(hipc::Allocator *alloc,
+           const TaskNode &task_node,
+           const DomainId &domain_id,
+           const TaskStateId &state_id,
+           std::vector<DomainId> &domain_ids,
+           Task *orig_task,
+           TaskState *exec,
+           u32 exec_method,
+           std::vector<DataTransfer> &xfer) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kPush;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_PREEMPTIVE | TASK_REMOTE_DEBUG_MARK | TASK_FIRE_AND_FORGET);
+    domain_id_ = domain_id;
+
+    // Custom params
+    domain_ids_ = std::move(domain_ids);
+    orig_task_ = orig_task;
+    exec_ = exec;
+    exec_method_ = exec_method;
+    xfer_ = std::move(xfer);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A task to push a serialized task onto the remote queue
+ * */
+struct DupTask : public Task, TaskFlags<TF_LOCAL> {
+  IN Task *orig_task_;
+  IN TaskState *exec_;
+  IN u32 exec_method_;
+  IN std::vector<LPointer<Task>> dups_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DupTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DupTask(hipc::Allocator *alloc,
+           const TaskNode &task_node,
+           const TaskStateId &state_id,
+           Task *orig_task,
+           TaskState *exec,
+           u32 exec_method,
+           std::vector<LPointer<Task>> &dups) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kDup;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_REMOTE_DEBUG_MARK | TASK_FIRE_AND_FORGET | TASK_COROUTINE);
+    domain_id_ = DomainId::GetLocal();
+
+    // Custom params
+    orig_task_ = orig_task;
+    exec_ = exec;
+    exec_method_ = exec_method;
+    dups_ = std::move(dups);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A task to push a serialized task onto the remote queue
+ * */
+//struct AcceptTask : public Task {
+//  /** Emplace constructor */
+//  HSHM_ALWAYS_INLINE explicit
+//  AcceptTask(hipc::Allocator *alloc,
+//             const TaskNode &task_node,
+//             const DomainId &domain_id,
+//             const TaskStateId &state_id) : Task(alloc) {
+//    // Initialize task
+//    task_node_ = task_node;
+//    lane_hash_ = 0;
+//    task_state_ = state_id;
+//    method_ = Method::kAccept;
+//    task_flags_.SetBits(0);
+//    domain_id_ = domain_id;
+//  }
+//};
+
+} // namespace hrun::remote_queue
+
+#endif //HRUN_TASKS_REMOTE_QUEUE_INCLUDE_REMOTE_QUEUE_REMOTE_QUEUE_TASKS_H_
diff --git a/hrun/tasks_required/remote_queue/src/CMakeLists.txt b/hrun/tasks_required/remote_queue/src/CMakeLists.txt
new file mode 100644
index 000000000..f130ef443
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/src/CMakeLists.txt
@@ -0,0 +1,57 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+include_directories(myapp PRIVATE ${libfabric_INCLUDE_DIRS})
+link_directories(${libfabric_LIBRARY_DIRS})
+add_library(remote_queue SHARED
+        remote_queue.cc)
+add_dependencies(remote_queue ${Hermes_RUNTIME_DEPS})
+target_link_libraries(remote_queue
+        hrun_runtime ${libfabric_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        remote_queue
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        remote_queue
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(remote_queue)
+endif()
diff --git a/hrun/tasks_required/remote_queue/src/remote_queue.cc b/hrun/tasks_required/remote_queue/src/remote_queue.cc
new file mode 100644
index 000000000..1de787101
--- /dev/null
+++ b/hrun/tasks_required/remote_queue/src/remote_queue.cc
@@ -0,0 +1,319 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "remote_queue/remote_queue.h"
+
+namespace thallium {
+
+/** Serialize I/O type enum */
+SERIALIZE_ENUM(hrun::IoType);
+
+}  // namespace thallium
+
+namespace hrun::remote_queue {
+
+class Server : public TaskLib {
+ public:
+  hrun::remote_queue::Client client_;
+
+ public:
+  Server() = default;
+
+  /** Construct remote queue */
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    HILOG(kInfo, "(node {}) Constructing remote queue (task_node={}, task_state={}, method={})",
+          HRUN_CLIENT->node_id_, task->task_node_, task->task_state_, task->method_);
+    HRUN_THALLIUM->RegisterRpc("RpcPushSmall", [this](const tl::request &req,
+                                                         TaskStateId state_id,
+                                                         u32 method,
+                                                         std::string &params) {
+      this->RpcPushSmall(req, state_id, method, params);
+    });
+    HRUN_THALLIUM->RegisterRpc("RpcPushBulk", [this](const tl::request &req,
+                                                        const tl::bulk &bulk,
+                                                        TaskStateId state_id,
+                                                        u32 method,
+                                                        std::string &params,
+                                                        size_t data_size,
+                                                        IoType io_type) {
+      this->RpcPushBulk(req, state_id, method, params, bulk, data_size, io_type);
+    });
+    task->SetModuleComplete();
+  }
+
+  /** Destroy remote queue */
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  /** Handle output from replica PUSH */
+  static void ClientHandlePushReplicaOutput(int replica, std::string &ret, PushTask *task) {
+    std::vector<DataTransfer> xfer(1);
+    xfer[0].data_ = ret.data();
+    xfer[0].data_size_ = ret.size();
+    HILOG(kDebug, "Wait got {} bytes of data (task_node={}, task_state={}, method={})",
+          xfer[0].data_size_,
+          task->orig_task_->task_node_,
+          task->orig_task_->task_state_,
+          task->orig_task_->method_);
+    BinaryInputArchive<false> ar(xfer);
+    task->exec_->LoadEnd(replica, task->exec_method_, ar, task->orig_task_);
+  }
+
+  /** Handle finalization of PUSH replicate */
+  static void ClientHandlePushReplicaEnd(PushTask *task) {
+    task->exec_->ReplicateEnd(task->orig_task_->method_, task->orig_task_);
+    HILOG(kDebug, "Completing task (task_node={}, task_state={}, method={})",
+          task->orig_task_->task_node_,
+          task->orig_task_->task_state_,
+          task->orig_task_->method_);
+    if (!task->orig_task_->IsLongRunning()) {
+      task->orig_task_->SetModuleComplete();
+    } else {
+      task->orig_task_->UnsetStarted();
+      task->orig_task_->UnsetDisableRun();
+    }
+    task->SetModuleComplete();
+  }
+
+  /** Push for small message */
+  void ClientSmallPush(std::vector<DataTransfer> &xfer, PushTask *task) {
+    task->params_ = std::string((char *) xfer[0].data_, xfer[0].data_size_);
+    for (int replica = 0; replica < task->domain_ids_.size(); ++replica) {
+      DomainId domain_id = task->domain_ids_[replica];
+      HILOG(kDebug, "(SM) Transferring {} bytes of data (task_node={}, task_state={}, method={}, from={}, to={})",
+            task->params_.size(),
+            task->orig_task_->task_node_,
+            task->orig_task_->task_state_,
+            task->orig_task_->method_,
+            HRUN_CLIENT->node_id_,
+            domain_id.id_);
+      std::string ret = HRUN_THALLIUM->SyncCall<std::string>(domain_id.id_,
+                                                                "RpcPushSmall",
+                                                                task->exec_->id_,
+                                                                task->exec_method_,
+                                                                task->params_);
+      HILOG(kDebug, "(SM) Finished {} bytes of data (task_node={}, task_state={}, method={}, from={}, to={})",
+            task->params_.size(),
+            task->orig_task_->task_node_,
+            task->orig_task_->task_state_,
+            task->orig_task_->method_,
+            HRUN_CLIENT->node_id_,
+            domain_id.id_);
+      ClientHandlePushReplicaOutput(replica, ret, task);
+    }
+  }
+
+  /** Push for I/O message */
+  void ClientIoPush(std::vector<DataTransfer> &xfer, PushTask *task) {
+    task->params_ = std::string((char *) xfer[1].data_, xfer[1].data_size_);
+    IoType io_type = IoType::kRead;
+    if (xfer[0].flags_.Any(DT_RECEIVER_READ)) {
+      io_type = IoType::kWrite;
+    }
+    for (int replica = 0; replica < task->domain_ids_.size(); ++replica) {
+      DomainId domain_id = task->domain_ids_[replica];
+      char *data = (char*)xfer[0].data_;
+      size_t data_size = xfer[0].data_size_;
+      HILOG(kDebug, "(IO) Transferring {} bytes of data (task_node={}, task_state={}, method={}, from={}, to={}, type={})",
+            data_size,
+            task->orig_task_->task_node_,
+            task->orig_task_->task_state_,
+            task->orig_task_->method_,
+            HRUN_CLIENT->node_id_,
+            domain_id.id_,
+            static_cast<int>(io_type));
+      std::string ret = HRUN_THALLIUM->SyncIoCall<std::string>(domain_id.id_,
+                                                                  "RpcPushBulk",
+                                                                  io_type,
+                                                                  data,
+                                                                  data_size,
+                                                                  task->exec_->id_,
+                                                                  task->exec_method_,
+                                                                  task->params_,
+                                                                  data_size,
+                                                                  io_type);
+      HILOG(kDebug, "(IO) Finished transferring {} bytes of data (task_node={}, task_state={}, method={}, from={}, to={}, type={})",
+            data_size,
+            task->orig_task_->task_node_,
+            task->orig_task_->task_state_,
+            task->orig_task_->method_,
+            HRUN_CLIENT->node_id_,
+            domain_id.id_,
+            static_cast<int>(io_type));
+      ClientHandlePushReplicaOutput(replica, ret, task);
+    }
+  }
+
+  /** Push operation called on client */
+  void Push(PushTask *task, RunContext &rctx) {
+    std::vector<DataTransfer> &xfer = task->xfer_;
+    switch (xfer.size()) {
+      case 1: {
+        ClientSmallPush(xfer, task);
+        break;
+      }
+      case 2: {
+        ClientIoPush(xfer, task);
+        break;
+      }
+      default: {
+        HELOG(kFatal, "The task {}/{} does not support remote calls", task->task_state_, task->method_);
+      }
+    }
+    ClientHandlePushReplicaEnd(task);
+  }
+
+  /** Duplicate operations */
+  void Dup(DupTask *task, RunContext &ctx) {
+    for (size_t i = 0; i < task->dups_.size(); ++i) {
+      LPointer<Task> &dup = task->dups_[i];
+      dup->Wait<TASK_YIELD_CO>(task);
+      task->exec_->DupEnd(dup->method_, i, task->orig_task_, dup.ptr_);
+      HRUN_CLIENT->DelTask(dup);
+    }
+    task->exec_->ReplicateEnd(task->exec_method_, task->orig_task_);
+    task->orig_task_->SetModuleComplete();
+    task->SetModuleComplete();
+  }
+
+ private:
+  /** The RPC for processing a small message */
+  void RpcPushSmall(const tl::request &req,
+                    TaskStateId state_id,
+                    u32 method,
+                    std::string &params) {
+    // Create the input data transfer object
+    std::vector<DataTransfer> xfer(1);
+    xfer[0].data_ = params.data();
+    xfer[0].data_size_ = params.size();
+    HILOG(kDebug, "Received small message of size {} "
+                  "(task_state={}, method={})", xfer[0].data_size_, state_id, method);
+
+    // Process the message
+    TaskState *exec;
+    Task *orig_task;
+    RpcExec(req, state_id, method, xfer, orig_task, exec);
+    RpcComplete(req, method, orig_task, exec, state_id);
+  }
+
+  /** The RPC for processing a message with data */
+  void RpcPushBulk(const tl::request &req,
+                   TaskStateId state_id,
+                   u32 method,
+                   std::string &params,
+                   const tl::bulk &bulk,
+                   size_t data_size,
+                   IoType io_type) {
+    hshm::charbuf data(data_size);
+
+    // Create the input data transfer object
+    std::vector<DataTransfer> xfer(2);
+    xfer[0].data_ = data.data();
+    xfer[0].data_size_ = data.size();
+    xfer[1].data_ = params.data();
+    xfer[1].data_size_ = params.size();
+
+    HILOG(kDebug, "Received large message of size {} "
+                  "(task_state={}, method={})", xfer[0].data_size_, state_id, method);
+
+    // Process the message
+    if (io_type == IoType::kWrite) {
+      HRUN_THALLIUM->IoCallServer(req, bulk, io_type, data.data(), data_size);
+      HILOG(kDebug, "(node {}) Write blob integer: {}", HRUN_CLIENT->node_id_, (int)data[0])
+    }
+    TaskState *exec;
+    Task *orig_task;
+    RpcExec(req, state_id, method, xfer, orig_task, exec);
+    if (io_type == IoType::kRead) {
+      HILOG(kDebug, "(node {}) Read blob integer: {}", HRUN_CLIENT->node_id_, (int)data[0])
+      HRUN_THALLIUM->IoCallServer(req, bulk, io_type, data.data(), data_size);
+    }
+
+    // Return
+    RpcComplete(req, method, orig_task, exec, state_id);
+  }
+
+  /** Push operation called at the remote server */
+  void RpcExec(const tl::request &req,
+               const TaskStateId &state_id,
+               u32 method,
+               std::vector<DataTransfer> &xfer,
+               Task *&orig_task, TaskState *&exec) {
+    size_t data_size = xfer[0].data_size_;
+    BinaryInputArchive<true> ar(xfer);
+
+    // Deserialize task
+    exec = HRUN_TASK_REGISTRY->GetTaskState(state_id);
+    if (exec == nullptr) {
+      HELOG(kFatal, "(node {}) Could not find the task state {}",
+            HRUN_CLIENT->node_id_, state_id);
+      req.respond(std::string());
+      return;
+    } else {
+      HILOG(kDebug, "(node {}) Found task state {}",
+            HRUN_CLIENT->node_id_,
+            state_id);
+    }
+    TaskPointer task_ptr = exec->LoadStart(method, ar);
+    orig_task = task_ptr.ptr_;
+    hipc::Pointer &p = task_ptr.shm_;
+    orig_task->domain_id_ = DomainId::GetNode(HRUN_CLIENT->node_id_);
+
+    // Execute task
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(QueueId(state_id));
+    orig_task->UnsetFireAndForget();
+    orig_task->UnsetStarted();
+    orig_task->UnsetDataOwner();
+    orig_task->UnsetLongRunning();
+    queue->Emplace(orig_task->prio_, orig_task->lane_hash_, p);
+    HILOG(kDebug,
+          "(node {}) Executing task (task_node={}, task_state={}/{}, state_name={}, method={}, size={}, lane_hash={})",
+          HRUN_CLIENT->node_id_,
+          orig_task->task_node_,
+          orig_task->task_state_,
+          state_id,
+          exec->name_,
+          method,
+          data_size,
+          orig_task->lane_hash_);
+    orig_task->Wait<TASK_YIELD_ABT>();
+  }
+
+  void RpcComplete(const tl::request &req,
+                   u32 method, Task *orig_task,
+                   TaskState *exec, TaskStateId state_id) {
+    BinaryOutputArchive<false> ar(DomainId::GetNode(HRUN_CLIENT->node_id_));
+    std::vector<DataTransfer> out_xfer = exec->SaveEnd(method, ar, orig_task);
+    HILOG(kDebug, "(node {}) Returning {} bytes of data (task_node={}, task_state={}/{}, method={})",
+          HRUN_CLIENT->node_id_,
+          out_xfer[0].data_size_,
+          orig_task->task_node_,
+          orig_task->task_state_,
+          state_id,
+          method);
+    HRUN_CLIENT->DelTask(exec, orig_task);
+    if (out_xfer.size() > 0 && out_xfer[0].data_size_ > 0) {
+      req.respond(std::string((char *) out_xfer[0].data_, out_xfer[0].data_size_));
+    } else {
+      req.respond(std::string());
+    }
+  }
+
+ public:
+#include "remote_queue/remote_queue_lib_exec.h"
+};
+}  // namespace hrun
+
+HRUN_TASK_CC(hrun::remote_queue::Server, "remote_queue");
diff --git a/hrun/tasks_required/small_message/CMakeLists.txt b/hrun/tasks_required/small_message/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/hrun/tasks_required/small_message/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/small_message/include/small_message/small_message.h b/hrun/tasks_required/small_message/include/small_message/small_message.h
new file mode 100644
index 000000000..f66d120f2
--- /dev/null
+++ b/hrun/tasks_required/small_message/include/small_message/small_message.h
@@ -0,0 +1,99 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_small_message_H_
+#define HRUN_small_message_H_
+
+#include "small_message_tasks.h"
+
+namespace hrun::small_message {
+
+/** Create admin requests */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Create a small_message */
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(const DomainId &domain_id,
+                  const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    id_ = HRUN_ADMIN->CreateTaskStateRoot<ConstructTask>(
+        domain_id, state_name, id_, queue_info);
+    queue_id_ = QueueId(id_);
+  }
+
+  /** Destroy state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /** Metadata task */
+  LPointer<MdTask> AsyncMd(const TaskNode &task_node,
+                           const DomainId &domain_id) {
+    MultiQueue *queue = HRUN_CLIENT->GetQueue(queue_id_);
+    auto task = HRUN_CLIENT->NewTask<MdTask>(
+        task_node, domain_id, id_);
+    queue->Emplace(TaskPrio::kLowLatency, 3, task.shm_);
+    return task;
+  }
+  HRUN_TASK_NODE_ROOT(AsyncMd);
+  int MdRoot(const DomainId &domain_id) {
+    LPointer<MdTask> task = AsyncMdRoot(domain_id);
+    task->Wait();
+    int ret = task->ret_[0];
+    HRUN_CLIENT->DelTask(task);
+    return ret;
+  }
+
+  /** Metadata PUSH task */
+  void AsyncMdPushConstruct(MdPushTask *task,
+                            const TaskNode &task_node,
+                            const DomainId &domain_id) {
+    HRUN_CLIENT->ConstructTask<MdPushTask>(
+        task, task_node, domain_id, id_);
+  }
+  int MdPushRoot(const DomainId &domain_id) {
+    LPointer<hrunpq::TypedPushTask<MdPushTask>> push_task =
+        AsyncMdPushRoot(domain_id);
+    push_task->Wait();
+    MdPushTask *task = push_task->get();
+    int ret = task->ret_[0];
+    HRUN_CLIENT->DelTask(push_task);
+    return ret;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(MdPush);
+
+  /** Io task */
+  void AsyncIoConstruct(IoTask *task, const TaskNode &task_node,
+                        const DomainId &domain_id) {
+    HRUN_CLIENT->ConstructTask<IoTask>(
+        task, task_node, domain_id, id_);
+  }
+  int IoRoot(const DomainId &domain_id) {
+    LPointer<hrunpq::TypedPushTask<IoTask>> push_task = AsyncIoRoot(domain_id);
+    push_task->Wait();
+    IoTask *task = push_task->get();
+    int ret = task->ret_;
+    HRUN_CLIENT->DelTask(push_task);
+    return ret;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Io)
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_small_message_H_
diff --git a/hrun/tasks_required/small_message/include/small_message/small_message_lib_exec.h b/hrun/tasks_required/small_message/include/small_message/small_message_lib_exec.h
new file mode 100644
index 000000000..692bcd8f5
--- /dev/null
+++ b/hrun/tasks_required/small_message/include/small_message/small_message_lib_exec.h
@@ -0,0 +1,285 @@
+#ifndef HRUN_SMALL_MESSAGE_LIB_EXEC_H_
+#define HRUN_SMALL_MESSAGE_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kMd: {
+      Md(reinterpret_cast<MdTask *>(task), rctx);
+      break;
+    }
+    case Method::kIo: {
+      Io(reinterpret_cast<IoTask *>(task), rctx);
+      break;
+    }
+    case Method::kMdPush: {
+      MdPush(reinterpret_cast<MdPushTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kMd: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<MdTask *>(task));
+      break;
+    }
+    case Method::kIo: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<IoTask *>(task));
+      break;
+    }
+    case Method::kMdPush: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<MdPushTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kMd: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<MdTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kIo: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<IoTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kMdPush: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<MdPushTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kMd: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<MdTask*>(orig_task), reinterpret_cast<MdTask*>(dup_task));
+      break;
+    }
+    case Method::kIo: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<IoTask*>(orig_task), reinterpret_cast<IoTask*>(dup_task));
+      break;
+    }
+    case Method::kMdPush: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<MdPushTask*>(orig_task), reinterpret_cast<MdPushTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kMd: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<MdTask*>(task));
+      break;
+    }
+    case Method::kIo: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<IoTask*>(task));
+      break;
+    }
+    case Method::kMdPush: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<MdPushTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kMd: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<MdTask*>(task));
+      break;
+    }
+    case Method::kIo: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<IoTask*>(task));
+      break;
+    }
+    case Method::kMdPush: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<MdPushTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kMd: {
+      ar << *reinterpret_cast<MdTask*>(task);
+      break;
+    }
+    case Method::kIo: {
+      ar << *reinterpret_cast<IoTask*>(task);
+      break;
+    }
+    case Method::kMdPush: {
+      ar << *reinterpret_cast<MdPushTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kMd: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<MdTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<MdTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kIo: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<IoTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<IoTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kMdPush: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<MdPushTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<MdPushTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kMd: {
+      ar << *reinterpret_cast<MdTask*>(task);
+      break;
+    }
+    case Method::kIo: {
+      ar << *reinterpret_cast<IoTask*>(task);
+      break;
+    }
+    case Method::kMdPush: {
+      ar << *reinterpret_cast<MdPushTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kMd: {
+      ar.Deserialize(replica, *reinterpret_cast<MdTask*>(task));
+      break;
+    }
+    case Method::kIo: {
+      ar.Deserialize(replica, *reinterpret_cast<IoTask*>(task));
+      break;
+    }
+    case Method::kMdPush: {
+      ar.Deserialize(replica, *reinterpret_cast<MdPushTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kMd: {
+      return reinterpret_cast<MdTask*>(task)->GetGroup(group);
+    }
+    case Method::kIo: {
+      return reinterpret_cast<IoTask*>(task)->GetGroup(group);
+    }
+    case Method::kMdPush: {
+      return reinterpret_cast<MdPushTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_SMALL_MESSAGE_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/small_message/include/small_message/small_message_methods.h b/hrun/tasks_required/small_message/include/small_message/small_message_methods.h
new file mode 100644
index 000000000..0d02897c9
--- /dev/null
+++ b/hrun/tasks_required/small_message/include/small_message/small_message_methods.h
@@ -0,0 +1,11 @@
+#ifndef HRUN_SMALL_MESSAGE_METHODS_H_
+#define HRUN_SMALL_MESSAGE_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kMd = kLast + 0;
+  TASK_METHOD_T kIo = kLast + 1;
+  TASK_METHOD_T kMdPush = kLast + 2;
+};
+
+#endif  // HRUN_SMALL_MESSAGE_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/small_message/include/small_message/small_message_methods.yaml b/hrun/tasks_required/small_message/include/small_message/small_message_methods.yaml
new file mode 100644
index 000000000..ddc39a75e
--- /dev/null
+++ b/hrun/tasks_required/small_message/include/small_message/small_message_methods.yaml
@@ -0,0 +1,3 @@
+kMd: 0
+kIo: 1
+kMdPush: 2
\ No newline at end of file
diff --git a/hrun/tasks_required/small_message/include/small_message/small_message_tasks.h b/hrun/tasks_required/small_message/include/small_message/small_message_tasks.h
new file mode 100644
index 000000000..f1a074a38
--- /dev/null
+++ b/hrun/tasks_required/small_message/include/small_message/small_message_tasks.h
@@ -0,0 +1,250 @@
+//
+// Created by lukemartinlogan on 8/11/23.
+//
+
+#ifndef HRUN_TASKS_SMALL_MESSAGE_INCLUDE_SMALL_MESSAGE_SMALL_MESSAGE_TASKS_H_
+#define HRUN_TASKS_SMALL_MESSAGE_INCLUDE_SMALL_MESSAGE_SMALL_MESSAGE_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hrun::small_message {
+
+#include "small_message_methods.h"
+#include "hrun/hrun_namespace.h"
+
+/**
+ * A task to create small_message
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "small_message", id, queue_info) {
+  }
+};
+
+/** A task to destroy small_message */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+};
+
+/**
+ * A custom task in small_message
+ * */
+struct MdTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  OUT hipc::pod_array<int, 1> ret_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  MdTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  MdTask(hipc::Allocator *alloc,
+         const TaskNode &task_node,
+         const DomainId &domain_id,
+         TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kMd;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    ret_.construct(alloc, 1);
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, MdTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, MdTask &dup_task) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {
+    ret_.resize(count);
+  }
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(ret_[replica]);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in small_message
+ * */
+struct MdPushTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  OUT hipc::pod_array<int, 1> ret_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  MdPushTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  MdPushTask(hipc::Allocator *alloc,
+             const TaskNode &task_node,
+             const DomainId &domain_id,
+             TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kMd;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    ret_.construct(alloc, 1);
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, MdPushTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, MdPushTask &dup_task) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {
+    ret_.resize(count);
+  }
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(ret_[replica]);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in small_message
+ * */
+struct IoTask : public Task, TaskFlags<TF_SRL_ASYM_START | TF_SRL_SYM_END> {
+  static inline int const DATA_SIZE = 4096;
+  IN char data_[DATA_SIZE];
+  OUT int ret_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  IoTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  IoTask(hipc::Allocator *alloc,
+         const TaskNode &task_node,
+         const DomainId &domain_id,
+         TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 3;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kIo;
+    task_flags_.SetBits(0);
+    domain_id_ = domain_id;
+
+    // Custom params
+    memset(data_, 10, DATA_SIZE);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SaveStart(Ar &ar) {
+    DataTransfer xfer(DT_RECEIVER_READ, data_, DATA_SIZE, domain_id_);
+    task_serialize<Ar>(ar);
+    ar & xfer;
+  }
+
+  /** Deserialize message call */
+  template<typename Ar>
+  void LoadStart(Ar &ar) {
+    DataTransfer xfer;
+    task_serialize<Ar>(ar);
+    ar & xfer;
+    memcpy(data_, xfer.data_, xfer.data_size_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(ret_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_TASKS_SMALL_MESSAGE_INCLUDE_SMALL_MESSAGE_SMALL_MESSAGE_TASKS_H_
diff --git a/hrun/tasks_required/small_message/src/CMakeLists.txt b/hrun/tasks_required/small_message/src/CMakeLists.txt
new file mode 100644
index 000000000..2ff5b6185
--- /dev/null
+++ b/hrun/tasks_required/small_message/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(small_message SHARED
+        small_message.cc)
+add_dependencies(small_message ${Hermes_RUNTIME_DEPS})
+target_link_libraries(small_message ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        small_message
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        small_message
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(small_message)
+endif()
diff --git a/hrun/tasks_required/small_message/src/small_message.cc b/hrun/tasks_required/small_message/src/small_message.cc
new file mode 100644
index 000000000..30d737b28
--- /dev/null
+++ b/hrun/tasks_required/small_message/src/small_message.cc
@@ -0,0 +1,59 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "small_message/small_message.h"
+
+namespace hrun::small_message {
+
+class Server : public TaskLib {
+ public:
+  int count_ = 0;
+
+ public:
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Md(MdTask *task, RunContext &rctx) {
+    task->ret_[0] = 1;
+    task->SetModuleComplete();
+  }
+
+  void MdPush(MdPushTask *task, RunContext &rctx) {
+    task->ret_[0] = 1;
+    task->SetModuleComplete();
+  }
+
+  void Io(IoTask *task, RunContext &rctx) {
+    task->ret_ = 1;
+    for (int i = 0; i < 256; ++i) {
+      if (task->data_[i] != 10) {
+        task->ret_ = 0;
+        break;
+      }
+    }
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "small_message/small_message_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hrun::small_message::Server, "small_message");
diff --git a/hrun/tasks_required/worch_proc_round_robin/CMakeLists.txt b/hrun/tasks_required/worch_proc_round_robin/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin.h b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin.h
new file mode 100644
index 000000000..f57feabaa
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin.h
@@ -0,0 +1,43 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_worch_proc_round_robin_H_
+#define HRUN_worch_proc_round_robin_H_
+
+#include "worch_proc_round_robin_tasks.h"
+
+namespace hrun::worch_proc_round_robin {
+
+/** Create admin requests */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Create a worch_proc_round_robin */
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(const DomainId &domain_id,
+                  const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, 4, 0},
+    };
+    id_ = HRUN_ADMIN->CreateTaskStateRoot<ConstructTask>(
+        domain_id, state_name, id_, queue_info);
+  }
+
+  /** Destroy state */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_worch_proc_round_robin_H_
diff --git a/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_lib_exec.h b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_lib_exec.h
new file mode 100644
index 000000000..b859d2bf8
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_lib_exec.h
@@ -0,0 +1,197 @@
+#ifndef HRUN_WORCH_PROC_ROUND_ROBIN_LIB_EXEC_H_
+#define HRUN_WORCH_PROC_ROUND_ROBIN_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kSchedule: {
+      Schedule(reinterpret_cast<ScheduleTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ScheduleTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ScheduleTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ScheduleTask*>(orig_task), reinterpret_cast<ScheduleTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ScheduleTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ScheduleTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kSchedule: {
+      ar << *reinterpret_cast<ScheduleTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kSchedule: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ScheduleTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ScheduleTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kSchedule: {
+      ar << *reinterpret_cast<ScheduleTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      ar.Deserialize(replica, *reinterpret_cast<ScheduleTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kSchedule: {
+      return reinterpret_cast<ScheduleTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_WORCH_PROC_ROUND_ROBIN_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_methods.h b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_methods.h
new file mode 100644
index 000000000..3256067b1
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_methods.h
@@ -0,0 +1,9 @@
+#ifndef HRUN_WORCH_PROC_ROUND_ROBIN_METHODS_H_
+#define HRUN_WORCH_PROC_ROUND_ROBIN_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kSchedule = kLast + 0;
+};
+
+#endif  // HRUN_WORCH_PROC_ROUND_ROBIN_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_methods.yaml b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_methods.yaml
new file mode 100644
index 000000000..49b54822b
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_methods.yaml
@@ -0,0 +1 @@
+kSchedule: 0
\ No newline at end of file
diff --git a/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_tasks.h b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_tasks.h
new file mode 100644
index 000000000..7f8324945
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/include/worch_proc_round_robin/worch_proc_round_robin_tasks.h
@@ -0,0 +1,68 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_WORCH_PROC_ROUND_ROBIN_TASKS_H__
+#define HRUN_WORCH_PROC_ROUND_ROBIN_TASKS_H__
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun/work_orchestrator/scheduler.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hrun::worch_proc_round_robin {
+
+#include "hrun/hrun_namespace.h"
+
+/** The set of methods in the worch task */
+typedef SchedulerMethod Method;
+
+/**
+ * A task to create worch_proc_round_robin
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "worch_proc_round_robin", id, queue_info) {
+  }
+};
+
+/** A task to destroy worch_proc_round_robin */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hrun::worch_proc_round_robin
+
+#endif  // HRUN_WORCH_PROC_ROUND_ROBIN_TASKS_H__
diff --git a/hrun/tasks_required/worch_proc_round_robin/src/CMakeLists.txt b/hrun/tasks_required/worch_proc_round_robin/src/CMakeLists.txt
new file mode 100644
index 000000000..8537ffd9e
--- /dev/null
+++ b/hrun/tasks_required/worch_proc_round_robin/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(worch_proc_round_robin SHARED
+        worch_proc_round_robin.cc)
+add_dependencies(worch_proc_round_robin ${Hermes_RUNTIME_DEPS})
+target_link_libraries(worch_proc_round_robin ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        worch_proc_round_robin
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        worch_proc_round_robin
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(worch_proc_round_robin)
+endif()
diff --git a/src/borg_io_clients/borg_io_client_factory.h b/hrun/tasks_required/worch_proc_round_robin/src/worch_proc_round_robin.cc
similarity index 54%
rename from src/borg_io_clients/borg_io_client_factory.h
rename to hrun/tasks_required/worch_proc_round_robin/src/worch_proc_round_robin.cc
index d196cbc8b..0c8be3c24 100644
--- a/src/borg_io_clients/borg_io_client_factory.h
+++ b/hrun/tasks_required/worch_proc_round_robin/src/worch_proc_round_robin.cc
@@ -10,37 +10,33 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_SRC_BORG_IO_CLIENTS_IO_CLIENT_FACTORY_H
-#define HERMES_SRC_BORG_IO_CLIENTS_IO_CLIENT_FACTORY_H
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "worch_proc_round_robin/worch_proc_round_robin.h"
 
-#include "borg_io_client.h"
-#include "metadata_types.h"
-#include "borg_posix_client.h"
-#include "borg_ram_client.h"
+namespace hrun::worch_proc_round_robin {
 
-namespace hermes::borg {
-
-/**
- A class to represent I/O Client Factory
-*/
-class BorgIoClientFactory {
+class Server : public TaskLib {
  public:
-  /**
-   * Get the I/O api implementation
-   * */
-  static std::unique_ptr<BorgIoClient> Get(IoInterface type) {
-    switch (type) {
-      case IoInterface::kPosix: {
-        return std::make_unique<PosixIoClient>();
-      }
-      case IoInterface::kRam:
-      default: {
-        return std::make_unique<RamIoClient>();
-      }
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Schedule(ScheduleTask *task, RunContext &rctx) {
+    int rr = 0;
+    for (Worker &worker : HRUN_WORK_ORCHESTRATOR->workers_) {
+      worker.SetCpuAffinity(rr % HERMES_SYSTEM_INFO->ncpu_);
+      ++rr;
     }
   }
+
+#include "worch_proc_round_robin/worch_proc_round_robin_lib_exec.h"
 };
 
-}  // namespace hermes::borg
+}  // namespace hrun
 
-#endif  // HERMES_SRC_BORG_IO_CLIENTS_IO_CLIENT_FACTORY_H
+HRUN_TASK_CC(hrun::worch_proc_round_robin::Server, "worch_proc_round_robin");
diff --git a/hrun/tasks_required/worch_queue_round_robin/CMakeLists.txt b/hrun/tasks_required/worch_queue_round_robin/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin.h b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin.h
new file mode 100644
index 000000000..539f96fb3
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin.h
@@ -0,0 +1,43 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_worch_queue_round_robin_H_
+#define HRUN_worch_queue_round_robin_H_
+
+#include "worch_queue_round_robin_tasks.h"
+
+namespace hrun::worch_queue_round_robin {
+
+/** Create admin requests */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Create a worch_queue_round_robin */
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(const DomainId &domain_id,
+                  const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, 4, 0},
+    };
+    id_ = HRUN_ADMIN->CreateTaskStateRoot<ConstructTask>(
+        domain_id, state_name, id_, queue_info);
+  }
+
+  /** Destroy task state */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_worch_queue_round_robin_H_
diff --git a/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_lib_exec.h b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_lib_exec.h
new file mode 100644
index 000000000..4f4c3237d
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_lib_exec.h
@@ -0,0 +1,197 @@
+#ifndef HRUN_WORCH_QUEUE_ROUND_ROBIN_LIB_EXEC_H_
+#define HRUN_WORCH_QUEUE_ROUND_ROBIN_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kSchedule: {
+      Schedule(reinterpret_cast<ScheduleTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ScheduleTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ScheduleTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ScheduleTask*>(orig_task), reinterpret_cast<ScheduleTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ScheduleTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ScheduleTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kSchedule: {
+      ar << *reinterpret_cast<ScheduleTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kSchedule: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ScheduleTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ScheduleTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kSchedule: {
+      ar << *reinterpret_cast<ScheduleTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kSchedule: {
+      ar.Deserialize(replica, *reinterpret_cast<ScheduleTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kSchedule: {
+      return reinterpret_cast<ScheduleTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_WORCH_QUEUE_ROUND_ROBIN_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_methods.h b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_methods.h
new file mode 100644
index 000000000..b099e4b47
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_methods.h
@@ -0,0 +1,9 @@
+#ifndef HRUN_WORCH_QUEUE_ROUND_ROBIN_METHODS_H_
+#define HRUN_WORCH_QUEUE_ROUND_ROBIN_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kSchedule = kLast + 0;
+};
+
+#endif  // HRUN_WORCH_QUEUE_ROUND_ROBIN_METHODS_H_
\ No newline at end of file
diff --git a/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_methods.yaml b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_methods.yaml
new file mode 100644
index 000000000..49b54822b
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_methods.yaml
@@ -0,0 +1 @@
+kSchedule: 0
\ No newline at end of file
diff --git a/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_tasks.h b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_tasks.h
new file mode 100644
index 000000000..666231d06
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/include/worch_queue_round_robin/worch_queue_round_robin_tasks.h
@@ -0,0 +1,72 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_WORCH_QUEUE_ROUND_ROBIN_TASKS_H_
+#define HRUN_WORCH_QUEUE_ROUND_ROBIN_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/work_orchestrator/scheduler.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hrun::worch_queue_round_robin {
+
+#include "hrun/hrun_namespace.h"
+
+/** The set of methods in the worch task */
+typedef SchedulerMethod Method;
+
+/**
+ * A task to create worch_queue_round_robin
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "worch_queue_round_robin", id, queue_info) {
+  }
+
+  /** Destructor */
+  HSHM_ALWAYS_INLINE
+  ~ConstructTask() {}
+};
+
+/** A task to destroy worch_queue_round_robin */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               TaskStateId &state_id,
+               const DomainId &domain_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hrun::worch_queue_round_robin
+
+#endif  // HRUN_WORCH_QUEUE_ROUND_ROBIN_TASKS_H_
diff --git a/hrun/tasks_required/worch_queue_round_robin/src/CMakeLists.txt b/hrun/tasks_required/worch_queue_round_robin/src/CMakeLists.txt
new file mode 100644
index 000000000..838c8566a
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(worch_queue_round_robin SHARED
+        worch_queue_round_robin.cc)
+add_dependencies(worch_queue_round_robin ${Hermes_RUNTIME_DEPS})
+target_link_libraries(worch_queue_round_robin ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        worch_queue_round_robin
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        worch_queue_round_robin
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(worch_queue_round_robin)
+endif()
diff --git a/hrun/tasks_required/worch_queue_round_robin/src/worch_queue_round_robin.cc b/hrun/tasks_required/worch_queue_round_robin/src/worch_queue_round_robin.cc
new file mode 100644
index 000000000..15596232f
--- /dev/null
+++ b/hrun/tasks_required/worch_queue_round_robin/src/worch_queue_round_robin.cc
@@ -0,0 +1,67 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "worch_queue_round_robin/worch_queue_round_robin.h"
+
+namespace hrun::worch_queue_round_robin {
+
+class Server : public TaskLib {
+ public:
+  u32 count_;
+
+ public:
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    count_ = 0;
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Schedule(ScheduleTask *task, RunContext &rctx) {
+    // Check if any new queues need to be scheduled
+    for (MultiQueue &queue : *HRUN_QM_RUNTIME->queue_map_) {
+      if (queue.id_.IsNull() || !queue.flags_.Any(QUEUE_READY)) {
+        continue;
+      }
+      for (LaneGroup &lane_group : *queue.groups_) {
+        // NOTE(llogan): Assumes a minimum of two workers, admin on worker 0.
+        if (lane_group.IsLowPriority()) {
+          for (u32 lane_id = lane_group.num_scheduled_; lane_id < lane_group.num_lanes_; ++lane_id) {
+            // HILOG(kDebug, "Scheduling the queue {} (lane {})", queue.id_, lane_id);
+            Worker &worker = HRUN_WORK_ORCHESTRATOR->workers_[0];
+            worker.PollQueues({WorkEntry(lane_group.prio_, lane_id, &queue)});
+          }
+          lane_group.num_scheduled_ = lane_group.num_lanes_;
+        } else {
+          for (u32 lane_id = lane_group.num_scheduled_; lane_id < lane_group.num_lanes_; ++lane_id) {
+            // HILOG(kDebug, "Scheduling the queue {} (lane {})", queue.id_, lane_id);
+            u32 worker_id = (count_ % (HRUN_WORK_ORCHESTRATOR->workers_.size() - 1)) + 1;
+            Worker &worker = HRUN_WORK_ORCHESTRATOR->workers_[worker_id];
+            worker.PollQueues({WorkEntry(lane_group.prio_, lane_id, &queue)});
+            count_ += 1;
+          }
+          lane_group.num_scheduled_ = lane_group.num_lanes_;
+        }
+      }
+    }
+  }
+
+#include "worch_queue_round_robin/worch_queue_round_robin_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hrun::worch_queue_round_robin::Server, "worch_queue_round_robin");
diff --git a/include/hermes/CPPLINT.cfg b/include/hermes/CPPLINT.cfg
new file mode 100644
index 000000000..4bca945b7
--- /dev/null
+++ b/include/hermes/CPPLINT.cfg
@@ -0,0 +1,2 @@
+exclude_files=.*config_client_default
+exclude_files=.*config_server_default
\ No newline at end of file
diff --git a/adapter/adapter_types.h b/include/hermes/adapter_types.h
similarity index 99%
rename from adapter/adapter_types.h
rename to include/hermes/adapter_types.h
index a13ad2d5a..faf3486da 100644
--- a/adapter/adapter_types.h
+++ b/include/hermes/adapter_types.h
@@ -80,7 +80,6 @@ class AdapterModeConv {
   }
 };
 
-
 }  // namespace hermes::adapter
 
 #endif  // HERMES_ADAPTER_ADAPTER_TYPES_H_
diff --git a/include/hermes/bucket.h b/include/hermes/bucket.h
new file mode 100644
index 000000000..f607d6ef6
--- /dev/null
+++ b/include/hermes/bucket.h
@@ -0,0 +1,631 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASKS_HERMES_CONF_INCLUDE_HERMES_CONF_BUCKET_H_
+#define HRUN_TASKS_HERMES_CONF_INCLUDE_HERMES_CONF_BUCKET_H_
+
+#include "hermes/hermes_types.h"
+#include "hermes_mdm/hermes_mdm.h"
+#include "hermes/config_manager.h"
+
+namespace hermes {
+
+#include "hrun/hrun_namespace.h"
+using hermes::blob_mdm::PutBlobTask;
+using hermes::blob_mdm::GetBlobTask;
+
+#define HERMES_BUCKET_IS_FILE BIT_OPT(u32, 1)
+
+class Bucket {
+ public:
+  mdm::Client *mdm_;
+  blob_mdm::Client *blob_mdm_;
+  bucket_mdm::Client *bkt_mdm_;
+  TagId id_;
+  std::string name_;
+  Context ctx_;
+  bitfield32_t flags_;
+
+ public:
+  /**====================================
+   * Bucket Operations
+   * ===================================*/
+
+  /**
+   * Get or create \a bkt_name bucket.
+   *
+   * Called from hermes.h in GetBucket(). Should not
+   * be used directly.
+   * */
+  explicit Bucket(const std::string &bkt_name,
+                  size_t backend_size = 0,
+                  u32 flags = 0) {
+    mdm_ = &HERMES_CONF->mdm_;
+    blob_mdm_ = &HERMES_CONF->blob_mdm_;
+    bkt_mdm_ = &HERMES_CONF->bkt_mdm_;
+    id_ = bkt_mdm_->GetOrCreateTagRoot(
+        hshm::charbuf(bkt_name), true,
+        std::vector<TraitId>(), backend_size, flags);
+    name_ = bkt_name;
+  }
+
+  /**
+   * Get or create \a bkt_name bucket.
+   *
+   * Called from hermes.h in GetBucket(). Should not
+   * be used directly.
+   * */
+  explicit Bucket(const std::string &bkt_name,
+                  Context &ctx,
+                  size_t backend_size = 0,
+                  u32 flags = 0) {
+    mdm_ = &HERMES_CONF->mdm_;
+    blob_mdm_ = &HERMES_CONF->blob_mdm_;
+    bkt_mdm_ = &HERMES_CONF->bkt_mdm_;
+    id_ = bkt_mdm_->GetOrCreateTagRoot(
+        hshm::charbuf(bkt_name), true,
+        std::vector<TraitId>(), backend_size, flags);
+    name_ = bkt_name;
+  }
+
+  /**
+   * Get an existing bucket.
+   * */
+  explicit Bucket(TagId tag_id) {
+    id_ = tag_id;
+    mdm_ = &HERMES_CONF->mdm_;
+    blob_mdm_ = &HERMES_CONF->blob_mdm_;
+    bkt_mdm_ = &HERMES_CONF->bkt_mdm_;
+  }
+
+  /** Default constructor */
+  Bucket() = default;
+
+  /** Default copy constructor */
+  Bucket(const Bucket &other) = default;
+
+  /** Default copy assign */
+  Bucket& operator=(const Bucket &other) = default;
+
+  /** Default move constructor */
+  Bucket(Bucket &&other) = default;
+
+  /** Default move assign */
+  Bucket& operator=(Bucket &&other) = default;
+
+ public:
+  /**
+   * Get the name of this bucket. Name is cached instead of
+   * making an RPC. Not coherent if Rename is called.
+   * */
+  const std::string& GetName() const {
+    return name_;
+  }
+
+  /**
+   * Get the identifier of this bucket
+   * */
+  TagId GetId() const {
+    return id_;
+  }
+
+  /**
+   * Get the context object of this bucket
+   * */
+  Context& GetContext() {
+    return ctx_;
+  }
+
+  /**
+   * Attach a trait to the bucket
+   * */
+  void AttachTrait(TraitId trait_id) {
+    // TODO(llogan)
+  }
+
+  /**
+   * Get the current size of the bucket
+   * */
+  size_t GetSize() {
+    return bkt_mdm_->GetSizeRoot(id_);
+  }
+
+  /**
+   * Rename this bucket
+   * */
+  void Rename(const std::string &new_bkt_name) {
+    bkt_mdm_->RenameTagRoot(id_, hshm::to_charbuf(new_bkt_name));
+  }
+
+  /**
+   * Clears the buckets contents, but doesn't destroy its metadata
+   * */
+  void Clear() {
+    bkt_mdm_->TagClearBlobsRoot(id_);
+  }
+
+  /**
+   * Destroys this bucket along with all its contents.
+   * */
+  void Destroy() {
+    bkt_mdm_->DestroyTagRoot(id_);
+  }
+
+  /**
+   * Check if this bucket is valid
+   * */
+  bool IsNull() {
+    return id_.IsNull();
+  }
+
+ public:
+  /**====================================
+   * Blob Operations
+   * ===================================*/
+
+  /**
+   * Get the id of a blob from the blob name
+   *
+   * @param blob_name the name of the blob
+   * @param blob_id (output) the returned blob_id
+   * @return
+   * */
+  BlobId GetBlobId(const std::string &blob_name) {
+    return blob_mdm_->GetBlobIdRoot(id_, hshm::to_charbuf(blob_name));
+  }
+
+  /**
+   * Get the name of a blob from the blob id
+   *
+   * @param blob_id the blob_id
+   * @param blob_name the name of the blob
+   * @return The Status of the operation
+   * */
+  std::string GetBlobName(const BlobId &blob_id) {
+    return blob_mdm_->GetBlobNameRoot(id_, blob_id);
+  }
+
+
+  /**
+   * Get the score of a blob from the blob id
+   *
+   * @param blob_id the blob_id
+   * @return The Status of the operation
+   * */
+  float GetBlobScore(const BlobId &blob_id) {
+    return blob_mdm_->GetBlobScoreRoot(id_, blob_id);
+  }
+
+  /**
+   * Label \a blob_id blob with \a tag_name TAG
+   * */
+  Status TagBlob(BlobId &blob_id,
+                 TagId &tag_id) {
+    bkt_mdm_->TagAddBlobRoot(tag_id, blob_id);
+    return Status();
+  }
+
+  /**
+   * Put \a blob_name Blob into the bucket
+   * */
+  template<bool PARTIAL, bool ASYNC>
+  HSHM_ALWAYS_INLINE
+  BlobId BasePut(const std::string &blob_name,
+                 const BlobId &orig_blob_id,
+                 const Blob &blob,
+                 size_t blob_off,
+                 Context &ctx) {
+    BlobId blob_id = orig_blob_id;
+    bitfield32_t flags, task_flags(
+        TASK_FIRE_AND_FORGET | TASK_DATA_OWNER | TASK_LOW_LATENCY);
+    // Copy data to shared memory
+    LPointer<char> p = HRUN_CLIENT->AllocateBuffer(blob.size());
+    char *data = p.ptr_;
+    memcpy(data, blob.data(), blob.size());
+    // Put to shared memory
+    hshm::charbuf blob_name_buf = hshm::to_charbuf(blob_name);
+    if constexpr (!ASYNC) {
+      if (blob_id.IsNull()) {
+        flags.SetBits(HERMES_GET_BLOB_ID);
+        task_flags.UnsetBits(TASK_FIRE_AND_FORGET);
+      }
+    }
+    if constexpr(!PARTIAL) {
+      flags.SetBits(HERMES_BLOB_REPLACE);
+    }
+    LPointer<hrunpq::TypedPushTask<PutBlobTask>> push_task;
+    push_task = blob_mdm_->AsyncPutBlobRoot(id_, blob_name_buf,
+                                            blob_id, blob_off, blob.size(),
+                                            p.shm_, ctx.blob_score_,
+                                            flags.bits_, ctx, task_flags.bits_);
+    if constexpr (!ASYNC) {
+      if (flags.Any(HERMES_GET_BLOB_ID)) {
+        push_task->Wait();
+        PutBlobTask *task = push_task->get();
+        blob_id = task->blob_id_;
+        HRUN_CLIENT->DelTask(push_task);
+      }
+    }
+    return blob_id;
+  }
+
+  /**
+   * Put \a blob_name Blob into the bucket
+   * */
+  template<typename T, bool PARTIAL, bool ASYNC>
+  HSHM_ALWAYS_INLINE
+  BlobId SrlBasePut(const std::string &blob_name,
+                    const BlobId &orig_blob_id,
+                    const T &data,
+                    Context &ctx) {
+    std::stringstream ss;
+    cereal::BinaryOutputArchive ar(ss);
+    ar << data;
+    Blob blob(ss.str());
+    return BasePut<PARTIAL, ASYNC>(blob_name, orig_blob_id, blob, 0, ctx);
+  }
+
+  /**
+   * Put \a blob_name Blob into the bucket
+   * */
+  template<typename T = Blob>
+  BlobId Put(const std::string &blob_name,
+             const T &blob,
+             Context &ctx) {
+    if constexpr(std::is_same_v<T, Blob>) {
+      return BasePut<false, false>(
+          blob_name, BlobId::GetNull(), blob, 0, ctx);
+    } else {
+      return SrlBasePut<T, false, false>(
+          blob_name, BlobId::GetNull(), blob, ctx);
+    }
+  }
+
+  /**
+   * Put \a blob_id Blob into the bucket
+   * */
+  template<typename T = Blob>
+  BlobId Put(const BlobId &blob_id,
+             const T &blob,
+             Context &ctx) {
+    if constexpr(std::is_same_v<T, Blob>) {
+      return BasePut<false, false>("", blob_id, blob, 0, ctx);
+    } else {
+      return SrlBasePut<T, false, false>("", blob_id, blob, ctx);
+    }
+  }
+
+  /**
+   * Put \a blob_name Blob into the bucket
+   * */
+  template<typename T = Blob>
+  HSHM_ALWAYS_INLINE
+  void AsyncPut(const std::string &blob_name,
+                const Blob &blob,
+                Context &ctx) {
+    if constexpr(std::is_same_v<T, Blob>) {
+      BasePut<false, true>(blob_name, BlobId::GetNull(), blob, 0, ctx);
+    } else {
+      SrlBasePut<T, false, true>(blob_name, BlobId::GetNull(), blob, ctx);
+    }
+  }
+
+  /**
+   * Put \a blob_id Blob into the bucket
+   * */
+  template<typename T>
+  HSHM_ALWAYS_INLINE
+  void AsyncPut(const BlobId &blob_id,
+                const Blob &blob,
+                Context &ctx) {
+    if constexpr(std::is_same_v<T, Blob>) {
+      BasePut<false, true>("", blob_id, blob, 0, ctx);
+    } else {
+      SrlBasePut<T, false, true>("", blob_id, blob, ctx);
+    }
+  }
+
+  /**
+   * PartialPut \a blob_name Blob into the bucket
+   * */
+  BlobId PartialPut(const std::string &blob_name,
+                    const Blob &blob,
+                    size_t blob_off,
+                    Context &ctx) {
+    return BasePut<true, false>(blob_name,
+                                BlobId::GetNull(),
+                                blob, blob_off, ctx);
+  }
+
+  /**
+   * PartialPut \a blob_id Blob into the bucket
+   * */
+  BlobId PartialPut(const BlobId &blob_id,
+                    const Blob &blob,
+                    size_t blob_off,
+                    Context &ctx) {
+    return BasePut<true, false>("", blob_id, blob, blob_off, ctx);
+  }
+
+  /**
+   * AsyncPartialPut \a blob_name Blob into the bucket
+   * */
+  void AsyncPartialPut(const std::string &blob_name,
+                       const Blob &blob,
+                       size_t blob_off,
+                       Context &ctx) {
+    BasePut<true, true>(blob_name, BlobId::GetNull(), blob, blob_off, ctx);
+  }
+
+  /**
+   * AsyncPartialPut \a blob_id Blob into the bucket
+   * */
+  void AsyncPartialPut(const BlobId &blob_id,
+                       const Blob &blob,
+                       size_t blob_off,
+                       Context &ctx) {
+    BasePut<true, true>("", blob_id, blob, blob_off, ctx);
+  }
+
+  /**
+   * Append \a blob_name Blob into the bucket (fully asynchronous)
+   * */
+  void Append(const Blob &blob, size_t page_size, Context &ctx) {
+    LPointer<char> p = HRUN_CLIENT->AllocateBuffer(blob.size());
+    char *data = p.ptr_;
+    memcpy(data, blob.data(), blob.size());
+    bkt_mdm_->AppendBlobRoot(
+        id_, blob.size(), p.shm_, page_size,
+        ctx.blob_score_, ctx.node_id_, ctx);
+  }
+
+  /**
+   * Reorganize a blob to a new score or node
+   * */
+  void ReorganizeBlob(const BlobId &blob_id,
+                      float score) {
+    blob_mdm_->AsyncReorganizeBlobRoot(id_, blob_id, score, 0);
+  }
+
+  /**
+   * Reorganize a blob to a new score or node
+   * */
+  void ReorganizeBlob(const BlobId &blob_id,
+                      float score,
+                      Context &ctx) {
+    blob_mdm_->AsyncReorganizeBlobRoot(id_, blob_id, score, 0);
+  }
+
+  /**
+   * Reorganize a blob to a new score or node
+   * */
+  void ReorganizeBlob(const BlobId &blob_id,
+                      float score,
+                      u32 node_id,
+                      Context &ctx) {
+    blob_mdm_->AsyncReorganizeBlobRoot(id_, blob_id, score, node_id);
+  }
+
+  /**
+   * Get the current size of the blob in the bucket
+   * */
+  size_t GetBlobSize(const BlobId &blob_id) {
+    return blob_mdm_->GetBlobSizeRoot(id_, hshm::charbuf(""), blob_id);
+  }
+
+  /**
+   * Get the current size of the blob in the bucket
+   * */
+  size_t GetBlobSize(const std::string &name) {
+    return blob_mdm_->GetBlobSizeRoot(
+        id_, hshm::charbuf(name), BlobId::GetNull());
+  }
+
+  /**
+   * Get \a blob_id Blob from the bucket (async)
+   * */
+  LPointer<hrunpq::TypedPushTask<GetBlobTask>>
+  HSHM_ALWAYS_INLINE
+  AsyncBaseGet(const std::string &blob_name,
+               const BlobId &blob_id,
+               Blob &blob,
+               size_t blob_off,
+               Context &ctx) {
+    bitfield32_t flags;
+    // Get the blob ID
+    if (blob_id.IsNull()) {
+      flags.SetBits(HERMES_GET_BLOB_ID);
+    }
+    // Get from shared memory
+    size_t data_size = blob.size();
+    LPointer data_p = HRUN_CLIENT->AllocateBuffer(data_size);
+    LPointer<hrunpq::TypedPushTask<GetBlobTask>> push_task;
+    push_task = blob_mdm_->AsyncGetBlobRoot(id_, hshm::to_charbuf(blob_name),
+                                            blob_id, blob_off,
+                                            data_size, data_p.shm_,
+                                            ctx, flags.bits_);
+    return push_task;
+  }
+
+  /**
+   * Get \a blob_id Blob from the bucket (sync)
+   * */
+  BlobId BaseGet(const std::string &blob_name,
+                 const BlobId &orig_blob_id,
+                 Blob &blob,
+                 size_t blob_off,
+                 Context &ctx) {
+    // TODO(llogan): intercept mmap to avoid copy
+    // TODO(llogan): make GetBlobSize work with blob_name
+    size_t data_size = blob.size();
+    if (blob.size() == 0) {
+      data_size = blob_mdm_->GetBlobSizeRoot(
+          id_, hshm::charbuf(blob_name), orig_blob_id);
+      blob.resize(data_size);
+    }
+    HILOG(kDebug, "Getting blob of size {}", data_size);
+    BlobId blob_id;
+    LPointer<hrunpq::TypedPushTask<GetBlobTask>> push_task;
+    push_task = AsyncBaseGet(blob_name, orig_blob_id, blob, blob_off, ctx);
+    push_task->Wait();
+    GetBlobTask *task = push_task->get();
+    blob_id = task->blob_id_;
+    char *data = HRUN_CLIENT->GetPrivatePointer(task->data_);
+    memcpy(blob.data(), data, data_size);
+    HRUN_CLIENT->FreeBuffer(task->data_);
+    HRUN_CLIENT->DelTask(push_task);
+    return blob_id;
+  }
+
+  /**
+   * Get \a blob_id Blob from the bucket (sync)
+   * */
+  template<typename T>
+  BlobId SrlBaseGet(const std::string &blob_name,
+                    const BlobId &orig_blob_id,
+                    T &data,
+                    Context &ctx) {
+    Blob blob;
+    BlobId blob_id = BaseGet(blob_name, orig_blob_id, blob, 0, ctx);
+    std::stringstream ss(std::string(blob.data(), blob.size()));
+    cereal::BinaryInputArchive ar(ss);
+    ar >> data;
+    return blob_id;
+  }
+
+  /**
+   * Get \a blob_id Blob from the bucket
+   * */
+  template<typename T>
+  BlobId Get(const std::string &blob_name,
+             T &blob,
+             Context &ctx) {
+    if constexpr(std::is_same_v<T, Blob>) {
+      return BaseGet(blob_name, BlobId::GetNull(), blob, 0, ctx);
+    } else {
+      return SrlBaseGet<T>(blob_name, BlobId::GetNull(), blob, ctx);
+    }
+  }
+
+  /**
+   * Get \a blob_id Blob from the bucket
+   * */
+  template<typename T>
+  BlobId Get(const BlobId &blob_id,
+             T &blob,
+             Context &ctx) {
+    if constexpr(std::is_same_v<T, Blob>) {
+      return BaseGet("", blob_id, blob, 0, ctx);
+    } else {
+      return SrlBaseGet<T>("", blob_id, blob, ctx);
+    }
+  }
+
+  /**
+   * AsyncGet \a blob_name Blob from the bucket
+   * */
+  LPointer<hrunpq::TypedPushTask<GetBlobTask>>
+  AsyncGet(const std::string &blob_name,
+           Blob &blob,
+           Context &ctx) {
+    return AsyncBaseGet(blob_name, BlobId::GetNull(), blob, 0, ctx);
+  }
+
+  /**
+   * AsyncGet \a blob_id Blob from the bucket
+   * */
+  LPointer<hrunpq::TypedPushTask<GetBlobTask>>
+  AsyncGet(const BlobId &blob_id,
+           Blob &blob,
+           Context &ctx) {
+    return AsyncBaseGet("", blob_id, blob, 0, ctx);
+  }
+
+  /**
+   * Put \a blob_name Blob into the bucket
+   * */
+  BlobId PartialGet(const std::string &blob_name,
+                    Blob &blob,
+                    size_t blob_off,
+                    Context &ctx) {
+    return BaseGet(blob_name, BlobId::GetNull(), blob, blob_off, ctx);
+  }
+
+  /**
+   * Put \a blob_name Blob into the bucket
+   * */
+  BlobId PartialGet(const BlobId &blob_id,
+                    Blob &blob,
+                    size_t blob_off,
+                    Context &ctx) {
+    return BaseGet("", blob_id, blob, blob_off, ctx);
+  }
+
+  /**
+   * AsyncGet \a blob_name Blob from the bucket
+   * */
+  LPointer<hrunpq::TypedPushTask<GetBlobTask>>
+  AsyncPartialGet(const std::string &blob_name,
+                  Blob &blob,
+                  size_t blob_off,
+                  Context &ctx) {
+    return AsyncBaseGet(blob_name, BlobId::GetNull(), blob, blob_off, ctx);
+  }
+
+  /**
+   * AsyncGet \a blob_id Blob from the bucket
+   * */
+  LPointer<hrunpq::TypedPushTask<GetBlobTask>>
+  AsyncPartialGet(const BlobId &blob_id,
+                  Blob &blob,
+                  size_t blob_off,
+                  Context &ctx) {
+    return AsyncBaseGet("", blob_id, blob, blob_off, ctx);
+  }
+
+  /**
+   * Determine if the bucket contains \a blob_id BLOB
+   * */
+  bool ContainsBlob(const std::string &blob_name) {
+    BlobId new_blob_id = blob_mdm_->GetBlobIdRoot(
+        id_, hshm::to_charbuf(blob_name));
+    return !new_blob_id.IsNull();
+  }
+
+  /**
+   * Rename \a blob_id blob to \a new_blob_name new name
+   * */
+  void RenameBlob(const BlobId &blob_id,
+                  std::string new_blob_name,
+                  Context &ctx) {
+    blob_mdm_->RenameBlobRoot(id_, blob_id, hshm::to_charbuf(new_blob_name));
+  }
+
+  /**
+   * Delete \a blob_id blob
+   * */
+  void DestroyBlob(const BlobId &blob_id, Context &ctx) {
+    // TODO(llogan): Make apart of bkt_mdm_ instead
+    blob_mdm_->DestroyBlobRoot(id_, blob_id);
+  }
+
+  /**
+   * Get the set of blob IDs contained in the bucket
+   * */
+  std::vector<BlobId> GetContainedBlobIds() {
+    return bkt_mdm_->GetContainedBlobIdsRoot(id_);
+  }
+};
+
+}  // namespace hermes
+
+#endif  // HRUN_TASKS_HERMES_CONF_INCLUDE_HERMES_CONF_BUCKET_H_
diff --git a/src/config.h b/include/hermes/config.h
similarity index 90%
rename from src/config.h
rename to include/hermes/config.h
index 7772eb657..aa18b4d94 100644
--- a/src/config.h
+++ b/include/hermes/config.h
@@ -20,11 +20,9 @@
 #include <vector>
 #include <sstream>
 #include <limits>
-#include "data_structures.h"
 #include "hermes_shm/util/config_parse.h"
 
-#include "hermes_types.h"
-#include "utils.h"
+#include "hermes/hermes_types.h"
 
 namespace hermes::config {
 
@@ -77,4 +75,16 @@ class BaseConfig {
 };
 
 }  // namespace hermes::config
+
+namespace hermes {
+/** Get an environment variable with null safety. */
+static inline std::string GetEnvSafe(const char *env_name) {
+  char *val = getenv(env_name);
+  if (val == nullptr) {
+    return "";
+  }
+  return val;
+}
+}  // namespace hermes
+
 #endif  // HERMES_CONFIG_PARSER_H_
diff --git a/src/config_client.h b/include/hermes/config_client.h
similarity index 57%
rename from src/config_client.h
rename to include/hermes/config_client.h
index 36f4f54c2..9dcf043d4 100644
--- a/src/config_client.h
+++ b/include/hermes/config_client.h
@@ -15,7 +15,8 @@
 
 #include <filesystem>
 #include "config.h"
-#include "adapter/adapter_types.h"
+#include "hermes_adapters/adapter_types.h"
+#include "config_client_default.h"
 
 namespace stdfs = std::filesystem;
 
@@ -63,7 +64,9 @@ class ClientConfig : public BaseConfig {
 
  public:
   ClientConfig() = default;
-  void LoadDefault() override;
+  void LoadDefault() override {
+    LoadText(kHermesClientDefaultConfigStr, false);
+  }
 
   void SetBaseAdapterMode(AdapterMode mode) {
     base_adapter_config_.mode_ = mode;
@@ -118,10 +121,83 @@ class ClientConfig : public BaseConfig {
   }
 
  private:
-  void ParseYAML(YAML::Node &yaml_conf) override;
+  void ParseYAML(YAML::Node &yaml_conf) override {
+    if (yaml_conf["stop_daemon"]) {
+      std::string stop_env = GetEnvSafe(Constant::kHermesStopDaemon);
+      if (stop_env.size() == 0) {
+        stop_daemon_ = yaml_conf["stop_daemon"].as<bool>();
+      } else {
+        std::istringstream(stop_env) >> stop_daemon_;
+      }
+    }
+    if (yaml_conf["base_adapter_mode"]) {
+      std::string mode_env = GetEnvSafe(Constant::kHermesAdapterMode);
+      if (mode_env.size() == 0) {
+        base_adapter_config_.mode_ = AdapterModeConv::to_enum(
+            yaml_conf["base_adapter_mode"].as<std::string>());
+      } else {
+        base_adapter_config_.mode_ = AdapterModeConv::to_enum(mode_env);
+      }
+    }
+    if (yaml_conf["file_page_size"]) {
+      std::string page_size_env = GetEnvSafe(Constant::kHermesPageSize);
+      if (page_size_env.size() == 0) {
+        base_adapter_config_.page_size_ =
+            hshm::ConfigParse::ParseSize(
+                yaml_conf["file_page_size"].as<std::string>());
+      } else {
+        base_adapter_config_.page_size_ =
+            hshm::ConfigParse::ParseSize(page_size_env);
+      }
+    }
+    if (yaml_conf["path_inclusions"]) {
+      std::vector<std::string> inclusions;
+      ParseVector<std::string>(yaml_conf["path_inclusions"], inclusions);
+      for (auto &entry : inclusions) {
+        entry = hshm::ConfigParse::ExpandPath(entry);
+        SetAdapterPathTracking(std::move(entry), true);
+      }
+    }
+    if (yaml_conf["path_exclusions"]) {
+      std::vector<std::string> exclusions;
+      ParseVector<std::string>(yaml_conf["path_exclusions"], exclusions);
+      for (auto &entry : exclusions) {
+        entry = hshm::ConfigParse::ExpandPath(entry);
+        SetAdapterPathTracking(std::move(entry), false);
+      }
+    }
+    if (yaml_conf["flushing_mode"]) {
+      flushing_mode_ =
+          FlushingModeConv::GetEnum(
+              yaml_conf["flushing_mode"].as<std::string>());
+      auto flush_mode_env = getenv("HERMES_FLUSH_MODE");
+      if (flush_mode_env) {
+        flushing_mode_ = FlushingModeConv::GetEnum(flush_mode_env);
+      }
+    }
+    if (yaml_conf["file_adapter_configs"]) {
+      for (auto node : yaml_conf["file_adapter_configs"]) {
+        AdapterObjectConfig conf(base_adapter_config_);
+        ParseAdapterConfig(node, conf);
+      }
+    }
+  }
 
   void ParseAdapterConfig(YAML::Node &yaml_conf,
-                          AdapterObjectConfig &conf);
+                          AdapterObjectConfig &conf) {
+    std::string path = yaml_conf["path"].as<std::string>();
+    path = hshm::ConfigParse::ExpandPath(path);
+    path = stdfs::absolute(path).string();
+    if (yaml_conf["mode"]) {
+      conf.mode_ = AdapterModeConv::to_enum(
+          yaml_conf["mode"].as<std::string>());
+    }
+    if (yaml_conf["page_size"]) {
+      conf.page_size_ = hshm::ConfigParse::ParseSize(
+          yaml_conf["page_size"].as<std::string>());
+    }
+    SetAdapterConfig(path, conf);
+  }
 };
 
 }  // namespace hermes::config
diff --git a/src/config_client_default.h b/include/hermes/config_client_default.h
similarity index 57%
rename from src/config_client_default.h
rename to include/hermes/config_client_default.h
index b8df9e778..aff693b94 100644
--- a/src/config_client_default.h
+++ b/include/hermes/config_client_default.h
@@ -1,6 +1,6 @@
-#ifndef HERMES_SRC_CONFIG_CLIENT_DEFAULT_H_
-#define HERMES_SRC_CONFIG_CLIENT_DEFAULT_H_
-const char* kClientDefaultConfigStr = 
+#ifndef HRUN_SRC_CONFIG_HERMES_CLIENT_DEFAULT_H_
+#define HRUN_SRC_CONFIG_HERMES_CLIENT_DEFAULT_H_
+const inline char* kHermesClientDefaultConfigStr = 
 "stop_daemon: false\n"
 "path_inclusions: [\"/tmp/test_hermes\"]\n"
 "path_exclusions: [\"/\"]\n"
@@ -11,4 +11,4 @@ const char* kClientDefaultConfigStr =
 "  - path: \"/\"\n"
 "    page_size: 1MB\n"
 "    mode: kDefault\n";
-#endif  // HERMES_SRC_CONFIG_CLIENT_DEFAULT_H_
\ No newline at end of file
+#endif  // HRUN_SRC_CONFIG_HERMES_CLIENT_DEFAULT_H_
\ No newline at end of file
diff --git a/include/hermes/config_manager.h b/include/hermes/config_manager.h
new file mode 100644
index 000000000..1cf44a040
--- /dev/null
+++ b/include/hermes/config_manager.h
@@ -0,0 +1,102 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASKS_HERMES_INCLUDE_hermes_H_
+#define HRUN_TASKS_HERMES_INCLUDE_hermes_H_
+
+#include "hermes/hermes_types.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hermes_mdm/hermes_mdm.h"
+#include "hermes_bucket_mdm/hermes_bucket_mdm.h"
+#include "hermes_blob_mdm/hermes_blob_mdm.h"
+#include "hermes_data_op/hermes_data_op.h"
+#include "hermes/config_client.h"
+#include "hermes/config_server.h"
+#include "data_stager/data_stager.h"
+
+namespace hermes {
+
+class ConfigurationManager {
+ public:
+  mdm::Client mdm_;
+  bucket_mdm::Client bkt_mdm_;
+  blob_mdm::Client blob_mdm_;
+  data_stager::Client stager_mdm_;
+  data_op::Client op_mdm_;
+  ServerConfig server_config_;
+  ClientConfig client_config_;
+  bool is_initialized_ = false;
+
+ public:
+  ConfigurationManager() = default;
+
+  void ClientInit() {
+    if (is_initialized_) {
+      return;
+    }
+    // Create connection to MDM
+    std::string config_path = "";
+    LoadClientConfig(config_path);
+    LoadServerConfig(config_path);
+    mdm_.CreateRoot(DomainId::GetGlobal(), "hermes_mdm");
+    blob_mdm_.CreateRoot(DomainId::GetGlobal(), "hermes_blob_mdm");
+    bkt_mdm_.CreateRoot(DomainId::GetGlobal(), "hermes_bkt_mdm");
+    op_mdm_.CreateRoot(DomainId::GetGlobal(), "hermes_op_mdm",
+                       bkt_mdm_.id_, blob_mdm_.id_);
+    stager_mdm_.CreateRoot(DomainId::GetGlobal(),
+                           "hermes_stager_mdm", blob_mdm_.id_);
+    blob_mdm_.SetBucketMdmRoot(DomainId::GetGlobal(),
+                               bkt_mdm_.id_,
+                               stager_mdm_.id_, op_mdm_.id_);
+    bkt_mdm_.SetBlobMdmRoot(DomainId::GetGlobal(),
+                            blob_mdm_.id_, stager_mdm_.id_);
+    is_initialized_ = true;
+  }
+
+  void LoadClientConfig(std::string &config_path) {
+    // Load hermes config
+    if (config_path.empty()) {
+      config_path = GetEnvSafe(Constant::kHermesClientConf);
+    }
+    HILOG(kInfo, "Loading client configuration: {}", config_path)
+    client_config_.LoadFromFile(config_path);
+  }
+
+  void LoadServerConfig(std::string &config_path) {
+    // Load hermes config
+    if (config_path.empty()) {
+      config_path = GetEnvSafe(Constant::kHermesServerConf);
+    }
+    HILOG(kInfo, "Loading server configuration: {}", config_path)
+    server_config_.LoadFromFile(config_path);
+  }
+};
+
+}  // namespace hermes
+
+#define HERMES_CONF \
+hshm::Singleton<::hermes::ConfigurationManager>::GetInstance()
+#define HERMES_CLIENT_CONF \
+HERMES_CONF->client_config_
+#define HERMES_SERVER_CONF \
+HERMES_CONF->server_config_
+
+/** Initialize client-side Hermes transparently */
+static inline bool TRANSPARENT_HERMES() {
+  if (TRANSPARENT_HRUN()) {
+    HERMES_CONF->ClientInit();
+    return true;
+  }
+  return false;
+}
+
+#endif  // HRUN_TASKS_HERMES_INCLUDE_hermes_H_
diff --git a/include/hermes/config_server.h b/include/hermes/config_server.h
new file mode 100644
index 000000000..9c6dbd68d
--- /dev/null
+++ b/include/hermes/config_server.h
@@ -0,0 +1,344 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HERMES_SRC_CONFIG_SERVER_H_
+#define HERMES_SRC_CONFIG_SERVER_H_
+
+#include "config.h"
+#include "config_server_default.h"
+
+namespace hermes::config {
+
+struct DeviceInfo; /** Forward declaration of DeviceInfo */
+
+/**
+ * The type of interface the device exposes
+ * */
+enum class IoInterface {
+  kRam,
+  kPosix
+};
+
+/**
+ * DeviceInfo shared-memory representation
+ * */
+struct DeviceInfo {
+  /** The human-readable name of the device */
+  std::string dev_name_;
+  /** The unit of each slab, a multiple of the Device's block size */
+  std::vector<size_t> slab_sizes_;
+  /** The directory the device is mounted on */
+  std::string mount_dir_;
+  /** The file to create on the device */
+  std::string mount_point_;
+  /** The I/O interface for the device */
+  IoInterface io_api_;
+  /** The minimum transfer size of each device */
+  size_t block_size_;
+  /** Device capacity (bytes) */
+  size_t capacity_;
+  /** Bandwidth of a device (MBps) */
+  f32 bandwidth_;
+  /** Latency of the device (us)*/
+  f32 latency_;
+  /** Whether or not the device is shared among all nodes */
+  bool is_shared_;
+  /** BORG's minimum and maximum capacity threshold for device */
+  f32 borg_min_thresh_, borg_max_thresh_;
+};
+
+/**
+ * RPC information defined in server config
+ * */
+struct RpcInfo {
+  /** The name of a file that contains host names, 1 per line */
+  std::string host_file_;
+  /** The parsed hostnames from the hermes conf */
+  std::vector<std::string> host_names_;
+  /** The RPC protocol to be used. */
+  std::string protocol_;
+  /** The RPC domain name for verbs transport. */
+  std::string domain_;
+  /** The RPC port number. */
+  int port_;
+  /** The number of handler threads per RPC server. */
+  int num_threads_;
+};
+
+/**
+ * DPE information defined in server config
+ * */
+struct DpeInfo {
+  /** The default blob placement policy. */
+  PlacementPolicy default_policy_;
+
+  /** Whether blob splitting is enabled for Round-Robin blob placement. */
+  bool default_rr_split_;
+};
+
+/**
+ * Buffer organizer information defined in server config
+ * */
+struct BorgInfo {
+  /** The number of buffer organizer threads. */
+  int num_threads_;
+  /** Interval (seconds) where blobs are checked for flushing */
+  size_t flush_period_;
+  /** Interval (seconds) where blobs are checked for re-organization */
+  size_t blob_reorg_period_;
+  /** Time when score is equal to 1 (seconds) */
+  float recency_min_;
+  /** Time when score is equal to 0 (seconds) */
+  float recency_max_;
+  /** Number of accesses for score to be equal to 1 (count) */
+  float freq_max_;
+  /** Number of accesses for score to be equal to 0 (count) */
+  float freq_min_;
+};
+
+/**
+ * Prefetcher information in server config
+ * */
+struct PrefetchInfo {
+  bool enabled_;
+  std::string trace_path_;
+  std::string apriori_schema_path_;
+  size_t epoch_ms_;
+  bool is_mpi_;
+};
+
+/**
+ * Tracing information in server config
+ * */
+struct TracingInfo {
+  bool enabled_;
+  std::string output_;
+};
+
+/** MDM information */
+struct MdmInfo {
+  /** Number of buckets in mdm bucket map before collisions */
+  size_t num_bkts_;
+
+  /** Number of blobs in mdm blob map before collisions */
+  size_t num_blobs_;
+
+  /** Number of traits in mdm trait map before collisions */
+  size_t num_traits_;
+};
+
+/**
+ * System configuration for Hermes
+ */
+class ServerConfig : public BaseConfig {
+ public:
+  /** The device information */
+  std::vector<DeviceInfo> devices_;
+
+  /** The RPC information */
+  RpcInfo rpc_;
+
+  /** The DPE information */
+  DpeInfo dpe_;
+
+  /** Buffer organizer (BORG) information */
+  BorgInfo borg_;
+
+  /** Tracing information */
+  TracingInfo tracing_;
+
+  /** Prefetcher information */
+  PrefetchInfo prefetcher_;
+
+  /** Metadata Manager information */
+  MdmInfo mdm_;
+
+  /** Trait repo information */
+  std::vector<std::string> trait_paths_;
+
+  /** The length of a view state epoch */
+  u32 system_view_state_update_interval_ms;
+
+ public:
+  /** Default constructor */
+  ServerConfig() = default;
+
+  /** Load the default configuration */
+  void LoadDefault() {
+    LoadText(kHermesServerDefaultConfigStr, false);
+  }
+
+ private:
+  /** parse the YAML node */
+  void ParseYAML(YAML::Node &yaml_conf)  {
+    if (yaml_conf["devices"]) {
+      ParseDeviceInfo(yaml_conf["devices"]);
+    }
+    if (yaml_conf["dpe"]) {
+      ParseDpeInfo(yaml_conf["dpe"]);
+    }
+    if (yaml_conf["buffer_organizer"]) {
+      ParseBorgInfo(yaml_conf["buffer_organizer"]);
+    }
+    if (yaml_conf["tracing"]) {
+      ParseTracingInfo(yaml_conf["tracing"]);
+    }
+    if (yaml_conf["prefetch"]) {
+      ParsePrefetchInfo(yaml_conf["prefetch"]);
+    }
+    if (yaml_conf["mdm"]) {
+      ParseMdmInfo(yaml_conf["mdm"]);
+    }
+    if (yaml_conf["system_view_state_update_interval_ms"]) {
+      system_view_state_update_interval_ms =
+          yaml_conf["system_view_state_update_interval_ms"].as<int>();
+    }
+    if (yaml_conf["traits"]) {
+      ParseTraitInfo(yaml_conf["traits"]);
+    }
+  }
+
+
+  /** parse device information from YAML config */
+  void ParseDeviceInfo(YAML::Node yaml_conf) {
+    devices_.clear();
+    for (auto device : yaml_conf) {
+      devices_.emplace_back();
+      DeviceInfo &dev = devices_.back();
+      auto dev_info = device.second;
+      dev.dev_name_ = device.first.as<std::string>();
+      dev.mount_dir_ = hshm::ConfigParse::ExpandPath(
+          dev_info["mount_point"].as<std::string>());
+      dev.borg_min_thresh_ =
+          dev_info["borg_capacity_thresh"][0].as<float>();
+      dev.borg_max_thresh_ =
+          dev_info["borg_capacity_thresh"][1].as<float>();
+      dev.is_shared_ =
+          dev_info["is_shared_device"].as<bool>();
+      dev.block_size_ =
+          hshm::ConfigParse::ParseSize(
+              dev_info["block_size"].as<std::string>());
+      dev.capacity_ =
+          hshm::ConfigParse::ParseSize(
+              dev_info["capacity"].as<std::string>());
+      dev.bandwidth_ =
+          hshm::ConfigParse::ParseSize(
+              dev_info["bandwidth"].as<std::string>());
+      dev.latency_ =
+          hshm::ConfigParse::ParseLatency(
+              dev_info["latency"].as<std::string>());
+      std::vector<std::string> size_vec;
+      ParseVector<std::string, std::vector<std::string>>(
+          dev_info["slab_sizes"], size_vec);
+      dev.slab_sizes_.reserve(size_vec.size());
+      for (const std::string &size_str : size_vec) {
+        dev.slab_sizes_.emplace_back(
+            hshm::ConfigParse::ParseSize(size_str));
+      }
+    }
+  }
+
+  /** parse dpe information from YAML config */
+  void ParseDpeInfo(YAML::Node yaml_conf) {
+    if (yaml_conf["default_placement_policy"]) {
+      std::string policy =
+          yaml_conf["default_placement_policy"].as<std::string>();
+      dpe_.default_policy_ = PlacementPolicyConv::to_enum(policy);
+    }
+  }
+
+  /** parse buffer organizer information from YAML config */
+  void ParseBorgInfo(YAML::Node yaml_conf) {
+    if (yaml_conf["num_threads"]) {
+      borg_.num_threads_ = yaml_conf["num_threads"].as<int>();
+    }
+    if (yaml_conf["flush_period"]) {
+      borg_.flush_period_ = yaml_conf["flush_period"].as<size_t>();
+    }
+    if (yaml_conf["blob_reorg_period"]) {
+      borg_.blob_reorg_period_ = yaml_conf["blob_reorg_period"].as<size_t>();
+    }
+    if (yaml_conf["recency_min"]) {
+      borg_.recency_min_ = yaml_conf["recency_min"].as<float>();
+    }
+    if (yaml_conf["recency_max"]) {
+      borg_.recency_max_ = yaml_conf["recency_max"].as<float>();
+    }
+    if (yaml_conf["freq_max"]) {
+      borg_.freq_max_ = yaml_conf["freq_max"].as<float>();
+    }
+    if (yaml_conf["freq_min"]) {
+      borg_.freq_min_ = yaml_conf["freq_min"].as<float>();
+    }
+  }
+
+  /** parse I/O tracing information from YAML config */
+  void ParsePrefetchInfo(YAML::Node yaml_conf) {
+    if (yaml_conf["enabled"]) {
+      tracing_.enabled_ = yaml_conf["enabled"].as<bool>();
+    }
+    if (yaml_conf["output"]) {
+      tracing_.output_ = hshm::ConfigParse::ExpandPath(
+          yaml_conf["output"].as<std::string>());
+    }
+  }
+
+  /** parse prefetch information from YAML config */
+  void ParseTracingInfo(YAML::Node yaml_conf) {
+    if (yaml_conf["enabled"]) {
+      prefetcher_.enabled_ = yaml_conf["enabled"].as<bool>();
+    }
+    if (yaml_conf["io_trace_path"]) {
+      prefetcher_.trace_path_ = hshm::ConfigParse::ExpandPath(
+          yaml_conf["io_trace_path"].as<std::string>());
+    }
+    if (yaml_conf["epoch_ms"]) {
+      prefetcher_.epoch_ms_ = yaml_conf["epoch_ms"].as<size_t>();
+    }
+    if (yaml_conf["is_mpi"]) {
+      prefetcher_.is_mpi_ = yaml_conf["is_mpi"].as<bool>();
+    }
+    if (yaml_conf["apriori_schema_path"]) {
+      prefetcher_.apriori_schema_path_ =
+          yaml_conf["apriori_schema_path"].as<std::string>();
+    }
+  }
+
+  /** parse prefetch information from YAML config */
+  void ParseTraitInfo(YAML::Node yaml_conf) {
+    std::vector<std::string> trait_names;
+    ParseVector<std::string, std::vector<std::string>>(
+        yaml_conf, trait_names);
+    trait_paths_.reserve(trait_names.size());
+    for (auto &name : trait_names) {
+      name = hshm::ConfigParse::ExpandPath(name);
+      trait_paths_.emplace_back(
+          hshm::Formatter::format("lib{}.so", name));
+    }
+  }
+
+  /** parse prefetch information from YAML config */
+  void ParseMdmInfo(YAML::Node yaml_conf) {
+    mdm_.num_blobs_ = yaml_conf["est_blob_count"].as<size_t>();
+    mdm_.num_bkts_ = yaml_conf["est_blob_count"].as<size_t>();
+    mdm_.num_traits_ = yaml_conf["est_num_traits"].as<size_t>();
+  }
+};
+
+}  // namespace hermes::config
+
+namespace hermes {
+using config::ServerConfig;
+using config::DeviceInfo;
+}  // namespace hermes
+
+#endif  // HERMES_SRC_CONFIG_SERVER_H_
diff --git a/src/config_server_default.h b/include/hermes/config_server_default.h
similarity index 84%
rename from src/config_server_default.h
rename to include/hermes/config_server_default.h
index 63ab8b94a..75ce716a1 100644
--- a/src/config_server_default.h
+++ b/include/hermes/config_server_default.h
@@ -1,6 +1,6 @@
-#ifndef HERMES_SRC_CONFIG_SERVER_DEFAULT_H_
-#define HERMES_SRC_CONFIG_SERVER_DEFAULT_H_
-const char* kServerDefaultConfigStr = 
+#ifndef HRUN_SRC_CONFIG_HERMES_SERVER_DEFAULT_H_
+#define HRUN_SRC_CONFIG_HERMES_SERVER_DEFAULT_H_
+const inline char* kHermesServerDefaultConfigStr = 
 "# Example Hermes configuration file\n"
 "\n"
 "### Define properties of the storage devices\n"
@@ -85,32 +85,6 @@ const char* kServerDefaultConfigStr =
 "# any amount of memory\n"
 "max_memory: 0g\n"
 "\n"
-"### Define properties of RPCs\n"
-"rpc:\n"
-"  # A path to a file containing a list of server names, 1 per line. If your\n"
-"  # servers are named according to a pattern (e.g., server-1, server-2, etc.),\n"
-"  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this\n"
-"  # option is not empty, it will override anything in `rpc_server_base_name`.\n"
-"  host_file: \"\"\n"
-"\n"
-"  # Host names can be defined using the following syntax:\n"
-"  # ares-comp-[0-9]-40g will convert to ares-comp-0-40g, ares-comp-1-40g, ...\n"
-"  # ares-comp[00-09] will convert to ares-comp-00, ares-comp-01, ...\n"
-"  host_names: [\"localhost\"]\n"
-"\n"
-"  # The RPC protocol. This must come from the documentation of the specific RPC\n"
-"  # library in use.\n"
-"  protocol: \"ofi+sockets\"\n"
-"\n"
-"  # RPC domain name for verbs transport. Blank for tcp.\n"
-"  domain: \"\"\n"
-"\n"
-"  # Desired RPC port number.\n"
-"  port: 8080\n"
-"\n"
-"  # The number of handler threads for each RPC server.\n"
-"  num_threads: 4\n"
-"\n"
 "### Define properties of the BORG\n"
 "buffer_organizer:\n"
 "  # The number of threads used in the background organization of internal Hermes buffers.\n"
@@ -164,18 +138,64 @@ const char* kServerDefaultConfigStr =
 "  est_bucket_count: 100000\n"
 "  est_num_traits: 256\n"
 "\n"
-"# The shared memory prefix for the hermes shared memory segment. A username\n"
-"# will be automatically appended.\n"
-"shmem_name: \"/hermes_shm_\"\n"
-"\n"
 "# The interval in milliseconds at which to update the global system view.\n"
 "system_view_state_update_interval_ms: 1000\n"
 "\n"
-"### Define the names of the traits to search LD_LIBRARY_PATH for\n"
-"traits:\n"
-"  - \"hermes_posix_io_client\"\n"
-"  - \"hermes_stdio_io_client\"\n"
-"  - \"hermes_mpiio_io_client\"\n"
-"  - \"hermes_example_trait\"\n"
-"  - \"hermes_prefetcher_trait\"\n";
-#endif  // HERMES_SRC_CONFIG_SERVER_DEFAULT_H_
\ No newline at end of file
+"### Runtime orchestration settings\n"
+"work_orchestrator:\n"
+"  # The number of worker threads to spawn\n"
+"  max_workers: 4\n"
+"\n"
+"### Queue Manager settings\n"
+"queue_manager:\n"
+"  # The default depth of allocated queues\n"
+"  queue_depth: 256\n"
+"  # The maximum number of lanes per queue\n"
+"  max_lanes: 16\n"
+"  # The maximum number of queues\n"
+"  max_queues: 1024\n"
+"  # The shared memory allocator to use\n"
+"  shm_allocator: kScalablePageAllocator\n"
+"  # The name of the shared memory region to create\n"
+"  shm_name: \"hrun_shm\"\n"
+"  # The size of the shared memory region to allocate for general data structures\n"
+"  shm_size: 0g\n"
+"  # The size of the shared memory to allocate for data buffers\n"
+"\n"
+"### Define properties of RPCs\n"
+"rpc:\n"
+"  # A path to a file containing a list of server names, 1 per line. If your\n"
+"  # servers are named according to a pattern (e.g., server-1, server-2, etc.),\n"
+"  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this\n"
+"  # option is not empty, it will override anything in `rpc_server_base_name`.\n"
+"  host_file: \"\"\n"
+"\n"
+"  # Host names can be defined using the following syntax:\n"
+"  # ares-comp-[0-9]-40g will convert to ares-comp-0-40g, ares-comp-1-40g, ...\n"
+"  # ares-comp[00-09] will convert to ares-comp-00, ares-comp-01, ...\n"
+"  host_names: [\"localhost\"]\n"
+"\n"
+"  # The RPC protocol. This must come from the documentation of the specific RPC\n"
+"  # library in use.\n"
+"  protocol: \"ofi+sockets\"\n"
+"\n"
+"  # RPC domain name for verbs transport. Blank for tcp.\n"
+"  domain: \"\"\n"
+"\n"
+"  # Desired RPC port number.\n"
+"  port: 8080\n"
+"\n"
+"  # The number of handler threads for each RPC server.\n"
+"  num_threads: 4\n"
+"\n"
+"### Task Registry\n"
+"task_registry: [\n"
+"  \'hermes_mdm\',\n"
+"  \'hermes_blob_mdm\',\n"
+"  \'hermes_bucket_mdm\',\n"
+"  \'hermes_data_op\',\n"
+"  \'data_stager\',\n"
+"  \'posix_bdev\',\n"
+"  \'ram_bdev\'\n"
+"]\n";
+#endif  // HRUN_SRC_CONFIG_HERMES_SERVER_DEFAULT_H_
\ No newline at end of file
diff --git a/src/data_placement_engine.h b/include/hermes/dpe/dpe.h
similarity index 70%
rename from src/data_placement_engine.h
rename to include/hermes/dpe/dpe.h
index e2607ad2f..8392734b9 100644
--- a/src/data_placement_engine.h
+++ b/include/hermes/dpe/dpe.h
@@ -15,29 +15,22 @@
 
 #include <map>
 
-#include "hermes.h"
-#include "status.h"
-#include "hermes_types.h"
-#include "metadata_manager.h"
+#include "hermes/hermes_types.h"
+#include "hermes_mdm/hermes_mdm.h"
+#include "bdev/bdev.h"
 
 namespace hermes {
 
-using api::Status;
-using hermes::api::PlacementPolicy;
-
 /**
  A class to represent data placement engine
 */
-class DPE {
- protected:
-  MetadataManager *mdm_; /**< A pointer to the MDM */
-
+class Dpe {
  public:
   /** Constructor. */
-  DPE();
+  Dpe() = default;
 
   /** Destructor. */
-  virtual ~DPE() = default;
+  virtual ~Dpe() = default;
 
   /**
    * Calculate the placement of a set of blobs using a particular
@@ -45,16 +38,8 @@ class DPE {
    * */
   virtual Status Placement(const std::vector<size_t> &blob_sizes,
                            std::vector<TargetInfo> &targets,
-                           api::Context &ctx,
+                           Context &ctx,
                            std::vector<PlacementSchema> &output) = 0;
-
-  /**
-   * Calculate the total placement for all blobs and output a schema for
-   * each blob.
-   * */
-  Status CalculatePlacement(const std::vector<size_t> &blob_sizes,
-                            std::vector<PlacementSchema> &output,
-                            api::Context &api_context);
 };
 
 }  // namespace hermes
diff --git a/src/data_placement_engine_factory.h b/include/hermes/dpe/dpe_factory.h
similarity index 87%
rename from src/data_placement_engine_factory.h
rename to include/hermes/dpe/dpe_factory.h
index 8d8c1baba..99211f712 100644
--- a/src/data_placement_engine_factory.h
+++ b/include/hermes/dpe/dpe_factory.h
@@ -13,18 +13,18 @@
 #ifndef HERMES_SRC_DPE_DATA_PLACEMENT_ENGINE_FACTORY_H_
 #define HERMES_SRC_DPE_DATA_PLACEMENT_ENGINE_FACTORY_H_
 
-#include "dpe/minimize_io_time.h"
-#include "dpe/random.h"
-#include "dpe/round_robin.h"
+#include "minimize_io_time.h"
+#include "random.h"
+#include "round_robin.h"
+#include "dpe.h"
+#include "hermes/hermes.h"
 
 namespace hermes {
 
-using hermes::api::PlacementPolicy;
-
 /**
  A class to represent Data Placement Engine Factory
 */
-class DPEFactory {
+class DpeFactory {
  public:
   /**
    * return a pointer to data placement engine given a policy type.
@@ -34,7 +34,10 @@ class DPEFactory {
    *            data placement engine factory.
    * @return pointer to DataPlacementEngine given \a type PlacementPolicy.
    */
-  static DPE* Get(const PlacementPolicy &type) {
+  static Dpe* Get(PlacementPolicy type) {
+    if (type == PlacementPolicy::kNone) {
+      type = HERMES_SERVER_CONF.dpe_.default_policy_;
+    }
     switch (type) {
       case PlacementPolicy::kRandom: {
         return hshm::EasySingleton<Random>::GetInstance();
diff --git a/include/hermes/dpe/minimize_io_time.h b/include/hermes/dpe/minimize_io_time.h
new file mode 100644
index 000000000..7c09b6c96
--- /dev/null
+++ b/include/hermes/dpe/minimize_io_time.h
@@ -0,0 +1,84 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HERMES_SRC_DPE_MINIMIZE_IO_TIME_H_
+#define HERMES_SRC_DPE_MINIMIZE_IO_TIME_H_
+
+#include "dpe.h"
+
+namespace hermes {
+/**
+ A class to represent data placement engine that minimizes I/O time.
+*/
+class MinimizeIoTime : public Dpe {
+ public:
+  MinimizeIoTime() = default;
+  ~MinimizeIoTime() = default;
+  Status Placement(const std::vector<size_t> &blob_sizes,
+                   std::vector<TargetInfo> &targets,
+                   Context &ctx,
+                   std::vector<PlacementSchema> &output) {
+    for (size_t blob_size : blob_sizes) {
+      // Initialize blob's size, score, and schema
+      size_t rem_blob_size = blob_size;
+      float score = ctx.blob_score_;
+      if (ctx.blob_score_ == -1) {
+        score = 1;
+      }
+      output.emplace_back();
+      PlacementSchema &blob_schema = output.back();
+
+      for (u32 tgt_idx = 0; tgt_idx < targets.size(); ++tgt_idx) {
+        TargetInfo &target = targets[tgt_idx];
+        // NOTE(llogan): We skip targets that are too high of priority or
+        // targets that can't fit the ENTIRE blob
+        size_t rem_cap = target.GetRemCap();
+        if (target.score_ > score || rem_cap < blob_size) {
+          // TODO(llogan): add other considerations of this Dpe
+          continue;
+        }
+        if (ctx.blob_score_ == -1) {
+          ctx.blob_score_ = target.score_;
+        }
+
+        // NOTE(llogan): we assume the TargetInfo list is sorted
+        if (rem_cap >= rem_blob_size) {
+          blob_schema.plcmnts_.emplace_back(rem_blob_size,
+                                            target.id_);
+          rem_cap -= rem_blob_size;
+          rem_blob_size = 0;
+        } else {
+          // NOTE(llogan): this code technically never gets called,
+          // but it might in the future
+          blob_schema.plcmnts_.emplace_back(rem_cap,
+                                            target.id_);
+          rem_blob_size -= rem_cap;
+          rem_cap = 0;
+        }
+
+        if (rem_blob_size == 0) {
+          break;
+        }
+      }
+
+      if (rem_blob_size > 0) {
+        return DPE_MIN_IO_TIME_NO_SOLUTION;
+      }
+    }
+
+    return Status();
+  }
+};
+
+}  // namespace hermes
+
+#endif  // HERMES_SRC_DPE_MINIMIZE_IO_TIME_H_
diff --git a/src/dpe/random.h b/include/hermes/dpe/random.h
similarity index 55%
rename from src/dpe/random.h
rename to include/hermes/dpe/random.h
index 6a4bbb1da..3d989ef93 100644
--- a/src/dpe/random.h
+++ b/include/hermes/dpe/random.h
@@ -13,15 +13,16 @@
 #ifndef HERMES_SRC_DPE_RANDOM_H_
 #define HERMES_SRC_DPE_RANDOM_H_
 
-#include "data_placement_engine.h"
+#include "dpe.h"
 #include <cstdlib>
 #include <ctime>
 
 namespace hermes {
+
 /**
  A class to represent data placement engine that places data randomly.
 */
-class Random : public DPE {
+class Random : public Dpe {
  public:
   Random() {
     // TODO(llogan): make seed configurable
@@ -30,8 +31,42 @@ class Random : public DPE {
   ~Random() = default;
   Status Placement(const std::vector<size_t> &blob_sizes,
                    std::vector<TargetInfo> &targets,
-                   api::Context &ctx,
-                   std::vector<PlacementSchema> &output) override;
+                   Context &ctx,
+                   std::vector<PlacementSchema> &output) override {
+    for (size_t blob_size : blob_sizes) {
+      // Initialize blob's size, score, and schema
+      size_t rem_blob_size = blob_size;
+      output.emplace_back();
+      PlacementSchema &blob_schema = output.back();
+
+      // Choose RR target and iterate
+      size_t target_id = std::rand() % targets.size();
+      for (size_t tgt_idx = 0; tgt_idx < targets.size(); ++tgt_idx) {
+        TargetInfo &target = targets[(target_id + tgt_idx) % targets.size()];
+        size_t rem_cap = target.GetRemCap();
+
+        // NOTE(llogan): We skip targets that can't fit the ENTIRE blob
+        if (rem_cap < blob_size) {
+          continue;
+        }
+        if (ctx.blob_score_ == -1) {
+          ctx.blob_score_ = target.score_;
+        }
+
+        // Place the blob on this target
+        blob_schema.plcmnts_.emplace_back(rem_blob_size,
+                                          target.id_);
+        rem_blob_size = 0;
+        break;
+      }
+
+      if (rem_blob_size > 0) {
+        return DPE_MIN_IO_TIME_NO_SOLUTION;
+      }
+    }
+
+    return Status();
+  }
 };
 
 }  // namespace hermes
diff --git a/src/dpe/round_robin.h b/include/hermes/dpe/round_robin.h
similarity index 52%
rename from src/dpe/round_robin.h
rename to include/hermes/dpe/round_robin.h
index bfc7976bf..440f7a072 100644
--- a/src/dpe/round_robin.h
+++ b/include/hermes/dpe/round_robin.h
@@ -15,14 +15,12 @@
 
 #include <map>
 
-#include "data_placement_engine.h"
+#include "dpe.h"
 
 namespace hermes {
 
-using api::Status;
-
 /** Represents the state of a Round-Robin data placement strategy */
-class RoundRobin : public DPE {
+class RoundRobin : public Dpe {
  private:
   std::atomic<size_t> counter_;
 
@@ -31,8 +29,42 @@ class RoundRobin : public DPE {
 
   Status Placement(const std::vector<size_t> &blob_sizes,
                    std::vector<TargetInfo> &targets,
-                   api::Context &ctx,
-                   std::vector<PlacementSchema> &output);
+                   Context &ctx,
+                   std::vector<PlacementSchema> &output) {
+    for (size_t blob_size : blob_sizes) {
+      // Initialize blob's size, score, and schema
+      size_t rem_blob_size = blob_size;
+      output.emplace_back();
+      PlacementSchema &blob_schema = output.back();
+
+      // Choose RR target and iterate
+      size_t target_id = counter_.fetch_add(1) % targets.size();
+      for (size_t tgt_idx = 0; tgt_idx < targets.size(); ++tgt_idx) {
+        TargetInfo &target = targets[(target_id + tgt_idx) % targets.size()];
+        size_t rem_cap = target.GetRemCap();
+
+        // NOTE(llogan): We skip targets that can't fit the ENTIRE blob
+        if (rem_cap < blob_size) {
+          continue;
+        }
+        if (ctx.blob_score_ == -1) {
+          ctx.blob_score_ = target.score_;
+        }
+
+        // Place the blob on this target
+        blob_schema.plcmnts_.emplace_back(rem_blob_size,
+                                          target.id_);
+        rem_blob_size = 0;
+        break;
+      }
+
+      if (rem_blob_size > 0) {
+        return DPE_MIN_IO_TIME_NO_SOLUTION;
+      }
+    }
+
+    return Status();
+  }
 };
 
 }  // namespace hermes
diff --git a/include/hermes/hermes.h b/include/hermes/hermes.h
new file mode 100644
index 000000000..7cf45ffea
--- /dev/null
+++ b/include/hermes/hermes.h
@@ -0,0 +1,75 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASKS_HERMES_INCLUDE_HERMES_HERMES_H_
+#define HRUN_TASKS_HERMES_INCLUDE_HERMES_HERMES_H_
+
+#include "hermes/bucket.h"
+
+namespace hermes {
+
+struct MetadataTable {
+  std::vector<BlobInfo> blob_info_;
+  std::vector<TargetStats> target_info_;
+  std::vector<TagInfo> bkt_info_;
+};
+
+class Hermes {
+ public:
+  /** Init hermes client */
+  void ClientInit() {
+    HERMES_CONF->ClientInit();
+  }
+
+  /** Check if initialized */
+  bool IsInitialized() {
+    return HERMES_CONF->is_initialized_;
+  }
+
+  /** Get tag ID */
+  TagId GetTagId(const std::string &tag_name) {
+    return HERMES_CONF->bkt_mdm_.GetTagIdRoot(hshm::to_charbuf(tag_name));
+  }
+
+  /** Collect a snapshot of all metadata in Hermes */
+  MetadataTable CollectMetadataSnapshot() {
+    MetadataTable table;
+    table.blob_info_ = HERMES_CONF->blob_mdm_.PollBlobMetadataRoot();
+    table.target_info_ = HERMES_CONF->blob_mdm_.PollTargetMetadataRoot();
+    table.bkt_info_ = HERMES_CONF->bkt_mdm_.PollTagMetadataRoot();
+    return table;
+  }
+
+  /** Get or create a bucket */
+  hermes::Bucket GetBucket(const std::string &path,
+                           Context ctx = Context(),
+                           size_t backend_size = 0,
+                           u32 flags = 0) {
+    return hermes::Bucket(path, ctx, backend_size, flags);
+  }
+
+  /** Register an operation graph */
+  void RegisterOp(hermes::data_op::OpGraph &op_graph) {
+    HERMES_CONF->op_mdm_.RegisterOpRoot(op_graph);
+  }
+
+  /** Clear all data from hermes */
+  void Clear() {
+    // TODO(llogan)
+  }
+};
+
+#define HERMES hshm::EasySingleton<::hermes::Hermes>::GetInstance()
+
+}  // namespace hermes
+
+#endif  // HRUN_TASKS_HERMES_INCLUDE_HERMES_HERMES_H_
diff --git a/include/hermes/hermes_types.h b/include/hermes/hermes_types.h
new file mode 100644
index 000000000..d27638f27
--- /dev/null
+++ b/include/hermes/hermes_types.h
@@ -0,0 +1,480 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASKS_HERMES_INCLUDE_HERMES_HERMES_TYPES_H_
+#define HRUN_TASKS_HERMES_INCLUDE_HERMES_HERMES_TYPES_H_
+
+#include "hrun/hrun_types.h"
+#include "hrun/task_registry/task_registry.h"
+#include "hrun/api/hrun_client.h"
+#include "status.h"
+#include "statuses.h"
+
+namespace hapi = hermes;
+
+namespace hermes {
+
+using hrun::TaskLib;
+using hrun::TaskMethod;
+using hrun::UniqueId;
+using hrun::TaskStateId;
+using hrun::DomainId;
+using hrun::Task;
+using hrun::TaskId;
+using hrun::TaskNode;
+using hshm::bitfield32_t;
+
+/** Queue id */
+using hrun::QueueId;
+
+/** Queue for interprocess-communication */
+using hrun::MultiQueue;
+
+/** Unique blob id */
+typedef UniqueId<100> BlobId;
+
+/** Unique bucket id */
+typedef UniqueId<101> BucketId;
+
+/** Represents a tag */
+typedef UniqueId<102> TagId;
+
+/** Represetnts a storage target */
+typedef TaskStateId TargetId;
+
+/** Represents a trait */
+typedef TaskStateId TraitId;
+
+/** Different categories of traits */
+enum class TraitType {
+  kStagingTrait,
+  kProducerOpTrait
+};
+
+/** Represents a blob  */
+typedef hshm::charbuf Blob;
+
+/** Represents a blob in shared memory */
+typedef hipc::uptr<hipc::charbuf> IpcBlob;
+
+/** Supported data placement policies */
+enum class PlacementPolicy {
+  kRandom,         /**< Random blob placement */
+  kRoundRobin,     /**< Round-Robin (around devices) blob placement */
+  kMinimizeIoTime, /**< LP-based blob placement, minimize I/O time */
+  kNone,           /**< No Dpe for cases we want it disabled */
+};
+
+/** A class to convert placement policy enum value to string */
+class PlacementPolicyConv {
+ public:
+  /** A function to return string representation of \a policy */
+  static std::string to_str(PlacementPolicy policy) {
+    switch (policy) {
+      case PlacementPolicy::kRandom: {
+        return "PlacementPolicy::kRandom";
+      }
+      case PlacementPolicy::kRoundRobin: {
+        return "PlacementPolicy::kRoundRobin";
+      }
+      case PlacementPolicy::kMinimizeIoTime: {
+        return "PlacementPolicy::kMinimizeIoTime";
+      }
+      case PlacementPolicy::kNone: {
+        return "PlacementPolicy::kNone";
+      }
+    }
+    return "PlacementPolicy::Invalid";
+  }
+
+  /** return enum value of \a policy  */
+  static PlacementPolicy to_enum(const std::string &policy) {
+    if (policy.find("Random") != std::string::npos) {
+      return PlacementPolicy::kRandom;
+    } else if (policy.find("RoundRobin") != std::string::npos) {
+      return PlacementPolicy::kRoundRobin;
+    } else if (policy.find("MinimizeIoTime") != std::string::npos) {
+      return PlacementPolicy::kMinimizeIoTime;
+    } else if (policy.find("None") != std::string::npos) {
+      return PlacementPolicy::kNone;
+    }
+    return PlacementPolicy::kNone;
+  }
+};
+
+/** Hermes API call context */
+struct Context {
+  /** Data placement engine */
+  PlacementPolicy dpe_;
+
+  /** The blob's score */
+  float blob_score_;
+
+  /** Page size to use for FS reads / writes*/
+  size_t page_size_;
+
+  /** Flags */
+  bitfield32_t flags_;
+
+  /** The node id the blob will be accessed from */
+  u32 node_id_;
+
+  Context()
+  : dpe_(PlacementPolicy::kNone),
+    blob_score_(1),
+    node_id_(0) {}
+};
+
+/**
+ * Represents the fraction of a blob to place
+ * on a particular target during data placement
+ * */
+struct SubPlacement {
+  size_t size_;   /**< Size (bytes) */
+  TargetId tid_;  /**< Index in the target vector */
+
+  SubPlacement() = default;
+
+  explicit SubPlacement(size_t size, const TargetId &tid)
+      : size_(size), tid_(tid) {}
+};
+
+/**
+ * The organization of a particular blob in the storage
+ * hierarchy during data placement.
+ */
+struct PlacementSchema {
+  std::vector<SubPlacement> plcmnts_;
+
+  void AddSubPlacement(size_t size, const TargetId &tid) {
+    plcmnts_.emplace_back(size, tid);
+  }
+
+  void Clear() {
+    plcmnts_.clear();
+  }
+};
+
+/** The types of topologies */
+enum class TopologyType {
+  Local,
+  Neighborhood,
+  Global,
+
+  kCount
+};
+
+/** The flushing mode */
+enum class FlushingMode {
+  kSync,
+  kAsync
+};
+
+/** Convert flushing modes to strings */
+class FlushingModeConv {
+ public:
+  static FlushingMode GetEnum(const std::string &str) {
+    if (str == "kSync") {
+      return FlushingMode::kSync;
+    }
+    if (str == "kAsync") {
+      return FlushingMode::kAsync;
+    }
+    return FlushingMode::kAsync;
+  }
+};
+
+/** A class with static constants */
+#define CONST_T static inline const
+class Constant {
+ public:
+  /** Hermes server environment variable */
+  CONST_T char* kHermesServerConf = "HERMES_CONF";
+
+  /** Hermes client environment variable */
+  CONST_T char* kHermesClientConf = "HERMES_CLIENT_CONF";
+
+  /** Hermes adapter mode environment variable */
+  CONST_T char* kHermesAdapterMode = "HERMES_ADAPTER_MODE";
+
+  /** Filesystem page size environment variable */
+  CONST_T char* kHermesPageSize = "HERMES_PAGE_SIZE";
+
+  /** Stop daemon environment variable */
+  CONST_T char* kHermesStopDaemon = "HERMES_STOP_DAEMON";
+
+  /** Maximum path length environment variable */
+  CONST_T size_t kMaxPathLength = 4096;
+};
+
+/** Represents an allocated fraction of a target */
+struct BufferInfo {
+  TargetId tid_;        /**< The destination target */
+  size_t t_slab_;       /**< The index of the slab in the target */
+  size_t t_off_;        /**< Offset in the target */
+  size_t t_size_;       /**< Size in the target */
+
+  /** Serialization */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(tid_, t_slab_, t_off_, t_size_);
+  }
+
+  /** Default constructor */
+  BufferInfo() = default;
+
+  /** Primary constructor */
+  BufferInfo(TaskStateId tid, size_t t_off, size_t t_size,
+             size_t blob_off, size_t blob_size)
+      : tid_(tid), t_off_(t_off), t_size_(t_size) {}
+
+  /** Copy constructor */
+  BufferInfo(const BufferInfo &other) {
+    Copy(other);
+  }
+
+  /** Move constructor */
+  BufferInfo(BufferInfo &&other) {
+    Copy(other);
+  }
+
+  /** Copy assignment */
+  BufferInfo& operator=(const BufferInfo &other) {
+    Copy(other);
+    return *this;
+  }
+
+  /** Move assignment */
+  BufferInfo& operator=(BufferInfo &&other) {
+    Copy(other);
+    return *this;
+  }
+
+  /** Performs move/copy */
+  void Copy(const BufferInfo &other) {
+    tid_ = other.tid_;
+    t_slab_ = other.t_slab_;
+    t_off_ = other.t_off_;
+    t_size_ = other.t_size_;
+  }
+};
+
+/** Data structure used to store Blob information */
+struct BlobInfo {
+  TagId tag_id_;    /**< Tag the blob is on */
+  BlobId blob_id_;  /**< Unique ID of the blob */
+  hshm::charbuf name_;  /**< Name of the blob */
+  std::vector<BufferInfo> buffers_;  /**< Set of buffers */
+  std::vector<TagId> tags_;  /**< Set of tags */
+  size_t blob_size_;      /**< The overall size of the blob */
+  size_t max_blob_size_;  /**< The amount of space current buffers support */
+  float score_;  /**< The priority of this blob */
+  std::atomic<u32> access_freq_;  /**< Number of times blob accessed in epoch */
+  u64 last_access_;  /**< Last time blob accessed */
+  std::atomic<size_t> mod_count_;   /**< The number of times blob modified */
+  std::atomic<size_t> last_flush_;  /**< The last mod that was flushed */
+
+  /** Serialization */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(tag_id_, blob_id_, name_, buffers_, tags_, blob_size_, max_blob_size_,
+       score_, access_freq_, last_access_, mod_count_, last_flush_);
+  }
+
+  /** Default constructor */
+  BlobInfo() = default;
+
+  /** Copy constructor */
+  BlobInfo(const BlobInfo &other) {
+    tag_id_ = other.tag_id_;
+    blob_id_ = other.blob_id_;
+    name_ = other.name_;
+    buffers_ = other.buffers_;
+    tags_ = other.tags_;
+    blob_size_ = other.blob_size_;
+    max_blob_size_ = other.max_blob_size_;
+    score_ = other.score_;
+    access_freq_ = other.access_freq_.load();
+    last_access_ = other.last_access_;
+    mod_count_ = other.mod_count_.load();
+    last_flush_ = other.last_flush_.load();
+  }
+
+  /** Update modify stats */
+  void UpdateWriteStats() {
+    mod_count_.fetch_add(1);
+    UpdateReadStats();
+  }
+
+  /** Update read stats */
+  void UpdateReadStats() {
+    last_access_ = GetTimeFromStartNs();
+    access_freq_.fetch_add(1);
+  }
+
+  /** Get the time from start in nanoseconds */
+  static u64 GetTimeFromStartNs() {
+    struct timespec currentTime;
+    clock_gettime(CLOCK_MONOTONIC, &currentTime);
+    unsigned long long nanoseconds =
+        currentTime.tv_sec * 1000000000ULL + currentTime.tv_nsec;
+    return nanoseconds;
+  }
+};
+
+/** Data structure used to store Bucket information */
+struct TagInfo {
+  TagId tag_id_;
+  hshm::charbuf name_;
+  std::list<BlobId> blobs_;
+  std::list<Task*> traits_;
+  size_t internal_size_;
+  size_t page_size_;
+  bool owner_;
+
+  /** Serialization */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(tag_id_, name_, internal_size_, page_size_, owner_);
+  }
+};
+
+/** The types of I/O that can be performed (for IoCall RPC) */
+enum class IoType {
+  kRead,
+  kWrite,
+  kNone
+};
+
+/** Indicates a PUT or GET for a particular blob */
+struct IoStat {
+  IoType type_;
+  BlobId blob_id_;
+  TagId tag_id_;
+  size_t blob_size_;
+  int rank_;
+
+  /** Default constructor */
+  IoStat() = default;
+
+  /** Copy constructor */
+  IoStat(const IoStat &other) {
+    Copy(other);
+  }
+
+  /** Copy assignment */
+  IoStat& operator=(const IoStat &other) {
+    if (this != &other) {
+      Copy(other);
+    }
+    return *this;
+  }
+
+  /** Move constructor */
+  IoStat(IoStat &&other) {
+    Copy(other);
+  }
+
+  /** Move assignment */
+  IoStat& operator=(IoStat &&other) {
+    if (this != &other) {
+      Copy(other);
+    }
+    return *this;
+  }
+
+  /** Generic copy / move */
+  HSHM_ALWAYS_INLINE void Copy(const IoStat &other) {
+    type_ = other.type_;
+    blob_id_ = other.blob_id_;
+    tag_id_ = other.tag_id_;
+    blob_size_ = other.blob_size_;
+    rank_ = other.rank_;
+  }
+
+  /** Serialize */
+  template<class Archive>
+  void save(Archive &ar) const {
+    int type = static_cast<int>(type_);
+    u64 ids[2] = {blob_id_.unique_, tag_id_.unique_};
+    u32 nodes[2] = {blob_id_.node_id_, tag_id_.node_id_};
+    ar(type, ids[0], nodes[0], ids[1], nodes[1], blob_size_, rank_);
+  }
+
+  /** Deserialize */
+  template<class Archive>
+  void load(Archive &ar) {
+    int type;
+    ar(type,
+       blob_id_.unique_,
+       blob_id_.node_id_,
+       tag_id_.unique_,
+       tag_id_.node_id_,
+       blob_size_,
+       rank_);
+    type_ = static_cast<IoType>(type);
+  }
+};
+
+/** Used for debugging concurrency issues with locks */
+enum LockOwners {
+  kNone = 0,
+  kMDM_Create = 1,
+  kMDM_Update = 2,
+  kMDM_Find = 3,
+  kMDM_Find2 = 4,
+  kMDM_Delete = 5,
+  kFS_GetBaseAdapterMode = 6,
+  kFS_GetAdapterMode = 7,
+  kFS_GetAdapterPageSize = 8,
+  kBORG_LocalEnqueueFlushes = 9,
+  kBORG_LocalProcessFlushes = 10,
+  kMDM_LocalGetBucketSize = 12,
+  kMDM_LocalSetBucketSize = 13,
+  kMDM_LocalLockBucket = 14,
+  kMDM_LocalUnlockBucket = 15,
+  kMDM_LocalClearBucket = 16,
+  kMDM_LocalTagBlob = 17,
+  kMDM_LocalBlobHasTag = 18,
+  kMDM_LocalTryCreateBlob = 19,
+  kMDM_LocalPutBlobMetadata = 20,
+  kMDM_LocalGetBlobId = 21,
+  kMDM_LocalGetBlobName = 22,
+  kMDM_LocalGetBlobScore = 24,
+  kMDM_LocalLockBlob = 26,
+  kMDM_LocalUnlockBlob = 27,
+  kMDM_LocalGetBlobBuffers = 28,
+  kMDM_LocalRenameBlob = 29,
+  kMDM_LocalDestroyBlob = 30,
+  kMDM_LocalClear = 31,
+  kMDM_LocalGetOrCreateTag = 32,
+  kMDM_LocalGetTagId = 33,
+  kMDM_LocalGetTagName = 34,
+  kMDM_LocalRenameTag = 35,
+  kMDM_LocalDestroyTag = 36,
+  kMDM_LocalTagAddBlob = 37,
+  kMDM_LocalTagRemoveBlob = 38,
+  kMDM_LocalGroupByTag = 39,
+  kMDM_LocalTagAddTrait = 40,
+  kMDM_LocalTagGetTraits = 41,
+  kMDM_LocalRegisterTrait = 42,
+  kMDM_LocalGetTraitId = 43,
+  kMDM_LocalGetTraitParams = 44,
+  kMDM_GlobalGetTrait = 45,
+  kMDM_AddIoStat = 46,
+  kMDM_ClearIoStats = 47
+};
+
+
+}  // namespace hermes
+
+#endif  // HRUN_TASKS_HERMES_INCLUDE_HERMES_HERMES_TYPES_H_
diff --git a/include/hermes/slab_allocator.h b/include/hermes/slab_allocator.h
new file mode 100644
index 000000000..33ff777da
--- /dev/null
+++ b/include/hermes/slab_allocator.h
@@ -0,0 +1,160 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef HRUN_TASKS_HERMES_INCLUDE_HERMES_SLAB_ALLOCATOR_H_
+#define HRUN_TASKS_HERMES_INCLUDE_HERMES_SLAB_ALLOCATOR_H_
+
+#include "hrun/hrun_types.h"
+#include "hermes/hermes_types.h"
+
+namespace hermes {
+
+struct Slab {
+  size_t slab_size_;
+  std::list<BufferInfo> buffers_;
+};
+
+struct SlabCount {
+  size_t count_;
+  size_t slab_size_;
+
+  SlabCount() : count_(0), slab_size_(0) {}
+};
+
+class SlabAllocator {
+ public:
+  std::vector<Slab> slab_lists_;
+  std::atomic<size_t> heap_;
+  size_t dev_size_;
+  TargetId target_id_;
+
+ public:
+  /** Default constructor */
+  SlabAllocator() = default;
+
+  /** Destructor */
+  ~SlabAllocator() = default;
+
+  /** Initialize slab allocator */
+  void Init(TargetId target_id,
+            size_t dev_size,
+            std::vector<size_t> &slab_sizes) {
+    heap_ = 0;
+    dev_size_ = dev_size;
+    target_id_ = target_id;
+    slab_lists_.reserve(slab_sizes.size());
+    for (auto &slab_size : slab_sizes) {
+      slab_lists_.emplace_back();
+      auto &slab = slab_lists_.back();
+      slab.slab_size_ = slab_size;
+    }
+  }
+
+  /**
+   * Allocate enough slabs to ideally fit the size
+   * It can allocate less than or more than the requested size
+   *
+   * @param size the amount of space to allocate
+   * @param[OUT] buffers the buffers allocated
+   * @return the amount of space actually allocated. Maximum value is size.
+   * */
+  void Allocate(size_t size,
+                std::vector<BufferInfo> &buffers,
+                size_t &total_size) {
+    u32 buffer_count = 0;
+    std::vector<SlabCount> coins = CoinSelect(size, buffer_count);
+    buffers.reserve(buffer_count);
+    total_size = 0;
+    int slab_idx = 0;
+    for (auto &coin : coins) {
+      AllocateSlabs(coin.slab_size_,
+                    slab_idx,
+                    coin.count_,
+                    buffers,
+                    total_size);
+      ++slab_idx;
+    }
+  }
+
+ private:
+  /** Determine how many of each slab size to allocate */
+  std::vector<SlabCount> CoinSelect(size_t size, u32 &buffer_count) {
+    std::vector<SlabCount> coins(slab_lists_.size());
+    size_t rem_size = size;
+
+    while (rem_size) {
+      // Find the slab size nearest to the rem_size
+      size_t i = 0, slab_size = 0;
+      for (auto &slab : slab_lists_) {
+        if (slab.slab_size_ >= rem_size) {
+          break;
+        }
+        ++i;
+      }
+      if (i == slab_lists_.size()) { i -= 1; }
+      slab_size = slab_lists_[i].slab_size_;
+
+      // Divide rem_size into slabs
+      if (rem_size > slab_size) {
+        coins[i].count_ += rem_size / slab_size;
+        coins[i].slab_size_ = slab_size;
+        rem_size %= slab_size;
+      } else {
+        coins[i].count_ += 1;
+        coins[i].slab_size_ = slab_size;
+        rem_size = 0;
+      }
+      buffer_count += coins[i].count_;
+    }
+
+    return coins;
+  }
+
+  /** Allocate slabs of a certain size */
+  void AllocateSlabs(size_t slab_size, int slab_idx, size_t count,
+                     std::vector<BufferInfo> &buffers,
+                     size_t &total_size) {
+    auto &slab = slab_lists_[slab_idx];
+    for (size_t i = 0; i < count; ++i) {
+      if (slab.buffers_.size() > 0) {
+        buffers.push_back(slab.buffers_.front());
+        slab.buffers_.pop_front();
+      } else {
+        // Verify the heap has space
+        if (heap_.load() + slab_size > dev_size_) {
+          return;
+        }
+        // Allocate a new slab
+        buffers.emplace_back();
+        BufferInfo &buf = buffers.back();
+        buf.tid_ = target_id_;
+        buf.t_off_ = heap_.fetch_add(slab_size);
+        buf.t_size_ = slab_size;
+        buf.t_slab_ = slab_idx;
+      }
+      total_size += slab_size;
+    }
+  }
+
+ public:
+  /** Free a set of buffers */
+  void Free(const std::vector<BufferInfo> &buffers) {
+    for (const auto &buffer : buffers) {
+      auto &slab = slab_lists_[buffer.t_slab_];
+      slab.buffers_.push_back(buffer);
+    }
+  }
+};
+
+}  // namespace hermes
+
+#endif  // HRUN_TASKS_HERMES_INCLUDE_HERMES_SLAB_ALLOCATOR_H_
diff --git a/src/status.h b/include/hermes/status.h
similarity index 96%
rename from src/status.h
rename to include/hermes/status.h
index ea86f68e0..6e1ffb60c 100644
--- a/src/status.h
+++ b/include/hermes/status.h
@@ -17,7 +17,7 @@
 
 /** \file hermes_status.h */
 
-namespace hermes::api {
+namespace hermes {
 
 class Status {
  public:
@@ -47,5 +47,5 @@ class Status {
   }
 };
 
-}  // namespace hermes::api
+}  // namespace hermes
 #endif  // HERMES_STATUS_H_
diff --git a/src/utils.h b/include/hermes/statuses.h
similarity index 64%
rename from src/utils.h
rename to include/hermes/statuses.h
index bbb416b3c..30e130bce 100644
--- a/src/utils.h
+++ b/include/hermes/statuses.h
@@ -10,24 +10,21 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_UTILS_H_
-#define HERMES_UTILS_H_
+#ifndef HRUN_TASKS_HERMES_INCLUDE_STATUSES_H_
+#define HRUN_TASKS_HERMES_INCLUDE_STATUSES_H_
 
-#include <assert.h>
-#include <map>
-#include "hermes_shm/util/logging.h"
+#include "status.h"
+
+#define STATUS_T static inline const Status
 
 namespace hermes {
 
-/** Get an environment variable with null safety. */
-static inline std::string GetEnvSafe(const char *env_name) {
-  char *val = getenv(env_name);
-  if (val == nullptr) {
-    return "";
-  }
-  return val;
-}
+STATUS_T NOT_IMPLEMENTED(0, "Function was not implemented");
+STATUS_T DPE_PLACEMENT_SCHEMA_EMPTY(1, "DPE placement schema is empty");
+STATUS_T DPE_NO_SPACE(1, "Placement failed. Non-fatal.");
+STATUS_T DPE_MIN_IO_TIME_NO_SOLUTION(
+    1, "DPE could not find solution for the minimize I/O time DPE");
 
 }  // namespace hermes
 
-#endif  // HERMES_UTILS_H_
+#endif  // HRUN_TASKS_HERMES_INCLUDE_STATUSES_H_
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60b99d42a..4bcda8599 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,182 +1,54 @@
-include_directories(${CMAKE_SOURCE_DIR})
-
-configure_file(hermes_version.h.in hermes_version.h)
-
-# Create rpc factory
-set(CMAKE_HERMES_COMMUNICATION_TYPE HERMES_RPC_NONE)
-if (HERMES_RPC_THALLIUM)
-  set(CMAKE_HERMES_RPC_TYPE HERMES_RPC_THALLIUM)
-  set(CMAKE_HERMES_RPC_TYPE_LIB thallium)
-endif()
-configure_file(rpc_factory.h.in rpc_factory.h)
-
 #------------------------------------------------------------------------------
-# External dependencies
+# Build Small Message Task Library
 #------------------------------------------------------------------------------
-# None for now
+add_library(hermes SHARED
+        hermes_config_manager.cc)
+add_dependencies(hermes ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hermes ${Hermes_RUNTIME_LIBRARIES})
 
 #------------------------------------------------------------------------------
-# Set sources
-#------------------------------------------------------------------------------
-set(HERMES_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/api/hermes_singleton.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/config_client.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/config_server.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/hermes_types.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/rpc.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/rpc_thallium.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/rpc_thallium_defs.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/metadata_types.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/metadata_manager.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/api/bucket.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/api/hermes.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/buffer_pool.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/buffer_organizer.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/prefetcher.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/prefetcher/apriori_prefetcher.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/trait_manager.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/data_placement_engine.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/dpe/random.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/dpe/round_robin.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/dpe/minimize_io_time.cc)
-
-#------------------------------------------------------------------------------
-# Build Hermes Shared Library
-#------------------------------------------------------------------------------
-set(HERMES_BUILD_INCLUDE_DEPENDENCIES
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/api
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-add_library(hermes SHARED ${HERMES_SRCS})
-include_directories(${CMAKE_SOURCE_DIR}/io_client)
-target_include_directories(hermes
-  PUBLIC "$<BUILD_INTERFACE:${HERMES_BUILD_INCLUDE_DEPENDENCIES}>"
-          $<INSTALL_INTERFACE:${HERMES_INSTALL_INCLUDE_INTERFACE}>
-)
-target_include_directories(hermes
-  SYSTEM PUBLIC ${HERMES_EXT_INCLUDE_DEPENDENCIES})
-add_dependencies(hermes
-        hermes_shm_data_structures)
-target_link_libraries(hermes
-  hermes_shm_data_structures
-  ${CMAKE_HERMES_RPC_TYPE_LIB}
-  yaml-cpp
-  cereal::cereal
-  MPI::MPI_CXX)
-
-if (HERMES_ENABLE_PROFILING)
-  message("profiling is enabled: ${HERMES_ENABLE_PROFILING}")
-endif()
-
-target_compile_definitions(hermes
-  PRIVATE $<$<BOOL:${HERMES_ONLY_RPC}>:HERMES_ONLY_RPC>
-  PRIVATE $<$<BOOL:${HERMES_ENABLE_PROFILING}>:HERMES_ENABLE_PROFILING>
-)
-
-hermes_set_lib_options(hermes "hermes" ${HERMES_LIBTYPE})
-set(HERMES_EXPORTED_LIBS hermes hermes_daemon finalize_hermes ${HERMES_EXPORTED_LIBS})
-
-#------------------------------------------------------------------------------
-# Build Hermes Daemon
-#------------------------------------------------------------------------------
-find_package(Catch2 REQUIRED)
-add_executable(hermes_daemon api/hermes_daemon.cc)
-add_dependencies(hermes_daemon hermes)
-target_link_libraries(hermes_daemon hermes -ldl -lc MPI::MPI_CXX)
-target_compile_definitions(hermes_daemon
-        PRIVATE $<$<BOOL:${HERMES_ENABLE_PROFILING}>:HERMES_ENABLE_PROFILING>)
-
-
+# Install Small Message Task Library
 #------------------------------------------------------------------------------
-# Build Hermes Shared Library
-#------------------------------------------------------------------------------
-add_executable(finalize_hermes api/finalize_hermes.cc)
-add_dependencies(finalize_hermes hermes)
-target_link_libraries(finalize_hermes hermes)
-
-#-----------------------------------------------------------------------------
-# Specify project header files to be installed
-#-----------------------------------------------------------------------------
-file(GLOB_RECURSE HERMES_HEADERS "*.h")
-set(HERMES_HEADERS
-        ${CMAKE_BINARY_DIR}/src/rpc_factory.h
-        ${CMAKE_BINARY_DIR}/src/hermes_version.h
-        ${HERMES_HEADERS})
-
-#-----------------------------------------------------------------------------
-# Add file(s) to CMake Install
-#-----------------------------------------------------------------------------
-install(
-  FILES
-    ${HERMES_HEADERS}
-  DESTINATION
-    ${HERMES_INSTALL_INCLUDE_DIR}
-  COMPONENT
-    headers
-)
-
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
 install(
-  TARGETS
-    hermes
-    hermes_daemon
-    finalize_hermes
-  EXPORT
-    ${HERMES_EXPORTED_TARGETS}
-  LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-  ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-  RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+        TARGETS
+        hermes
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
 )
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 install(
-  EXPORT
-    ${HERMES_EXPORTED_TARGETS}
-  DESTINATION
-    ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
-  FILE
-    ${HERMES_EXPORTED_TARGETS}.cmake
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
 )
 
 #-----------------------------------------------------------------------------
 # Export all exported targets to the build tree for use by parent project
 #-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hermes
+        ${HERMES_EXPORTED_LIBS})
 if(NOT HERMES_EXTERNALLY_CONFIGURED)
-EXPORT (
-  TARGETS
-    ${HERMES_EXPORTED_LIBS}
-  FILE
-    ${HERMES_EXPORTED_TARGETS}.cmake
-)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
 endif()
 
-#------------------------------------------------------------------------------
-# Set variables for parent scope
-#------------------------------------------------------------------------------
-# Used by config.cmake.build.in and Testing
-set(HERMES_INCLUDES_BUILD_TIME
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${HERMES_EXT_INCLUDE_DEPENDENCIES}
-  PARENT_SCOPE
-)
-
-# Used by config.cmake.install.in
-set(HERMES_INCLUDES_INSTALL_TIME
-  ${HERMES_INSTALL_INCLUDE_DIR}
-  ${HERMES_EXT_INCLUDE_DEPENDENCIES}
-  PARENT_SCOPE
-)
-
 #------------------------------------------------------------------------------
 # Coverage
 #------------------------------------------------------------------------------
 if(HERMES_ENABLE_COVERAGE)
-  set_coverage_flags(hermes)
-endif()
\ No newline at end of file
+    set_coverage_flags(hermes)
+endif()
diff --git a/src/api/bucket.cc b/src/api/bucket.cc
deleted file mode 100644
index 9d297041a..000000000
--- a/src/api/bucket.cc
+++ /dev/null
@@ -1,260 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "bucket.h"
-#include "data_placement_engine_factory.h"
-
-namespace hermes::api {
-
-using hermes::adapter::AdapterMode;
-
-/**====================================
- * Bucket Operations
- * ===================================*/
-
-/**
- * Either initialize or fetch the bucket.
- * */
-Bucket::Bucket(const std::string &bkt_name,
-               Context &ctx,
-               size_t backend_size)
-: mdm_(&HERMES->mdm_), bpm_(&HERMES->bpm_), name_(bkt_name) {
-  std::vector<TraitId> traits;
-  auto ret = mdm_->GlobalGetOrCreateTag(bkt_name, true, traits, backend_size);
-  id_ = ret.first;
-  did_create_ = ret.second;
-}
-
-/**
- * Either initialize or fetch the bucket.
- * */
-Bucket::Bucket(TagId tag_id)
-    : mdm_(&HERMES->mdm_), bpm_(&HERMES->bpm_) {
-  name_ = mdm_->GlobalGetTagName(tag_id);
-  id_ = tag_id;
-  did_create_ = false;
-}
-
-/**
- * Attach a trait to the bucket
- * */
-void Bucket::AttachTrait(TraitId trait_id) {
-  HERMES->AttachTrait(id_, trait_id);
-}
-
-/**
- * Get the current size of the bucket
- * */
-size_t Bucket::GetSize() {
-  return mdm_->GlobalGetBucketSize(id_);
-}
-
-/**
-   * Update the size of the bucket
-   * Needed for the adapters for now.
-   * */
-void Bucket::SetSize(size_t new_size) {
-  mdm_->GlobalSetBucketSize(id_, new_size);
-}
-
-/**
- * Lock a bucket
- * */
-void Bucket::LockBucket(MdLockType type) {
-  mdm_->GlobalLockBucket(id_, type);
-}
-
-/**
- * Unlock a bucket
- * */
-void Bucket::UnlockBucket(MdLockType type) {
-  mdm_->GlobalUnlockBucket(id_, type);
-}
-
-/**
- * Rename this bucket
- * */
-void Bucket::Rename(const std::string &new_bkt_name) {
-  mdm_->GlobalRenameTag(id_, new_bkt_name);
-}
-
-/**
-   * Clears the buckets contents, but doesn't destroy its metadata
-   * */
-void Bucket::Clear() {
-  mdm_->GlobalClearBucket(id_);
-}
-
-/**
- * Destroys this bucket along with all its contents.
- * */
-void Bucket::Destroy() {
-  mdm_->GlobalDestroyTag(id_);
-}
-
-/**====================================
- * Blob Operations
- * ===================================*/
-
-/**
- * Get the id of a blob from the blob name
- * */
-Status Bucket::GetBlobId(const std::string &blob_name,
-                         BlobId &blob_id) {
-  blob_id = mdm_->GlobalGetBlobId(GetId(), blob_name);
-  return Status();
-}
-
-/**
- * Get the name of a blob from the blob id
- *
- * @param blob_id the blob_id
- * @return The Status of the operation
- * */
-std::string Bucket::GetBlobName(const BlobId &blob_id) {
-  return mdm_->GlobalGetBlobName(blob_id);
-}
-
-/**
- * Get the score of a blob from the blob id
- *
- * @param blob_id the blob_id
- * @return The Status of the operation
- * */
-float Bucket::GetBlobScore(const BlobId &blob_id) {
-  return mdm_->GlobalGetBlobScore(blob_id);
-}
-
-
-/**
- * Lock the bucket
- * */
-bool Bucket::LockBlob(BlobId blob_id, MdLockType lock_type) {
-  return mdm_->GlobalLockBlob(blob_id, lock_type);
-}
-
-/**
- * Unlock the bucket
- * */
-bool Bucket::UnlockBlob(BlobId blob_id, MdLockType lock_type) {
-  return mdm_->GlobalUnlockBlob(blob_id, lock_type);
-}
-
-/**
- * Put \a blob_id Blob into the bucket
- * */
-Status Bucket::TryCreateBlob(const std::string &blob_name,
-                             BlobId &blob_id,
-                             Context &ctx) {
-  std::pair<BlobId, bool> ret = mdm_->GlobalTryCreateBlob(id_, blob_name);
-  blob_id = ret.first;
-  if (ret.second) {
-    mdm_->GlobalTagAddBlob(id_,
-                           blob_id);
-  }
-  return Status();
-}
-
-/**
- * Label \a blob_id blob with \a tag_name TAG
- * */
-Status Bucket::TagBlob(BlobId &blob_id,
-                       TagId &tag_id) {
-  mdm_->GlobalTagAddBlob(tag_id, blob_id);
-  return mdm_->GlobalTagBlob(blob_id, tag_id);
-}
-
-/**
- * Put \a blob_id Blob into the bucket
- * */
-Status Bucket::Put(std::string blob_name,
-                   const Blob &blob,
-                   BlobId &blob_id,
-                   Context &ctx) {
-  // Calculate placement
-  auto dpe = DPEFactory::Get(ctx.policy);
-  std::vector<size_t> blob_sizes(1, blob.size());
-  std::vector<PlacementSchema> schemas;
-  dpe->CalculatePlacement(blob_sizes, schemas, ctx);
-
-  // Allocate buffers for the blob & enqueue placement
-  for (auto &schema : schemas) {
-    auto buffers = bpm_->GlobalAllocateAndSetBuffers(schema, blob);
-    auto put_ret = mdm_->GlobalPutBlobMetadata(id_, blob_name,
-                                               blob.size(), buffers,
-                                               ctx.blob_score_);
-    blob_id = std::get<0>(put_ret);
-    bool did_create = std::get<1>(put_ret);
-    if (did_create) {
-      mdm_->GlobalTagAddBlob(id_, blob_id);
-    }
-  }
-
-  // Update the local MDM I/O log
-  mdm_->AddIoStat(id_, blob_id, blob.size(), IoType::kWrite);
-
-  return Status();
-}
-
-/**
- * Get \a blob_id Blob from the bucket
- * */
-Status Bucket::Get(BlobId blob_id, Blob &blob, Context &ctx) {
-  std::vector<BufferInfo> buffers = mdm_->GlobalGetBlobBuffers(blob_id);
-  blob = HERMES->borg_.GlobalReadBlobFromBuffers(buffers);
-  // Update the local MDM I/O log
-  mdm_->AddIoStat(id_, blob_id, blob.size(), IoType::kRead);
-  return Status();
-}
-
-/**
- * Determine if the bucket contains \a blob_id BLOB
- * */
-bool Bucket::ContainsBlob(const std::string &blob_name,
-                          BlobId &blob_id) {
-  GetBlobId(blob_name, blob_id);
-  return !blob_id.IsNull();
-}
-
-/**
- * Determine if the bucket contains \a blob_id BLOB
- * */
-bool Bucket::ContainsBlob(BlobId blob_id) {
-  return mdm_->GlobalBlobHasTag(blob_id, id_);
-}
-
-/**
- * Rename \a blob_id blob to \a new_blob_name new name
- * */
-void Bucket::RenameBlob(BlobId blob_id,
-                        std::string new_blob_name,
-                        Context &ctx) {
-  mdm_->GlobalRenameBlob(id_, blob_id, new_blob_name);
-}
-
-/**
- * Delete \a blob_id blob
- * */
-void Bucket::DestroyBlob(BlobId blob_id,
-                         Context &ctx) {
-  mdm_->GlobalTagRemoveBlob(id_, blob_id);
-  mdm_->GlobalDestroyBlob(id_, blob_id);
-}
-
-/**
- * Get the set of blob IDs owned by the bucket
- * */
-std::vector<BlobId> Bucket::GetContainedBlobIds() {
-  return mdm_->GlobalGroupByTag(id_);
-}
-
-}  // namespace hermes::api
diff --git a/src/api/bucket.h b/src/api/bucket.h
deleted file mode 100644
index 3370e8b90..000000000
--- a/src/api/bucket.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_API_BUCKET_H_
-#define HERMES_SRC_API_BUCKET_H_
-
-#include "hermes_types.h"
-#include "status.h"
-#include "buffer_pool.h"
-
-namespace hermes::api {
-
-class Bucket {
- private:
-  MetadataManager *mdm_;
-  BufferPool *bpm_;
-  TagId id_;
-  std::string name_;
-  Context ctx_;
-  bool did_create_;
-
- public:
-  /**====================================
-   * Bucket Operations
-   * ===================================*/
-
-  /**
-   * Get or create \a bkt_name bucket.
-   *
-   * Called from hermes.h in GetBucket(). Should not
-   * be used directly.
-   * */
-  explicit Bucket(const std::string &bkt_name,
-                  Context &ctx,
-                  size_t backend_size = 0);
-
-  /**
-   * Get an existing bucket.
-   * */
-  explicit Bucket(TagId tag_id);
-
-  /**
-   * Check if the bucket was created in the constructor
-   * */
-  bool DidCreate() {
-    return did_create_;
-  }
-
-  /** Default constructor */
-  Bucket() = default;
-
-  /** Default copy constructor */
-  Bucket(const Bucket &other) = default;
-
-  /** Default copy assign */
-  Bucket& operator=(const Bucket &other) = default;
-
-  /** Default move constructor */
-  Bucket(Bucket &&other) = default;
-
-  /** Default move assign */
-  Bucket& operator=(Bucket &&other) = default;
-
- public:
-  /**
-   * Get the name of this bucket. Name is cached instead of
-   * making an RPC. Not coherent if Rename is called.
-   * */
-  const std::string& GetName() const {
-    return name_;
-  }
-
-  /**
-   * Get the identifier of this bucket
-   * */
-  TagId GetId() const {
-    return id_;
-  }
-
-  /**
-   * Get the context object of this bucket
-   * */
-  Context& GetContext() {
-    return ctx_;
-  }
-
-  /**
-   * Attach a trait to the bucket
-   * */
-  void AttachTrait(TraitId trait_id);
-
-  /**
-   * Get the current size of the bucket
-   * */
-  size_t GetSize();
-
-  /**
-   * Update the size of the bucket
-   * Needed for the adapters for now.
-   * */
-  void SetSize(size_t new_size);
-
-  /**
-   * Lock a bucket
-   * */
-  void LockBucket(MdLockType type);
-
-  /**
-   * Unlock a bucket
-   * */
-  void UnlockBucket(MdLockType type);
-
-  /**
-   * Rename this bucket
-   * */
-  void Rename(const std::string &new_bkt_name);
-
-  /**
-   * Clears the buckets contents, but doesn't destroy its metadata
-   * */
-  void Clear();
-
-  /**
-   * Destroys this bucket along with all its contents.
-   * */
-  void Destroy();
-
-  /**
-   * Check if this bucket is valid
-   * */
-  bool IsNull() {
-    return id_.IsNull();
-  }
-
- public:
-  /**====================================
-   * Blob Operations
-   * ===================================*/
-
-  /**
-   * Get the id of a blob from the blob name
-   *
-   * @param blob_name the name of the blob
-   * @param blob_id (output) the returned blob_id
-   * @return The Status of the operation
-   * */
-  Status GetBlobId(const std::string &blob_name, BlobId &blob_id);
-
-  /**
-   * Get the name of a blob from the blob id
-   *
-   * @param blob_id the blob_id
-   * @param blob_name the name of the blob
-   * @return The Status of the operation
-   * */
-  std::string GetBlobName(const BlobId &blob_id);
-
-
-  /**
-   * Get the score of a blob from the blob id
-   *
-   * @param blob_id the blob_id
-   * @return The Status of the operation
-   * */
-  float GetBlobScore(const BlobId &blob_id);
-
-  /**
-   * Lock the blob
-   * */
-  bool LockBlob(BlobId blob_id, MdLockType lock_type);
-
-  /**
-   * Unlock the blob
-   * */
-  bool UnlockBlob(BlobId blob_id, MdLockType lock_type);
-
-  /**
-   * Create \a blob_name EMPTY BLOB if it does not already exist.
-   * */
-  Status TryCreateBlob(const std::string &blob_name,
-                       BlobId &blob_id,
-                       Context &ctx);
-
-  /**
-   * Label \a blob_id blob with \a tag_name TAG
-   * */
-  Status TagBlob(BlobId &blob_id,
-                 TagId &tag_id);
-
-  /**
-   * Put \a blob_name Blob into the bucket
-   * */
-  Status Put(std::string blob_name,
-             const Blob &blob,
-             BlobId &blob_id,
-             Context &ctx);
-
-  /**
-   * Get \a blob_id Blob from the bucket
-   * */
-  Status Get(BlobId blob_id,
-             Blob &blob,
-             Context &ctx);
-
-  /**
-   * Determine if the bucket contains \a blob_id BLOB
-   * */
-  bool ContainsBlob(const std::string &blob_name,
-                    BlobId &blob_id);
-
-  /**
-   * Determine if the bucket contains \a blob_id BLOB
-   * */
-  bool ContainsBlob(BlobId blob_id);
-
-  /**
-   * Rename \a blob_id blob to \a new_blob_name new name
-   * */
-  void RenameBlob(BlobId blob_id, std::string new_blob_name, Context &ctx);
-
-  /**
-   * Delete \a blob_id blob
-   * */
-  void DestroyBlob(BlobId blob_id, Context &ctx);
-
-  /**
-   * Get the set of blob IDs contained in the bucket
-   * */
-  std::vector<BlobId> GetContainedBlobIds();
-};
-
-}  // namespace hermes::api
-
-#endif  // HERMES_SRC_API_BUCKET_H_
diff --git a/src/api/finalize_hermes.cc b/src/api/finalize_hermes.cc
deleted file mode 100644
index fbc0e025c..000000000
--- a/src/api/finalize_hermes.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes_shm/util/singleton.h"
-#include "hermes.h"
-
-int main(int argc, char **argv) {
-  HILOG(kDebug, "Finalize Hermes begins")
-  HERMES->Create(hermes::HermesType::kClient);
-  HERMES->client_config_.stop_daemon_ = true;
-  HERMES->Flush();
-  HERMES->Finalize();
-}
diff --git a/src/api/hermes.cc b/src/api/hermes.cc
deleted file mode 100644
index d5e3ae6a7..000000000
--- a/src/api/hermes.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes.h"
-#include "bucket.h"
-
-namespace hermes::api {
-
-/**====================================
- * PRIVATE Init + Finalize Operations
- * ===================================*/
-
-/** Internal initialization of Hermes */
-void Hermes::Init(HermesType mode,
-                  std::string server_config_path,
-                  std::string client_config_path) {
-  // Initialize hermes
-  hshm::ScopedMutex lock(lock_, 1);
-  if (is_initialized_) {
-    return;
-  }
-  mode_ = mode;
-  is_being_initialized_ = true;
-  switch (mode_) {
-    case HermesType::kServer: {
-      InitServer(std::move(server_config_path));
-      break;
-    }
-    case HermesType::kClient: {
-      InitClient(std::move(server_config_path),
-                 std::move(client_config_path));
-      break;
-    }
-    case HermesType::kNone: {
-      HELOG(kFatal, "Cannot have none HermesType")
-    }
-  }
-  is_initialized_ = true;
-  is_being_initialized_ = false;
-}
-
-/** Initialize Hermes as a server */
-void Hermes::InitServer(std::string server_config_path) {
-  LoadServerConfig(server_config_path);
-  InitSharedMemory();
-
-  // Initialize RPC
-  rpc_.InitServer();
-  HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kArgobots);
-
-  // Load the trait libraries
-  traits_.Init();
-
-  // Construct the reference objects
-  mdm_.shm_init(header_->mdm_, main_alloc_, &server_config_);
-  rpc_.InitClient();
-  bpm_.shm_init(header_->bpm_, main_alloc_);
-  borg_.shm_init(header_->borg_, main_alloc_);
-  prefetch_.Init();
-}
-
-/** Initialize Hermes as a client to the daemon */
-void Hermes::InitClient(std::string server_config_path,
-                        std::string client_config_path) {
-  LoadServerConfig(server_config_path);
-  LoadClientConfig(client_config_path);
-  LoadSharedMemory();
-
-  // Initialize references to SHM types
-  mdm_.shm_deserialize(header_->mdm_);
-  rpc_.InitClient();
-  HERMES_THREAD_MODEL->SetThreadModel(hshm::ThreadType::kArgobots);
-  bpm_.shm_deserialize(header_->bpm_);
-  borg_.shm_deserialize(header_->borg_);
-  prefetch_.Init();
-  // mdm_.PrintDeviceInfo();
-
-  // Load the trait libraries
-  traits_.Init();
-}
-
-/** Load the server-side configuration */
-void Hermes::LoadServerConfig(std::string config_path) {
-  if (config_path.empty()) {
-    config_path = GetEnvSafe(kHermesServerConf);
-  }
-  if (mode_ == HermesType::kServer) {
-    HILOG(kInfo, "Loading server configuration: {}", config_path)
-  }
-  server_config_.LoadFromFile(config_path);
-}
-
-/** Load the client-side configuration */
-void Hermes::LoadClientConfig(std::string config_path) {
-  if (config_path.empty()) {
-    config_path = GetEnvSafe(kHermesClientConf);
-  }
-  HILOG(kDebug, "Loading client configuration: {}", config_path)
-  client_config_.LoadFromFile(config_path);
-}
-
-/** Initialize shared-memory between daemon and client */
-void Hermes::InitSharedMemory() {
-  // Create shared-memory allocator
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  if (server_config_.max_memory_ == 0) {
-    server_config_.max_memory_ = hipc::MemoryManager::GetDefaultBackendSize();
-  }
-  mem_mngr->CreateBackend<hipc::PosixShmMmap>(
-    server_config_.max_memory_,
-    server_config_.shmem_name_);
-  main_alloc_ =
-    mem_mngr->CreateAllocator<hipc::ScalablePageAllocator>(
-      server_config_.shmem_name_,
-      main_alloc_id,
-      sizeof(HermesShm));
-  header_ = main_alloc_->GetCustomHeader<HermesShm>();
-}
-
-/** Connect to a Daemon's shared memory */
-void Hermes::LoadSharedMemory() {
-  // Load shared-memory allocator
-  auto mem_mngr = HERMES_MEMORY_MANAGER;
-  mem_mngr->AttachBackend(hipc::MemoryBackendType::kPosixShmMmap,
-                          server_config_.shmem_name_);
-  main_alloc_ = mem_mngr->GetAllocator(main_alloc_id);
-  header_ = main_alloc_->GetCustomHeader<HermesShm>();
-}
-
-/** Finalize Daemon mode */
-void Hermes::FinalizeServer() {
-  // NOTE(llogan): rpc_.Finalize() is called internally by daemon in this case
-  // bpm_.shm_destroy();
-  // mdm_.shm_destroy();
-}
-
-/** Finalize client mode */
-void Hermes::FinalizeClient() {
-  if (client_config_.stop_daemon_) {
-    StopDaemon();
-  }
-  rpc_.Finalize();
-}
-
-/**====================================
- * PUBLIC Finalize Operations
- * ===================================*/
-
-/** Finalize Hermes explicitly */
-void Hermes::Finalize() {
-  if (!is_initialized_ || is_terminated_) {
-    return;
-  }
-  switch (mode_) {
-    case HermesType::kServer: {
-      FinalizeServer();
-      break;
-    }
-    case HermesType::kClient: {
-      FinalizeClient();
-      break;
-    }
-    default: {
-      throw std::logic_error("Invalid HermesType to launch in");
-    }
-  }
-  is_initialized_ = false;
-  is_terminated_ = true;
-}
-
-/** Run the Hermes core Daemon */
-void Hermes::RunDaemon() {
-  rpc_.RunDaemon();
-}
-
-/** Stop the Hermes core Daemon */
-void Hermes::StopDaemon() {
-  rpc_.StopDaemon();
-}
-
-/**====================================
- * PUBLIC Bucket Operations
- * ===================================*/
-
-/** Get or create a Bucket in Hermes */
-Bucket Hermes::GetBucket(std::string name,
-                         Context ctx,
-                         size_t backend_size) {
-  return Bucket(name, ctx, backend_size);
-}
-
-/** Get an existing Bucket in Hermes */
-Bucket Hermes::GetBucket(TagId tag_id) {
-  return Bucket(tag_id);
-}
-
-/**====================================
- * PUBLIC I/O Operations
- * ===================================*/
-
-/** Waits for all blobs to finish being flushed */
-void Hermes::Flush() {
-  borg_.GlobalWaitForFullFlush();
-}
-
-/** Destroy all buckets and blobs in this instance */
-void Hermes::Clear() {
-  Flush();
-  mdm_.GlobalClear();
-}
-
-/**====================================
- * PUBLIC Tag Operations
- * ===================================*/
-
-/** Locate all blobs with a tag */
-std::vector<BlobId> Hermes::GroupBy(TagId tag_id) {
-  return mdm_.GlobalGroupByTag(tag_id);
-}
-
-
-
-}  // namespace hermes::api
diff --git a/src/api/hermes.h b/src/api/hermes.h
deleted file mode 100644
index 16f821776..000000000
--- a/src/api/hermes.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_API_HERMES_H_
-#define HERMES_SRC_API_HERMES_H_
-
-#include "config_client.h"
-#include "config_server.h"
-#include "hermes_types.h"
-#include "utils.h"
-
-#include "rpc.h"
-#include "metadata_manager.h"
-#include "buffer_pool.h"
-#include "buffer_organizer.h"
-#include "prefetcher.h"
-#include "trait_manager.h"
-#include "bucket.h"
-
-#include "hermes_shm/util/singleton.h"
-
-// Singleton macros
-#define HERMES hshm::Singleton<hermes::api::Hermes>::GetInstance()
-#define HERMES_T hermes::api::Hermes*
-
-namespace hapi = hermes::api;
-
-namespace hermes::api {
-
-/**
- * The Hermes shared-memory header
- * */
-struct HermesShm {
-  hipc::Pointer ram_tier_;
-  hipc::ShmArchive<MetadataManagerShm> mdm_;
-  hipc::ShmArchive<BufferPoolShm> bpm_;
-  hipc::ShmArchive<BufferOrganizerShm> borg_;
-};
-
-/**
- * An index into all Hermes-related data structures.
- * */
-class Hermes {
- public:
-  HermesType mode_;
-  HermesShm *header_;
-  ServerConfig server_config_;
-  ClientConfig client_config_;
-  MetadataManager mdm_;
-  BufferPool bpm_;
-  BufferOrganizer borg_;
-  TraitManager traits_;
-  Prefetcher prefetch_;
-  RPC_TYPE rpc_;
-  hipc::Allocator *main_alloc_;
-  bool is_being_initialized_;
-  bool is_initialized_;
-  bool is_terminated_;
-  bool is_transparent_;
-  hshm::Mutex lock_;
-
- public:
-  /**====================================
-   * PUBLIC Init Operations
-   * ===================================*/
-
-  /** Default constructor */
-  Hermes() : is_being_initialized_(false),
-             is_initialized_(false),
-             is_terminated_(false),
-             is_transparent_(false) {}
-
-  /** Destructor */
-  ~Hermes() {}
-
-  /** Whether or not Hermes is currently being initialized */
-  bool IsBeingInitialized() { return is_being_initialized_; }
-
-  /** Whether or not Hermes is initialized */
-  bool IsInitialized() { return is_initialized_; }
-
-  /** Whether or not Hermes is finalized */
-  bool IsTerminated() { return is_terminated_; }
-
-  /** Initialize Hermes explicitly */
-  static Hermes* Create(HermesType mode = HermesType::kClient,
-                        std::string server_config_path = "",
-                        std::string client_config_path = "") {
-    auto hermes = HERMES;
-    hermes->Init(mode, server_config_path, client_config_path);
-    return hermes;
-  }
-
- public:
-  /**====================================
-   * PUBLIC Finalize Operations
-   * ===================================*/
-
-  /** Finalize Hermes explicitly */
-  void Finalize();
-
-  /** Run the Hermes core Daemon */
-  void RunDaemon();
-
-  /** Stop the Hermes core Daemon */
-  void StopDaemon();
-
- public:
-  /**====================================
-   * PUBLIC Bucket Operations
-   * ===================================*/
-
-  /** Get or create a Bucket in Hermes */
-  Bucket GetBucket(std::string name,
-                   Context ctx = Context(),
-                   size_t backend_size = 0);
-
-  /** Get an existing Bucket in Hermes */
-  Bucket GetBucket(TagId bkt_id);
-
-  /**====================================
-   * PUBLIC I/O Operations
-   * ===================================*/
-
-  /** Waits for all blobs to finish being flushed */
-  void Flush();
-
-  /** Destroy all buckets and blobs in this instance */
-  void Clear();
-
-  /**====================================
-   * PUBLIC Tag Operations
-   * ===================================*/
-
-  /** Create a generic tag in Hermes */
-  TagId CreateTag(const std::string &tag_name) {
-    std::vector<TraitId> traits;
-    return mdm_.GlobalCreateTag(tag_name, false, traits);
-  }
-
-  /** Get the TagId  */
-  TagId GetTagId(const std::string &tag_name) {
-    return mdm_.GlobalGetTagId(tag_name);
-  }
-
-  /** Locate all blobs with a tag */
-  std::vector<BlobId> GroupBy(TagId tag_id);
-
-  /**====================================
-   * PUBLIC Trait Operations
-   * ===================================*/
-
-  /** Create a trait */
-  template<typename TraitT, typename ...Args>
-  TraitId RegisterTrait(TraitT *trait) {
-    TraitId id = GetTraitId(trait->GetTraitUuid());
-    if (!id.IsNull()) {
-      HILOG(kDebug, "Found existing trait trait: {}", trait->GetTraitUuid())
-      return id;
-    }
-    HILOG(kDebug, "Registering a new trait: {}", trait->GetTraitUuid())
-    id = HERMES->mdm_.GlobalRegisterTrait(TraitId::GetNull(),
-                                          trait->trait_info_);
-    HILOG(kDebug, "Giving trait {} id {}.{}",
-          trait->GetTraitUuid(), id.node_id_, id.unique_)
-    return id;
-  }
-
-  /** Create a trait */
-  template<typename TraitT, typename ...Args>
-  TraitId RegisterTrait(const std::string &trait_uuid,
-                        Args&& ...args) {
-    TraitId id = GetTraitId(trait_uuid);
-    if (!id.IsNull()) {
-      HILOG(kDebug, "Found existing trait trait: {}", trait_uuid)
-      return id;
-    }
-    HILOG(kDebug, "Registering new trait: {}", trait_uuid)
-    TraitT obj(trait_uuid, std::forward<Args>(args)...);
-    id = HERMES->mdm_.GlobalRegisterTrait(TraitId::GetNull(),
-                                           obj.trait_info_);
-    HILOG(kDebug, "Giving trait \"{}\" id {}.{}",
-          trait_uuid, id.node_id_, id.unique_)
-    return id;
-  }
-
-  /** Get trait id */
-  TraitId GetTraitId(const std::string &trait_uuid) {
-    return HERMES->mdm_.GlobalGetTraitId(trait_uuid);
-  }
-
-  /** Get the trait */
-  Trait* GetTrait(TraitId trait_id) {
-    return mdm_.GlobalGetTrait(trait_id);
-  }
-
-  /** Attach a trait to a tag */
-  void AttachTrait(TagId tag_id, TraitId trait_id) {
-    HERMES->mdm_.GlobalTagAddTrait(tag_id, trait_id);
-  }
-
-  /** Get traits attached to tag */
-  std::vector<Trait*> GetTraits(TagId tag_id,
-                                uint32_t flags = ALL_BITS(uint32_t)) {
-    // HILOG(kDebug, "Getting the traits for tag {}", tag_id)
-    std::vector<TraitId> trait_ids = HERMES->mdm_.GlobalTagGetTraits(tag_id);
-    std::vector<Trait*> traits;
-    traits.reserve(trait_ids.size());
-    for (TraitId &trait_id : trait_ids) {
-      auto trait = GetTrait(trait_id);
-      if (!trait) { continue; }
-      if (trait->GetTraitFlags().Any(flags)) {
-        traits.emplace_back(trait);
-      }
-    }
-    return traits;
-  }
-
- private:
-  /**====================================
-   * PRIVATE Init + Finalize Operations
-   * ===================================*/
-
-  /** Internal initialization of Hermes */
-  void Init(HermesType mode = HermesType::kClient,
-            std::string server_config_path = "",
-            std::string client_config_path = "");
-
-  /** Initialize Hermes as a server */
-  void InitServer(std::string server_config_path);
-
-  /** Initialize Hermes as a client to the daemon */
-  void InitClient(std::string server_config_path,
-                  std::string client_config_path);
-
-  /** Load the server-side configuration */
-  void LoadServerConfig(std::string config_path);
-
-  /** Load the client-side configuration */
-  void LoadClientConfig(std::string config_path);
-
-  /** Initialize shared-memory between daemon and client */
-  void InitSharedMemory();
-
-  /** Connect to a Daemon's shared memory */
-  void LoadSharedMemory();
-
-  /** Finalize Daemon mode */
-  void FinalizeServer();
-
-  /** Finalize client mode */
-  void FinalizeClient();
-};
-
-#define TRANSPARENT_HERMES\
-  if (!HERMES->IsInitialized() && \
-      !HERMES->IsBeingInitialized() && \
-      !HERMES->IsTerminated()) {\
-    HERMES->Create(hermes::HermesType::kClient);\
-    HERMES->is_transparent_ = true;\
-  }
-
-}  // namespace hermes::api
-
-#endif  // HERMES_SRC_API_HERMES_H_
diff --git a/src/binlog.h b/src/binlog.h
deleted file mode 100644
index 27c4316c6..000000000
--- a/src/binlog.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_BINLOG_H_
-#define HERMES_SRC_BINLOG_H_
-
-#include <hermes_shm/types/bitfield.h>
-#include "data_structures.h"
-#include <vector>
-#include <string>
-#include <cereal/archives/binary.hpp>
-#include <cereal/types/vector.hpp>
-#include <sstream>
-
-namespace hermes {
-
-template<typename T>
-struct BinaryLogRank {
-  std::vector<T> log_;  /**< Cached log entries */
-  size_t backend_off_;  /**< Entry offset in the backend file */
-
-  BinaryLogRank() : backend_off_(0) {}
-};
-
-/**
- * A simple file-per-process log format for storing
- * execution traces.
- *
- * This assumes only a single thread modifies or reads
- * from the log. Intended for internal use by prefetcher.
- * */
-template<typename T>
-class BinaryLog {
- public:
-  std::vector<BinaryLogRank<T>> cache_;  /**< The cached log entries */
-  size_t max_ingest_;  /**< Max number of elements to cache before flush */
-  size_t cur_entry_count_;  /**< Total number of cached entries */
-  std::string path_;  /**< Path to the backing log file */
-
- public:
-  /** Default Constructor*/
-  BinaryLog() : max_ingest_(0), cur_entry_count_(0) {}
-
-  /** Constructor. */
-  void Init(const std::string &path,
-            size_t max_ingest_bytes) {
-    max_ingest_ = max_ingest_bytes / sizeof(T);
-    path_ = path;
-    // Create + truncate the file
-    // This is ok because the Hermes daemons are assumed to be spawned before
-    // applications start running.
-    std::ofstream output_file(path_);
-  }
-
-  /**
-   * Appends all entries in the queue to the cache.
-   * */
-  void Ingest(const hipc::mpsc_queue<T> &queue) {
-    T entry;
-    while (!queue.pop(entry).IsNull()) {
-      AppendEntry(entry);
-    }
-  }
-
-  /**
-   * Appends all entries in the vector to the cache.
-   * */
-  void Ingest(const std::vector<T> &queue) {
-    for (auto &entry : queue) {
-      AppendEntry(entry);
-    }
-  }
-
-  /** Appends an entry to the cache */
-  void AppendEntry(const T &entry) {
-    if (entry.rank_ >= (int)cache_.size()) {
-      cache_.resize(entry.rank_ + 1);
-    }
-    auto &cache = cache_[entry.rank_];
-    if (cache.log_.size() == 0) {
-      cache.log_.reserve(8192);
-    }
-    cache.log_.emplace_back(entry);
-    cur_entry_count_ += 1;
-  }
-
-  /**
-   * Get the total number of ops stored in the rank's log throughout
-   * its lifetime.
-   * */
-  size_t GetRankLogSize(int rank) {
-    auto &cache = cache_[rank];
-    return cache.log_.size() + cache.backend_off_;
-  }
-
-  /**
-   * Get the next entry corresponding to the rank
-   * */
-  bool GetEntry(int rank, size_t off, T &entry) {
-    auto &cache = cache_[rank];
-    if (off < cache.backend_off_ + cache.log_.size()) {
-      entry = cache.log_[off];
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Flush all entries to the backing log
-   * */
-  void Flush(bool force = false) {
-    if (!force && cur_entry_count_ < max_ingest_) {
-      return;
-    }
-
-    // Serialize all contents into the log file
-    if (path_.empty()) {
-      std::ofstream output_file(path_, std::ios::out | std::ios::app);
-      cereal::BinaryOutputArchive oarch(output_file);
-      for (auto &cache : cache_) {
-        for (size_t i = 0; i < cache.log_.size(); ++i) {
-          auto &entry = cache.log_[i];
-          oarch(entry);
-          cache.backend_off_ += 1;
-        }
-        cache.log_.clear();
-      }
-    }
-    cur_entry_count_ = 0;
-  }
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_BINLOG_H_
diff --git a/src/borg_io_clients/borg_posix_client.h b/src/borg_io_clients/borg_posix_client.h
deleted file mode 100644
index 02b1846e6..000000000
--- a/src/borg_io_clients/borg_posix_client.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_BORG_IO_CLIENTS_POSIX_H
-#define HERMES_SRC_BORG_IO_CLIENTS_POSIX_H
-
-#include "borg_io_client.h"
-#include "adapter/posix/posix_api.h"
-
-#include <filesystem>
-
-namespace stdfs = std::filesystem;
-
-namespace hermes::borg {
-
-class PosixIoClient : public BorgIoClient {
- public:
-  virtual ~PosixIoClient() = default;
-
-  bool Init(DeviceInfo &dev_info) override {
-    auto api = HERMES_POSIX_API;
-    std::string text = (*dev_info.mount_dir_).str() +
-                        "/" + "slab_" + (*dev_info.dev_name_).str();
-    auto canon = stdfs::weakly_canonical(text).string();
-    (*dev_info.mount_point_) = canon;
-    int fd = api->open((*dev_info.mount_point_).c_str(),
-                       O_TRUNC | O_CREAT, 0666);
-    if (fd < 0) { return false; }
-    api->close(fd);
-    return true;
-  }
-
-  bool Write(DeviceInfo &dev_info, const char *data,
-             size_t off, size_t size) override {
-    auto api = HERMES_POSIX_API;
-    auto mount_point = (*dev_info.mount_point_).str();
-    int fd = api->open(mount_point.c_str(), O_RDWR);
-    if (fd < 0) {
-      HELOG(kError, "Failed to open (write): {}",
-            dev_info.mount_point_->str())
-      return false;
-    }
-    size_t count = api->pwrite(fd, data, size, off);
-    api->close(fd);
-    if (count != size) {
-      HELOG(kError, "BORG: wrote {} bytes, but expected {}",
-            count, size);
-      return false;
-    }
-    return true;
-  }
-
-  bool Read(DeviceInfo &dev_info, char *data,
-            size_t off, size_t size) override {
-    auto api = HERMES_POSIX_API;
-    auto mount_point = (*dev_info.mount_point_).str();
-    int fd = api->open(mount_point.c_str(), O_RDWR);
-    if (fd < 0) {
-      HELOG(kError, "Failed to open (read): {}",
-            dev_info.mount_point_->str())
-      return false;
-    }
-    size_t count = api->pread(fd, data, size, off);
-    api->close(fd);
-    if (count != size) {
-      HELOG(kError, "BORG: read {} bytes, but expected {}",
-            count, size);
-      return false;
-    }
-    return true;
-  }
-};
-
-}  // namespace hermes::borg
-
-#endif  // HERMES_SRC_BORG_IO_CLIENTS_POSIX_H
diff --git a/src/borg_io_clients/borg_ram_client.h b/src/borg_io_clients/borg_ram_client.h
deleted file mode 100644
index a018d84dd..000000000
--- a/src/borg_io_clients/borg_ram_client.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_BORG_IO_CLIENTS_RAM_H_
-#define HERMES_SRC_BORG_IO_CLIENTS_RAM_H_
-
-#include "borg_io_client.h"
-#include "adapter/posix/posix_api.h"
-#include "hermes.h"
-
-namespace hermes::borg {
-
-class RamIoClient : public BorgIoClient {
- public:
-  virtual ~RamIoClient() = default;
-
-  bool Init(DeviceInfo &dev_info) override {
-    auto &hermes_header = HERMES->header_;
-    auto &main_alloc = HERMES->main_alloc_;
-    hermes_header->ram_tier_ = main_alloc->
-                               Allocate(dev_info.capacity_);
-    if (hermes_header->ram_tier_.IsNull()) {
-      HELOG(kFatal, BUFFER_POOL_OUT_OF_RAM.Msg());
-    }
-    return true;
-  }
-
-  bool Write(DeviceInfo &dev_info, const char *data,
-             size_t off, size_t size) override {
-    auto &hermes_header = HERMES->header_;
-    auto &main_alloc = HERMES->main_alloc_;
-    char *ram_ptr = main_alloc->Convert<char>(hermes_header->ram_tier_);
-    if (off + size > dev_info.capacity_) {
-      HILOG(kDebug, "Out of bounds: attempting to write to offset: {} / {}",
-            off + size, dev_info.capacity_);
-      return false;
-    }
-    memcpy(ram_ptr + off, data, size);
-    return true;
-  }
-
-  bool Read(DeviceInfo &dev_info, char *data,
-            size_t off, size_t size) override {
-    auto &hermes_header = HERMES->header_;
-    auto &main_alloc = HERMES->main_alloc_;
-    char *ram_ptr = main_alloc->Convert<char>(hermes_header->ram_tier_);
-    memcpy(data, ram_ptr + off, size);
-    return true;
-  }
-};
-
-}  // namespace hermes::borg
-
-#endif  // HERMES_SRC_BORG_IO_CLIENTS_RAM_H_
diff --git a/src/buffer_organizer.cc b/src/buffer_organizer.cc
deleted file mode 100644
index 2329c9f27..000000000
--- a/src/buffer_organizer.cc
+++ /dev/null
@@ -1,535 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "buffer_organizer.h"
-#include "metadata_manager.h"
-#include "borg_io_clients/borg_io_client_factory.h"
-#include "hermes.h"
-#include "bucket.h"
-
-namespace hermes {
-
-/**====================================
- * BORG I/O thread manager
- * ===================================*/
-
-/** Spawn a thread for re-organizing blobs */
-void BorgIoThreadManager::SpawnBlobMonitor() {
-  auto flush_scheduler = [](void *args) {
-    HILOG(kDebug, "Blob re-organization thread has started")
-    (void) args;
-    auto borg = &HERMES->borg_;
-    while (HERMES_THREAD_MANAGER->Alive()) {
-      borg->LocalAnalyzeBlobs();
-      tl::thread::self().sleep(*HERMES->rpc_.server_engine_,
-                               HERMES->server_config_.borg_.blob_reorg_period_);
-    }
-    HERMES_BORG_IO_THREAD_MANAGER->Join();
-    HILOG(kDebug, "Blob re-organization thread has stopped")
-  };
-  HERMES_THREAD_MANAGER->Spawn(flush_scheduler);
-}
-
-/** Spawn the enqueuing thread */
-void BorgIoThreadManager::SpawnFlushMonitor() {
-  auto flush_scheduler = [](void *args) {
-    HILOG(kDebug, "Flushing scheduler thread has started")
-    (void) args;
-    auto borg = &HERMES->borg_;
-    while (HERMES_THREAD_MANAGER->Alive()) {
-      borg->LocalEnqueueFlushes();
-      tl::thread::self().sleep(*HERMES->rpc_.server_engine_,
-                               HERMES->server_config_.borg_.flush_period_);
-    }
-    HERMES_BORG_IO_THREAD_MANAGER->Join();
-    HILOG(kDebug, "Flush scheduler thread has stopped")
-  };
-  HERMES_THREAD_MANAGER->Spawn(flush_scheduler);
-}
-
-/** Spawn the flushing I/O threads */
-void BorgIoThreadManager::SpawnFlushWorkers(int num_threads) {
-  // Define flush worker thread function
-  // The function will continue working until all pending flushes have
-  // been processed
-  auto flush = [](void *params) {
-    BufferOrganizer *borg = &HERMES->borg_;
-    int *id = reinterpret_cast<int*>(params);
-    BorgIoThreadQueue &bq = (*borg->queues_)[*id];
-    BorgIoThreadQueueInfo& bq_info = bq.GetSecond();
-    _BorgIoThreadQueue& queue = bq.GetFirst();
-    HILOG(kDebug, "Flushing worker {} has started", bq_info.id_)
-    while (HERMES_BORG_IO_THREAD_MANAGER->Alive() ||
-          (!HERMES_BORG_IO_THREAD_MANAGER->Alive() && bq_info.load_)) {
-      borg->LocalProcessFlushes(bq_info, queue);
-      tl::thread::self().sleep(*HERMES->rpc_.server_engine_, 25);
-    }
-    HILOG(kDebug, "Flushing worker {} has stopped", bq_info.id_)
-  };
-
-  // Create the flushing threads
-  for (int i = 0; i < num_threads; ++i) {
-    BorgIoThreadQueue &bq = (*queues_)[i];
-    BorgIoThreadQueueInfo& bq_info = bq.GetSecond();
-    bq_info.id_ = i;
-    bq_info.load_ = 0;
-    HERMES_THREAD_MANAGER->Spawn(flush, &bq_info.id_);
-  }
-}
-
-/** Wait for flushing to complete */
-void BorgIoThreadManager::WaitForFlush() {
-  HILOG(kDebug, "Waiting for all flushing to complete {}",
-        HERMES->rpc_.node_id_)
-  while (IsFlushing()) {
-    tl::thread::self().sleep(*HERMES->rpc_.server_engine_, 5);
-  }
-  HILOG(kDebug, "Finished flushing {}",
-        HERMES->rpc_.node_id_)
-}
-
-/**====================================
- * SHM Init
- * ===================================*/
-
-/**
- * Initialize the BORG
- * REQUIRES mdm to be initialized already.
- * */
-void BufferOrganizer::shm_init(hipc::ShmArchive<BufferOrganizerShm> &header,
-                               hipc::Allocator *alloc) {
-  shm_deserialize(header);
-
-  // Initialize device information
-  for (TargetInfo &target : (*mdm_->targets_)) {
-    DeviceInfo &dev_info =
-        (*mdm_->devices_)[target.id_.GetDeviceId()];
-    if (dev_info.mount_dir_->size() == 0) {
-      dev_info.io_api_ = IoInterface::kRam;
-    } else {
-      dev_info.io_api_ = IoInterface::kPosix;
-    }
-    auto io_client = borg::BorgIoClientFactory::Get(dev_info.io_api_);
-    io_client->Init(dev_info);
-  }
-
-  // Print out device info
-  mdm_->PrintDeviceInfo();
-
-  // Spawn the thread for flushing blobs
-  int num_threads = HERMES->server_config_.borg_.num_threads_;
-  HSHM_MAKE_AR((*header).queues_, alloc, num_threads)
-  HERMES_BORG_IO_THREAD_MANAGER->queues_ = queues_;
-  HERMES_BORG_IO_THREAD_MANAGER->SpawnBlobMonitor();
-  HERMES_BORG_IO_THREAD_MANAGER->SpawnFlushMonitor();
-  HERMES_BORG_IO_THREAD_MANAGER->SpawnFlushWorkers(num_threads);
-}
-
-/**====================================
- * SHM Deserialization
- * ===================================*/
-
-/** Deserialize the BORG from shared memory */
-void BufferOrganizer::shm_deserialize(
-    hipc::ShmArchive<BufferOrganizerShm> &header)  {
-  mdm_ = &HERMES->mdm_;
-  rpc_ = &HERMES->rpc_;
-  queues_ = (*header).queues_.get();
-  HERMES_BORG_IO_THREAD_MANAGER->queues_ = queues_;
-}
-
-/**====================================
- * Destructors
- * ===================================*/
-
-/** Finalize the BORG */
-void BufferOrganizer::shm_destroy_main() {
-  queues_->shm_destroy();
-}
-
-/**====================================
- * BORG Methods
- * ===================================*/
-
-/** Stores a blob into a set of buffers */
-RPC void BufferOrganizer::LocalPlaceBlobInBuffers(
-    const Blob &blob, std::vector<BufferInfo> &buffers) {
-  AUTO_TRACE(1)
-  size_t blob_off = 0;
-  for (BufferInfo &buffer_info : buffers) {
-    if (buffer_info.tid_.GetNodeId() != mdm_->rpc_->node_id_) {
-      continue;
-    }
-    TIMER_START("DeviceInfo")
-    DeviceInfo &dev_info =
-        (*mdm_->devices_)[buffer_info.tid_.GetDeviceId()];
-    if (buffer_info.t_off_ + buffer_info.blob_size_ >
-        dev_info.capacity_) {
-      HELOG(kFatal, "Out of bounds: attempting to write to offset: {} / {} "
-            "on device {}: {}",
-            buffer_info.t_off_ + buffer_info.blob_size_,
-            dev_info.capacity_,
-            buffer_info.tid_.GetDeviceId(),
-            dev_info.mount_point_->str())
-    }
-    auto io_client = borg::BorgIoClientFactory::Get(dev_info.io_api_);
-    TIMER_END()
-
-    TIMER_START("IO")
-    bool ret = io_client->Write(dev_info,
-                                blob.data() + blob_off,
-                                buffer_info.t_off_,
-                                buffer_info.blob_size_);
-    TIMER_END()
-    blob_off += buffer_info.blob_size_;
-    if (!ret) {
-      mdm_->PrintDeviceInfo();
-      HELOG(kFatal, "Could not perform I/O in BORG."
-            " Writing to target ID:"
-            " (node_id: {}, tgt_id: {}, dev_id: {},"
-            " t_off: {}, blob_size: {})",
-            buffer_info.tid_.GetNodeId(),
-            buffer_info.tid_.GetIndex(),
-            buffer_info.tid_.GetDeviceId(),
-            buffer_info.t_off_,
-            buffer_info.blob_size_)
-    }
-  }
-}
-
-/** Globally store a blob into a set of buffers */
-void BufferOrganizer::GlobalPlaceBlobInBuffers(
-    const Blob &blob, std::vector<BufferInfo> &buffers) {
-  AUTO_TRACE(1)
-  // Get the nodes to transfer buffers to
-  size_t total_size;
-  auto unique_nodes = BufferPool::GroupByNodeId(buffers, total_size);
-
-  // Send the buffers to each node
-  for (auto &[node_id, size] : unique_nodes) {
-    if (NODE_ID_IS_LOCAL(node_id)) {
-      LocalPlaceBlobInBuffers(blob, buffers);
-    } else {
-      rpc_->IoCall<void>(
-          node_id, "RpcPlaceBlobInBuffers",
-          IoType::kWrite, blob.data(), blob.size(),
-          blob.size(), buffers);
-    }
-  }
-}
-
-/** Stores a blob into a set of buffers */
-RPC void BufferOrganizer::LocalReadBlobFromBuffers(
-    Blob &blob, std::vector<BufferInfo> &buffers) {
-  AUTO_TRACE(1)
-  size_t blob_off = 0;
-  for (BufferInfo &buffer_info : buffers) {
-    if (buffer_info.tid_.GetNodeId() != mdm_->rpc_->node_id_) {
-      continue;
-    }
-    DeviceInfo &dev_info =
-        (*mdm_->devices_)[buffer_info.tid_.GetDeviceId()];
-    if (buffer_info.t_off_ + buffer_info.blob_size_ >
-        dev_info.capacity_) {
-      HELOG(kFatal, "Out of bounds: attempting to read from offset: {} / {}"
-            " on device {}: {}",
-            buffer_info.t_off_ + buffer_info.blob_size_,
-            dev_info.capacity_,
-            buffer_info.tid_.GetDeviceId(),
-            dev_info.mount_point_->str())
-    }
-    auto io_client = borg::BorgIoClientFactory::Get(dev_info.io_api_);
-    bool ret = io_client->Read(dev_info,
-                               blob.data() + blob_off,
-                               buffer_info.t_off_,
-                               buffer_info.blob_size_);
-    blob_off += buffer_info.blob_size_;
-    if (!ret) {
-      HELOG(kFatal, "Could not perform I/O in BORG."
-                    " reading from target ID:"
-                    " (node_id: {}, tgt_id: {}, dev_id: {},"
-                    " t_off: {}, blob_size: {})",
-            buffer_info.tid_.GetNodeId(),
-            buffer_info.tid_.GetIndex(),
-            buffer_info.tid_.GetDeviceId(),
-            buffer_info.t_off_,
-            buffer_info.blob_size_)
-    }
-  }
-}
-
-/** The Global form of ReadBLobFromBuffers */
-Blob BufferOrganizer::GlobalReadBlobFromBuffers(
-    std::vector<BufferInfo> &buffers) {
-  AUTO_TRACE(1)
-  // Get the nodes to transfer buffers to
-  size_t total_size = 0;
-  auto unique_nodes = BufferPool::GroupByNodeId(buffers, total_size);
-
-  // Send the buffers to each node
-  std::vector<Blob> blobs;
-  blobs.reserve(unique_nodes.size());
-  for (auto &[node_id, size] : unique_nodes) {
-    blobs.emplace_back(size);
-    if (NODE_ID_IS_LOCAL(node_id)) {
-      LocalReadBlobFromBuffers(blobs.back(), buffers);
-    } else {
-      rpc_->IoCall<void>(
-          node_id, "RpcReadBlobFromBuffers",
-          IoType::kRead, blobs.back().data(), size,
-          size, buffers);
-    }
-  }
-
-  // If the blob was only on one node
-  if (unique_nodes.size() == 1) {
-    return std::move(blobs.back());
-  }
-
-  // Merge the blobs at the end
-  hapi::Blob blob(total_size);
-  for (size_t i = 0; i < unique_nodes.size(); ++i) {
-    auto &[node_id, size] = unique_nodes[i];
-    auto &tmp_blob = blobs[i];
-    size_t tmp_blob_off = 0;
-    for (BufferInfo &info : buffers) {
-      if (info.tid_.GetNodeId() != node_id) {
-        continue;
-      }
-      memcpy(blob.data() + info.blob_off_,
-             tmp_blob.data() + tmp_blob_off,
-             info.blob_size_);
-      tmp_blob_off += info.blob_size_;
-    }
-  }
-  return blob;
-}
-
-/** Re-organize blobs based on a score */
-void BufferOrganizer::GlobalOrganizeBlob(const std::string &bucket_name,
-                                         const std::string &blob_name,
-                                         float score) {
-  AUTO_TRACE(1)
-  auto bkt = HERMES->GetBucket(bucket_name);
-  BlobId blob_id;
-  bkt.GetBlobId(blob_name, blob_id);
-  float blob_score = bkt.GetBlobScore(blob_id);
-  GlobalOrganizeBlob(bkt, blob_name, blob_id, blob_score, score);
-}
-
-/** Re-organize blobs based on a score */
-void BufferOrganizer::GlobalOrganizeBlob(hapi::Bucket &bkt,
-                                         const std::string &blob_name,
-                                         BlobId &blob_id,
-                                         float blob_score,
-                                         float score) {
-  AUTO_TRACE(1);
-  Context ctx;
-
-  HILOG(kDebug, "Changing blob score from: {} to {}", blob_score, score)
-
-  // Skip organizing if below threshold
-  if (abs(blob_score - score) < .05) {
-    return;
-  }
-
-  // Lock the blob to ensure it doesn't get modified
-  bkt.LockBlob(blob_id, MdLockType::kExternalWrite);
-
-  // Get the blob
-  hapi::Blob blob;
-  bkt.Get(blob_id, blob, ctx);
-
-  // Re-emplace the blob with new score
-  BlobId tmp_id;
-  ctx.blob_score_ = score;
-  bkt.Put(blob_name, blob, tmp_id, ctx);
-
-  // Unlock the blob
-  bkt.UnlockBlob(blob_id, MdLockType::kExternalWrite);
-}
-
-/**====================================
- * BORG Flushing methods
- * ===================================*/
-
-/** Find blobs which should be re-organized */
-void BufferOrganizer::LocalAnalyzeBlobs() {
-  auto mdm = &HERMES->mdm_;
-  ScopedRwReadLock blob_map_lock(mdm->header_->lock_[kBlobMapLock],
-                                 kBORG_LocalEnqueueFlushes);
-  float recency_min = HERMES->server_config_.borg_.recency_min_;
-  float recency_max = HERMES->server_config_.borg_.recency_max_;
-  float freq_max = HERMES->server_config_.borg_.freq_max_;
-  float freq_min = HERMES->server_config_.borg_.freq_min_;
-
-  // Only re-organize if there's a capacity trigger
-  bool is_below_thresh = false;
-  auto targets = mdm->LocalGetTargetInfo();
-  for (TargetInfo &target : targets) {
-    DeviceInfo &dev_info =
-      (*mdm_->devices_)[target.id_.GetDeviceId()];
-    float rem_cap = (float) target.rem_cap_ / (float)target.max_cap_;
-    if (rem_cap < dev_info.borg_min_thresh_) {
-      is_below_thresh = true;
-    }
-  }
-  if (!is_below_thresh) {
-    return;
-  }
-
-  u64 time = BlobInfo::GetTimeFromStartNs();
-  for (hipc::pair<BlobId, BlobInfo>& blob_p : *mdm->blob_map_) {
-    BlobInfo &blob_info = blob_p.GetSecond();
-    // Get the recency score [0, 1]
-    float last_access_elapse = (float)(time - blob_info.last_access_);
-    float recency_score;
-    if (last_access_elapse <= recency_min) {
-      recency_score = 1;
-    } else if (last_access_elapse >= recency_max) {
-      recency_score = 0;
-    } else {
-      recency_score = (last_access_elapse - recency_min) /
-        (recency_max - recency_min);
-      recency_score = 1 - recency_score;
-    }
-
-    // Get the frequency score [0, 1]
-    float freq_score;
-    float freq = (float)blob_info.access_freq_;
-    if (freq <= freq_min) {
-      freq_score = 0;
-    } else if (freq >= freq_max) {
-      freq_score = 1;
-    } else {
-      freq_score = (freq - freq_min) / (freq_max - freq_min);
-    }
-
-    // Update the current blob score
-    auto bkt = HERMES->GetBucket(blob_info.tag_id_);
-    GlobalOrganizeBlob(bkt,
-                       blob_info.name_->str(),
-                       blob_info.blob_id_,
-                       blob_info.score_,
-                       std::max(freq_score, recency_score));
-  }
-}
-
-/** Flush all blobs registered in this daemon */
-void BufferOrganizer::LocalEnqueueFlushes() {
-  auto mdm = &HERMES->mdm_;
-  // Acquire the read lock on the blob map
-  ScopedRwReadLock blob_map_lock(mdm->header_->lock_[kBlobMapLock],
-                                 kBORG_LocalEnqueueFlushes);
-  // Begin checking for blobs which need flushing
-  size_t count = 0;
-  for (hipc::pair<BlobId, BlobInfo>& blob_p : *mdm->blob_map_) {
-    BlobId &blob_id = blob_p.GetFirst();
-    BlobInfo &blob_info = blob_p.GetSecond();
-    // Verify that flush is needing to happen
-    if (blob_info.mod_count_ == blob_info.last_flush_) {
-      continue;
-    }
-    // Check if bucket has flush trait
-    TagId &bkt_id = blob_info.tag_id_;
-    size_t blob_size = blob_info.blob_size_;
-    std::vector<Trait*> traits = HERMES->GetTraits(bkt_id,
-                                                   HERMES_TRAIT_FLUSH);
-    if (traits.size() == 0) {
-      continue;
-    }
-    // Schedule the blob on an I/O worker thread
-    HERMES_BORG_IO_THREAD_MANAGER->Enqueue(bkt_id, blob_id, blob_size,
-                                           std::move(traits));
-    count += 1;
-  }
-  if (count) {
-    HILOG(kDebug, "Flushing {} blobs", count);
-  }
-}
-
-/** Actually process flush operations */
-void BufferOrganizer::LocalProcessFlushes(
-    BorgIoThreadQueueInfo &bq_info,
-    _BorgIoThreadQueue& queue) {
-  // Begin flushing
-  ScopedRwWriteLock flush_lock(mdm_->header_->lock_[kFlushLock],
-                               kBORG_LocalProcessFlushes);
-  // Process tasks
-  auto entry = hipc::make_uptr<BorgIoTask>();
-  while (!queue.pop(*entry).IsNull()) {
-    BorgIoTask &task = *entry;
-    HILOG(kDebug, "Attempting to flush blob {}", task.blob_id_);
-    Blob blob;
-
-    // Verify the blob exists and then read lock it
-    auto iter = mdm_->blob_map_->find(task.blob_id_);
-    if (iter.is_end()) {
-      bq_info.load_.fetch_sub(task.blob_size_);
-      HILOG(kDebug, "Finished BORG task for blob {} and load {}",
-            task.blob_id_, bq_info.load_.load())
-      continue;
-    }
-    hipc::pair<BlobId, BlobInfo>& blob_info_p = *iter;
-    BlobInfo &blob_info = blob_info_p.GetSecond();
-    std::string blob_name = blob_info.name_->str();
-
-    // Verify that flush is needing to happen
-    if (blob_info.mod_count_ == blob_info.last_flush_) {
-      bq_info.load_.fetch_sub(task.blob_size_);
-      HILOG(kDebug, "Finished BORG task for blob {} and load {}",
-            task.blob_id_, bq_info.load_.load())
-      continue;
-    }
-    size_t last_flush = blob_info.mod_count_;
-    blob_info.last_flush_ = last_flush;
-
-    // Get the current blob from Hermes
-    api::Bucket bkt = HERMES->GetBucket(task.bkt_id_);
-    bkt.Get(task.blob_id_, blob, bkt.GetContext());
-    HILOG(kDebug, "Flushing blob {} ({}) of size {}",
-          blob_name,
-          task.blob_id_,
-          blob.size())
-    FlushTraitParams trait_params;
-    for (Trait *trait : task.traits_) {
-      trait_params.blob_ = &blob;
-      trait_params.blob_name_ = blob_name;
-      trait_params.bkt_ = &bkt;
-      trait->Run(HERMES_TRAIT_FLUSH, &trait_params);
-    }
-
-    // Dequeue
-    bq_info.load_.fetch_sub(task.blob_size_);
-    HILOG(kDebug, "Finished BORG task for blob {} and load {}",
-          task.blob_id_, bq_info.load_.load())
-  }
-}
-
-/** Barrier for all flushing to complete */
-void BufferOrganizer::LocalWaitForFullFlush() {
-  HILOG(kInfo, "Full synchronous flush on node {}", rpc_->node_id_)
-  LocalEnqueueFlushes();
-  HERMES_BORG_IO_THREAD_MANAGER->WaitForFlush();
-  HILOG(kInfo, "Finished synchronous flush on node {}", rpc_->node_id_)
-}
-
-/** Barrier for all I/O in Hermes to flush */
-void BufferOrganizer::GlobalWaitForFullFlush() {
-  for (int i = 0; i < (int)rpc_->hosts_.size(); ++i) {
-    int node_id = i + 1;
-    HILOG(kInfo, "Wait for flush on node {}", node_id)
-    rpc_->Call<bool>(node_id, "RpcWaitForFullFlush");
-  }
-}
-
-}  // namespace hermes
diff --git a/src/buffer_organizer.h b/src/buffer_organizer.h
deleted file mode 100644
index ea07eea61..000000000
--- a/src/buffer_organizer.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_BUFFER_ORGANIZER_H_
-#define HERMES_SRC_BUFFER_ORGANIZER_H_
-
-#include "rpc.h"
-#include "hermes_types.h"
-#include "buffer_pool.h"
-#include "trait_manager.h"
-
-/** Forward declaration of Bucket */
-namespace hermes::api {
-class Bucket;
-}  // namespace hermes::api
-
-namespace hermes {
-
-// NOTE(llogan): I may add this back to make flushing more intelligent
-/** Calculates the total size of a blob's buffers
-static inline size_t SumBufferBlobSizes(std::vector<BufferInfo> &buffers) {
-  size_t sum = 0;
-  for (BufferInfo &buffer_ref : buffers) {
-    sum += buffer_ref.blob_size_;
-  }
-  return sum;
-}*/
-
-/** Information needed by traits called internally by Flush */
-struct FlushTraitParams {
-  Blob *blob_;
-  std::string blob_name_;
-  api::Bucket *bkt_;
-};
-
-/** An I/O flushing task spawned by BORG */
-struct BorgIoTask {
-  TagId bkt_id_;
-  BlobId blob_id_;
-  size_t blob_size_;
-  size_t last_modified_;
-  std::vector<Trait*> traits_;
-
-  /** Default constructor */
-  BorgIoTask() = default;
-
-  /** Flush emplace constructor */
-  explicit BorgIoTask(TagId bkt_id, BlobId blob_id, size_t blob_size,
-                      std::vector<Trait*> &&traits)
-    : bkt_id_(bkt_id), blob_id_(blob_id), blob_size_(blob_size),
-      traits_(std::forward<std::vector<Trait*>>(traits)) {}
-
-  /** Copy constructor */
-  BorgIoTask(const BorgIoTask &other) = default;
-
-  /** Copy assignment operator */
-  BorgIoTask& operator=(const BorgIoTask &other) = default;
-
-  /** Move constructor */
-  BorgIoTask(BorgIoTask &&other) = default;
-
-  /** Move assignment operator */
-  BorgIoTask& operator=(BorgIoTask &&other) = default;
-};
-
-/** Info about a BORG I/O queue */
-struct BorgIoThreadQueueInfo {
-  std::atomic<size_t> load_;      /**< Data being processed on queue */
-  int id_;  /**< Unique ID of worker */
-
-  /** Default constructor */
-  BorgIoThreadQueueInfo() {
-    load_ = 0;
-    id_ = 0;
-  }
-
-  /** Copy constructor */
-  BorgIoThreadQueueInfo(const BorgIoThreadQueueInfo &other)
-  : load_(other.load_.load()), id_(other.id_) {}
-
-  /** Copy assignment  */
-  BorgIoThreadQueueInfo& operator=(const BorgIoThreadQueueInfo &other) {
-    if (this != &other) {
-      load_ = other.load_.load();
-      id_ = other.id_;
-    }
-    return *this;
-  }
-
-  /** Move constructor */
-  BorgIoThreadQueueInfo(BorgIoThreadQueueInfo &&other)
-  : load_(other.load_.load()), id_(other.id_) {}
-
-  /** Move assignment  */
-  BorgIoThreadQueueInfo& operator=(BorgIoThreadQueueInfo &&other) {
-    if (this != &other) {
-      load_ = other.load_.load();
-      id_ = other.id_;
-    }
-    return *this;
-  }
-};
-
-/** A SHM queue for holding BORG I/O flushing tasks */
-typedef hipc::mpsc_queue<BorgIoTask> _BorgIoThreadQueue;
-
-/** A SHM queue for holding tasks + statistics */
-typedef hipc::pair<_BorgIoThreadQueue, BorgIoThreadQueueInfo>
-    BorgIoThreadQueue;
-
-/** Macro to simplify thread manager singleton */
-#define HERMES_BORG_IO_THREAD_MANAGER \
-  hshm::EasySingleton<BorgIoThreadManager>::GetInstance()
-
-/** Manages the I/O flushing threads for BORG */
-class BorgIoThreadManager {
- public:
-  hipc::vector<BorgIoThreadQueue>
-    *queues_;  /**< Shared-memory request queues */
-  std::atomic<bool> kill_requested_;  /**< Kill flushing threads eventually */
-
- public:
-  /** Constructor */
-  BorgIoThreadManager() {
-    kill_requested_.store(false);
-  }
-
-  /** Indicate that no more modifications will take place to blobs */
-  void Join() {
-    kill_requested_.store(true);
-  }
-
-  /** Check if IoThreadManager is still alive */
-  bool Alive() {
-    return !kill_requested_.load();
-  }
-
-  /** Spawn a thread for re-organizing blobs */
-  void SpawnBlobMonitor();
-
-  /** Spawn the enqueuing thread */
-  void SpawnFlushMonitor();
-
-  /** Spawn the I/O threads */
-  void SpawnFlushWorkers(int num_threads);
-
-  /** Wait for flushing to complete */
-  void WaitForFlush();
-
-  /** Check if a flush is still happening */
-  bool IsFlushing() {
-    for (BorgIoThreadQueue &bq : *queues_) {
-      BorgIoThreadQueueInfo& bq_info = bq.GetSecond();
-      if (bq_info.load_ > 0) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /** Enqueue a flushing task to a worker */
-  void Enqueue(TagId bkt_id, BlobId blob_id, size_t blob_size,
-               std::vector<Trait*> &&traits) {
-    BorgIoThreadQueue &bq = HashToQueue(blob_id);
-    BorgIoThreadQueueInfo& bq_info = bq.GetSecond();
-    _BorgIoThreadQueue& queue = bq.GetFirst();
-    bq_info.load_.fetch_add(blob_size);
-    queue.emplace(bkt_id, blob_id, blob_size,
-                   std::forward<std::vector<Trait*>>(traits));
-  }
-
-  /** Hash request to a queue */
-  BorgIoThreadQueue& HashToQueue(BlobId blob_id) {
-    size_t qid = std::hash<BlobId>{}(blob_id) % queues_->size();
-    return (*queues_)[qid];
-  }
-};
-
-/**
- * Any state needed by BORG in SHM
- * */
-struct BufferOrganizerShm {
-  hipc::ShmArchive<hipc::vector<BorgIoThreadQueue>> queues_;
-};
-
-/**
- * Manages the organization of blobs in the hierarchy.
- * */
-class BufferOrganizer {
- public:
-  MetadataManager *mdm_;
-  RPC_TYPE *rpc_;
-  hipc::vector<BorgIoThreadQueue>*
-    queues_; /** Async tasks for BORG. */
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** Default constructor */
-  BufferOrganizer() = default;
-
-  /**====================================
-   * SHM Init
-   * ===================================*/
-
-  /**
-   * Initialize the BORG
-   * REQUIRES mdm to be initialized already.
-   * */
-  void shm_init(hipc::ShmArchive<BufferOrganizerShm> &header,
-                hipc::Allocator *alloc);
-
-  /**====================================
-   * SHM Deserialization
-   * ===================================*/
-
-  /** Deserialize the BORG from shared memory */
-  void shm_deserialize(hipc::ShmArchive<BufferOrganizerShm> &header);
-
-  /**====================================
-   * Destructors
-   * ===================================*/
-
-  /** Finalize the BORG */
-  void shm_destroy_main();
-
-  /**====================================
-   * BORG Methods
-   * ===================================*/
-
-  /** Stores a blob into a set of buffers */
-  RPC void LocalPlaceBlobInBuffers(const Blob &blob,
-                                   std::vector<BufferInfo> &buffers);
-  RPC void GlobalPlaceBlobInBuffers(const Blob &blob,
-                                    std::vector<BufferInfo> &buffers);
-
-  /** Stores a blob into a set of buffers */
-  RPC void LocalReadBlobFromBuffers(Blob &blob,
-                                    std::vector<BufferInfo> &buffers);
-  Blob GlobalReadBlobFromBuffers(std::vector<BufferInfo> &buffers);
-
-  /** Re-organize blobs based on a score */
-  void GlobalOrganizeBlob(const std::string &bucket_name,
-                          const std::string &blob_name,
-                          float score);
-
-  /** Re-organize blobs based on a score */
-  void GlobalOrganizeBlob(hermes::api::Bucket &bkt,
-                          const std::string &blob_name,
-                          BlobId &blob_id,
-                          float blob_score,
-                          float score);
-
- public:
-  /**====================================
-   * BORG Flushing methods
-   * ===================================*/
-
-  /** Find blobs which should be re-organized */
-  void LocalAnalyzeBlobs();
-
-  /** Flush all blobs registered in this daemon */
-  void LocalEnqueueFlushes();
-
-  /** Actually process flush operations */
-  void LocalProcessFlushes(BorgIoThreadQueueInfo &bq_info,
-                           _BorgIoThreadQueue &queue);
-
-  /** Barrier for all flushing to complete */
-  void LocalWaitForFullFlush();
-
-  /** Barrier for all I/O in Hermes to flush */
-  void GlobalWaitForFullFlush();
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_BUFFER_ORGANIZER_H_
diff --git a/src/buffer_pool.cc b/src/buffer_pool.cc
deleted file mode 100644
index b772144ba..000000000
--- a/src/buffer_pool.cc
+++ /dev/null
@@ -1,444 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "buffer_pool.h"
-#include "metadata_manager.h"
-#include "hermes.h"
-#include "buffer_organizer.h"
-
-namespace hermes {
-
-/**====================================
- * Default Constructor
- * ===================================*/
-
-/**
-* Initialize the BPM and its shared memory.
-* REQUIRES mdm to be initialized already.
-* */
-void BufferPool::shm_init(hipc::ShmArchive<BufferPoolShm> &header,
-                          hipc::Allocator *alloc) {
-  shm_deserialize(header);
-  // Initialize header
-  HSHM_MAKE_AR0(header_->free_lists_, alloc);
-  // [target] [cpu] [page_size]
-  header_->ntargets_ = mdm_->targets_->size();
-  header_->concurrency_ = HERMES_SYSTEM_INFO->ncpu_;
-  header_->nslabs_ = 0;
-  // Get the maximum number of slab sizes over all targets
-  for (TargetInfo &target : *mdm_->targets_) {
-    int dev_id = target.id_.GetDeviceId();
-    DeviceInfo &dev_info = (*mdm_->devices_)[dev_id];
-    if (header_->nslabs_ < dev_info.slab_sizes_->size()) {
-      header_->nslabs_ = dev_info.slab_sizes_->size();
-    }
-  }
-  // Create target free lists
-  target_allocs_->resize(header_->ntargets_ * header_->concurrency_ *
-                         header_->nslabs_);
-  // Initialize target free lists
-  for (u16 target_id = 0; target_id < header_->ntargets_; ++target_id) {
-    for (size_t cpu = 0; cpu < header_->concurrency_; ++cpu) {
-      // Get the target + device info
-      TargetInfo &target = (*mdm_->targets_)[target_id];
-      int dev_id = target.id_.GetDeviceId();
-      DeviceInfo &dev_info = (*mdm_->devices_)[dev_id];
-      size_t size_per_core = target.max_cap_ / header_->concurrency_;
-      if (size_per_core < MEGABYTES(1)) {
-        HELOG(kFatal, "The capacity of the target {} ({} bytes)"
-              " is not enough to give each of the {} CPUs at least"
-              " 1MB of space",
-              dev_info.mount_point_->str(),
-              target.max_cap_, header_->concurrency_)
-      }
-
-      // Initialize the core's metadata
-      BpFreeListStat *target_stat;
-      GetTargetStatForCpu(target_id, cpu, target_stat);
-      target_stat->region_off_ = cpu * size_per_core;
-      target_stat->region_size_ = size_per_core;
-      target_stat->lock_.Init();
-    }
-  }
-}
-
-/**====================================
- * SHM Deserialize
- * ===================================*/
-
-/** Deserialize the BPM from shared memory */
-void BufferPool::shm_deserialize(hipc::ShmArchive<BufferPoolShm> &header) {
-  mdm_ = &HERMES->mdm_;
-  borg_ = &HERMES->borg_;
-  rpc_ = &HERMES->rpc_;
-  header_ = header.get();
-  target_allocs_ = header_->free_lists_.get();
-}
-
-/**====================================
- * Destructor
- * ===================================*/
-
-/** Destroy the BPM shared memory. */
-void BufferPool::shm_destroy_main() {
-  target_allocs_->shm_destroy();
-}
-
-/**====================================
- * Allocate Buffers
- * ===================================*/
-
-/**
-* Allocate buffers from the targets according to the schema
-* */
-std::vector<BufferInfo>
-BufferPool::LocalAllocateAndSetBuffers(PlacementSchema &schema,
-                                       const Blob &blob) {
-  AUTO_TRACE(1)
-  std::vector<BufferInfo> buffers;
-  size_t blob_off = 0;
-  int cpu = hshm::NodeThreadId().hash() % header_->concurrency_;
-
-  TIMER_START("AllocateBuffers")
-  for (SubPlacement &plcmnt : schema.plcmnts_) {
-    // Get the target and device in the placement schema
-    if (plcmnt.tid_.GetNodeId() != mdm_->rpc_->node_id_) {
-      blob_off += plcmnt.size_;
-      continue;
-    }
-    int dev_id = plcmnt.tid_.GetDeviceId();
-    DeviceInfo &dev_info = (*mdm_->devices_)[dev_id];
-
-    // Get the number of each buffer size to allocate
-    size_t buffer_count;
-    std::vector<BpCoin> coins = CoinSelect(dev_info,
-                                           plcmnt.size_,
-                                           buffer_count);
-
-    // Allocate buffers
-    AllocateBuffers(plcmnt.size_,
-                    coins,
-                    plcmnt.tid_,
-                    cpu,
-                    blob_off,
-                    buffers);
-  }
-  TIMER_END()
-  borg_->LocalPlaceBlobInBuffers(blob, buffers);
-  return buffers;
-}
-
-/**
- * The RPC of LocalAllocateAndSendBuffers
- * */
-std::vector<BufferInfo>
-BufferPool::GlobalAllocateAndSetBuffers(PlacementSchema &schema,
-                                        const Blob &blob) {
-  AUTO_TRACE(1)
-  // Get the nodes to transfer buffers to
-  size_t total_size;
-  auto unique_nodes = GroupByNodeId(schema, total_size);
-  std::vector<BufferInfo> info;
-
-  // Send the buffers to each node
-  for (auto &[node_id, size] : unique_nodes) {
-    std::vector<BufferInfo> sub_info;
-    if (NODE_ID_IS_LOCAL(node_id)) {
-      sub_info = LocalAllocateAndSetBuffers(schema, blob);
-    } else {
-      sub_info = rpc_->IoCall<std::vector<BufferInfo>>(
-          node_id, "RpcAllocateAndSetBuffers",
-          IoType::kWrite, blob.data(), blob.size(),
-          blob.size(), schema);
-    }
-
-    // Concatenate
-    info.reserve(info.size() + sub_info.size());
-    for (BufferInfo &tmp_info : sub_info) {
-      info.emplace_back(tmp_info);
-    }
-  }
-
-  return info;
-}
-
-/**
- * Allocate requested slabs from this target.
- * If the target runs out of space, it will provision from the next target.
- * We assume there is a baseline target, which can house an infinite amount
- * of data. This would be the PFS in an HPC machine.
- *
- * @param total_size the total amount of data being placed in this target
- * @param coins The requested number of slabs to allocate from this target
- * @param target_id The ID of the (ideal) target to allocate from
- * @param blob_off [out] The current size of the blob which has been placed
- * @param buffers [out] The buffers which were allocated
- * */
-void BufferPool::AllocateBuffers(size_t total_size,
-                                 std::vector<BpCoin> &coins,
-                                 TargetId tid,
-                                 int cpu,
-                                 size_t &blob_off,
-                                 std::vector<BufferInfo> &buffers) {
-  // Get this target's stack allocator
-  size_t rem_size = total_size;
-
-  // Allocate each slab size
-  for (size_t slab_id = 0; slab_id < coins.size(); ++slab_id) {
-    size_t slab_size = coins[slab_id].slab_size_;
-    size_t slab_count = coins[slab_id].count_;
-    while (slab_count) {
-      // Allocate slabs
-      AllocateSlabs(rem_size, slab_size, slab_count, slab_id, tid,
-                    cpu, blob_off, buffers);
-
-      // Go to the next target if there was not enough space in this target
-      if (slab_count > 0) {
-        i32 target_id = tid.GetIndex() + 1;
-        if (target_id >= (i32)mdm_->targets_->size()) {
-          HELOG(kFatal, "BORG ran out of space on all targets."
-                " This shouldn't happen."
-                " Please increase the amount of space dedicated to PFS.")
-        }
-        tid = (*mdm_->targets_)[target_id].id_;
-      }
-    }
-  }
-}
-
-/**
- * Allocate a set of slabs of particular size from this target.
- *
- * @param rem_size the amount of data remaining that needs to be allocated
- * @param slab_size Size of the slabs to allocate
- * @param slab_count The count of this slab size to allocate
- * @param slab_id The offset of the slab in the device's slab list
- * @param tid The target to allocate slabs from
- * @param cpu the CPU this node is on
- * @param blob_off [out] The current size of the blob which has been placed
- * @param buffers [out] The buffers which were allocated
- * */
-void BufferPool::AllocateSlabs(size_t &rem_size,
-                               size_t slab_size,
-                               size_t &slab_count,
-                               size_t slab_id,
-                               TargetId tid,
-                               int cpu,
-                               size_t &blob_off,
-                               std::vector<BufferInfo> &buffers) {
-  int cpu_off = 0;
-  int ncpu = header_->concurrency_;
-
-  // Get the free list for this CPU
-  BpFreeList *free_list;
-  BpFreeListStat *free_list_stat;
-  BpFreeListStat *target_stat;
-  GetFreeListForCpu(tid.GetIndex(), cpu, slab_id, free_list,
-                    free_list_stat);
-  GetTargetStatForCpu(tid.GetIndex(), cpu, target_stat);
-  target_stat->lock_.Lock(10);
-
-  while (slab_count > 0) {
-    BpSlot slot =
-        AllocateSlabSize(cpu, slab_size,
-                         free_list, free_list_stat, target_stat);
-    if (slot.IsNull()) {
-      if (cpu_off < ncpu) {
-        cpu = (cpu + 1) % ncpu;
-        target_stat->lock_.Unlock();
-        GetFreeListForCpu(tid.GetIndex(), cpu, slab_id, free_list,
-                          free_list_stat);
-        GetTargetStatForCpu(tid.GetIndex(), cpu, target_stat);
-        target_stat->lock_.Lock(11);
-        cpu_off += 1;
-        continue;
-      } else {
-        target_stat->lock_.Unlock();
-        return;
-      }
-    }
-    buffers.emplace_back();
-    BufferInfo &info = buffers.back();
-    info.t_off_ = slot.t_off_;
-    info.t_size_ = slot.t_size_;
-    info.t_slab_ = slab_id;
-    info.blob_off_ = blob_off;
-    info.blob_size_ = slot.t_size_;
-    if (rem_size < slot.t_size_) {
-      info.blob_size_ = rem_size;
-    }
-    rem_size -= info.blob_size_;
-    info.tid_ = tid;
-    blob_off += info.blob_size_;
-    mdm_->LocalUpdateTargetCapacity(tid, -static_cast<off64_t>(slab_size));
-    --slab_count;
-  }
-  target_stat->lock_.Unlock();
-}
-
-/**
- * Allocate a buffer of a particular size
- *
- * @param slab_id The size of slab to allocate
- * @param tid The target to (ideally) allocate the slab from
- * @param coin The buffer size information
- *
- * @return returns a BufferPool (BP) slot. The slot is NULL if the
- * target didn't have enough remaining space.
- * */
-BpSlot BufferPool::AllocateSlabSize(int cpu,
-                                    size_t slab_size,
-                                    BpFreeList *free_list,
-                                    BpFreeListStat *free_list_stat,
-                                    BpFreeListStat *target_stat) {
-  BpSlot slot(0, 0);
-
-  // Case 1: Slab is cached on this core
-  if (free_list->size()) {
-    auto first = free_list->begin();
-    slot = *first;
-    free_list->erase(first);
-    return slot;
-  }
-
-  // Case 2: Allocate slab from stack
-  if (slot.IsNull() && target_stat->region_size_ >= slab_size) {
-    slot.t_off_ = target_stat->region_off_.fetch_add(slab_size);
-    slot.t_size_ = slab_size;
-    target_stat->region_size_.fetch_sub(slab_size);
-    return slot;
-  }
-
-  // Case 3: Coalesce
-  // TOOD(llogan)
-
-  // Case 4: No more space left in this target.
-  return slot;
-}
-
-/**
-   * Determines a reasonable allocation of buffers based on the size of I/O.
-   * Returns the number of each slab size to allocate
-   * */
-std::vector<BpCoin> BufferPool::CoinSelect(DeviceInfo &dev_info,
-                                           size_t total_size,
-                                           size_t &buffer_count) {
-  std::vector<BpCoin> coins(dev_info.slab_sizes_->size());
-  size_t rem_size = total_size;
-  buffer_count = 0;
-
-  while (rem_size) {
-    // Find the slab size nearest to the rem_size
-    size_t i = 0, slab_size = 0;
-    for (size_t &tmp_slab_size : *dev_info.slab_sizes_) {
-      slab_size = tmp_slab_size;
-      if (slab_size >= rem_size) {
-        break;
-      }
-      ++i;
-    }
-    if (i == dev_info.slab_sizes_->size()) { i -= 1; }
-
-    // Divide rem_size into slabs
-    if (rem_size > slab_size) {
-      coins[i].count_ += rem_size / slab_size;
-      coins[i].slab_size_ = slab_size;
-      rem_size %= slab_size;
-    } else {
-      coins[i].count_ += 1;
-      coins[i].slab_size_ = slab_size;
-      rem_size = 0;
-    }
-    buffer_count += coins[i].count_;
-  }
-
-  return coins;
-}
-
-/**====================================
- * Free Buffers
- * ===================================*/
-
-/**
- * Free buffers from the BufferPool
- * */
-bool BufferPool::LocalReleaseBuffers(std::vector<BufferInfo> &buffers) {
-  AUTO_TRACE(1)
-  HILOG(kDebug, "Releasing buffers")
-  int cpu = hshm::NodeThreadId().hash() % header_->concurrency_;
-  for (BufferInfo &info : buffers) {
-    // Acquire the main CPU lock for the target
-    BpFreeListStat *target_stat;
-    GetTargetStatForCpu(info.tid_.GetIndex(), cpu, target_stat);
-    hshm::ScopedMutex bpm_lock(target_stat->lock_, 12);
-
-    // Get this core's free list for the page_size
-    BpFreeListStat *free_list_stat;
-    BpFreeList *free_list;
-    GetFreeListForCpu(info.tid_.GetIndex(), cpu, info.t_slab_,
-                      free_list, free_list_stat);
-    free_list->emplace_front(info.t_off_, info.t_size_);
-  }
-  return true;
-}
-
-/**
- * Free buffers from the BufferPool (global)
- * */
-bool BufferPool::GlobalReleaseBuffers(std::vector<BufferInfo> &buffers) {
-  AUTO_TRACE(1)
-  // Get the nodes to transfer buffers to
-  size_t total_size;
-  auto unique_nodes = GroupByNodeId(buffers, total_size);
-
-  // Send the buffers to each node
-  for (auto &[node_id, size] : unique_nodes) {
-    if (NODE_ID_IS_LOCAL(node_id)) {
-      LocalReleaseBuffers(buffers);
-    } else {
-      rpc_->Call<bool>(node_id, "RpcReleaseBuffers", buffers);
-    }
-  }
-
-  return true;
-}
-
-/**====================================
- * Helper Methods
- * ===================================*/
-
-/** Get a free list reference */
-void BufferPool::GetFreeListForCpu(u16 target_id, int cpu, int slab_id,
-                                   BpFreeList* &free_list,
-                                   BpFreeListStat* &free_list_stat) {
-  size_t cpu_free_list_idx = header_->GetCpuFreeList(target_id,
-                                                     cpu, slab_id);
-  if (cpu_free_list_idx >= target_allocs_->size()) {
-    HELOG(kFatal, "For some reason, the CPU free list was "
-          "not allocated properly and overflowed.")
-  }
-  BpFreeListPair &free_list_p =
-      (*target_allocs_)[cpu_free_list_idx];
-  free_list_stat = &free_list_p.GetFirst();
-  free_list = &free_list_p.GetSecond();
-}
-
-/** Get the stack allocator from the cpu */
-void BufferPool::GetTargetStatForCpu(u16 target_id, int cpu,
-                                     BpFreeListStat* &target_stat) {
-  size_t tgt_free_list_start = header_->GetCpuTargetStat(target_id, cpu);
-  BpFreeListPair &free_list_p =
-      (*target_allocs_)[tgt_free_list_start];
-  target_stat = &free_list_p.GetFirst();
-}
-
-}  // namespace hermes
diff --git a/src/buffer_pool.h b/src/buffer_pool.h
deleted file mode 100644
index 3f35e6132..000000000
--- a/src/buffer_pool.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_BUFFER_POOL_H_
-#define HERMES_SRC_BUFFER_POOL_H_
-
-#include "hermes_types.h"
-#include "rpc.h"
-
-namespace hermes {
-
-class MetadataManager;
-class BufferOrganizer;
-class BufferPool;
-
-struct BpCoin {
-  size_t count_;
-  size_t slab_size_;
-
-  BpCoin() : count_(0), slab_size_(0) {}
-};
-
-struct BpSlot {
-  size_t t_off_;    /**< Offset of the buffer in the target */
-  size_t t_size_;   /**< Size of the buffer in the target*/
-
-  BpSlot() : t_size_(0) {}
-
-  BpSlot(size_t t_off, size_t t_size) : t_off_(t_off), t_size_(t_size) {}
-
-  bool IsNull() {
-    return t_size_ == 0;
-  }
-};
-
-struct BpFreeListStat {
-  std::atomic<size_t> region_off_;  /**< Current offset in the target */
-  std::atomic<size_t> region_size_; /**< Current space remaining in the tgt */
-  size_t page_size_;  /**< The size of page in this buffer list */
-  size_t cur_count_;  /**< Current number of pages allocated */
-  size_t max_count_;  /**< Max pages allocated at one time */
-  Mutex lock_;        /**< The modifier lock for this slot */
-
-  /** Default constructor */
-  BpFreeListStat() = default;
-
-  /** Copy constructor */
-  BpFreeListStat(const BpFreeListStat &other) {
-    strong_copy(other);
-  }
-
-  /** Copy assignment operator */
-  BpFreeListStat& operator=(const BpFreeListStat &other) {
-    strong_copy(other);
-    return *this;
-  }
-
-  /** Move constructor */
-  BpFreeListStat(BpFreeListStat &&other) {
-    strong_copy(other);
-  }
-
-  /** Move assignment operator */
-  BpFreeListStat& operator=(BpFreeListStat &&other) {
-    strong_copy(other);
-    return *this;
-  }
-
-  /** Internal copy */
-  void strong_copy(const BpFreeListStat &other) {
-    region_off_ = other.region_off_.load();
-    region_size_ = other.region_size_.load();
-    page_size_ = other.page_size_;
-    cur_count_ = other.cur_count_;
-    max_count_ = other.max_count_;
-  }
-};
-
-/** Represents the list of available buffers */
-typedef hipc::slist<BpSlot> BpFreeList;
-
-/** Represents a cache of buffer size in the target */
-typedef hipc::pair<BpFreeListStat, BpFreeList> BpFreeListPair;
-
-/** Represents the set of targets */
-typedef hipc::vector<BpFreeListPair> BpTargetAllocs;
-
-/**
- * The shared-memory representation of the BufferPool
- * */
-struct BufferPoolShm {
-  hipc::ShmArchive<BpTargetAllocs> free_lists_;
-  u16 ntargets_;
-  size_t concurrency_;
-  size_t nslabs_;
-
-  /**
-   * Get the free list of the target
-   * This is where region_off_ & region_size_ in the BpFreeListStat are valid
-   * */
-  size_t GetCpuTargetStat(u16 target, int cpu) {
-    return target * concurrency_ * nslabs_ + cpu * nslabs_;
-  }
-
-  /**
-   * Get the start of the vector of the free list for the CPU in the target
-   * This is where page_size_, cur_count_, and max_count_ are valid.
-   *
-   * [target] [cpu] [slab_id]
-   * */
-  size_t GetCpuFreeList(u16 target, int cpu, int slab_id) {
-    return target * concurrency_ * nslabs_ + cpu * nslabs_ + slab_id;
-  }
-};
-
-/**
- * Responsible for managing the buffering space of all node-local targets.
- * */
-class BufferPool {
- private:
-  MetadataManager *mdm_;
-  BufferOrganizer *borg_;
-  RPC_TYPE *rpc_;
-  BufferPoolShm *header_;
-  /** Per-target allocator */
-  BpTargetAllocs *target_allocs_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** Default constructor */
-  BufferPool() = default;
-
-  /**====================================
-   * SHM Init
-   * ===================================*/
-
-  /**
-   * Initialize the BPM and its shared memory.
-   * REQUIRES mdm to be initialized already.
-   * */
-  void shm_init(hipc::ShmArchive<BufferPoolShm> &header,
-                hipc::Allocator *alloc);
-
-  /**====================================
-   * SHM Deserialize
-   * ===================================*/
-
-  /** Deserialize the BPM from shared memory */
-  void shm_deserialize(hipc::ShmArchive<BufferPoolShm> &header);
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Destroy the BPM shared memory. */
-  void shm_destroy_main();
-
-  /**====================================
-   * Allocate Buffers
-   * ===================================*/
-
-  /**
-   * Allocate buffers from the targets according to the schema
-   * */
-  RPC std::vector<BufferInfo>
-  LocalAllocateAndSetBuffers(PlacementSchema &schema,
-                             const Blob &blob);
-  std::vector<BufferInfo>
-  GlobalAllocateAndSetBuffers(PlacementSchema &schema,
-                              const Blob &blob);
-
-  /**
-   * Determines a reasonable allocation of buffers based on the size of I/O.
-   * Returns the number of each slab size to allocate
-   * */
-  std::vector<BpCoin> CoinSelect(DeviceInfo &dev_info,
-                                 size_t total_size,
-                                 size_t &buffer_count);
-
-  /**
-   * Allocate requested slabs from this target.
-   * If the target runs out of space, it will provision from the next target.
-   * We assume there is a baseline target, which can house an infinite amount
-   * of data. This would be the PFS in an HPC machine.
-   *
-   * @param total_size the total amount of data being placed in this target
-   * @param coins The requested number of slabs to allocate from this target
-   * @param tid The ID of the (ideal) target to allocate from
-   * @param cpu The CPU we are currently scheduled on
-   * @param blob_off [out] The current size of the blob which has been placed
-   * @param buffers [out] The buffers which were allocated
-   * */
-  void AllocateBuffers(size_t total_size,
-                       std::vector<BpCoin> &coins,
-                       TargetId tid,
-                       int cpu,
-                       size_t &blob_off,
-                       std::vector<BufferInfo> &buffers);
-
-  /**
-   * Allocate a set of slabs of particular size from this target.
-   *
-   * @param rem_size the amount of data remaining that needs to be allocated
-   * @param slab_size Size of the slabs to allocate
-   * @param slab_count The count of this slab size to allocate
-   * @param slab_id The offset of the slab in the device's slab list
-   * @param tid The target to allocate slabs from
-   * @param blob_off [out] The current size of the blob which has been placed
-   * @param buffers [out] The buffers which were allocated
-   * */
-  void AllocateSlabs(size_t &rem_size,
-                     size_t slab_size,
-                     size_t &slab_count,
-                     size_t slab_id,
-                     TargetId tid,
-                     int cpu,
-                     size_t &blob_off,
-                     std::vector<BufferInfo> &buffers);
-
-  /**
-   * Allocate a buffer of a particular size
-   *
-   * @param slab_id The size of slab to allocate
-   * @param tid The target to (ideally) allocate the slab from
-   * @param coin The buffer size information
-   *
-   * @return returns a BufferPool (BP) slot. The slot is NULL if the
-   * target didn't have enough remaining space.
-   * */
-  BpSlot AllocateSlabSize(int cpu,
-                          size_t slab_size,
-                          BpFreeList *free_list,
-                          BpFreeListStat *stat,
-                          BpFreeListStat *target_stat);
-
-
-  /**====================================
-   * Free Buffers
-   * ===================================*/
-
-  /**
-   * Free buffers from the BufferPool
-   * */
-  RPC bool LocalReleaseBuffers(std::vector<BufferInfo> &buffers);
-  bool GlobalReleaseBuffers(std::vector<BufferInfo> &buffers);
-
-  /**====================================
-   * Helper Methods
-   * ===================================*/
-
-  /** Get a free list reference */
-  void GetFreeListForCpu(u16 target_id, int cpu, int slab_id,
-                         BpFreeList* &free_list,
-                         BpFreeListStat* &free_list_stat);
-
-  /** Get the stack allocator from the cpu */
-  void GetTargetStatForCpu(u16 target_id, int cpu,
-                           BpFreeListStat* &target_stat);
-
-  /** Find instance of unique target if it exists */
-  static std::vector<std::pair<i32, size_t>>::iterator
-  FindUniqueNodeId(std::vector<std::pair<i32, size_t>> &unique_nodes,
-                   i32 node_id) {
-    for (auto iter = unique_nodes.begin(); iter != unique_nodes.end(); ++iter) {
-      if (iter->first == node_id) {
-        return iter;
-      }
-    }
-    return unique_nodes.end();
-  }
-
-  /** Get the unique set of targets */
-  static std::vector<std::pair<i32, size_t>>
-  GroupByNodeId(std::vector<BufferInfo> &buffers, size_t &total_size) {
-    total_size = 0;
-    std::vector<std::pair<i32, size_t>> unique_nodes;
-    for (BufferInfo &info : buffers) {
-      auto iter = FindUniqueNodeId(unique_nodes, info.tid_.GetNodeId());
-      if (iter == unique_nodes.end()) {
-        unique_nodes.emplace_back(info.tid_.GetNodeId(), info.blob_size_);
-      } else {
-        (*iter).second += info.blob_size_;
-      }
-      total_size += info.blob_size_;
-    }
-    return unique_nodes;
-  }
-
-  /** Get the unique set of targets */
-  static std::vector<std::pair<i32, size_t>>
-  GroupByNodeId(PlacementSchema &schema, size_t &total_size) {
-    total_size = 0;
-    std::vector<std::pair<i32, size_t>> unique_nodes;
-    for (auto &plcmnt : schema.plcmnts_) {
-      auto iter = FindUniqueNodeId(unique_nodes, plcmnt.tid_.GetNodeId());
-      if (iter == unique_nodes.end()) {
-        unique_nodes.emplace_back(plcmnt.tid_.GetNodeId(), plcmnt.size_);
-      } else {
-        (*iter).second += plcmnt.size_;
-      }
-      total_size += plcmnt.size_;
-    }
-    return unique_nodes;
-  }
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_BUFFER_POOL_H_
diff --git a/src/config_client.cc b/src/config_client.cc
deleted file mode 100644
index 1217aeaae..000000000
--- a/src/config_client.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "config_client.h"
-#include "config_client_default.h"
-#include "hermes_shm/util/config_parse.h"
-#include <filesystem>
-
-namespace stdfs = std::filesystem;
-
-namespace hermes::config {
-
-/** parse the AdapterConfig YAML node */
-void ClientConfig::ParseAdapterConfig(YAML::Node &yaml_conf,
-                                      AdapterObjectConfig &conf) {
-  std::string path = yaml_conf["path"].as<std::string>();
-  path = hshm::ConfigParse::ExpandPath(path);
-  path = stdfs::absolute(path).string();
-  if (yaml_conf["mode"]) {
-    conf.mode_ = AdapterModeConv::to_enum(yaml_conf["mode"].as<std::string>());
-  }
-  if (yaml_conf["page_size"]) {
-    conf.page_size_ = hshm::ConfigParse::ParseSize(
-        yaml_conf["page_size"].as<std::string>());
-  }
-  SetAdapterConfig(path, conf);
-}
-
-/** parse the YAML node */
-void ClientConfig::ParseYAML(YAML::Node &yaml_conf) {
-  if (yaml_conf["stop_daemon"]) {
-    std::string stop_env = GetEnvSafe(kHermesStopDaemon);
-    if (stop_env.size() == 0) {
-      stop_daemon_ = yaml_conf["stop_daemon"].as<bool>();
-    } else {
-      std::istringstream(stop_env) >> stop_daemon_;
-    }
-  }
-  if (yaml_conf["base_adapter_mode"]) {
-    std::string mode_env = GetEnvSafe(kHermesAdapterMode);
-    if (mode_env.size() == 0) {
-      base_adapter_config_.mode_ = AdapterModeConv::to_enum(
-          yaml_conf["base_adapter_mode"].as<std::string>());
-    } else {
-      base_adapter_config_.mode_ = AdapterModeConv::to_enum(mode_env);
-    }
-  }
-  if (yaml_conf["file_page_size"]) {
-    std::string page_size_env = GetEnvSafe(kHermesPageSize);
-    if (page_size_env.size() == 0) {
-      base_adapter_config_.page_size_ =
-          hshm::ConfigParse::ParseSize(
-              yaml_conf["file_page_size"].as<std::string>());
-    } else {
-      base_adapter_config_.page_size_ =
-          hshm::ConfigParse::ParseSize(page_size_env);
-    }
-  }
-  if (yaml_conf["path_inclusions"]) {
-    std::vector<std::string> inclusions;
-    ParseVector<std::string>(yaml_conf["path_inclusions"], inclusions);
-    for (auto &entry : inclusions) {
-      entry = hshm::ConfigParse::ExpandPath(entry);
-      SetAdapterPathTracking(std::move(entry), true);
-    }
-  }
-  if (yaml_conf["path_exclusions"]) {
-    std::vector<std::string> exclusions;
-    ParseVector<std::string>(yaml_conf["path_exclusions"], exclusions);
-    for (auto &entry : exclusions) {
-      entry = hshm::ConfigParse::ExpandPath(entry);
-      SetAdapterPathTracking(std::move(entry), false);
-    }
-  }
-  if (yaml_conf["flushing_mode"]) {
-    flushing_mode_ =
-        FlushingModeConv::GetEnum(yaml_conf["flushing_mode"].as<std::string>());
-    auto flush_mode_env = getenv("HERMES_FLUSH_MODE");
-    if (flush_mode_env) {
-      flushing_mode_ = FlushingModeConv::GetEnum(flush_mode_env);
-    }
-  }
-  if (yaml_conf["file_adapter_configs"]) {
-    for (auto node : yaml_conf["file_adapter_configs"]) {
-      AdapterObjectConfig conf(base_adapter_config_);
-      ParseAdapterConfig(node, conf);
-    }
-  }
-}
-
-/** Load the default configuration */
-void ClientConfig::LoadDefault() {
-  LoadText(kClientDefaultConfigStr, false);
-}
-
-}  // namespace hermes::config
diff --git a/src/config_server.cc b/src/config_server.cc
deleted file mode 100644
index 59d1abb5c..000000000
--- a/src/config_server.cc
+++ /dev/null
@@ -1,221 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <string.h>
-#include <yaml-cpp/yaml.h>
-#include <ostream>
-#include "hermes_shm/util/logging.h"
-#include "utils.h"
-#include "config.h"
-#include "hermes_shm/util/config_parse.h"
-
-#include "config_server.h"
-#include "config_server_default.h"
-
-namespace hermes::config {
-
-/** parse device information from YAML config */
-void ServerConfig::ParseDeviceInfo(YAML::Node yaml_conf) {
-  devices_ = hipc::make_uptr<hipc::vector<DeviceInfo>>();
-  for (auto device : yaml_conf) {
-    devices_->emplace_back();
-    DeviceInfo &dev = devices_->back();
-    auto dev_info = device.second;
-    (*dev.dev_name_) = device.first.as<std::string>();
-    (*dev.mount_dir_) = hshm::ConfigParse::ExpandPath(
-        dev_info["mount_point"].as<std::string>());
-    dev.borg_min_thresh_ =
-        dev_info["borg_capacity_thresh"][0].as<float>();
-    dev.borg_max_thresh_ =
-        dev_info["borg_capacity_thresh"][1].as<float>();
-    dev.is_shared_ =
-        dev_info["is_shared_device"].as<bool>();
-    dev.block_size_ =
-        hshm::ConfigParse::ParseSize(dev_info["block_size"].as<std::string>());
-    dev.capacity_ =
-        hshm::ConfigParse::ParseSize(dev_info["capacity"].as<std::string>());
-    dev.bandwidth_ =
-        hshm::ConfigParse::ParseSize(dev_info["bandwidth"].as<std::string>());
-    dev.latency_ =
-        hshm::ConfigParse::ParseLatency(dev_info["latency"].as<std::string>());
-    std::vector<std::string> size_vec;
-    ParseVector<std::string, std::vector<std::string>>(
-        dev_info["slab_sizes"], size_vec);
-    dev.slab_sizes_->reserve(size_vec.size());
-    for (const std::string &size_str : size_vec) {
-      dev.slab_sizes_->emplace_back(hshm::ConfigParse::ParseSize(size_str));
-    }
-  }
-}
-
-/** parse RPC information from YAML config */
-void ServerConfig::ParseRpcInfo(YAML::Node yaml_conf) {
-  std::string suffix;
-
-  if (yaml_conf["host_file"]) {
-    rpc_.host_file_ =
-        hshm::ConfigParse::ExpandPath(yaml_conf["host_file"].as<std::string>());
-    rpc_.host_names_.clear();
-  }
-  if (yaml_conf["host_names"] && rpc_.host_file_.size() == 0) {
-    // NOTE(llogan): host file is prioritized
-    rpc_.host_names_.clear();
-    for (YAML::Node host_name_gen : yaml_conf["host_names"]) {
-      std::string host_names = host_name_gen.as<std::string>();
-      hshm::ConfigParse::ParseHostNameString(host_names, rpc_.host_names_);
-    }
-  }
-  if (yaml_conf["domain"]) {
-    rpc_.domain_ = yaml_conf["domain"].as<std::string>();
-  }
-  if (yaml_conf["protocol"]) {
-    rpc_.protocol_ = yaml_conf["protocol"].as<std::string>();
-  }
-  if (yaml_conf["port"]) {
-    rpc_.port_ = yaml_conf["port"].as<int>();
-  }
-  if (yaml_conf["num_threads"]) {
-    rpc_.num_threads_ = yaml_conf["num_threads"].as<int>();
-  }
-}
-
-/** parse dpe information from YAML config */
-void ServerConfig::ParseDpeInfo(YAML::Node yaml_conf) {
-  if (yaml_conf["default_placement_policy"]) {
-    std::string policy =
-        yaml_conf["default_placement_policy"].as<std::string>();
-    dpe_.default_policy_ = api::PlacementPolicyConv::to_enum(policy);
-  }
-}
-
-/** parse buffer organizer information from YAML config */
-void ServerConfig::ParseBorgInfo(YAML::Node yaml_conf) {
-  if (yaml_conf["num_threads"]) {
-    borg_.num_threads_ = yaml_conf["num_threads"].as<int>();
-  }
-  if (yaml_conf["flush_period"]) {
-    borg_.flush_period_ = yaml_conf["flush_period"].as<size_t>();
-  }
-  if (yaml_conf["blob_reorg_period"]) {
-    borg_.blob_reorg_period_ = yaml_conf["blob_reorg_period"].as<size_t>();
-  }
-  if (yaml_conf["recency_min"]) {
-    borg_.recency_min_ = yaml_conf["recency_min"].as<float>();
-  }
-  if (yaml_conf["recency_max"]) {
-    borg_.recency_max_ = yaml_conf["recency_max"].as<float>();
-  }
-  if (yaml_conf["freq_max"]) {
-    borg_.freq_max_ = yaml_conf["freq_max"].as<float>();
-  }
-  if (yaml_conf["freq_min"]) {
-    borg_.freq_min_ = yaml_conf["freq_min"].as<float>();
-  }
-}
-
-/** parse I/O tracing information from YAML config */
-void ServerConfig::ParseTracingInfo(YAML::Node yaml_conf) {
-  if (yaml_conf["enabled"]) {
-    tracing_.enabled_ = yaml_conf["enabled"].as<bool>();
-  }
-  if (yaml_conf["output"]) {
-    tracing_.output_ = hshm::ConfigParse::ExpandPath(
-        yaml_conf["output"].as<std::string>());
-  }
-}
-
-/** parse prefetch information from YAML config */
-void ServerConfig::ParsePrefetchInfo(YAML::Node yaml_conf) {
-  if (yaml_conf["enabled"]) {
-    prefetcher_.enabled_ = yaml_conf["enabled"].as<bool>();
-  }
-  if (yaml_conf["io_trace_path"]) {
-    prefetcher_.trace_path_ = hshm::ConfigParse::ExpandPath(
-        yaml_conf["io_trace_path"].as<std::string>());
-  }
-  if (yaml_conf["epoch_ms"]) {
-    prefetcher_.epoch_ms_ = yaml_conf["epoch_ms"].as<size_t>();
-  }
-  if (yaml_conf["is_mpi"]) {
-    prefetcher_.is_mpi_ = yaml_conf["is_mpi"].as<bool>();
-  }
-  if (yaml_conf["apriori_schema_path"]) {
-    prefetcher_.apriori_schema_path_ =
-      yaml_conf["apriori_schema_path"].as<std::string>();
-  }
-}
-
-/** parse prefetch information from YAML config */
-void ServerConfig::ParseTraitInfo(YAML::Node yaml_conf) {
-  std::vector<std::string> trait_names;
-  ParseVector<std::string, std::vector<std::string>>(
-      yaml_conf, trait_names);
-  trait_paths_.reserve(trait_names.size());
-  for (auto &name : trait_names) {
-    name = hshm::ConfigParse::ExpandPath(name);
-    trait_paths_.emplace_back(
-        hshm::Formatter::format("lib{}.so", name));
-  }
-}
-
-/** parse prefetch information from YAML config */
-void ServerConfig::ParseMdmInfo(YAML::Node yaml_conf) {
-  mdm_.num_blobs_ = yaml_conf["est_blob_count"].as<size_t>();
-  mdm_.num_bkts_ = yaml_conf["est_blob_count"].as<size_t>();
-  mdm_.num_traits_ = yaml_conf["est_num_traits"].as<size_t>();
-}
-
-/** parse the YAML node */
-void ServerConfig::ParseYAML(YAML::Node &yaml_conf) {
-  if (yaml_conf["devices"]) {
-    ParseDeviceInfo(yaml_conf["devices"]);
-  }
-  if (yaml_conf["rpc"]) {
-    ParseRpcInfo(yaml_conf["rpc"]);
-  }
-  if (yaml_conf["dpe"]) {
-    ParseDpeInfo(yaml_conf["dpe"]);
-  }
-  if (yaml_conf["buffer_organizer"]) {
-    ParseBorgInfo(yaml_conf["buffer_organizer"]);
-  }
-  if (yaml_conf["tracing"]) {
-    ParseTracingInfo(yaml_conf["tracing"]);
-  }
-  if (yaml_conf["prefetch"]) {
-    ParsePrefetchInfo(yaml_conf["prefetch"]);
-  }
-  if (yaml_conf["mdm"]) {
-    ParseMdmInfo(yaml_conf["mdm"]);
-  }
-  if (yaml_conf["system_view_state_update_interval_ms"]) {
-    system_view_state_update_interval_ms =
-        yaml_conf["system_view_state_update_interval_ms"].as<int>();
-  }
-  if (yaml_conf["traits"]) {
-    ParseTraitInfo(yaml_conf["traits"]);
-  }
-  if (yaml_conf["shmem_name"]) {
-    shmem_name_ = yaml_conf["shmem_name"].as<std::string>();
-  }
-  if (yaml_conf["max_memory"]) {
-    max_memory_ = hshm::ConfigParse::ParseSize(
-      yaml_conf["max_memory"].as<std::string>());
-  }
-}
-
-/** Load the default configuration */
-void ServerConfig::LoadDefault() {
-  LoadText(kServerDefaultConfigStr, false);
-}
-
-}  // namespace hermes::config
diff --git a/src/config_server.h b/src/config_server.h
deleted file mode 100644
index 4f2b461a5..000000000
--- a/src/config_server.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_CONFIG_SERVER_H_
-#define HERMES_SRC_CONFIG_SERVER_H_
-
-#include "config.h"
-
-namespace hermes::config {
-
-struct DeviceInfo; /** Forward declaration of DeviceInfo */
-
-/**
- * The type of interface the device exposes
- * */
-enum class IoInterface {
-  kRam,
-  kPosix
-};
-
-/**
- * DeviceInfo shared-memory representation
- * */
-class DeviceInfo : public hipc::ShmContainer {
-  SHM_CONTAINER_TEMPLATE(DeviceInfo, DeviceInfo)
-
-  /** The human-readable name of the device */
-  hipc::ShmArchive<hipc::string> dev_name_;
-  /** The unit of each slab, a multiple of the Device's block size */
-  hipc::ShmArchive<hipc::vector<size_t>> slab_sizes_;
-  /** The directory the device is mounted on */
-  hipc::ShmArchive<hipc::string> mount_dir_;
-  /** The file to create on the device */
-  hipc::ShmArchive<hipc::string> mount_point_;
-  /** The I/O interface for the device */
-  IoInterface io_api_;
-  /** The minimum transfer size of each device */
-  size_t block_size_;
-  /** Device capacity (bytes) */
-  size_t capacity_;
-  /** Bandwidth of a device (MBps) */
-  f32 bandwidth_;
-  /** Latency of the device (us)*/
-  f32 latency_;
-  /** Whether or not the device is shared among all nodes */
-  bool is_shared_;
-  /** BORG's minimum and maximum capacity threshold for device */
-  f32 borg_min_thresh_, borg_max_thresh_;
-
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM Constructor. Default. */
-  explicit DeviceInfo(hipc::Allocator *alloc) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR0(dev_name_, alloc);
-    HSHM_MAKE_AR0(slab_sizes_, alloc);
-    HSHM_MAKE_AR0(mount_dir_, alloc);
-    HSHM_MAKE_AR0(mount_point_, alloc);
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor. From DeviceInfo. */
-  explicit DeviceInfo(hipc::Allocator *alloc,
-                      const DeviceInfo &other) {
-    shm_init_container(alloc);
-    shm_strong_copy_constructor_main(alloc, other);
-  }
-
-  /** Internal copy */
-  void strong_copy(const DeviceInfo &other) {
-    io_api_ = other.io_api_;
-    block_size_ = other.block_size_;
-    capacity_ = other.capacity_;
-    bandwidth_ = other.bandwidth_;
-    latency_ = other.latency_;
-    is_shared_ = other.is_shared_;
-    borg_min_thresh_ = other.borg_min_thresh_;
-    borg_max_thresh_ = other.borg_max_thresh_;
-  }
-
-  /** Copy constructor main. */
-  void shm_strong_copy_constructor_main(hipc::Allocator *alloc,
-                                        const DeviceInfo &other) {
-    strong_copy(other);
-    HSHM_MAKE_AR(dev_name_, alloc, *other.dev_name_);
-    HSHM_MAKE_AR(slab_sizes_, alloc, *other.slab_sizes_);
-    HSHM_MAKE_AR(mount_dir_, alloc, *other.mount_dir_);
-    HSHM_MAKE_AR(mount_point_, alloc, *other.mount_point_);
-  }
-
-  /** SHM copy assignment operator. From DeviceInfo. */
-  DeviceInfo& operator=(const DeviceInfo &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_op_main(other);
-    }
-    return *this;
-  }
-
-  /** Copy assignment operator main. */
-  void shm_strong_copy_op_main(const DeviceInfo &other) {
-    strong_copy(other);
-    (*dev_name_) = (*other.dev_name_);
-    (*slab_sizes_) = (*other.slab_sizes_);
-    (*mount_dir_) = (*other.mount_dir_);
-    (*mount_point_) = (*other.mount_point_);
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  DeviceInfo(hipc::Allocator *alloc,
-             DeviceInfo &&other) {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      strong_copy(other);
-      HSHM_MAKE_AR(dev_name_, alloc, std::move(*other.dev_name_));
-      HSHM_MAKE_AR(slab_sizes_, alloc, std::move(*other.slab_sizes_));
-      HSHM_MAKE_AR(mount_dir_, alloc, std::move(*other.mount_dir_));
-      HSHM_MAKE_AR(mount_point_, alloc, std::move(*other.mount_point_));
-      other.SetNull();
-    } else {
-      shm_strong_copy_constructor_main(alloc, other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  DeviceInfo& operator=(DeviceInfo &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        strong_copy(other);
-        (*dev_name_) = std::move(*other.dev_name_);
-        (*slab_sizes_) = std::move(*other.slab_sizes_);
-        (*mount_dir_) = std::move(*other.mount_dir_);
-        (*mount_point_) = std::move(*other.mount_point_);
-        other.SetNull();
-      } else {
-        shm_strong_copy_op_main(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Whether DeviceInfo is NULL */
-  bool IsNull() { return false; }
-
-  /** Set DeviceInfo to NULL */
-  void SetNull() {}
-
-  /** Free shared memory */
-  void shm_destroy_main() {
-    (*dev_name_).shm_destroy();
-    (*slab_sizes_).shm_destroy();
-    (*mount_dir_).shm_destroy();
-    (*mount_point_).shm_destroy();
-  }
-};
-
-/**
- * RPC information defined in server config
- * */
-struct RpcInfo {
-  /** The name of a file that contains host names, 1 per line */
-  std::string host_file_;
-  /** The parsed hostnames from the hermes conf */
-  std::vector<std::string> host_names_;
-  /** The RPC protocol to be used. */
-  std::string protocol_;
-  /** The RPC domain name for verbs transport. */
-  std::string domain_;
-  /** The RPC port number. */
-  int port_;
-  /** The number of handler threads per RPC server. */
-  int num_threads_;
-};
-
-/**
- * DPE information defined in server config
- * */
-struct DpeInfo {
-  /** The default blob placement policy. */
-  api::PlacementPolicy default_policy_;
-
-  /** Whether blob splitting is enabled for Round-Robin blob placement. */
-  bool default_rr_split_;
-};
-
-/**
- * Buffer organizer information defined in server config
- * */
-struct BorgInfo {
-  /** The number of buffer organizer threads. */
-  int num_threads_;
-  /** Interval (seconds) where blobs are checked for flushing */
-  size_t flush_period_;
-  /** Interval (seconds) where blobs are checked for re-organization */
-  size_t blob_reorg_period_;
-  /** Time when score is equal to 1 (seconds) */
-  float recency_min_;
-  /** Time when score is equal to 0 (seconds) */
-  float recency_max_;
-  /** Number of accesses for score to be equal to 1 (count) */
-  float freq_max_;
-  /** Number of accesses for score to be equal to 0 (count) */
-  float freq_min_;
-};
-
-/**
- * Prefetcher information in server config
- * */
-struct PrefetchInfo {
-  bool enabled_;
-  std::string trace_path_;
-  std::string apriori_schema_path_;
-  size_t epoch_ms_;
-  bool is_mpi_;
-};
-
-/**
- * Tracing information in server config
- * */
-struct TracingInfo {
-  bool enabled_;
-  std::string output_;
-};
-
-/** MDM information */
-struct MdmInfo {
-  /** Number of buckets in mdm bucket map before collisions */
-  size_t num_bkts_;
-
-  /** Number of blobs in mdm blob map before collisions */
-  size_t num_blobs_;
-
-  /** Number of traits in mdm trait map before collisions */
-  size_t num_traits_;
-};
-
-/**
- * System configuration for Hermes
- */
-class ServerConfig : public BaseConfig {
- public:
-  /** The device information */
-  hipc::uptr<hipc::vector<DeviceInfo>> devices_;
-
-  /** The RPC information */
-  RpcInfo rpc_;
-
-  /** The DPE information */
-  DpeInfo dpe_;
-
-  /** Buffer organizer (BORG) information */
-  BorgInfo borg_;
-
-  /** Tracing information */
-  TracingInfo tracing_;
-
-  /** Prefetcher information */
-  PrefetchInfo prefetcher_;
-
-  /** Metadata Manager information */
-  MdmInfo mdm_;
-
-  /** Trait repo information */
-  std::vector<std::string> trait_paths_;
-
-  /** The length of a view state epoch */
-  u32 system_view_state_update_interval_ms;
-
-  /** The max amount of memory hermes uses for non-buffering tasks */
-  size_t max_memory_;
-
-  /** A base name for the BufferPool shared memory segement. Hermes appends the
-   * value of the USER environment variable to this string.
-   */
-  std::string shmem_name_;
-
- public:
-  ServerConfig() = default;
-  void LoadDefault();
-
- private:
-  void ParseYAML(YAML::Node &yaml_conf);
-  void CheckConstraints();
-  void ParseRpcInfo(YAML::Node yaml_conf);
-  void ParseDeviceInfo(YAML::Node yaml_conf);
-  void ParseDpeInfo(YAML::Node yaml_conf);
-  void ParseBorgInfo(YAML::Node yaml_conf);
-  void ParsePrefetchInfo(YAML::Node yaml_conf);
-  void ParseTracingInfo(YAML::Node yaml_conf);
-  void ParseTraitInfo(YAML::Node yaml_conf);
-  void ParseMdmInfo(YAML::Node yaml_conf);
-};
-
-}  // namespace hermes::config
-
-namespace hermes {
-using config::ServerConfig;
-}  // namespace hermes
-
-#endif  // HERMES_SRC_CONFIG_SERVER_H_
diff --git a/src/data_placement_engine.cc b/src/data_placement_engine.cc
deleted file mode 100644
index bdcf35906..000000000
--- a/src/data_placement_engine.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "data_placement_engine_factory.h"
-
-#include <assert.h>
-#include <math.h>
-
-#include <utility>
-#include <random>
-#include <map>
-
-#include "hermes.h"
-#include "hermes_types.h"
-#include "buffer_pool.h"
-
-namespace hermes {
-
-/** Constructor. */
-DPE::DPE() : mdm_(&HERMES->mdm_) {}
-
-/** calculate data placement */
-Status DPE::CalculatePlacement(const std::vector<size_t> &blob_sizes,
-                               std::vector<PlacementSchema> &output,
-                               api::Context &ctx) {
-  AUTO_TRACE(1)
-  Status result;
-
-  // NOTE(chogan): Start with local targets and gradually expand the target
-  // list until the placement succeeds.
-  for (int i = 0; i < static_cast<int>(TopologyType::kCount); ++i) {
-    // Reset the output schema
-    output.clear();
-    // Get the capacity/bandwidth of targets
-    std::vector<TargetInfo> targets;
-    switch (static_cast<TopologyType>(i)) {
-      case TopologyType::Local: {
-        targets = mdm_->LocalGetTargetInfo();
-        break;
-      }
-      case TopologyType::Neighborhood: {
-        // targets = mdm_->GetNeighborhoodTargetInfo();
-        break;
-      }
-      case TopologyType::Global: {
-        // targets = mdm_->GetGlobalTargetInfo();
-        break;
-      }
-      case TopologyType::kCount: {
-        HELOG(kFatal, "Not a valid topology type")
-      }
-    }
-    if (targets.size() == 0) {
-      result = DPE_PLACEMENT_SCHEMA_EMPTY;
-      continue;
-    }
-    // Calculate a placement schema
-    result = Placement(blob_sizes, targets, ctx, output);
-    if (!result.Fail()) {
-      break;
-    }
-  }
-  return result;
-}
-
-}  // namespace hermes
diff --git a/src/decorator.h b/src/decorator.h
deleted file mode 100644
index 4d5016e82..000000000
--- a/src/decorator.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_RPC_GENERATOR_DECORATOR_H_
-#define HERMES_SRC_RPC_GENERATOR_DECORATOR_H_
-
-/**
- * Decorators for RPC code generation
- *
- * code_generators/rpc.py
- * */
-#define RPC
-#define RPC_AUTOGEN_START
-#define RPC_AUTOGEN_END
-#define RPC_CLASS_INSTANCE_DEFS_START
-#define RPC_CLASS_INSTANCE_DEFS_END
-
-/**
- * In many cases, we define functions which have a large parameter
- * set and then produce wrapper functions which set those parameters
- * differently. These decorators automate generating those wrapper
- * functions
- * */
-
-#define WRAP(...)
-#define WRAP_AUTOGEN_START
-#define WRAP_AUTOGEN_END
-
-#endif  // HERMES_SRC_RPC_GENERATOR_DECORATOR_H_
diff --git a/src/dpe/minimize_io_time.cc b/src/dpe/minimize_io_time.cc
deleted file mode 100644
index 6f58d2acd..000000000
--- a/src/dpe/minimize_io_time.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "minimize_io_time.h"
-#include <assert.h>
-#include <math.h>
-#include <numeric>
-
-namespace hermes {
-
-Status MinimizeIoTime::Placement(const std::vector<size_t> &blob_sizes,
-                                 std::vector<TargetInfo> &targets,
-                                 api::Context &ctx,
-                                 std::vector<PlacementSchema> &output) {
-  for (size_t blob_size : blob_sizes) {
-    // Initialize blob's size, score, and schema
-    size_t rem_blob_size = blob_size;
-    float score = ctx.blob_score_;
-    if (ctx.blob_score_ == -1) {
-      score = 1;
-    }
-    output.emplace_back();
-    PlacementSchema &blob_schema = output.back();
-
-    for (TargetInfo &target : targets) {
-      // NOTE(llogan): We skip targets that are too high of priority or
-      // targets that can't fit the ENTIRE blob
-      if (target.score_ > score ||
-          target.rem_cap_ < blob_size) {
-        // TODO(llogan): add other considerations of this DPE
-        continue;
-      }
-      if (ctx.blob_score_ == -1) {
-        ctx.blob_score_ = target.score_;
-      }
-
-      // NOTE(llogan): we assume the TargetInfo list is sorted
-      if (target.rem_cap_ >= rem_blob_size) {
-        blob_schema.plcmnts_.emplace_back(rem_blob_size,
-                                          target.id_);
-        target.rem_cap_ -= rem_blob_size;
-        rem_blob_size = 0;
-      } else {
-        // NOTE(llogan): this code technically never gets called,
-        // but it might in the future
-        blob_schema.plcmnts_.emplace_back(target.rem_cap_,
-                                          target.id_);
-        rem_blob_size -= target.rem_cap_;
-        target.rem_cap_ = 0;
-      }
-
-      if (rem_blob_size == 0) {
-        break;
-      }
-    }
-
-    if (rem_blob_size > 0) {
-      return DPE_MIN_IO_TIME_NO_SOLUTION;
-    }
-  }
-
-  return Status();
-}
-
-}  // namespace hermes
diff --git a/src/dpe/random.cc b/src/dpe/random.cc
deleted file mode 100644
index cb51e637f..000000000
--- a/src/dpe/random.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "random.h"
-
-#include <utility>
-#include <random>
-#include <map>
-
-namespace hermes {
-
-Status Random::Placement(const std::vector<size_t> &blob_sizes,
-                         std::vector<TargetInfo> &targets,
-                         api::Context &ctx,
-                         std::vector<PlacementSchema> &output) {
-  for (size_t blob_size : blob_sizes) {
-    // Initialize blob's size, score, and schema
-    size_t rem_blob_size = blob_size;
-    output.emplace_back();
-    PlacementSchema &blob_schema = output.back();
-
-    // Choose RR target and iterate
-    size_t target_id = std::rand() % targets.size();
-    for (size_t i = 0; i < targets.size(); ++i) {
-      TargetInfo &target = targets[(target_id + i) % targets.size()];
-
-      // NOTE(llogan): We skip targets that can't fit the ENTIRE blob
-      if (target.rem_cap_ < blob_size) {
-        continue;
-      }
-      if (ctx.blob_score_ == -1) {
-        ctx.blob_score_ = target.score_;
-      }
-
-      // Place the blob on this target
-      blob_schema.plcmnts_.emplace_back(rem_blob_size,
-                                        target.id_);
-      target.rem_cap_ -= rem_blob_size;
-      rem_blob_size = 0;
-      break;
-    }
-
-    if (rem_blob_size > 0) {
-      return DPE_MIN_IO_TIME_NO_SOLUTION;
-    }
-  }
-
-  return Status();
-}
-
-}  // namespace hermes
diff --git a/src/dpe/round_robin.cc b/src/dpe/round_robin.cc
deleted file mode 100644
index ed96b2a64..000000000
--- a/src/dpe/round_robin.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "round_robin.h"
-#include <numeric>
-
-namespace hermes {
-
-Status RoundRobin::Placement(const std::vector<size_t> &blob_sizes,
-                             std::vector<TargetInfo> &targets,
-                             api::Context &ctx,
-                             std::vector<PlacementSchema> &output) {
-  for (size_t blob_size : blob_sizes) {
-    // Initialize blob's size, score, and schema
-    size_t rem_blob_size = blob_size;
-    output.emplace_back();
-    PlacementSchema &blob_schema = output.back();
-
-    // Choose RR target and iterate
-    size_t target_id = counter_.fetch_add(1) % targets.size();
-    for (size_t i = 0; i < targets.size(); ++i) {
-      TargetInfo &target = targets[(target_id + i) % targets.size()];
-
-      // NOTE(llogan): We skip targets that can't fit the ENTIRE blob
-      if (target.rem_cap_ < blob_size) {
-        continue;
-      }
-      if (ctx.blob_score_ == -1) {
-        ctx.blob_score_ = target.score_;
-      }
-
-      // Place the blob on this target
-      blob_schema.plcmnts_.emplace_back(rem_blob_size,
-                                        target.id_);
-      target.rem_cap_ -= rem_blob_size;
-      rem_blob_size = 0;
-      break;
-    }
-
-    if (rem_blob_size > 0) {
-      return DPE_MIN_IO_TIME_NO_SOLUTION;
-    }
-  }
-
-  return Status();
-}
-
-}  // namespace hermes
diff --git a/hermes_shm/test/unit/data_structures/backend/test_init.cc b/src/hermes_config_manager.cc
similarity index 91%
rename from hermes_shm/test/unit/data_structures/backend/test_init.cc
rename to src/hermes_config_manager.cc
index 82bac123b..163876111 100644
--- a/hermes_shm/test/unit/data_structures/backend/test_init.cc
+++ b/src/hermes_config_manager.cc
@@ -10,9 +10,6 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include "hermes/config_manager.h"
 
-#include "basic_test.h"
-
-void MainPretest() {}
-
-void MainPosttest() {}
+DEFINE_SINGLETON_CC(hermes::ConfigurationManager)
diff --git a/src/hermes_types.cc b/src/hermes_types.cc
deleted file mode 100644
index 4a17ce528..000000000
--- a/src/hermes_types.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes_types.h"
-#include "hermes.h"
-
-namespace hermes {
-/** Identifier of the Hermes allocator */
-const hipc::allocator_id_t main_alloc_id(0, 1);
-
-/** Hermes server environment variable */
-const char* kHermesServerConf = "HERMES_CONF";
-
-/** Hermes client environment variable */
-const char* kHermesClientConf = "HERMES_CLIENT_CONF";
-
-/** Hermes adapter mode environment variable */
-const char* kHermesAdapterMode = "HERMES_ADAPTER_MODE";
-
-/** Filesystem page size environment variable */
-const char* kHermesPageSize = "HERMES_PAGE_SIZE";
-
-/** Stop daemon environment variable */
-const char* kHermesStopDaemon = "HERMES_STOP_DAEMON";
-
-/** Maximum path length environment variable */
-const size_t kMaxPathLength = 4096;
-}  // namespace hermes
-
-namespace hermes::api {
-
-/** Default constructor */
-Context::Context()
-    : policy(HERMES->server_config_.dpe_.default_policy_),
-      rr_split(HERMES->server_config_.dpe_.default_rr_split_),
-      rr_retry(false),
-      disable_swap(false),
-      blob_score_(-1) {}
-
-}  // namespace hermes::api
diff --git a/src/hermes_types.h b/src/hermes_types.h
deleted file mode 100644
index caeefd077..000000000
--- a/src/hermes_types.h
+++ /dev/null
@@ -1,567 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TYPES_H_
-#define HERMES_TYPES_H_
-
-#include "hermes_shm/util/logging.h"
-#include "hermes_shm/constants/macros.h"
-#include <stdint.h>
-
-#include <functional>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "data_structures.h"
-
-/**
- * \file hermes_types.h
- * Types used in Hermes.
- */
-
-/**
- * \namespace hermes
- */
-namespace hermes {
-
-typedef uint8_t u8;   /**< 8-bit unsigned integer */
-typedef uint16_t u16; /**< 16-bit unsigned integer */
-typedef uint32_t u32; /**< 32-bit unsigned integer */
-typedef uint64_t u64; /**< 64-bit unsigned integer */
-typedef int8_t i8;    /**< 8-bit signed integer */
-typedef int16_t i16;  /**< 16-bit signed integer */
-typedef int32_t i32;  /**< 32-bit signed integer */
-typedef int64_t i64;  /**< 64-bit signed integer */
-typedef float f32;    /**< 32-bit float */
-typedef double f64;   /**< 64-bit float */
-
-/** Identifier of the Hermes allocator */
-extern const hipc::allocator_id_t main_alloc_id;
-
-/** Hermes server environment variable */
-extern const char* kHermesServerConf;
-
-/** Hermes client environment variable */
-extern const char* kHermesClientConf;
-
-/** Hermes adapter mode environment variable */
-extern const char* kHermesAdapterMode;
-
-/** Filesystem page size environment variable */
-extern const char* kHermesPageSize;
-
-/** Stop daemon environment variable */
-extern const char* kHermesStopDaemon;
-
-/** Maximum path length environment variable */
-extern const size_t kMaxPathLength;
-
-/** The mode Hermes is launched in */
-enum class HermesType {
-  kNone,
-  kServer,
-  kClient
-};
-
-/** The flushing mode */
-enum class FlushingMode {
-  kSync,
-  kAsync
-};
-
-/** Convert flushing modes to strings */
-class FlushingModeConv {
- public:
-  static FlushingMode GetEnum(const std::string &str) {
-    if (str == "kSync") {
-      return FlushingMode::kSync;
-    }
-    if (str == "kAsync") {
-      return FlushingMode::kAsync;
-    }
-    return FlushingMode::kAsync;
-  }
-};
-
-/** The types of I/O that can be performed (for IoCall RPC) */
-enum class IoType {
-  kRead,
-  kWrite,
-  kNone
-};
-
-typedef u16 DeviceID; /**< device id in unsigned 16-bit integer */
-
-/** The types of topologies */
-enum class TopologyType {
-  Local,
-  Neighborhood,
-  Global,
-
-  kCount
-};
-
-/** Represents unique ID for BlobId and TagId */
-template<int TYPE>
-struct UniqueId {
-  u64 unique_;   /**< A unique id for the blob */
-  i32 node_id_;  /**< The node the content is on */
-
-  /** Default constructor */
-  UniqueId() = default;
-
-  /** Emplace constructor */
-  UniqueId(u64 unique, i32 node_id) : unique_(unique), node_id_(node_id) {}
-
-  /** Copy constructor */
-  UniqueId(const UniqueId &other) {
-    unique_ = other.unique_;
-    node_id_ = other.node_id_;
-  }
-
-  /** Copy assignment */
-  UniqueId& operator=(const UniqueId &other) {
-    if (this != &other) {
-      unique_ = other.unique_;
-      node_id_ = other.node_id_;
-    }
-    return *this;
-  }
-
-  /** Move constructor */
-  UniqueId(UniqueId &&other) {
-    unique_ = other.unique_;
-    node_id_ = other.node_id_;
-  }
-
-  /** Move assignment */
-  UniqueId& operator=(UniqueId &&other) {
-    if (this != &other) {
-      unique_ = other.unique_;
-      node_id_ = other.node_id_;
-    }
-    return *this;
-  }
-
-  /** Check if null */
-  bool IsNull() const { return unique_ == 0; }
-
-  /** Get null id */
-  static inline UniqueId GetNull() {
-    static const UniqueId id(0, 0);
-    return id;
-  }
-
-  /** Set to null id */
-  void SetNull() {
-    node_id_ = 0;
-    unique_ = 0;
-  }
-
-  /** Get id of node from this id */
-  i32 GetNodeId() const { return node_id_; }
-
-  /** Compare two ids for equality */
-  bool operator==(const UniqueId &other) const {
-    return unique_ == other.unique_ && node_id_ == other.node_id_;
-  }
-
-  /** Compare two ids for inequality */
-  bool operator!=(const UniqueId &other) const {
-    return unique_ != other.unique_ || node_id_ != other.node_id_;
-  }
-
-  /** Serialize a UniqueId
-  template<class Archive>
-  void serialize(Archive &ar) {
-    ar(unique_, node_id_);
-  }*/
-};
-typedef UniqueId<1> BlobId;
-typedef UniqueId<2> TagId;
-typedef UniqueId<3> TraitId;
-
-/** Allow unique ids to be printed as strings */
-template<int num>
-std::ostream &operator<<(std::ostream &os, UniqueId<num> const &obj) {
-  return os << (std::to_string(obj.node_id_) + "."
-               + std::to_string(obj.unique_));
-}
-
-/** Indicates a PUT or GET for a particular blob */
-struct IoStat {
-  IoType type_;
-  BlobId blob_id_;
-  TagId tag_id_;
-  size_t blob_size_;
-  int rank_;
-
-  /** Default constructor */
-  IoStat() = default;
-
-  /** Copy constructor */
-  IoStat(const IoStat &other) {
-    Copy(other);
-  }
-
-  /** Copy assignment */
-  IoStat& operator=(const IoStat &other) {
-    if (this != &other) {
-      Copy(other);
-    }
-    return *this;
-  }
-
-  /** Move constructor */
-  IoStat(IoStat &&other) {
-    Copy(other);
-  }
-
-  /** Move assignment */
-  IoStat& operator=(IoStat &&other) {
-    if (this != &other) {
-      Copy(other);
-    }
-    return *this;
-  }
-
-  /** Generic copy / move */
-  HSHM_ALWAYS_INLINE void Copy(const IoStat &other) {
-    type_ = other.type_;
-    blob_id_ = other.blob_id_;
-    tag_id_ = other.tag_id_;
-    blob_size_ = other.blob_size_;
-    rank_ = other.rank_;
-  }
-
-  /** Serialize */
-  template<class Archive>
-  void save(Archive &ar) const {
-    int type = static_cast<int>(type_);
-    u64 ids[2] = {blob_id_.unique_, tag_id_.unique_};
-    i32 nodes[2] = {blob_id_.node_id_, tag_id_.node_id_};
-    ar(type, ids[0], nodes[0], ids[1], nodes[1], blob_size_, rank_);
-  }
-
-  /** Deserialize */
-  template<class Archive>
-  void load(Archive &ar) {
-    int type;
-    ar(type,
-       blob_id_.unique_,
-       blob_id_.node_id_,
-       tag_id_.unique_,
-       tag_id_.node_id_,
-       blob_size_,
-       rank_);
-    type_ = static_cast<IoType>(type);
-  }
-};
-
-/** Used as hints to the prefetcher */
-struct IoTrace {
-  i32 node_id_;
-  IoType type_;
-  std::string blob_name_;
-  std::string tag_name_;
-  size_t blob_size_;
-  int organize_next_n_;
-  float score_;
-  int rank_;
-};
-
-/** A definition for logging something that is not yet implemented */
-#define HERMES_NOT_IMPLEMENTED_YET \
-  HELOG(kFatal, "not implemented yet")
-
-/** A TargetId uniquely identifies a buffering target within the system. */
-union TargetId {
-  /** The Target ID as bitfield */
-  struct {
-    /** The ID of the node in charge of this target. */
-    i32 node_id_;
-    /** The ID of the virtual device that backs this target. It is an index into
-     * the Device array. */
-    u16 device_id_;
-    /** The index into the Target array. */
-    u16 index_;
-  } bits_;
-
-  /** The TargetId as a unsigned 64-bit integer */
-  u64 as_int_;
-
-  TargetId() = default;
-
-  TargetId(i32 node_id, u16 device_id, u16 index) {
-    bits_.node_id_ = node_id;
-    bits_.device_id_ = device_id;
-    bits_.index_ = index;
-  }
-
-  TargetId(const TargetId &other) {
-    as_int_ = other.as_int_;
-  }
-
-  i32 GetNodeId() {
-    return bits_.node_id_;
-  }
-
-  u16 GetDeviceId() {
-    return bits_.device_id_;
-  }
-
-  u16 GetIndex() {
-    return bits_.index_;
-  }
-
-  bool IsNull() const  { return as_int_ == 0; }
-
-  bool operator==(const TargetId &other) const {
-    return as_int_ == other.as_int_;
-  }
-
-  bool operator!=(const TargetId &other) const {
-    return as_int_ != other.as_int_;
-  }
-};
-
-/**
- * Represents the fraction of a blob to place
- * on a particular target during data placement
- * */
-struct SubPlacement {
-  size_t size_;   /**< Size (bytes) */
-  TargetId tid_;  /**< Target destination of data */
-
-  SubPlacement() = default;
-
-  explicit SubPlacement(size_t size, TargetId tid)
-      : size_(size), tid_(tid) {}
-};
-
-/**
- * The organization of a particular blob in the storage
- * hierarchy during data placement.
- */
-struct PlacementSchema {
-  std::vector<SubPlacement> plcmnts_;
-
-  void AddSubPlacement(size_t size, TargetId tid) {
-    plcmnts_.emplace_back(size, tid);
-  }
-
-  void Clear() {
-    plcmnts_.clear();
-  }
-};
-
-/**
- * A structure to represent thesholds with mimimum and maximum values
- */
-struct Thresholds {
-  float min_; /**< minimum threshold value */
-  float max_; /**< maximum threshold value */
-};
-
-}  // namespace hermes
-
-
-namespace hermes::api {
-
-/** A blob is an uniterpreted array of bytes */
-typedef hshm::charbuf Blob;
-
-/** Supported data placement policies */
-enum class PlacementPolicy {
-  kRandom,         /**< Random blob placement */
-  kRoundRobin,     /**< Round-Robin (around devices) blob placement */
-  kMinimizeIoTime, /**< LP-based blob placement, minimize I/O time */
-  kNone,           /**< No DPE for cases we want it disabled */
-};
-
-/** A class to convert placement policy enum value to string */
-class PlacementPolicyConv {
- public:
-  /** A function to return string representation of \a policy */
-  static std::string to_str(PlacementPolicy policy) {
-    switch (policy) {
-      case PlacementPolicy::kRandom: {
-        return "PlacementPolicy::kRandom";
-      }
-      case PlacementPolicy::kRoundRobin: {
-        return "PlacementPolicy::kRoundRobin";
-      }
-      case PlacementPolicy::kMinimizeIoTime: {
-        return "PlacementPolicy::kMinimizeIoTime";
-      }
-      case PlacementPolicy::kNone: {
-        return "PlacementPolicy::kNone";
-      }
-    }
-    return "PlacementPolicy::Invalid";
-  }
-
-  /** return enum value of \a policy  */
-  static PlacementPolicy to_enum(const std::string &policy) {
-    if (policy.find("Random") != std::string::npos) {
-      return PlacementPolicy::kRandom;
-    } else if (policy.find("RoundRobin") != std::string::npos) {
-      return PlacementPolicy::kRoundRobin;
-    } else if (policy.find("MinimizeIoTime") != std::string::npos) {
-      return PlacementPolicy::kMinimizeIoTime;
-    } else if (policy.find("None") != std::string::npos) {
-      return PlacementPolicy::kNone;
-    }
-    return PlacementPolicy::kNone;
-  }
-};
-
-/**
-   A structure to represent MinimizeIOTime options
-*/
-struct MinimizeIoTimeOptions {
-  double minimum_remaining_capacity; /**<  minimum remaining capacity */
-  double capacity_change_threshold;  /**<  threshold for capacity change  */
-  bool use_placement_ratio;          /**<  use placement ratio or not */
-
-  /** A function for initialization */
-  MinimizeIoTimeOptions(double minimum_remaining_capacity_ = 0.0,
-                        double capacity_change_threshold_ = 0.0,
-                        bool use_placement_ratio_ = false)
-      : minimum_remaining_capacity(minimum_remaining_capacity_),
-        capacity_change_threshold(capacity_change_threshold_),
-        use_placement_ratio(use_placement_ratio_) {}
-};
-
-enum class PrefetchHint {
-  kNone,
-  kFileSequential,
-  kApriori,
-
-  kFileStrided,
-  kMachineLearning
-};
-
-/** Hermes API call context */
-struct Context {
-  /** The blob placement policy */
-  PlacementPolicy policy;
-
-  /** Options for controlling the MinimizeIoTime PlacementPolicy */
-  MinimizeIoTimeOptions minimize_io_time_options;
-
-  /** Whether random splitting of blobs is enabled for Round-Robin */
-  bool rr_split;
-
-  /** Whether Round-Robin can be retried after failure */
-  bool rr_retry;
-
-  /** Whether swapping is disabled */
-  bool disable_swap;
-
-  /** The blob's score */
-  float blob_score_;
-
-  Context();
-};
-
-/** \brief Trait types.
- *
- */
-enum class TraitType : u8 {
-  META = 0, /**< The Trait only modifies metadata. */
-  DATA = 1, /**< The Trait modifies raw data (Blob%s). */
-  PERSIST = 2,
-};
-
-}  // namespace hermes::api
-
-namespace hermes {
-
-/** Namespace simplification for Blob */
-using api::Blob;
-
-/** Namespace simplification for Context */
-using api::Context;
-
-}  // namespace hermes
-
-
-/**
- * HASH FUNCTIONS
- * */
-
-namespace std {
-template <int TYPE>
-struct hash<hermes::UniqueId<TYPE>> {
-  std::size_t operator()(const hermes::UniqueId<TYPE> &key) const {
-    return
-        std::hash<hermes::u64>{}(key.unique_) +
-        std::hash<hermes::i32>{}(key.node_id_);
-  }
-};
-}  // namespace std
-
-namespace hermes {
-
-/** Used for debugging concurrency issues with locks */
-enum LockOwners {
-  kNone = 0,
-  kMDM_Create = 1,
-  kMDM_Update = 2,
-  kMDM_Find = 3,
-  kMDM_Find2 = 4,
-  kMDM_Delete = 5,
-  kFS_GetBaseAdapterMode = 6,
-  kFS_GetAdapterMode = 7,
-  kFS_GetAdapterPageSize = 8,
-  kBORG_LocalEnqueueFlushes = 9,
-  kBORG_LocalProcessFlushes = 10,
-  kMDM_LocalGetBucketSize = 12,
-  kMDM_LocalSetBucketSize = 13,
-  kMDM_LocalLockBucket = 14,
-  kMDM_LocalUnlockBucket = 15,
-  kMDM_LocalClearBucket = 16,
-  kMDM_LocalTagBlob = 17,
-  kMDM_LocalBlobHasTag = 18,
-  kMDM_LocalTryCreateBlob = 19,
-  kMDM_LocalPutBlobMetadata = 20,
-  kMDM_LocalGetBlobId = 21,
-  kMDM_LocalGetBlobName = 22,
-  kMDM_LocalGetBlobScore = 24,
-  kMDM_LocalLockBlob = 26,
-  kMDM_LocalUnlockBlob = 27,
-  kMDM_LocalGetBlobBuffers = 28,
-  kMDM_LocalRenameBlob = 29,
-  kMDM_LocalDestroyBlob = 30,
-  kMDM_LocalClear = 31,
-  kMDM_LocalGetOrCreateTag = 32,
-  kMDM_LocalGetTagId = 33,
-  kMDM_LocalGetTagName = 34,
-  kMDM_LocalRenameTag = 35,
-  kMDM_LocalDestroyTag = 36,
-  kMDM_LocalTagAddBlob = 37,
-  kMDM_LocalTagRemoveBlob = 38,
-  kMDM_LocalGroupByTag = 39,
-  kMDM_LocalTagAddTrait = 40,
-  kMDM_LocalTagGetTraits = 41,
-  kMDM_LocalRegisterTrait = 42,
-  kMDM_LocalGetTraitId = 43,
-  kMDM_LocalGetTraitParams = 44,
-  kMDM_GlobalGetTrait = 45,
-  kMDM_AddIoStat = 46,
-  kMDM_ClearIoStats = 47
-};
-
-}  // namespace hermes
-#endif  // HERMES_TYPES_H_
diff --git a/src/hermes_version.h.in b/src/hermes_version.h.in
deleted file mode 100644
index c98e9f5cc..000000000
--- a/src/hermes_version.h.in
+++ /dev/null
@@ -1,21 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_VERSION_H_
-#define HERMES_VERSION_H_
-
-#define HERMES_VERSION_MAJOR @HERMES_VERSION_MAJOR@
-#define HERMES_VERSION_MINOR @HERMES_VERSION_MINOR@
-#define HERMES_VERSION_PATCH @HERMES_VERSION_PATCH@
-#define HERMES_VERSION_STRING "@HERMES_PACKAGE_VERSION@"
-
-#endif  // HERMES_VERSION_H_
diff --git a/src/metadata_manager.cc b/src/metadata_manager.cc
deleted file mode 100644
index db28a389d..000000000
--- a/src/metadata_manager.cc
+++ /dev/null
@@ -1,953 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes.h"
-#include "metadata_manager.h"
-#include "buffer_organizer.h"
-#include "api/bucket.h"
-#include <mpi.h>
-
-namespace hermes {
-
-/** Namespace simplification for Bucket */
-using api::Bucket;
-
-/**
- * Explicitly initialize the MetadataManager
- * Requires RPC to be initialized
- * */
-void MetadataManager::shm_init(hipc::ShmArchive<MetadataManagerShm> &header,
-                               hipc::Allocator *alloc,
-                               ServerConfig *config) {
-  shm_deserialize(header);
-  header_->id_alloc_ = 1;
-
-  // Put the node_id in SHM
-  header_->node_id_ = rpc_->node_id_;
-
-  // Create the metadata maps
-  HSHM_MAKE_AR(header_->blob_id_map_, alloc, config->mdm_.num_blobs_)
-  HSHM_MAKE_AR(header_->blob_map_, alloc, config->mdm_.num_blobs_)
-  HSHM_MAKE_AR(header_->tag_id_map_, alloc, config->mdm_.num_bkts_)
-  HSHM_MAKE_AR(header_->tag_map_, alloc, config->mdm_.num_bkts_)
-  HSHM_MAKE_AR(header_->trait_id_map_, alloc, config->mdm_.num_traits_)
-  HSHM_MAKE_AR(header_->trait_map_, alloc, config->mdm_.num_traits_)
-
-  // Create the DeviceInfo vector
-  HSHM_MAKE_AR(header_->devices_, alloc, *config->devices_)
-
-  // Create the TargetInfo vector
-  HSHM_MAKE_AR0(header_->targets_, alloc)
-  targets_->reserve(devices_->size());
-  int dev_id = 0;
-  float maxbw = 0;
-  for (DeviceInfo &dev_info : *config->devices_) {
-    targets_->emplace_back(
-        TargetId(rpc_->node_id_, dev_id, dev_id),
-        dev_info.capacity_,
-        dev_info.capacity_,
-        dev_info.bandwidth_,
-        dev_info.latency_);
-    if (maxbw < dev_info.bandwidth_) {
-      maxbw = dev_info.bandwidth_;
-    }
-    ++dev_id;
-  }
-
-  // Assign a score to each target
-  for (TargetInfo &target_info : *targets_) {
-    target_info.score_ = (target_info.bandwidth_ / maxbw);
-  }
-
-  // Create the log used to track I/O pattern
-  HSHM_MAKE_AR(header_->io_pattern_log_, alloc, 8192);
-}
-
-/**====================================
- * SHM Deserialize
- * ===================================*/
-
-/**
- * Store the MetadataManager in shared memory.
- * Does not require anything to be initialized.
- * */
-void MetadataManager::shm_deserialize(
-    hipc::ShmArchive<MetadataManagerShm> &header) {
-  rpc_ = &HERMES->rpc_;
-  borg_ = &HERMES->borg_;
-  traits_ = &HERMES->traits_;
-
-  header_ = header.get();
-  blob_id_map_ = header_->blob_id_map_.get();
-  blob_map_ = header_->blob_map_.get();
-  tag_id_map_ = header_->tag_id_map_.get();
-  tag_map_ = header_->tag_map_.get();
-  trait_id_map_ = header_->trait_id_map_.get();
-  trait_map_ = header_->trait_map_.get();
-  targets_ = header_->targets_.get();
-  devices_ = header_->devices_.get();
-  io_pattern_log_ = header_->io_pattern_log_.get();
-}
-
-/**====================================
- * Destructor
- * ===================================*/
-
-/**
- * Explicitly destroy the MetadataManager
- * */
-void MetadataManager::shm_destroy() {
-  (*blob_id_map_).shm_destroy();
-  (*blob_map_).shm_destroy();
-  (*tag_id_map_).shm_destroy();
-  (*tag_map_).shm_destroy();
-  (*trait_id_map_).shm_destroy();
-  (*trait_map_).shm_destroy();
-  (*targets_).shm_destroy();
-  (*devices_).shm_destroy();
-  (*io_pattern_log_).shm_destroy();
-}
-
-/**====================================
- * Bucket Operations
- * ===================================*/
-
-/**
- * Get the size of the bucket. May consider the impact the bucket has
- * on the backing storage system's statistics using the io_ctx.
- * */
-size_t MetadataManager::LocalGetBucketSize(TagId bkt_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (reading tag_map)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalGetBucketSize);
-  auto iter = tag_map_->find(bkt_id);
-  if (iter == tag_map_->end()) {
-    return 0;
-  }
-  hipc::pair<TagId, TagInfo> &info = (*iter);
-  TagInfo &bkt_info = info.GetSecond();
-  return bkt_info.internal_size_;
-}
-
-/**
- * Update \a bkt_id BUCKET stats
- * */
-bool MetadataManager::LocalSetBucketSize(TagId bkt_id,
-                                         size_t new_size) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (reading tag_map)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalSetBucketSize);
-  auto iter = tag_map_->find(bkt_id);
-  if (iter == tag_map_->end()) {
-    return false;
-  }
-  hipc::pair<TagId, TagInfo> &info = (*iter);
-  TagInfo &bkt_info = info.GetSecond();
-  bkt_info.internal_size_ = new_size;
-  HILOG(kDebug, "The new size of the bucket {} ({}) is {}",
-        bkt_info.name_->str(), bkt_id,
-        bkt_info.internal_size_)
-  return true;
-}
-
-/**
- * Lock the bucket
- * */
-bool MetadataManager::LocalLockBucket(TagId bkt_id,
-                                      MdLockType lock_type) {
-  AUTO_TRACE(1);
-  if (bkt_id.IsNull()) {
-    return false;
-  }
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalLockBucket);
-  return LockMdObject(*tag_map_, bkt_id, lock_type);
-}
-
-/**
- * Unlock the bucket
- * */
-bool MetadataManager::LocalUnlockBucket(TagId bkt_id,
-                                        MdLockType lock_type) {
-  AUTO_TRACE(1);
-  if (bkt_id.IsNull()) {
-    return false;
-  }
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalUnlockBucket);
-  return UnlockMdObject(*tag_map_, bkt_id, lock_type);
-}
-
-/**
- * Clear \a bkt_id bucket
- * */
-bool MetadataManager::LocalClearBucket(TagId bkt_id) {
-  AUTO_TRACE(1);
-  HILOG(kDebug, "Clearing the bucket {}", bkt_id)
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire tag map write lock
-  ScopedRwWriteLock tag_map_lock(header_->lock_[kTagMapLock],
-                                 kMDM_LocalClearBucket);
-  auto iter = tag_map_->find(bkt_id);
-  if (iter == tag_map_->end()) {
-    return true;
-  }
-  hipc::pair<TagId, TagInfo> &info = (*iter);
-  TagInfo &bkt_info = info.GetSecond();
-  for (BlobId &blob_id : *bkt_info.blobs_) {
-    GlobalDestroyBlob(bkt_id, blob_id);
-  }
-  bkt_info.blobs_->clear();
-  bkt_info.internal_size_ = 0;
-  return true;
-}
-
-/**====================================
- * Blob Operations
- * ===================================*/
-
-/**
- * Tag a blob
- *
- * @param blob_id id of the blob being tagged
- * @param tag_name tag name
- * */
-Status MetadataManager::LocalTagBlob(
-    BlobId blob_id, TagId tag_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read blob_map_)
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalTagBlob);
-  auto iter = blob_map_->find(blob_id);
-  if (iter == blob_map_->end()) {
-    return Status();  // TODO(llogan): error status
-  }
-  hipc::pair<BlobId, BlobInfo>& info = (*iter);
-  BlobInfo &blob_info = info.GetSecond();
-  // Acquire blob_info read lock (read buffers)
-  ScopedRwReadLock blob_info_lock(blob_info.lock_[0],
-                                  kMDM_LocalTagBlob);
-  blob_info.tags_->emplace_back(tag_id);
-  return Status();
-}
-
-/**
- * Check whether or not \a blob_id BLOB has \a tag_id TAG
- * */
-bool MetadataManager::LocalBlobHasTag(BlobId blob_id,
-                                      TagId tag_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (reading blob_map_)
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalBlobHasTag);
-  auto iter = blob_map_->find(blob_id);
-  if (iter == blob_map_->end()) {
-    return false;
-  }
-  // Get the blob info
-  hipc::pair<BlobId, BlobInfo>& info = (*iter);
-  BlobInfo &blob_info = info.GetSecond();
-  // Iterate over tags
-  for (TagId &tag_cmp : *blob_info.tags_) {
-    if (tag_cmp == tag_id) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Creates the blob metadata
- *
- * @param bkt_id id of the bucket
- * @param blob_name semantic blob name
- * */
-std::pair<BlobId, bool> MetadataManager::LocalTryCreateBlob(
-    TagId bkt_id,
-    const std::string &blob_name) {
-  AUTO_TRACE(1);
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modify blob_map_)
-  ScopedRwWriteLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                  kMDM_LocalTryCreateBlob);
-  // Get internal blob name
-  hipc::uptr<hipc::charbuf> internal_blob_name =
-      CreateBlobName(bkt_id, blob_name);
-  // Create unique ID for the Blob
-  BlobId blob_id;
-  blob_id.unique_ = header_->id_alloc_.fetch_add(1);
-  blob_id.node_id_ = rpc_->node_id_;
-  bool did_create = blob_id_map_->try_emplace(*internal_blob_name, blob_id);
-  if (did_create) {
-    blob_map_->emplace(blob_id);
-    auto iter = blob_map_->find(blob_id);
-    hipc::pair<BlobId, BlobInfo>& info = (*iter);
-    BlobInfo &blob_info = info.GetSecond();
-    (*blob_info.name_) = blob_name;
-    blob_info.blob_id_ = blob_id;
-    blob_info.tag_id_ = bkt_id;
-    blob_info.blob_size_ = 0;
-  }
-  return std::pair<BlobId, bool>(blob_id, did_create);
-}
-
-/**
- * Creates the blob metadata
- *
- * @param bkt_id id of the bucket
- * @param blob_name semantic blob name
- * @param data the data being placed
- * @param buffers the buffers to place data in
- * */
-std::tuple<BlobId, bool, size_t>
-MetadataManager::LocalPutBlobMetadata(TagId bkt_id,
-                                      const std::string &blob_name,
-                                      size_t blob_size,
-                                      std::vector<BufferInfo> &buffers,
-                                      float score) {
-  AUTO_TRACE(1);
-  size_t orig_blob_size = 0;
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modify blob_map_)
-  ScopedRwWriteLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                  kMDM_LocalPutBlobMetadata);
-  // Get internal blob name
-  hipc::uptr<hipc::charbuf> internal_blob_name =
-      CreateBlobName(bkt_id, blob_name);
-  // Create unique ID for the Blob
-  BlobId blob_id;
-  blob_id.unique_ = header_->id_alloc_.fetch_add(1);
-  blob_id.node_id_ = rpc_->node_id_;
-  bool did_create = blob_id_map_->try_emplace(*internal_blob_name, blob_id);
-  if (did_create) {
-    blob_map_->emplace(blob_id);
-    HILOG(kDebug, "Creating new blob: {}. Total num blobs: {}",
-          blob_name, blob_map_->size())
-    auto iter = blob_map_->find(blob_id);
-    hipc::pair<BlobId, BlobInfo>& info = (*iter);
-    BlobInfo &blob_info = info.GetSecond();
-    (*blob_info.name_) = blob_name;
-    (*blob_info.buffers_) = buffers;
-    blob_info.blob_id_ = blob_id;
-    blob_info.tag_id_ = bkt_id;
-    blob_info.blob_size_ = blob_size;
-    blob_info.score_ = score;
-    blob_info.mod_count_ = 0;
-    blob_info.access_freq_ = 0;
-    blob_info.last_flush_ = 0;
-    blob_info.UpdateWriteStats();
-  } else {
-    HILOG(kDebug, "Found existing blob: {}. Total num blobs: {}",
-          blob_name, blob_map_->size())
-    blob_id = (*blob_id_map_)[*internal_blob_name];
-    auto iter = blob_map_->find(blob_id);
-    hipc::pair<BlobId, BlobInfo>& info = (*iter);
-    BlobInfo &blob_info = info.GetSecond();
-    // Acquire blob_info write lock before modifying buffers
-    ScopedRwWriteLock blob_info_lock(blob_info.lock_[0],
-                                     kMDM_LocalPutBlobMetadata);
-    (*blob_info.buffers_) = buffers;
-    blob_info.blob_size_ = blob_size;
-    blob_info.score_ = score;
-    blob_info.UpdateWriteStats();
-  }
-  return std::tuple<BlobId, bool, size_t>(blob_id, did_create, orig_blob_size);
-}
-
-/**
- * Get \a blob_name blob from \a bkt_id bucket
- * */
-BlobId MetadataManager::LocalGetBlobId(TagId bkt_id,
-                                       const std::string &blob_name) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read blob_id_map_)
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalGetBlobId);
-  hipc::uptr<hipc::charbuf> internal_blob_name =
-      CreateBlobName(bkt_id, blob_name);
-  auto iter = blob_id_map_->find(*internal_blob_name);
-  if (iter == blob_id_map_->end()) {
-    return BlobId::GetNull();
-  }
-  hipc::pair<hipc::charbuf, BlobId> &info = *iter;
-  return info.GetSecond();
-}
-
-/**
- * Get \a blob_name BLOB name from \a blob_id BLOB id
- * */
-std::string MetadataManager::LocalGetBlobName(BlobId blob_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read blob_id_map_)
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalGetBlobName);
-  auto iter = blob_map_->find(blob_id);
-  if (iter == blob_map_->end()) {
-    return "";
-  }
-  hipc::pair<BlobId, BlobInfo>& info = *iter;
-  BlobInfo &blob_info = info.GetSecond();
-  return blob_info.name_->str();
-}
-
-/**
-   * Get \a score from \a blob_id BLOB id
-   * */
-float MetadataManager::LocalGetBlobScore(BlobId blob_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read blob_id_map_)
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalGetBlobScore);
-  auto iter = blob_map_->find(blob_id);
-  if (iter == blob_map_->end()) {
-    return -1;
-  }
-  hipc::pair<BlobId, BlobInfo>& info = *iter;
-  BlobInfo &blob_info = info.GetSecond();
-  return blob_info.score_;
-}
-
-/**
- * Lock the blob
- * */
-bool MetadataManager::LocalLockBlob(BlobId blob_id,
-                                    MdLockType lock_type) {
-  AUTO_TRACE(1);
-  if (blob_id.IsNull()) {
-    return false;
-  }
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalLockBlob);
-  return LockMdObject(*blob_map_, blob_id, lock_type);
-}
-
-/**
- * Unlock the blob
- * */
-bool MetadataManager::LocalUnlockBlob(BlobId blob_id,
-                                      MdLockType lock_type) {
-  AUTO_TRACE(1);
-  if (blob_id.IsNull()) {
-    return false;
-  }
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalUnlockBlob);
-  return UnlockMdObject(*blob_map_, blob_id, lock_type);
-}
-
-/**
- * Get \a blob_id blob's buffers
- * */
-std::vector<BufferInfo> MetadataManager::LocalGetBlobBuffers(BlobId blob_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read blob_map_)
-  ScopedRwReadLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                 kMDM_LocalGetBlobBuffers);
-  auto iter = blob_map_->find(blob_id);
-  if (iter == blob_map_->end()) {
-    return std::vector<BufferInfo>();
-  }
-  hipc::pair<BlobId, BlobInfo>& info = (*iter);
-  BlobInfo &blob_info = info.GetSecond();
-  // Acquire blob_info read lock
-  ScopedRwReadLock blob_info_lock(blob_info.lock_[0],
-                                  kMDM_LocalGetBlobBuffers);
-  blob_info.UpdateReadStats();
-  auto vec = blob_info.buffers_->vec();
-  return vec;
-}
-
-/**
- * Rename \a blob_id blob to \a new_blob_name new blob name
- * in \a bkt_id bucket.
- * */
-bool MetadataManager::LocalRenameBlob(TagId bkt_id, BlobId blob_id,
-                                      const std::string &new_blob_name) {
-  HILOG(kDebug, "Renaming the blob: {}.{}", blob_id.node_id_, blob_id.unique_)
-  AUTO_TRACE(1);
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modify blob_id_map_)
-  ScopedRwWriteLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                  kMDM_LocalRenameBlob);
-  auto iter = (*blob_map_).find(blob_id);
-  if (iter == blob_map_->end()) {
-    return true;
-  }
-  hipc::pair<BlobId, BlobInfo>& info = (*iter);
-  BlobInfo &blob_info = info.GetSecond();
-  hipc::uptr<hipc::charbuf> old_blob_name_internal =
-      CreateBlobName(bkt_id, *blob_info.name_);
-  hipc::uptr<hipc::charbuf> new_blob_name_internal =
-      CreateBlobName(bkt_id, new_blob_name);
-  blob_id_map_->erase(*old_blob_name_internal);
-  blob_id_map_->emplace(*new_blob_name_internal, blob_id);
-  return true;
-}
-
-/**
- * Destroy \a blob_id blob in \a bkt_id bucket
- * */
-bool MetadataManager::LocalDestroyBlob(TagId bkt_id,
-                                       BlobId blob_id) {
-  HILOG(kDebug, "Destroying the blob: {}", blob_id)
-  AUTO_TRACE(1);
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modify blob_id_map & blob_map_)
-  ScopedRwWriteLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                  kMDM_LocalDestroyBlob);
-  auto iter = (*blob_map_).find(blob_id);
-  if (iter.is_end()) {
-    return true;
-  }
-  hipc::pair<BlobId, BlobInfo>& info = (*iter);
-  BlobInfo &blob_info = info.GetSecond();
-  hipc::uptr<hipc::charbuf> blob_name_internal =
-      CreateBlobName(bkt_id, *blob_info.name_);
-  blob_id_map_->erase(*blob_name_internal);
-  blob_map_->erase(blob_id);
-  return true;
-}
-
-/**====================================
- * Bucket + Blob Operations
- * ===================================*/
-
-/**
- * Destroy all blobs + buckets
- * */
-void MetadataManager::LocalClear() {
-  AUTO_TRACE(1);
-  HILOG(kDebug, "Clearing all buckets and blobs")
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Modify tag map
-  ScopedRwWriteLock tag_map_lock(header_->lock_[kTagMapLock],
-                                 kMDM_LocalClear);
-  tag_id_map_->clear();
-  tag_map_->clear();
-  // Modify blob map
-  ScopedRwWriteLock blob_map_lock(header_->lock_[kBlobMapLock],
-                                  kMDM_LocalClear);
-  blob_id_map_->clear();
-  blob_map_->clear();
-}
-
-/**
- * Destroy all blobs + buckets globally
- * */
-void MetadataManager::GlobalClear() {
-  AUTO_TRACE(1);
-  for (i32 i = 0; i < (i32)rpc_->hosts_.size(); ++i) {
-    i32 node_id = i + 1;
-    if (NODE_ID_IS_LOCAL(node_id)) {
-      LocalClear();
-    } else {
-      rpc_->Call<bool>(node_id, "RpcClear");
-    }
-  }
-}
-
-/**====================================
- * Tag Operations
- * ===================================*/
-
-/**
- * Get or create a bucket with \a bkt_name bucket name
- * */
-std::pair<TagId, bool>
-MetadataManager::LocalGetOrCreateTag(const std::string &tag_name,
-                                     bool owner,
-                                     std::vector<TraitId> &traits,
-                                     size_t backend_size) {
-  AUTO_TRACE(1);
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modifying tag_map)
-  ScopedRwWriteLock tag_map_lock(header_->lock_[kTagMapLock],
-                                 kMDM_LocalGetOrCreateTag);
-
-  // Create unique ID for the Bucket
-  TagId tag_id;
-  tag_id.unique_ = header_->id_alloc_.fetch_add(1);
-  tag_id.node_id_ = rpc_->node_id_;
-  auto tag_name_shm = hipc::make_uptr<hipc::string>(tag_name);
-  bool did_create = tag_id_map_->try_emplace(*tag_name_shm, tag_id);
-
-  // Emplace bucket if it does not already exist
-  if (did_create) {
-    HILOG(kDebug, "Creating tag for the first time: {} {}", tag_name, tag_id)
-    tag_map_->emplace(tag_id);
-    auto iter = tag_map_->find(tag_id);
-    hipc::pair<TagId, TagInfo> &info_pair = *iter;
-    TagInfo &info = info_pair.GetSecond();
-    (*info.name_) = *tag_name_shm;
-    info.tag_id_ = tag_id;
-    info.owner_ = owner;
-    info.internal_size_ = backend_size;
-  } else {
-    HILOG(kDebug, "Found existing tag: {}", tag_name)
-    auto iter = tag_id_map_->find(*tag_name_shm);
-    hipc::pair<hipc::charbuf, TagId> &id_info = (*iter);
-    tag_id = id_info.GetSecond();
-  }
-
-  return {tag_id, did_create};
-}
-
-/**
- * Get the TagId with \a bkt_name bucket name
- * */
-TagId MetadataManager::LocalGetTagId(const std::string &tag_name) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (reading tag_id_map)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalGetTagId);
-  auto tag_name_shm = hipc::make_uptr<hipc::string>(tag_name);
-  auto iter = tag_id_map_->find(*tag_name_shm);
-  if (iter == tag_id_map_->end()) {
-    return TagId::GetNull();
-  }
-  hipc::pair<hipc::charbuf, TagId> &info_pair = (*iter);
-  TagId bkt_id = info_pair.GetSecond();
-  return bkt_id;
-}
-
-/**
- * Get the name of a tag
- * */
-std::string MetadataManager::LocalGetTagName(TagId tag_id) {
-  HILOG(kDebug, "Finding the name of tag: {}.{}",
-        tag_id.node_id_, tag_id.unique_)
-  AUTO_TRACE(1);
-  // Acquire MD read lock (reading tag_map_)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalGetTagName);
-  auto iter = tag_map_->find(tag_id);
-  if (iter == tag_map_->end()) {
-    return "";
-  }
-  hipc::pair<TagId, TagInfo> &info_pair = (*iter);
-  hipc::string &bkt_name = *info_pair.GetSecond().name_;
-  return bkt_name.str();
-}
-
-/**
- * Rename a tag
- * */
-bool MetadataManager::LocalRenameTag(TagId tag_id,
-                                     const std::string &new_name) {
-  HILOG(kDebug, "Renaming the tag: {}.{} to {}",
-        tag_id.node_id_, tag_id.unique_, new_name)
-  AUTO_TRACE(1);
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modifying tag_map_)
-  ScopedRwWriteLock tag_map_lock(header_->lock_[kTagMapLock],
-                                 kMDM_LocalRenameTag);
-  auto iter = tag_map_->find(tag_id);
-  if (iter == tag_map_->end()) {
-    return true;
-  }
-  auto new_name_shm = hipc::make_uptr<hipc::string>(new_name);
-  hipc::pair<TagId, TagInfo> &info_pair = (*iter);
-  hipc::string &old_bkt_name = *info_pair.GetSecond().name_;
-  tag_id_map_->erase(old_bkt_name);
-  tag_id_map_->emplace(*new_name_shm, tag_id);
-  return true;
-}
-
-/**
- * Delete a tag
- * */
-bool MetadataManager::LocalDestroyTag(TagId tag_id) {
-  HILOG(kDebug, "Destroying the tag: {}", tag_id)
-  AUTO_TRACE(1);
-  // Avoid flushing
-  ScopedRwReadLock flush_lock(header_->lock_[kFlushLock], kMDM_LocalClear);
-  // Acquire MD write lock (modifying tag_map_)
-  ScopedRwWriteLock tag_map_lock(header_->lock_[kTagMapLock],
-                                 kMDM_LocalDestroyTag);
-  auto iter = tag_map_->find(tag_id);
-  if (iter.is_end()) {
-    HILOG(kDebug, "Could NOT destroy: {}", tag_id)
-    return true;
-  }
-  hipc::pair<TagId, TagInfo> &info_pair = *iter;
-  auto &tag_info = info_pair.GetSecond();
-  tag_id_map_->erase(*tag_info.name_);
-  tag_map_->erase(tag_id);
-  HILOG(kDebug, "Destroyed the tag: {}", tag_id)
-  return true;
-}
-
-/**
- * Add a blob to a tag index
- * */
-Status MetadataManager::LocalTagAddBlob(TagId tag_id,
-                                        BlobId blob_id) {
-  AUTO_TRACE(1);
-  // Acquire MD write lock (modify tag_map_)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalTagAddBlob);
-  auto iter = tag_map_->find(tag_id);
-  if (iter.is_end()) {
-    return Status();
-  }
-  hipc::pair<TagId, TagInfo> &blob_list = (*iter);
-  TagInfo &info = blob_list.GetSecond();
-  ScopedRwWriteLock tag_lock(info.lock_[0], kMDM_LocalTagRemoveBlob);
-  info.blobs_->emplace_back(blob_id);
-  return Status();
-}
-
-/**
- * Remove a blob from a tag index.
- * */
-Status MetadataManager::LocalTagRemoveBlob(TagId tag_id,
-                                           BlobId blob_id) {
-  AUTO_TRACE(1);
-  // Acquire MD write lock (modify tag_map_)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalTagRemoveBlob);
-  auto iter = tag_map_->find(tag_id);
-  if (iter.is_end()) {
-    return Status();
-  }
-  hipc::pair<TagId, TagInfo> &blob_list = (*iter);
-  TagInfo &info = blob_list.GetSecond();
-  ScopedRwWriteLock tag_lock(info.lock_[0], kMDM_LocalTagRemoveBlob);
-  info.blobs_->erase(blob_id);
-  return Status();
-}
-
-
-/**
- * Find all blobs pertaining to a tag
- * */
-std::vector<BlobId> MetadataManager::LocalGroupByTag(TagId tag_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read tag_map_)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalGroupByTag);
-  // Get the tag info
-  auto iter = tag_map_->find(tag_id);
-  if (iter.is_end()) {
-    return std::vector<BlobId>();
-  }
-  auto &tag_info_pair = *iter;
-  TagInfo &tag_info = tag_info_pair.GetSecond();
-  // Convert slist into std::vector
-  return hshm::to_stl_vector<BlobId>(*tag_info.blobs_);
-}
-
-/**
- * Add a trait to a tag index. Create tag if it does not exist.
- * */
-bool MetadataManager::LocalTagAddTrait(TagId tag_id, TraitId trait_id) {
-  AUTO_TRACE(1);
-  HILOG(kDebug, "Adding trait {} to tag {}",
-        trait_id, tag_id);
-  // Acquire MD read lock (read tag_map_)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalTagAddTrait);
-  auto iter = tag_map_->find(tag_id);
-  if (iter.is_end()) {
-    HILOG(kDebug, "Could NOT add trait to tag {}")
-    return true;
-  }
-  auto &tag_info_pair = *iter;
-  TagInfo &tag_info = tag_info_pair.GetSecond();
-  ScopedRwWriteLock tag_lock(tag_info.lock_[0], kMDM_LocalTagAddTrait);
-  tag_info.traits_->emplace_back(trait_id);
-  HILOG(kDebug, "Added trait {} to tag {}",
-        trait_id, tag_id);
-  return true;
-}
-
-/**
- * Find all traits pertaining to a tag
- * */
-std::vector<TraitId> MetadataManager::LocalTagGetTraits(TagId tag_id) {
-  AUTO_TRACE(1);
-  // Acquire MD read lock (read tag_map_)
-  ScopedRwReadLock tag_map_lock(header_->lock_[kTagMapLock],
-                                kMDM_LocalTagGetTraits);
-  auto iter = tag_map_->find(tag_id);
-  if (iter.is_end()) {
-    return std::vector<TraitId>();
-  }
-  auto &tag_info_pair = *iter;
-  TagInfo &tag_info = tag_info_pair.GetSecond();
-  return hshm::to_stl_vector<TraitId>(*tag_info.traits_);
-}
-
-/**====================================
- * Trait Operations
- * ===================================*/
-
-/**
- * Register a trait. Stores the state of the trait in a way that can
- * be queried by all processes.
- * */
-RPC TraitId MetadataManager::LocalRegisterTrait(
-    TraitId trait_id,
-    const hshm::charbuf &trait_params) {
-  HILOG(kDebug, "Registering trait {}", trait_id)
-  // Acquire md write lock (modifying trait map)
-  ScopedRwWriteLock md_lock(header_->lock_[kTraitMapLock],
-                            kMDM_LocalRegisterTrait);
-  auto hdr = reinterpret_cast<TraitHeader*>(trait_params.data());
-  std::string trait_uuid = hdr->trait_uuid_;
-
-  // Check if trait exists
-  auto trait_uuid_shm = hipc::make_uptr<hipc::charbuf>(trait_uuid);
-  auto iter = trait_id_map_->find(*trait_uuid_shm);
-  if (!iter.is_end()) {
-    trait_id = (*iter).GetSecond();
-    return trait_id;
-  }
-
-  // Create new trait
-  if (trait_id.IsNull()) {
-    trait_id.unique_ = header_->id_alloc_.fetch_add(1);
-    trait_id.node_id_ = rpc_->node_id_;
-  }
-  trait_id_map_->emplace(*trait_uuid_shm, trait_id);
-  trait_map_->emplace(trait_id, trait_params);
-  return trait_id;
-}
-
-/**
- * Get trait identifier
- * */
-RPC TraitId
-MetadataManager::LocalGetTraitId(const std::string &trait_uuid) {
-  HILOG(kDebug, "Getting trait id for {}", trait_uuid)
-  // Acquire md read lock (reading trait_id_map)
-  ScopedRwReadLock md_lock(header_->lock_[kTraitMapLock],
-                           kMDM_LocalGetTraitId);
-  // Check if trait exists
-  auto trait_uuid_shm = hipc::make_uptr<hipc::charbuf>(trait_uuid);
-  auto iter = trait_id_map_->find(*trait_uuid_shm);
-  if (iter.is_end()) {
-    return TraitId::GetNull();
-  }
-  TraitId trait_id = (*iter).GetSecond();
-  return trait_id;
-}
-
-/**
- * Get trait parameters
- * */
-RPC hshm::charbuf
-MetadataManager::LocalGetTraitParams(TraitId trait_id) {
-  // Acquire md read lock (reading trait_map)
-  ScopedRwReadLock md_lock(header_->lock_[kTraitMapLock],
-                           kMDM_LocalGetTraitParams);
-
-  // Get the trait parameters from the map
-  auto iter = trait_map_->find(trait_id);
-  if (iter.is_end()) {
-    return hshm::charbuf();
-  }
-  hipc::pair<TraitId, hipc::charbuf> &trait_pair = *iter;
-  return hshm::to_charbuf(trait_pair.GetSecond());
-}
-
-/**
- * Get an existing trait
- * */
-Trait* MetadataManager::GlobalGetTrait(TraitId trait_id) {
-  // HILOG(kDebug, "Getting the trait {}", trait_id)
-  Trait *trait = nullptr;
-
-  // Check if trait is already constructed
-  ScopedRwReadLock trait_lock(header_->lock_[kTraitMapLock],
-                              kMDM_GlobalGetTrait);
-  auto iter = local_trait_map_.find(trait_id);
-  if (iter != local_trait_map_.end()) {
-    std::pair<TraitId, Trait*> trait_pair = *iter;
-    trait = trait_pair.second;
-    trait_lock.Unlock();
-    return trait;
-  }
-  trait_lock.Unlock();
-
-  // Get the trait state locally or globally
-  hshm::charbuf params = LocalGetTraitParams(trait_id);
-  if (params.size() == 0) {
-    params = GlobalGetTraitParams(trait_id);
-    if (params.size() == 0) {
-      HELOG(kError, "Could not find the trait {}.{}",
-            trait_id.node_id_, trait_id.unique_)
-      return nullptr;
-    }
-    LocalRegisterTrait(trait_id, params);
-  }
-
-  // Construct the trait based on the parameters
-  ScopedRwWriteLock trait_lock_w(header_->lock_[kTraitMapLock],
-                                 kMDM_GlobalGetTrait);
-  HILOG(kDebug, "Acquired trait lock w for {}", trait_id)
-
-  // Check if the trait exists now
-  iter = local_trait_map_.find(trait_id);
-  if (iter != local_trait_map_.end()) {
-    std::pair<TraitId, Trait*> trait_pair = *iter;
-    trait = trait_pair.second;
-    return trait;
-  }
-
-  // Construct the trait
-  trait = traits_->ConstructTrait(params);
-  if (trait == nullptr) {
-    return nullptr;
-  }
-
-  // Induct the trait
-  local_trait_map_.emplace(trait_id, trait);
-  return trait;
-}
-
-/**====================================
- * Statistics Operations
- * ===================================*/
-
-/** Add an I/O statistic to the internal log */
-void MetadataManager::AddIoStat(TagId tag_id,
-                                BlobId blob_id,
-                                size_t blob_size,
-                                IoType type) {
-  if (!enable_io_tracing_) {
-    return;
-  }
-  IoStat stat;
-  stat.blob_id_ = blob_id;
-  stat.tag_id_ = tag_id;
-  stat.blob_size_ = blob_size;
-  stat.type_ = type;
-  stat.rank_ = 0;
-  if (is_mpi_) {
-    MPI_Comm_rank(MPI_COMM_WORLD, &stat.rank_);
-  }
-  io_pattern_log_->emplace(stat);
-}
-
-
-}  // namespace hermes
diff --git a/src/metadata_manager.h b/src/metadata_manager.h
deleted file mode 100644
index 7ecf7864d..000000000
--- a/src/metadata_manager.h
+++ /dev/null
@@ -1,535 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_METADATA_MANAGER_H_
-#define HERMES_SRC_METADATA_MANAGER_H_
-
-#include "decorator.h"
-#include "hermes_types.h"
-#include "status.h"
-#include "rpc.h"
-#include "metadata_types.h"
-#include "trait_manager.h"
-#include "statuses.h"
-#include "rpc_thallium_serialization.h"
-
-namespace hermes {
-
-/** Forward declaration of borg */
-class BufferOrganizer;
-
-/**
- * Type name simplification for the various map types
- * */
-typedef hipc::unordered_map<hipc::charbuf, BlobId> BLOB_ID_MAP_T;
-typedef hipc::unordered_map<hipc::charbuf, TagId> TAG_ID_MAP_T;
-typedef hipc::unordered_map<hipc::charbuf, TraitId> TRAIT_ID_MAP_T;
-typedef hipc::unordered_map<BlobId, BlobInfo> BLOB_MAP_T;
-typedef hipc::unordered_map<TagId, TagInfo> TAG_MAP_T;
-typedef hipc::unordered_map<TraitId, hipc::charbuf> TRAIT_MAP_T;
-typedef hipc::mpsc_queue<IoStat> IO_PATTERN_LOG_T;
-
-enum MdmLock {
-  kBlobMapLock,
-  kTagMapLock,
-  kTraitMapLock,
-  kFlushLock,
-
-  kMdmLockCount
-};
-
-/**
- * The SHM representation of the MetadataManager
- * */
-struct MetadataManagerShm {
-  /// SHM representation of blob id map
-  hipc::ShmArchive<BLOB_ID_MAP_T> blob_id_map_;
-  /// SHM representation of blob map
-  hipc::ShmArchive<BLOB_MAP_T> blob_map_;
-  /// SHM representation of tag id map
-  hipc::ShmArchive<TAG_ID_MAP_T> tag_id_map_;
-  /// SHM representation of tag map
-  hipc::ShmArchive<TAG_MAP_T> tag_map_;
-  /// SHM representation of trait id map
-  hipc::ShmArchive<TRAIT_ID_MAP_T> trait_id_map_;
-  /// SHM representation of trait map
-  hipc::ShmArchive<TRAIT_MAP_T> trait_map_;
-  /// SHM representation of device vector
-  hipc::ShmArchive<hipc::vector<DeviceInfo>> devices_;
-  /// SHM representation of target info vector
-  hipc::ShmArchive<hipc::vector<TargetInfo>> targets_;
-  /// SHM representation of prefetcher stats log
-  hipc::ShmArchive<IO_PATTERN_LOG_T> io_pattern_log_;
-  /// Used to create unique ids. Starts at 1.
-  std::atomic<u64> id_alloc_;
-  /// Synchronization
-  RwLock lock_[kMdmLockCount];
-  /// The ID of THIS node
-  i32 node_id_;
-};
-
-/**
- * Manages the metadata for blobs, buckets, and vbuckets.
- * */
-class MetadataManager {
- public:
-  RPC_TYPE *rpc_;
-  BufferOrganizer *borg_;
-  TraitManager *traits_;
-  MetadataManagerShm *header_;
-
-  /**====================================
-   * Maps
-   * ===================================*/
-  BLOB_ID_MAP_T *blob_id_map_;
-  TAG_ID_MAP_T *tag_id_map_;
-  TRAIT_ID_MAP_T *trait_id_map_;
-  BLOB_MAP_T *blob_map_;
-  TAG_MAP_T *tag_map_;
-  TRAIT_MAP_T *trait_map_;
-  std::unordered_map<TraitId, Trait*> local_trait_map_;
-  RwLock local_lock_;
-
-  /**====================================
-   * I/O pattern log
-   * ===================================*/
-  IO_PATTERN_LOG_T *io_pattern_log_;
-  bool enable_io_tracing_;
-  bool is_mpi_;
-
-  /**====================================
-   * Targets + devices
-   * ===================================*/
-  hipc::vector<DeviceInfo> *devices_;
-  hipc::vector<TargetInfo> *targets_;
-
- public:
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** Default constructor */
-  MetadataManager() = default;
-
-  /**====================================
-   * SHM Init
-   * ===================================*/
-
-  /** Default constructor */
-  void shm_init(hipc::ShmArchive<MetadataManagerShm> &header,
-                hipc::Allocator *alloc,
-                ServerConfig *config);
-
-  /**====================================
-   * SHM Deserialize
-   * ===================================*/
-
-  /**
-   * Unload the MetadataManager from shared memory
-   * */
-  void shm_deserialize(hipc::ShmArchive<MetadataManagerShm> &header);
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Whether the MetadataManager is NULL */
-  bool IsNull() { return false; }
-
-  /** Set the MetadataManager to NULL */
-  void SetNull() {}
-
-  /**
-   * Explicitly destroy the MetadataManager
-   * */
-  void shm_destroy();
-
-  /**
-   * Create a unique blob name using TagId
-   * */
-  template<typename StringT>
-  static hipc::uptr<hipc::charbuf> CreateBlobName(
-      TagId bkt_id, const StringT &blob_name) {
-    auto new_name = hipc::make_uptr<hipc::charbuf>(
-        sizeof(uint64_t) + sizeof(uint32_t) + blob_name.size());
-    size_t off = 0;
-    memcpy(new_name->data() + off, &bkt_id.unique_, sizeof(uint64_t));
-    off += sizeof(uint64_t);
-    memcpy(new_name->data() + off, &bkt_id.node_id_, sizeof(uint32_t));
-    off += sizeof(uint32_t);
-    memcpy(new_name->data() + off, blob_name.data(), blob_name.size());
-    return new_name;
-  }
-
-  /**====================================
-   * Bucket Operations
-   * ===================================*/
-
-  /**
-   * Get the size of a bucket
-   * */
-  RPC size_t LocalGetBucketSize(TagId bkt_id);
-  DEFINE_RPC(size_t, GetBucketSize, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Update \a bkt_id BUCKET stats
-   * */
-  RPC bool LocalSetBucketSize(TagId bkt_id, size_t new_size);
-  DEFINE_RPC(bool, SetBucketSize, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Lock the bucket
-   * */
-  bool LocalLockBucket(TagId bkt_id, MdLockType lock_type);
-  DEFINE_RPC(bool, LockBucket, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Unlock the bucket
-   * */
-  bool LocalUnlockBucket(TagId bkt_id, MdLockType lock_type);
-  DEFINE_RPC(bool, UnlockBucket, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Destroy \a bkt_id bucket
-   * */
-  RPC bool LocalClearBucket(TagId bkt_id);
-  DEFINE_RPC(bool, ClearBucket, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**====================================
-   * Blob Operations
-   * ===================================*/
-
-  /**
-   * Create a blob's metadata
-   *
-   * @param bkt_id id of the bucket
-   * @param blob_name semantic blob name
-   * @param data the data being placed
-   * @param buffers the buffers to place data in
-   * */
-  RPC std::tuple<BlobId, bool, size_t> LocalPutBlobMetadata(
-      TagId bkt_id, const std::string &blob_name, size_t blob_size,
-      std::vector<BufferInfo> &buffers, float score);
-  DEFINE_RPC((std::tuple<BlobId, bool, size_t>), PutBlobMetadata, 1,
-             STRING_HASH_LAMBDA)
-
-  /**
-   * Creates the blob metadata
-   *
-   * @param bkt_id id of the bucket
-   * @param blob_name semantic blob name
-   * */
-  std::pair<BlobId, bool> LocalTryCreateBlob(TagId bkt_id,
-                                             const std::string &blob_name);
-  DEFINE_RPC((std::pair<BlobId, bool>), TryCreateBlob, 1,
-             STRING_HASH_LAMBDA)
-
-  /**
-   * Tag a blob
-   *
-   * @param blob_id id of the blob being tagged
-   * @param tag_name tag name
-   * */
-  Status LocalTagBlob(BlobId blob_id, TagId tag_id);
-  DEFINE_RPC(Status, TagBlob, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Check if blob has a tag
-   * */
-  bool LocalBlobHasTag(BlobId blob_id, TagId tag_id);
-  DEFINE_RPC(bool, BlobHasTag, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Get \a blob_name BLOB from \a bkt_id bucket
-   * */
-  RPC BlobId LocalGetBlobId(TagId bkt_id, const std::string &blob_name);
-  DEFINE_RPC(BlobId, GetBlobId, 1,
-             STRING_HASH_LAMBDA)
-
-  /**
-   * Get \a blob_name BLOB name from \a blob_id BLOB id
-   * */
-  RPC std::string LocalGetBlobName(BlobId blob_id);
-  DEFINE_RPC(std::string, GetBlobName, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Get \a score from \a blob_id BLOB id
-   * */
-  RPC float LocalGetBlobScore(BlobId blob_id);
-  DEFINE_RPC(float, GetBlobScore, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Lock the blob
-   * */
-  RPC bool LocalLockBlob(BlobId blob_id, MdLockType lock_type);
-  DEFINE_RPC(bool, LockBlob, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Unlock the blob
-   * */
-  RPC bool LocalUnlockBlob(BlobId blob_id, MdLockType lock_type);
-  DEFINE_RPC(bool, UnlockBlob, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Get \a blob_id blob's buffers
-   * */
-  RPC std::vector<BufferInfo> LocalGetBlobBuffers(BlobId blob_id);
-  DEFINE_RPC(std::vector<BufferInfo>, GetBlobBuffers, 0,
-             UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Rename \a blob_id blob to \a new_blob_name new blob name
-   * in \a bkt_id bucket.
-   * */
-  RPC bool LocalRenameBlob(TagId bkt_id, BlobId blob_id,
-                           const std::string &new_blob_name);
-  DEFINE_RPC(bool, RenameBlob, 1, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Destroy \a blob_id blob in \a bkt_id bucket
-   * */
-  RPC bool LocalDestroyBlob(TagId bkt_id, BlobId blob_id);
-  DEFINE_RPC(bool, DestroyBlob, 1, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**====================================
-   * Bucket + Blob Operations
-   * ===================================*/
-
-  /**
-   * Destroy all blobs + buckets
-   * */
-  void LocalClear();
-
-  /**
-   * Destroy all blobs + buckets globally
-   * */
-  void GlobalClear();
-
-  /**====================================
-   * Target Operations
-   * ===================================*/
-
-  /**
-   * Update the capacity of the target device
-   * */
-  RPC void LocalUpdateTargetCapacity(TargetId tid, off64_t offset) {
-    TargetInfo &target = (*targets_)[tid.GetIndex()];
-    target.rem_cap_ += offset;
-  }
-  DEFINE_RPC(bool, UpdateTargetCapacity, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Update the capacity of the target device
-   * */
-  RPC std::vector<TargetInfo> LocalGetTargetInfo() {
-    return hshm::to_stl_vector<TargetInfo>(*targets_);
-  }
-
-  /**
-   * Get the TargetInfo for neighborhood
-   * */
-  // hipc::vector<TargetInfo> GetNeighborhoodTargetInfo() { return {}; }
-
-  /**
-   * Get all TargetInfo in the system
-   * */
-  // hipc::vector<TargetInfo> GetGlobalTargetInfo() { return {}; }
-
-  /**====================================
-   * Tag Operations
-   * ===================================*/
-
-  /**
-   * Create a tag
-   * */
-  std::pair<TagId, bool> LocalGetOrCreateTag(const std::string &tag_name,
-                                             bool owner,
-                                             std::vector<TraitId> &traits,
-                                             size_t backend_size);
-  DEFINE_RPC((std::pair<TagId, bool>),
-             GetOrCreateTag, 0, STRING_HASH_LAMBDA)
-  TagId GlobalCreateTag(const std::string &tag_name,
-                        bool owner,
-                        std::vector<TraitId> &traits) {
-    return LocalGetOrCreateTag(tag_name, owner, traits, 0).first;
-  }
-
-  /**
-   * Get the id of a tag
-   * */
-  TagId LocalGetTagId(const std::string &tag_name);
-  DEFINE_RPC(TagId, GetTagId, 0, STRING_HASH_LAMBDA)
-
-  /**
-   * Get the name of a tag
-   * */
-  RPC std::string LocalGetTagName(TagId tag);
-  DEFINE_RPC(std::string, GetTagName, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Rename a tag
-   * */
-  RPC bool LocalRenameTag(TagId tag, const std::string &new_name);
-  DEFINE_RPC(bool, RenameTag, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Delete a tag
-   * */
-  bool LocalDestroyTag(TagId tag);
-  DEFINE_RPC(bool, DestroyTag, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA)
-
-  /**
-   * Add a blob to a tag index.
-   * */
-  Status LocalTagAddBlob(TagId tag_id, BlobId blob_id);
-  DEFINE_RPC(Status, TagAddBlob, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA);
-
-  /**
-   * Remove a blob from a tag index.
-   * */
-  Status LocalTagRemoveBlob(TagId tag_id, BlobId blob_id);
-  DEFINE_RPC(Status, TagRemoveBlob, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA);
-
-  /**
-   * Find all blobs pertaining to a tag
-   * */
-  std::vector<BlobId> LocalGroupByTag(TagId tag_id);
-  DEFINE_RPC(std::vector<BlobId>, GroupByTag, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA);
-
-  /**
-   * Add a trait to a tag index. Create tag if it does not exist.
-   * */
-  RPC bool LocalTagAddTrait(TagId tag_id, TraitId trait_id);
-  DEFINE_RPC(bool, TagAddTrait, 0, UNIQUE_ID_TO_NODE_ID_LAMBDA);
-
-  /**
-   * Find all traits pertaining to a tag
-   * */
-  std::vector<TraitId> LocalTagGetTraits(TagId tag_id);
-  DEFINE_RPC(std::vector<TraitId>, TagGetTraits, 0,
-             UNIQUE_ID_TO_NODE_ID_LAMBDA);
-
-  /**====================================
-   * Trait Operations
-   * ===================================*/
-
-  /**
-   * Register a trait. Stores the state of the trait in a way that can
-   * be queried by all processes.
-   * */
-  RPC TraitId LocalRegisterTrait(TraitId trait_id,
-                                 const hshm::charbuf &trait_params);
-  DEFINE_RPC(TraitId, RegisterTrait, 1, TRAIT_PARAMS_HASH_LAMBDA);
-
-  /**
-   * Get trait identifier
-   * */
-  RPC TraitId LocalGetTraitId(const std::string &trait_uuid);
-  DEFINE_RPC((TraitId), GetTraitId, 0, STRING_HASH_LAMBDA);
-
-  /**
-   * Get trait parameters
-   * */
-  RPC hshm::charbuf LocalGetTraitParams(TraitId trait_id);
-  DEFINE_RPC((hshm::charbuf),
-             GetTraitParams, 0,
-             UNIQUE_ID_TO_NODE_ID_LAMBDA);
-
-  /**
-   * Get an existing trait. Will load the trait into this process's
-   * address space if necessary.
-   * */
-  Trait* GlobalGetTrait(TraitId trait_id);
-
-  /**====================================
-   * Statistics Operations
-   * ===================================*/
-
-  /** Add an I/O statistic to the internal log */
-  void AddIoStat(TagId tag_id, BlobId blob_id, size_t blob_size, IoType type);
-
-  /**====================================
-   * Private Operations
-   * ===================================*/
-
- private:
-  /** Acquire the external lock to Bucket or Blob */
-  template<typename MapFirst, typename MapSecond, typename IdT>
-  bool LockMdObject(hipc::unordered_map<MapFirst, MapSecond> &map,
-                    IdT id,
-                    MdLockType lock_type) {
-    auto iter = map.find(id);
-    if (iter == map.end()) {
-      return false;
-    }
-    hipc::pair<MapFirst, MapSecond> &info = *iter;
-    MapSecond &obj_info = info.GetSecond();
-    switch (lock_type) {
-      case MdLockType::kExternalRead: {
-        obj_info.lock_[1].ReadLock(0);
-        return true;
-      }
-      case MdLockType::kExternalWrite: {
-        obj_info.lock_[1].WriteLock(0);
-        return true;
-      }
-      default: {
-        return false;
-      }
-    }
-  }
-
-  /** Release the external lock to Bucket or Blob */
-  template<typename MapFirst, typename MapSecond, typename IdT>
-  bool UnlockMdObject(hipc::unordered_map<MapFirst, MapSecond> &map,
-                      IdT id,
-                      MdLockType lock_type) {
-    auto iter = map.find(id);
-    if (iter == map.end()) {
-      return false;
-    }
-    hipc::pair<MapFirst, MapSecond> &info = *iter;
-    MapSecond &obj_info = info.GetSecond();
-    switch (lock_type) {
-      case MdLockType::kExternalRead: {
-        obj_info.lock_[1].ReadUnlock();
-        return true;
-      }
-      case MdLockType::kExternalWrite: {
-        obj_info.lock_[1].WriteUnlock();
-        return true;
-      }
-      default: {
-        return false;
-      }
-    }
-  }
-
-  /**====================================
-   * Debugging Logs
-   * ===================================*/
- public:
-  void PrintDeviceInfo() {
-    int id = 0;
-    for (DeviceInfo &dev_info : *devices_) {
-      HILOG(kInfo, "Device {} is mounted on {} with capacity {} bytes",
-            id,
-            dev_info.mount_point_->str(),
-            dev_info.capacity_)
-      ++id;
-    }
-  }
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_METADATA_MANAGER_H_
diff --git a/src/metadata_types.cc b/src/metadata_types.cc
deleted file mode 100644
index 724a3f1d8..000000000
--- a/src/metadata_types.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "metadata_types.h"
-#include "buffer_pool.h"
-#include "metadata_manager.h"
-#include "hermes.h"
-
-namespace hermes {
-
-void BlobInfo::shm_destroy_main() {
-  auto &bpm = HERMES->bpm_;
-  auto buffers_std = (*buffers_).vec();
-  bpm.GlobalReleaseBuffers(buffers_std);
-  (*name_).shm_destroy();
-  (*buffers_).shm_destroy();
-  (*tags_).shm_destroy();
-}
-
-void TagInfo::shm_destroy_main() {
-  auto mdm = &HERMES->mdm_;
-  (*name_).shm_destroy();
-  if (owner_) {
-    for (BlobId &blob_id : *blobs_) {
-      mdm->GlobalDestroyBlob(tag_id_, blob_id);
-    }
-  }
-  (*blobs_).shm_destroy();
-  (*traits_).shm_destroy();
-}
-
-}  // namespace hermes
diff --git a/src/metadata_types.h b/src/metadata_types.h
deleted file mode 100644
index 461b3c163..000000000
--- a/src/metadata_types.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_METADATA_TYPES_H_
-#define HERMES_SRC_METADATA_TYPES_H_
-
-#include "hermes_types.h"
-#include "config_server.h"
-
-namespace hermes {
-
-#define TEXT_HASH(text) \
-  std::hash<lipc::charbuf>{}(text);
-#define ID_HASH(id) \
-  id.bits_.node_id_
-#define BUCKET_HASH TEXT_HASH(bkt_name)
-#define BLOB_HASH TEXT_HASH(blob_name)
-
-using api::Blob;       /**< Namespace simplification for blob */
-struct TagInfo;     /**< Forward declaration of TagInfo */
-struct BlobInfo;       /**< Forward declaration of BlobInfo */
-
-/** Any statistics which need to be globally maintained across ranks */
-struct GlobalIoClientState {
-  size_t true_size_;
-};
-
-/** Device information (e.g., path) */
-using config::DeviceInfo;
-/** I/O interface to use for BORG (e.g., POSIX) */
-using config::IoInterface;
-
-/** Lock type used for internal metadata */
-enum class MdLockType {
-  kInternalRead,    /**< Internal read lock used by Hermes */
-  kInternalWrite,   /**< Internal write lock by Hermes */
-  kExternalRead,    /**< External is used by programs */
-  kExternalWrite,   /**< External is used by programs */
-};
-
-/** Represents the current status of a target */
-struct TargetInfo {
-  TargetId id_;         /**< unique Target ID */
-  size_t max_cap_;      /**< maximum capacity of the target */
-  size_t rem_cap_;      /**< remaining capacity of the target */
-  double bandwidth_;    /**< the bandwidth of the device */
-  double latency_;      /**< the latency of the device */
-  float score_;         /**< Relative importance of this tier */
-
-  /** Default constructor */
-  TargetInfo() = default;
-
-  /** Primary constructor */
-  TargetInfo(TargetId id, size_t max_cap, size_t rem_cap,
-             double bandwidth, double latency)
-      : id_(id), max_cap_(max_cap), rem_cap_(rem_cap),
-        bandwidth_(bandwidth), latency_(latency) {}
-};
-
-/** Represents an allocated fraction of a target */
-struct BufferInfo {
-  TargetId tid_;        /**< The destination target */
-  int t_slab_;          /**< The index of the slab in the target */
-  size_t t_off_;        /**< Offset in the target */
-  size_t t_size_;       /**< Size in the target */
-  size_t blob_off_;     /**< Offset in the blob */
-  size_t blob_size_;    /**< The amount of the blob being placed */
-
-  /** Default constructor */
-  BufferInfo() = default;
-
-  /** Primary constructor */
-  BufferInfo(TargetId tid, size_t t_off, size_t t_size,
-             size_t blob_off, size_t blob_size)
-      : tid_(tid), t_off_(t_off), t_size_(t_size),
-        blob_off_(blob_off), blob_size_(blob_size) {}
-
-  /** Copy constructor */
-  BufferInfo(const BufferInfo &other) {
-    Copy(other);
-  }
-
-  /** Move constructor */
-  BufferInfo(BufferInfo &&other) {
-    Copy(other);
-  }
-
-  /** Copy assignment */
-  BufferInfo& operator=(const BufferInfo &other) {
-    Copy(other);
-    return *this;
-  }
-
-  /** Move assignment */
-  BufferInfo& operator=(BufferInfo &&other) {
-    Copy(other);
-    return *this;
-  }
-
-  /** Performs move/copy */
-  void Copy(const BufferInfo &other) {
-    tid_ = other.tid_;
-    t_slab_ = other.t_slab_;
-    t_off_ = other.t_off_;
-    t_size_ = other.t_size_;
-    blob_off_ = other.blob_off_;
-    blob_size_ = other.blob_size_;
-  }
-};
-
-/** Represents BlobInfo in shared memory */
-struct BlobInfo : public hipc::ShmContainer {
-  SHM_CONTAINER_TEMPLATE(BlobInfo, BlobInfo)
-
-  BlobId blob_id_;   /**< The identifier of this blob */
-  TagId tag_id_;  /**< The bucket containing the blob */
-  hipc::ShmArchive<hipc::string>
-      name_;      /**< SHM pointer to name string */
-  hipc::ShmArchive<hipc::vector<BufferInfo>>
-      buffers_;   /**< SHM pointer to BufferInfo vector */
-  hipc::ShmArchive<hipc::slist<TagId>>
-      tags_;        /**< SHM pointer to tag list */
-  RwLock lock_[2];     /**< Ensures BlobInfo access is synchronized */
-  size_t blob_size_;   /**< The overall size of the blob */
-  float score_;        /**< The priority of this blob */
-  std::atomic<u32> access_freq_;  /**< Number of times blob accessed in epoch */
-  u64 last_access_;  /**< Last time blob accessed */
-  std::atomic<size_t> mod_count_;   /**< The number of times blob modified */
-  std::atomic<size_t> last_flush_;  /**< The last mod that was flushed */
-
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** Initialize the data structure */
-  explicit BlobInfo(hipc::Allocator *alloc) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR0(name_, alloc)
-    HSHM_MAKE_AR0(buffers_, alloc)
-    HSHM_MAKE_AR0(tags_, alloc)
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor. From DeviceInfo. */
-  explicit BlobInfo(hipc::Allocator *alloc,
-                    const BlobInfo &other) {
-    shm_init_container(alloc);
-    shm_strong_copy_constructor_main(alloc, other);
-  }
-
-  /** Copy the header POD types */
-  void strong_copy(const BlobInfo &other) {
-    blob_id_ = other.blob_id_;
-    tag_id_ = other.tag_id_;
-    blob_size_ = other.blob_size_;
-    score_ = other.score_;
-    mod_count_ = other.mod_count_.load();
-    last_flush_ = other.last_flush_.load();
-  }
-
-  /** Copy constructor main. */
-  void shm_strong_copy_constructor_main(hipc::Allocator *alloc,
-                                        const BlobInfo &other) {
-    strong_copy(other);
-    HSHM_MAKE_AR(name_, alloc, *other.name_)
-    HSHM_MAKE_AR(buffers_, alloc, *other.buffers_)
-    HSHM_MAKE_AR(tags_, alloc, *other.tags_)
-  }
-
-  /** SHM copy assignment operator. From DeviceInfo. */
-  BlobInfo& operator=(const BlobInfo &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_op_main(other);
-    }
-    return *this;
-  }
-
-  /** Copy assignment operator main. */
-  void shm_strong_copy_op_main(const BlobInfo &other) {
-    strong_copy(other);
-    (*name_) = (*other.name_);
-    (*buffers_) = (*other.buffers_);
-    (*tags_) = (*other.tags_);
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  BlobInfo(hipc::Allocator *alloc, BlobInfo &&other) {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      strong_copy(other);
-      HSHM_MAKE_AR(name_, alloc, std::move(*other.name_))
-      HSHM_MAKE_AR(buffers_, alloc, std::move(*other.buffers_))
-      HSHM_MAKE_AR(tags_, alloc, std::move(*other.tags_))
-      other.SetNull();
-    } else {
-      shm_strong_copy_constructor_main(alloc, other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  BlobInfo& operator=(BlobInfo &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        strong_copy(other);
-        (*name_) = std::move(*other.name_);
-        (*buffers_) = std::move(*other.buffers_);
-        (*tags_) = std::move(*other.tags_);
-        other.SetNull();
-      } else {
-        shm_strong_copy_op_main(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Whether the TagInfo is NULL */
-  bool IsNull() { return false; }
-
-  /** Set the TagInfo to NULL */
-  void SetNull() {}
-
-  /** Destroy all allocated data */
-  void shm_destroy_main();
-
-  /**====================================
-   * Statistics
-   * ===================================*/
-
-  void UpdateWriteStats() {
-    mod_count_.fetch_add(1);
-    UpdateReadStats();
-  }
-
-  void UpdateReadStats() {
-    last_access_ = GetTimeFromStartNs();
-    access_freq_.fetch_add(1);
-  }
-
-  static u64 GetTimeFromStartNs() {
-    struct timespec currentTime;
-    clock_gettime(CLOCK_MONOTONIC, &currentTime);
-    unsigned long long nanoseconds =
-      currentTime.tv_sec * 1000000000ULL + currentTime.tv_nsec;
-    return nanoseconds;
-  }
-};
-
-/** Represents TagInfo in shared memory */
-struct TagInfo : public hipc::ShmContainer {
-  SHM_CONTAINER_TEMPLATE(TagInfo, TagInfo)
-  TagId tag_id_;           /**< ID of the tag */
-  hipc::ShmArchive<hipc::string>
-      name_;               /**< Archive of tag name */
-  hipc::ShmArchive<hipc::slist<BlobId>>
-      blobs_;              /**< Archive of blob list */
-  hipc::ShmArchive<hipc::slist<TraitId>>
-      traits_;             /**< Archive of trait list */
-  size_t internal_size_;   /**< Current bucket size */
-  bool owner_;             /**< Whether this tag owns the blobs */
-  RwLock lock_[2];         /**< Lock the bucket */
-
-  /**====================================
-   * Default Constructor
-   * ===================================*/
-
-  /** SHM constructor. Default. */
-  explicit TagInfo(hipc::Allocator *alloc) {
-    shm_init_container(alloc);
-    HSHM_MAKE_AR0(name_, alloc)
-    HSHM_MAKE_AR0(blobs_, alloc)
-    HSHM_MAKE_AR0(traits_, alloc)
-  }
-
-  /**====================================
-   * Copy Constructors
-   * ===================================*/
-
-  /** SHM copy constructor. From DeviceInfo. */
-  explicit TagInfo(hipc::Allocator *alloc,
-                   const TagInfo &other) {
-    shm_init_container(alloc);
-    shm_strong_copy_constructor_main(alloc, other);
-  }
-
-  /** Copy POD types */
-  void strong_copy(const TagInfo &other) {
-    internal_size_ = other.internal_size_;
-    owner_ = other.owner_;
-  }
-
-  /** Copy constructor main. */
-  void shm_strong_copy_constructor_main(hipc::Allocator *alloc,
-                                        const TagInfo &other) {
-    strong_copy(other);
-    HSHM_MAKE_AR(name_, alloc, *other.name_)
-    HSHM_MAKE_AR(blobs_, alloc, *other.blobs_)
-    HSHM_MAKE_AR(traits_, alloc, *other.traits_)
-  }
-
-  /** SHM copy assignment operator. From DeviceInfo. */
-  TagInfo& operator=(const TagInfo &other) {
-    if (this != &other) {
-      shm_destroy();
-      shm_strong_copy_op_main(other);
-    }
-    return *this;
-  }
-
-  /** Copy assignment operator main. */
-  void shm_strong_copy_op_main(const TagInfo &other) {
-    strong_copy(other);
-    (*name_) = (*other.name_);
-    (*blobs_) = (*other.blobs_);
-    (*traits_) = (*other.traits_);
-  }
-
-  /**====================================
-   * Move Constructors
-   * ===================================*/
-
-  /** SHM move constructor. */
-  TagInfo(hipc::Allocator *alloc,
-          TagInfo &&other) {
-    shm_init_container(alloc);
-    if (GetAllocator() == other.GetAllocator()) {
-      strong_copy(other);
-      HSHM_MAKE_AR(name_, alloc, std::move(*other.name_))
-      HSHM_MAKE_AR(blobs_, alloc, std::move(*other.blobs_))
-      HSHM_MAKE_AR(traits_, alloc, std::move(*other.traits_))
-      other.SetNull();
-    } else {
-      shm_strong_copy_constructor_main(alloc, other);
-      other.shm_destroy();
-    }
-  }
-
-  /** SHM move assignment operator. */
-  TagInfo& operator=(TagInfo &&other) noexcept {
-    if (this != &other) {
-      shm_destroy();
-      if (GetAllocator() == other.GetAllocator()) {
-        strong_copy(other);
-        (*name_) = std::move(*other.name_);
-        (*blobs_) = std::move(*other.blobs_);
-        (*traits_) = std::move(*other.traits_);
-        other.SetNull();
-      } else {
-        shm_strong_copy_op_main(other);
-        other.shm_destroy();
-      }
-    }
-    return *this;
-  }
-
-  /**====================================
-   * Destructor
-   * ===================================*/
-
-  /** Whether the TagInfo is NULL */
-  bool IsNull() { return false; }
-
-  /** Set the TagInfo to NULL */
-  void SetNull() {}
-
-  /** Destroy all allocated data */
-  void shm_destroy_main();
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_METADATA_TYPES_H_
diff --git a/src/prefetcher.cc b/src/prefetcher.cc
deleted file mode 100644
index 364d31ead..000000000
--- a/src/prefetcher.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "prefetcher.h"
-#include "hermes.h"
-#include "prefetcher_factory.h"
-#include <unordered_set>
-
-namespace hermes {
-
-/** Initialize each candidate prefetcher, including trace info */
-void Prefetcher::Init() {
-  mdm_ = &HERMES->mdm_;
-  rpc_ = &HERMES->rpc_;
-  borg_ = &HERMES->borg_;
-  auto conf = HERMES->server_config_;
-
-  // Make sure that prefetcher is enabled
-  is_enabled_ = conf.prefetcher_.enabled_;
-  mdm_->enable_io_tracing_ = is_enabled_;
-  if (!is_enabled_) {
-    return;
-  }
-
-  // Info needed per-client and server
-  mdm_->is_mpi_ = conf.prefetcher_.is_mpi_;
-  if (HERMES->mode_ == HermesType::kClient) {
-    // NOTE(llogan): prefetcher runs only on daemon as thread
-    return;
-  }
-
-  // Create the binary log
-  if (conf.prefetcher_.trace_path_.empty()) {
-    log_.Init("", MEGABYTES(64));
-  } else {
-    log_.Init(conf.prefetcher_.trace_path_ + std::to_string(rpc_->node_id_),
-              MEGABYTES(64));
-  }
-
-  // Set the epoch
-  epoch_ms_ = (double)conf.prefetcher_.epoch_ms_;
-
-  // Spawn the prefetcher thread
-  auto prefetcher = [](void *args) {
-    HILOG(kDebug, "Prefetcher has started")
-    (void) args;
-    Prefetcher *prefetch = &HERMES->prefetch_;
-    while (HERMES_THREAD_MANAGER->Alive()) {
-      prefetch->Run();
-      tl::thread::self().sleep(*HERMES->rpc_.server_engine_,
-                               prefetch->epoch_ms_);
-    }
-    prefetch->log_.Flush(true);
-    HILOG(kDebug, "Prefetcher has stopped")
-  };
-  HERMES_THREAD_MANAGER->Spawn(prefetcher);
-}
-
-/** Finalize the prefetcher thread */
-void Prefetcher::Finalize()  {
-}
-
-/** Parse the MDM's I/O pattern log */
-void Prefetcher::Run() {
-  // Get the set of buckets + Ingest log
-  std::unordered_set<TagId> tags;
-  IoStat entry;
-  while (!mdm_->io_pattern_log_->pop(entry).IsNull()) {
-    log_.AppendEntry(entry);
-    tags.emplace(entry.tag_id_);
-  }
-
-  // Enact the prefetchers for each bucket
-  for (auto &bkt_id : tags) {
-    std::vector<Trait*> traits = HERMES->GetTraits(bkt_id);
-    for (auto trait : traits) {
-      if (trait->header_->flags_.Any(HERMES_TRAIT_PREFETCHER)) {
-        auto *trait_hdr =
-          trait->GetHeader<hermes::PrefetcherTraitHeader>();
-        auto *policy = PrefetcherFactory::Get(trait_hdr->type_);
-        policy->Prefetch(borg_, log_);
-      }
-    }
-  }
-
-  log_.Flush(false);
-}
-
-}  // namespace hermes
diff --git a/src/prefetcher.h b/src/prefetcher.h
deleted file mode 100644
index 2904d53ab..000000000
--- a/src/prefetcher.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_PREFETCHER_H_
-#define HERMES_SRC_PREFETCHER_H_
-
-#include "hermes_types.h"
-#include "thread_manager.h"
-#include "metadata_manager.h"
-#include "rpc.h"
-#include "binlog.h"
-#include <list>
-#include "traits/prefetcher/prefetcher_header.h"
-
-namespace hermes {
-
-class Prefetcher {
- public:
-  std::vector<std::list<IoTrace>> trace_;
-  std::vector<std::list<IoTrace>::iterator> trace_off_;
-  MetadataManager *mdm_;
-  RPC_TYPE *rpc_;
-  BufferOrganizer *borg_;
-  tl::engine *engine;            /**< Argobots execution engine */
-  double epoch_ms_;              /**< Milliseconds to sleep */
-  bool is_enabled_;              /**< Whether the prefetcher is enabled */
-  BinaryLog<IoStat> log_;
-
- public:
-  /** Initialize each candidate prefetcher, including trace info */
-  void Init();
-
-  /** Finalize the prefetcher thread */
-  void Finalize();
-
-  /** Parse the MDM's I/O pattern log */
-  void Run();
-};
-
-class PrefetcherPolicy {
- public:
-  /** Utilize the I/O pattern log to make prefetching decisions */
-  virtual void Prefetch(BufferOrganizer *borg, BinaryLog<IoStat> &log) = 0;
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_PREFETCHER_H_
diff --git a/src/prefetcher/apriori_prefetcher.cc b/src/prefetcher/apriori_prefetcher.cc
deleted file mode 100644
index e6fd3999b..000000000
--- a/src/prefetcher/apriori_prefetcher.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "apriori_prefetcher.h"
-#include "hermes.h"
-
-namespace hermes {
-
-/** Constructor. Parse YAML schema. */
-AprioriPrefetcher::AprioriPrefetcher() {
-  auto &path = HERMES->server_config_.prefetcher_.apriori_schema_path_;
-  auto real_path = hshm::ConfigParse::ExpandPath(path);
-  HILOG(kDebug, "Start load apriori schema {}", real_path)
-  try {
-    YAML::Node yaml_conf = YAML::LoadFile(real_path);
-    ParseSchema(yaml_conf);
-    HILOG(kDebug, "Complete load of apriori schema {}", real_path)
-  } catch (std::exception &e) {
-    HELOG(kFatal, e.what())
-  }
-}
-
-void ParseList(std::vector<std::string> &list, YAML::Node node) {
-  list.reserve(node.size());
-  for (YAML::Node sub_node : node) {
-    list.emplace_back(sub_node.as<std::string>());
-  }
-}
-
-/** Parse YAML schema. */
-void AprioriPrefetcher::ParseSchema(YAML::Node &schema) {
-  rank_info_.resize(schema.size());
-  for (const auto &rank_node_pair : schema) {
-    const YAML::Node& rank_node = rank_node_pair.first;
-    const YAML::Node& rank_instrs = rank_node_pair.second;
-    int rank = rank_node.as<int>();
-    auto &instr_list = rank_info_[rank];
-    for (YAML::Node instr_list_node : rank_instrs) {
-      instr_list.emplace_back();
-      auto &instr = instr_list.back();
-      YAML::Node op_count_range_node = instr_list_node["op_count_range"];
-      instr.min_op_count_ = op_count_range_node[0].as<size_t>();
-      instr.max_op_count_ = op_count_range_node[1].as<size_t>();
-      for (YAML::Node instr_node : instr_list_node["prefetch"]) {
-        instr.promotes_.emplace_back();
-        auto &promote = instr.promotes_.back();
-        promote.bkt_name_ = instr_node["bucket"].as<std::string>();
-        ParseList(promote.promote_, instr_node["promote_blobs"]);
-        ParseList(promote.demote_, instr_node["demote_blobs"]);
-      }
-    }
-  }
-}
-
-/** Prefetch based on YAML schema */
-void AprioriPrefetcher::Prefetch(BufferOrganizer *borg,
-                                 BinaryLog<IoStat> &log) {
-  for (size_t rank = 0; rank < rank_info_.size(); ++rank) {
-    size_t num_ops = log.GetRankLogSize((int)rank);
-    auto &instr_list = rank_info_[rank];
-
-    // Find the instruction to execute for this rank
-    auto begin = instr_list.begin();
-    auto cur = begin;
-    for (; cur != instr_list.end(); ++cur) {
-      auto &instr = *cur;
-      if (instr.min_op_count_ <= num_ops && instr.max_op_count_ <= num_ops) {
-        break;
-      }
-    }
-
-    // First, demote blobs
-    if (cur != instr_list.end()) {
-      auto &instr = *cur;
-      for (auto &promote_instr : instr.promotes_) {
-        for (auto &blob_name : promote_instr.demote_) {
-          borg->GlobalOrganizeBlob(promote_instr.bkt_name_,
-                                   blob_name, 0);
-        }
-      }
-
-      // Next, promote blobs
-      for (auto &promote_instr : instr.promotes_) {
-        for (auto &blob_name : promote_instr.promote_) {
-          borg->GlobalOrganizeBlob(promote_instr.bkt_name_,
-                                   blob_name, 1);
-        }
-      }
-    }
-
-    // Erase unneeded logs
-    instr_list.erase(begin, cur);
-  }
-}
-
-}  // namespace hermes
diff --git a/src/prefetcher/apriori_prefetcher.h b/src/prefetcher/apriori_prefetcher.h
deleted file mode 100644
index ef5ec3e4b..000000000
--- a/src/prefetcher/apriori_prefetcher.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_PREFETCHER_APRIORI_PREFETCHER_H_
-#define HERMES_SRC_PREFETCHER_APRIORI_PREFETCHER_H_
-
-#include "prefetcher.h"
-#include <vector>
-
-namespace hermes {
-
-struct AprioriPromoteInstr {
-  std::string bkt_name_;
-  std::vector<std::string> promote_;
-  std::vector<std::string> demote_;
-};
-
-struct AprioriPrefetchInstr {
-  size_t min_op_count_;
-  size_t max_op_count_;
-  std::vector<AprioriPromoteInstr> promotes_;
-};
-
-class AprioriPrefetcher : public PrefetcherPolicy {
- public:
-  std::vector<std::list<AprioriPrefetchInstr>> rank_info_;
-
- public:
-  /** Constructor. Parse YAML schema. */
-  AprioriPrefetcher();
-
-  /** Parse YAML config */
-  void ParseSchema(YAML::Node &schema);
-
-  /** Destructor. */
-  virtual ~AprioriPrefetcher() = default;
-
-  /** Prefetch based on YAML schema */
-  void Prefetch(BufferOrganizer *borg, BinaryLog<IoStat> &log);
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_PREFETCHER_APRIORI_PREFETCHER_H_
diff --git a/src/prefetcher_factory.h b/src/prefetcher_factory.h
deleted file mode 100644
index 82e9371b5..000000000
--- a/src/prefetcher_factory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_PREFETCHER_FACTORY_H_
-#define HERMES_SRC_PREFETCHER_FACTORY_H_
-
-#include "prefetcher.h"
-#include "prefetcher/apriori_prefetcher.h"
-
-namespace hermes {
-
-using hermes::PrefetcherType;
-
-/**
- * A class to represent Data Placement Engine Factory
- * */
-class PrefetcherFactory {
- public:
-  /**
-   * return a pointer to prefetcher policy given a policy type.
-   * This uses factory pattern.
-   *
-   * @param[in] type a prefetcher policy type
-   * @return pointer to PrefetcherPolicy
-   */
-  static PrefetcherPolicy* Get(const PrefetcherType &type) {
-    switch (type) {
-      case PrefetcherType::kApriori: {
-        return hshm::EasySingleton<AprioriPrefetcher>::GetInstance();
-      }
-      default: {
-        HELOG(kFatal, "PlacementPolicy not implemented")
-        return NULL;
-      }
-    }
-  }
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_PREFETCHER_FACTORY_H_
diff --git a/src/rpc.cc b/src/rpc.cc
deleted file mode 100644
index 7403a9a14..000000000
--- a/src/rpc.cc
+++ /dev/null
@@ -1,210 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "rpc.h"
-#include "hermes.h"
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#include <functional>
-#include <iostream>
-#include <fstream>
-
-namespace hermes {
-
-/** parse hostfile */
-std::vector<std::string> RpcContext::ParseHostfile(const std::string &path) {
-  std::vector<std::string> hosts;
-  std::ifstream file(path);
-  if (file.is_open()) {
-    std::string line;
-    while (std::getline(file, line)) {
-      hshm::ConfigParse::ParseHostNameString(line, hosts);
-    }
-    file.close();
-  } else {
-    HELOG(kFatal, "Could not open the hostfile: {}", path)
-  }
-  return hosts;
-}
-
-/**
- * initialize host info list
- * Requires the MetadataManager to be initialized.
- * */
-void RpcContext::InitRpcContext() {
-  config_ = &HERMES->server_config_;
-  mdm_ = &HERMES->mdm_;
-  port_ = config_->rpc_.port_;
-  mode_ = HERMES->mode_;
-  if (hosts_.size()) { return; }
-  // Uses hosts produced by host_names
-  auto &hosts = config_->rpc_.host_names_;
-  // Load hosts from hostfile
-  if (!config_->rpc_.host_file_.empty()) {
-    hosts = ParseHostfile(config_->rpc_.host_file_);
-  }
-
-  // Get all host info
-  hosts_.reserve(hosts.size());
-  for (const auto& name : hosts) {
-    hosts_.emplace_back(name, _GetIpAddress(name));
-  }
-
-  // Get id of current host
-  if (HERMES->mode_ == HermesType::kServer) {
-    node_id_ = _FindThisHost();
-  } else {
-    node_id_ = mdm_->header_->node_id_;
-  }
-  if (node_id_ == 0 || node_id_ > (i32)hosts_.size()) {
-    HELOG(kFatal, "Couldn't identify this host.")
-  }
-}
-
-/** Check if we should skip an RPC and call a function locally */
-bool RpcContext::ShouldDoLocalCall(i32 node_id) {
-  switch (mode_) {
-    case HermesType::kClient: {
-      return false;
-    }
-    case HermesType::kServer: {
-      return node_id == node_id_;
-    }
-    default: {
-      HELOG(kFatal, "Invalid HermesType.")
-      exit(1);
-    }
-  }
-}
-
-/** get RPC address */
-std::string RpcContext::GetRpcAddress(i32 node_id, int port) {
-  std::string result = config_->rpc_.protocol_ + "://";
-  if (!config_->rpc_.domain_.empty()) {
-    result += config_->rpc_.domain_ + "/";
-  }
-  std::string host_name = GetHostNameFromNodeId(node_id);
-  result += host_name + ":" + std::to_string(port);
-  return result;
-}
-
-/** Get RPC address for this node */
-std::string RpcContext::GetMyRpcAddress() {
-  return GetRpcAddress(node_id_, port_);
-}
-
-/** get host name from node ID */
-std::string RpcContext::GetHostNameFromNodeId(i32 node_id) {
-  // NOTE(llogan): node_id 0 is reserved as the NULL node
-  if (node_id <= 0 || node_id > (i32)hosts_.size()) {
-    HELOG(kFatal, "Attempted to get from node {}, which is out of "
-          "the range 1-{}", node_id, hosts_.size() + 1)
-  }
-  u32 index = node_id - 1;
-  return hosts_[index].hostname_;
-}
-
-/** get host name from node ID */
-std::string RpcContext::GetIpAddressFromNodeId(i32 node_id) {
-  // NOTE(llogan): node_id 0 is reserved as the NULL node
-  if (node_id <= 0 || node_id > (i32)hosts_.size()) {
-    HELOG(kFatal, "Attempted to get from node {}, which is out of "
-          "the range 1-{}", node_id, hosts_.size() + 1)
-  }
-  u32 index = node_id - 1;
-  return hosts_[index].ip_addr_;
-}
-
-/** Get RPC protocol */
-std::string RpcContext::GetProtocol() {
-  return config_->rpc_.protocol_;
-}
-
-/** Get the node ID of this machine according to hostfile */
-int RpcContext::_FindThisHost() {
-  int node_id = 1;
-  for (HostInfo &host : hosts_) {
-    if (_IsAddressLocal(host.ip_addr_)) {
-      return node_id;
-    }
-    ++node_id;
-  }
-  HELOG(kFatal, "Could not identify this host");
-  return -1;
-}
-
-/** Check if an IP address is local to this machine */
-bool RpcContext::_IsAddressLocal(const std::string &addr) {
-  struct ifaddrs* ifAddrList = nullptr;
-  bool found = false;
-
-  if (getifaddrs(&ifAddrList) == -1) {
-    perror("getifaddrs");
-    return false;
-  }
-
-  for (struct ifaddrs* ifAddr = ifAddrList;
-       ifAddr != nullptr; ifAddr = ifAddr->ifa_next) {
-    if (ifAddr->ifa_addr == nullptr ||
-        ifAddr->ifa_addr->sa_family != AF_INET) {
-      continue;
-    }
-
-    struct sockaddr_in* sin =
-        reinterpret_cast<struct sockaddr_in*>(ifAddr->ifa_addr);
-    char ipAddress[INET_ADDRSTRLEN] = {0};
-    inet_ntop(AF_INET, &(sin->sin_addr), ipAddress, INET_ADDRSTRLEN);
-
-    if (addr == ipAddress) {
-      found = true;
-      break;
-    }
-  }
-
-  freeifaddrs(ifAddrList);
-  return found;
-}
-
-/** Get IPv4 address from the host with "host_name" */
-std::string RpcContext::_GetIpAddress(const std::string &host_name) {
-  struct hostent hostname_info = {};
-  struct hostent *hostname_result;
-  int hostname_error = 0;
-  char hostname_buffer[4096] = {};
-#ifdef __APPLE__
-  hostname_result = gethostbyname(host_name.c_str());
-  in_addr **addr_list = (struct in_addr **)hostname_result->h_addr_list;
-#else
-  int gethostbyname_result =
-      gethostbyname_r(host_name.c_str(), &hostname_info, hostname_buffer,
-                      4096, &hostname_result, &hostname_error);
-  if (gethostbyname_result != 0) {
-    HELOG(kFatal, hstrerror(h_errno))
-  }
-  in_addr **addr_list = (struct in_addr **)hostname_info.h_addr_list;
-#endif
-  if (!addr_list[0]) {
-    HELOG(kFatal, hstrerror(h_errno))
-  }
-
-  char ip_address[INET_ADDRSTRLEN] = {0};
-  const char *inet_result =
-      inet_ntop(AF_INET, addr_list[0], ip_address, INET_ADDRSTRLEN);
-  if (!inet_result) {
-    perror("inet_ntop");
-    HELOG(kFatal, "inet_ntop failed");
-  }
-  return ip_address;
-}
-
-}  // namespace hermes
diff --git a/src/rpc.h b/src/rpc.h
deleted file mode 100644
index 0e591b325..000000000
--- a/src/rpc.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_RPC_H_
-#define HERMES_RPC_H_
-
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-
-#include <string>
-#include <vector>
-
-#include "hermes_types.h"
-#include "decorator.h"
-#include "config_server.h"
-#include "utils.h"
-#include "thread_manager.h"
-
-namespace hermes::api {
-class Hermes;
-}  // namespace hermes::api
-
-namespace hermes {
-
-class MetadataManager;
-using api::Hermes;
-
-/** RPC types */
-enum class RpcType {
-  kThallium
-};
-
-/** Uniquely identify a host machine */
-struct HostInfo {
-  i32 node_id_;           /**< Hermes-assigned node id */
-  std::string hostname_;  /**< Host name */
-  std::string ip_addr_;   /**< Host IP address */
-
-  HostInfo() = default;
-  explicit HostInfo(const std::string &hostname, const std::string &ip_addr)
-      : hostname_(hostname), ip_addr_(ip_addr) {}
-};
-
-/** A structure to represent RPC context. */
-class RpcContext {
- public:
-  ServerConfig *config_;
-  MetadataManager *mdm_;
-  int port_;  /**< port number */
-  i32 node_id_; /**< the ID of this node*/
-  std::vector<HostInfo> hosts_; /**< Hostname and ip addr per-node */
-  HermesType mode_; /**< The current mode hermes is executing in */
-
- public:
-  RpcContext() = default;
-
-  /** Parse a hostfile */
-  static std::vector<std::string> ParseHostfile(const std::string &path);
-
-  /** initialize host info list */
-  void InitRpcContext();
-
-  /** Check if we should skip an RPC and call a function locally */
-  bool ShouldDoLocalCall(i32 node_id);
-
-  /** get RPC address */
-  std::string GetRpcAddress(i32 node_id, int port);
-
-  /** Get RPC address for this node */
-  std::string GetMyRpcAddress();
-
-  /** get host name from node ID */
-  std::string GetHostNameFromNodeId(i32 node_id);
-
-  /** get host name from node ID */
-  std::string GetIpAddressFromNodeId(i32 node_id);
-
-  /** Get RPC protocol */
-  std::string GetProtocol();
-
- private:
-  /** Get the node ID of this machine according to hostfile */
-  int _FindThisHost();
-
-  /** Check if an IP address is local */
-  bool _IsAddressLocal(const std::string &addr);
-
-  /** Get IPv4 address from the host with "host_name" */
-  std::string _GetIpAddress(const std::string &host_name);
-
- public:
-  virtual void InitServer() = 0;
-  virtual void InitClient() = 0;
-};
-
-}  // namespace hermes
-
-
-/** Decide the node to send an RPC based on a UniqueId template */
-#define UNIQUE_ID_TO_NODE_ID_LAMBDA \
-  [](auto &&param) { return param.GetNodeId(); }
-
-/** Decide the node to send an RPC based on a std::string */
-#define STRING_HASH_LAMBDA \
-  [this](auto &&param) {   \
-    auto hash = std::hash<std::string>{}(param); \
-    hash %= this->rpc_->hosts_.size(); \
-    return hash + 1; \
-  }
-
-/** Decide the node to send an RPC based on serialized trait parameters */
-#define TRAIT_PARAMS_HASH_LAMBDA \
-  [this](auto &&param) { \
-      TraitHeader *hdr = reinterpret_cast<TraitHeader*>(param.data()); \
-      std::string trait_uuid = hdr->trait_uuid_; \
-      auto hash = std::hash<std::string>{}(trait_uuid); \
-      hash %= this->rpc_->hosts_.size(); \
-      return hash + 1; \
-    }
-
-/** A helper to test RPCs in hermes */
-#ifdef HERMES_ONLY_RPC
-#define NODE_ID_IS_LOCAL(node_id) false
-#else
-#define NODE_ID_IS_LOCAL(node_id) (node_id) == (rpc_->node_id_)
-#endif
-
-/**
- * For a function which need to be called as an RPC,
- * this will create the global form of that function.
- *
- * E.g., let's say you have a function:
- * BlobId LocalGetBlobId(std::string name)
- *
- * @param RET the return value of the RPC
- * @param BaseName the base of the function name. E.g., GetBlobId()
- * @param tuple_idx the offset of the parameter in the function prototype to
- * determine where to send the RPC. E.g., 0 -> std::string name
- * @param hashfn the hash function used to actually compute the node id.
- * E.g., STRING_HASH_LAMBDA
- * */
-#define DEFINE_RPC(RET, BaseName, tuple_idx, hashfn)\
-  template<typename ...Args>\
-  TYPE_UNWRAP(RET) Global##BaseName(Args&& ...args) {\
-    if constexpr(std::is_same_v<TYPE_UNWRAP(RET), void>) {\
-      _Global##BaseName(\
-          hshm::make_argpack(std::forward<Args>(args)...));\
-    } else {\
-      return _Global##BaseName(\
-          hshm::make_argpack(std::forward<Args>(args)...));\
-    }\
-  }\
-  template<typename ArgPackT>\
-  TYPE_UNWRAP(RET) _Global##BaseName(ArgPackT &&pack) {\
-    i32 node_id = hashfn(pack.template              \
-                         Forward<tuple_idx>()); \
-    if (NODE_ID_IS_LOCAL(node_id)) {\
-      if constexpr(std::is_same_v<TYPE_UNWRAP(RET), void>) {\
-        hshm::PassArgPack::Call(\
-            std::forward<ArgPackT>(pack), \
-            [this](auto &&...args) constexpr {\
-              this->Local##BaseName(std::forward<decltype(args)>(args)...);\
-            });\
-      } else {\
-        return hshm::PassArgPack::Call(\
-            std::forward<ArgPackT>(pack), \
-            [this](auto &&...args) constexpr {\
-              return this->Local##BaseName( \
-                  std::forward<decltype(args)>(args)...);\
-            });\
-      } \
-    } else { \
-      return hshm::PassArgPack::Call( \
-          std::forward<ArgPackT>(pack), \
-          [this, node_id](auto&& ...args) constexpr { \
-            if constexpr(std::is_same_v<TYPE_UNWRAP(RET), void>) { \
-              this->rpc_->Call<TYPE_UNWRAP(RET)>( \
-                  node_id, "Rpc" #BaseName, \
-                  std::forward<decltype(args)>(args)...); \
-            } else { \
-              return this->rpc_->Call<TYPE_UNWRAP(RET)>( \
-                  node_id, "Rpc" #BaseName, \
-                  std::forward<decltype(args)>(args)...); \
-            } \
-          }); \
-    } \
-  }
-#include "rpc_factory.h"
-
-#endif  // HERMES_RPC_H_
diff --git a/src/rpc_factory.h.in b/src/rpc_factory.h.in
deleted file mode 100644
index 76cc7ae74..000000000
--- a/src/rpc_factory.h.in
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Created by lukemartinlogan on 12/4/22.
-//
-
-#ifndef HERMES_SRC_RPC_FACTORY_H_
-#define HERMES_SRC_RPC_FACTORY_H_
-
-#ifndef @CMAKE_HERMES_RPC_TYPE@
-#define @CMAKE_HERMES_RPC_TYPE@
-#endif
-
-#if defined(HERMES_RPC_THALLIUM)
-#include "rpc_thallium.h"
-#define RPC_TYPE ThalliumRpc
-#else
-#error "RPC implementation required (e.g., -DHERMES_RPC_THALLIUM)."
-#endif
-
-#endif  // HERMES_SRC_RPC_FACTORY_H_
diff --git a/src/rpc_thallium.cc b/src/rpc_thallium.cc
deleted file mode 100644
index 45c2d5e9d..000000000
--- a/src/rpc_thallium.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <string>
-
-#include "hermes.h"
-#include "metadata_manager.h"
-#include "rpc_thallium.h"
-#include "hermes_shm/util/singleton.h"
-#include "prefetcher.h"
-#include <fstream>
-
-namespace tl = thallium;
-
-namespace hermes {
-
-/** start Thallium RPC server */
-void ThalliumRpc::InitServer() {
-  HILOG(kInfo, "Initializing RPC server");
-  InitRpcContext();
-  std::string addr = GetMyRpcAddress();
-  HILOG(kInfo, "Attempting to start server on: {}", addr);
-  try {
-    server_engine_ = std::make_unique<tl::engine>(
-        addr, THALLIUM_SERVER_MODE, true, config_->rpc_.num_threads_);
-  } catch (std::exception &e) {
-    HELOG(kFatal, "RPC init failed for host: {}\n{}", addr, e.what());
-  }
-  std::string rpc_server_name = server_engine_->self();
-  HILOG(kInfo, "Serving {} (i.e., {}) with {} RPC threads as node id {}",
-        rpc_server_name,
-        addr,
-        config_->rpc_.num_threads_,
-        node_id_);
-  DefineRpcs();
-}
-
-/** initialize RPC clients */
-void ThalliumRpc::InitClient()  {
-  InitRpcContext();
-  std::string protocol = GetProtocol();
-  client_engine_ = std::make_unique<tl::engine>(protocol,
-                              THALLIUM_CLIENT_MODE,
-                              true, 1);
-  HILOG(kInfo, "This client is on node {} (i.e., {})",
-        node_id_, GetHostNameFromNodeId(node_id_));
-}
-
-/** run daemon */
-void ThalliumRpc::RunDaemon() {
-  server_engine_->enable_remote_shutdown();
-  auto prefinalize_callback = [this]() {
-    HILOG(kInfo, "Beginning finalization on node: {}", this->node_id_);
-    this->Finalize();
-    HILOG(kInfo, "Finished finalization on node: {}", this->node_id_);
-  };
-
-  // TODO(llogan): add config param to do this
-  std::ofstream daemon_started_fs;
-  daemon_started_fs.open("/tmp/hermes_daemon_log.txt");
-  daemon_started_fs << HERMES_SYSTEM_INFO->pid_;
-  daemon_started_fs.close();
-  HILOG(kInfo, "Running the daemon on node: {}", node_id_);
-
-  server_engine_->push_prefinalize_callback(prefinalize_callback);
-  server_engine_->wait_for_finalize();
-  HILOG(kInfo, "Daemon has stopped on node: {}", node_id_);
-}
-
-/** stop daemon (from client) */
-void ThalliumRpc::StopDaemon() {
-  try {
-    for (i32 node_id = 1; node_id < (int)hosts_.size() + 1; ++node_id) {
-      HILOG(kInfo, "Sending stop signal to: {}", node_id);
-      std::string server_name = GetServerName(node_id);
-      tl::endpoint server = client_engine_->lookup(server_name.c_str());
-      client_engine_->shutdown_remote_engine(server);
-    }
-  } catch (std::exception &e) {
-    HELOG(kFatal, e.what());
-  }
-}
-
-/** get server name */
-std::string ThalliumRpc::GetServerName(i32 node_id) {
-  std::string ip_address = GetIpAddressFromNodeId(node_id);
-  return config_->rpc_.protocol_ + "://" +
-         std::string(ip_address) +
-         ":" + std::to_string(config_->rpc_.port_);
-}
-
-/** finalize RPC context */
-void ThalliumRpc::Finalize() {
-  switch (mode_) {
-    case HermesType::kServer: {
-      HILOG(kInfo, "Stopping (server mode)");
-      // NOTE(llogan): HERMES->Flush() is called in finalize_hermes to avoid
-      // margo exception.
-      HERMES_THREAD_MANAGER->Join();
-      HERMES->prefetch_.Finalize();
-      // NOTE(llogan): Don't use finalize with unique_ptr. finalize() is
-      // called in the destructor of the tl::enigne, and will segfault if
-      // called twice.
-
-      // server_engine_->finalize()
-      // client_engine_->finalize()
-      break;
-    }
-    case HermesType::kClient: {
-      HILOG(kInfo, "Stopping (client mode)");
-      HERMES_THREAD_MANAGER->Join();
-      // NOTE(llogan): Don't use finalize with unique_ptr. finalize() is
-      // called in the destructor of the tl::enigne, and will segfault if
-      // called twice.
-
-      // client_engine_.release();
-      break;
-    }
-    default: {
-      throw std::logic_error("Invalid Hermes initialization type");
-    }
-  }
-}
-
-}  // namespace hermes
diff --git a/src/rpc_thallium.h b/src/rpc_thallium.h
deleted file mode 100644
index 5cb5dc4a0..000000000
--- a/src/rpc_thallium.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_RPC_THALLIUM_H_
-#define HERMES_RPC_THALLIUM_H_
-
-#include <thallium.hpp>
-#include "rpc_thallium_serialization.h"
-#include "config.h"
-#include "utils.h"
-#include "hermes_shm/data_structures/serialization/thallium.h"
-
-#include "rpc.h"
-
-namespace tl = thallium;
-
-namespace hermes {
-
-/**
-   A structure to represent Thallium state
-*/
-class ThalliumRpc  : public RpcContext {
- public:
-  std::atomic<bool> kill_requested_; /**< is kill requested? */
-  std::unique_ptr<tl::engine> client_engine_; /**< pointer to client engine */
-  std::unique_ptr<tl::engine> server_engine_; /**< pointer to server engine */
-
-  /** initialize RPC context  */
-  ThalliumRpc() : RpcContext() {}
-
-  void InitServer() override;
-  void InitClient() override;
-  void Finalize();
-  void RunDaemon();
-  void StopDaemon();
-  std::string GetServerName(i32 node_id);
-
-  template<typename RpcLambda>
-  void RegisterRpc(const char *name, RpcLambda &&lambda) {
-    server_engine_->define(name, std::forward<RpcLambda>(lambda));
-  }
-
-  /** RPC call */
-  template <typename ReturnType, typename... Args>
-  ReturnType Call(i32 node_id, const char *func_name, Args&&... args) {
-    HILOG(kDebug, "Calling {} {} -> {}", func_name, node_id_, node_id)
-    try {
-      std::string server_name = GetServerName(node_id);
-      tl::remote_procedure remote_proc = client_engine_->define(func_name);
-      tl::endpoint server = client_engine_->lookup(server_name);
-      HILOG(kDebug, "Found the server: {}", server_name)
-      if constexpr (std::is_same<ReturnType, void>::value) {
-        remote_proc.disable_response();
-        remote_proc.on(server)(std::forward<Args>(args)...);
-      } else {
-        ReturnType result = remote_proc.on(server)(std::forward<Args>(args)...);
-        return result;
-      }
-    } catch (tl::margo_exception &err) {
-      HELOG(kFatal, "Thallium failed on function: {}\n{}",
-            func_name, err.what())
-      exit(1);
-    }
-  }
-
-  /** I/O transfers */
-  template<typename ReturnType, typename ...Args>
-  ReturnType IoCall(i32 node_id, const char *func_name,
-                    IoType type, char *data, size_t size, Args&& ...args) {
-    HILOG(kDebug, "Calling {} {} -> {}", func_name, node_id_, node_id)
-    std::string server_name = GetServerName(node_id);
-    tl::bulk_mode flag;
-    switch (type) {
-      case IoType::kRead: {
-        // The "bulk" object will be modified
-        flag = tl::bulk_mode::write_only;
-        break;
-      }
-      case IoType::kWrite: {
-        // The "bulk" object will only be read from
-        flag = tl::bulk_mode::read_only;
-        break;
-      }
-      case IoType::kNone: {
-        // TODO(llogan)
-        HELOG(kFatal, "Cannot have none I/O type")
-        exit(1);
-      }
-    }
-
-    tl::remote_procedure remote_proc = client_engine_->define(func_name);
-    tl::endpoint server = client_engine_->lookup(server_name);
-
-    std::vector<std::pair<void*, size_t>> segments(1);
-    segments[0].first  = data;
-    segments[0].second = size;
-
-    tl::bulk bulk = client_engine_->expose(segments, flag);
-    if constexpr(std::is_same_v<ReturnType, void>) {
-      remote_proc.on(server)(bulk, std::forward<Args>(args)...);
-    } else {
-      return remote_proc.on(server)(bulk, std::forward<Args>(args)...);
-    }
-  }
-
-  /** Io transfer at the server */
-  size_t IoCallServer(const tl::request &req, tl::bulk &bulk,
-                      IoType type, char *data, size_t size) {
-    tl::bulk_mode flag = tl::bulk_mode::write_only;
-    switch (type) {
-      case IoType::kRead: {
-        // The "local_bulk" object will only be read from
-        flag = tl::bulk_mode::read_only;
-        break;
-      }
-      case IoType::kWrite: {
-        // The "local_bulk" object will only be written to
-        flag = tl::bulk_mode::write_only;
-        break;
-      }
-      default: {
-        // NOTE(llogan): Avoids "uninitalized" warning
-        HELOG(kFatal, "Cannot have none I/O type")
-      }
-    }
-
-    tl::endpoint endpoint = req.get_endpoint();
-    std::vector<std::pair<void*, size_t>> segments(1);
-    segments[0].first  = data;
-    segments[0].second = size;
-    tl::bulk local_bulk = server_engine_->expose(segments, flag);
-    size_t io_bytes = 0;
-
-    switch (type) {
-      case IoType::kRead: {
-        // Read from "local_bulk" to "bulk"
-        io_bytes = bulk.on(endpoint) << local_bulk;
-        break;
-      }
-      case IoType::kWrite: {
-        // Write to "local_bulk" from "bulk"
-        io_bytes = bulk.on(endpoint) >> local_bulk;
-        break;
-      }
-      case IoType::kNone: {
-        HELOG(kFatal, "Cannot have none I/O type")
-      }
-    }
-    if (io_bytes != size) {
-      HELOG(kFatal, "Failed to perform bulk I/O thallium")
-    }
-    return io_bytes;
-  }
-
- private:
-  void DefineRpcs();
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_RPC_THALLIUM_H_
diff --git a/src/rpc_thallium_defs.cc b/src/rpc_thallium_defs.cc
deleted file mode 100644
index 7e647a789..000000000
--- a/src/rpc_thallium_defs.cc
+++ /dev/null
@@ -1,295 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "rpc_thallium.h"
-#include "metadata_manager.h"
-#include "rpc_thallium_serialization.h"
-#include "data_structures.h"
-
-#include "hermes.h"
-
-namespace hermes {
-
-using thallium::request;
-
-void ThalliumRpc::DefineRpcs() {
-  RPC_CLASS_INSTANCE_DEFS_START
-  MetadataManager *mdm = &HERMES->mdm_;
-  BufferPool *bpm = &HERMES->bpm_;
-  BufferOrganizer *borg = &HERMES->borg_;
-  RPC_CLASS_INSTANCE_DEFS_END
-
-  /**====================================
-   * Bucket Operations
-   * ===================================*/
-
-  RegisterRpc("RpcGetBucketSize", [mdm](const request &req,
-                                           TagId bkt_id) {
-    auto ret = mdm->LocalGetBucketSize(bkt_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcSetBucketSize", [mdm](const request &req,
-                                        TagId bkt_id,
-                                        size_t new_size) {
-    auto ret = mdm->LocalSetBucketSize(bkt_id, new_size);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcLockBucket", [mdm](const request &req,
-                                     TagId bkt_id,
-                                     MdLockType lock_type) {
-    auto ret = mdm->LocalLockBucket(bkt_id, lock_type);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcUnlockBucket", [mdm](const request &req,
-                                       TagId bkt_id,
-                                       MdLockType lock_type) {
-    auto ret = mdm->LocalUnlockBucket(bkt_id, lock_type);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcClearBucket", [mdm](const request &req,
-                                      TagId bkt_id) {
-    auto ret = mdm->LocalClearBucket(bkt_id);
-    req.respond(ret);
-  });
-
-  /**====================================
-   * Blob Operations
-   * ===================================*/
-
-  RegisterRpc("RpcPutBlobMetadata", [mdm](const request &req,
-                                          TagId bkt_id,
-                                          const std::string &blob_name,
-                                          size_t blob_size,
-                                          std::vector<BufferInfo> &buffers,
-                                          float score) {
-    auto ret = mdm->LocalPutBlobMetadata(bkt_id, blob_name,
-                                         blob_size, buffers, score);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcTryCreateBlob", [mdm](const request &req,
-                                        TagId bkt_id,
-                                        const std::string &blob_name) {
-    auto ret = mdm->LocalTryCreateBlob(bkt_id, blob_name);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcTagBlob", [mdm](const request &req,
-                                  BlobId blob_id,
-                                  TagId tag_id) {
-    auto ret = mdm->LocalTagBlob(blob_id, tag_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcBlobHasTag", [mdm](const request &req,
-                                     BlobId blob_id,
-                                     TagId tag_id) {
-    auto ret = mdm->LocalBlobHasTag(blob_id, tag_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetBlobId", [mdm](const request &req,
-                                    TagId bkt_id,
-                                    const std::string &blob_name) {
-    auto ret = mdm->LocalGetBlobId(bkt_id, blob_name);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetBlobName", [mdm](const request &req,
-                                      BlobId blob_id) {
-    auto ret = mdm->LocalGetBlobName(blob_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetBlobScore", [mdm](const request &req,
-                                      BlobId blob_id) {
-    auto ret = mdm->LocalGetBlobScore(blob_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcLockBlob", [mdm](const request &req,
-                                   BlobId blob_id,
-                                   MdLockType lock_type) {
-    auto ret = mdm->LocalLockBlob(blob_id, lock_type);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcUnlockBlob", [mdm](const request &req,
-                                     BlobId blob_id,
-                                     MdLockType lock_type) {
-    auto ret = mdm->LocalUnlockBlob(blob_id, lock_type);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetBlobBuffers", [mdm](const request &req,
-                                         BlobId blob_id) {
-    auto ret = mdm->LocalGetBlobBuffers(blob_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcRenameBlob", [mdm](const request &req,
-                                     TagId bkt_id,
-                                     BlobId blob_id,
-                                     const std::string &new_blob_name) {
-    auto ret = mdm->LocalRenameBlob(bkt_id, blob_id, new_blob_name);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcDestroyBlob", [mdm](const request &req,
-                                      TagId bkt_id,
-                                      BlobId blob_id) {
-    auto ret = mdm->LocalDestroyBlob(bkt_id, blob_id);
-    req.respond(ret);
-  });
-
-  /**====================================
-   * Target Operations
-   * ===================================*/
-
-  RegisterRpc("RpcUpdateTargetCapacity", [mdm](const request &req,
-                                               TargetId tid,
-                                               off64_t offset) {
-    mdm->LocalUpdateTargetCapacity(tid, offset);
-    req.respond(true);
-  });
-  RegisterRpc("RpcClear", [mdm](const request &req) {
-    mdm->LocalClear();
-    req.respond(true);
-  });
-
-  /**====================================
-   * Tag Operations
-   * ===================================*/
-
-  RegisterRpc("RpcGetOrCreateTag", [mdm](const request &req,
-                                         const std::string &tag_name,
-                                         bool owner,
-                                         std::vector<TraitId> &traits,
-                                         size_t backend_size) {
-    auto ret = mdm->LocalGetOrCreateTag(tag_name, owner, traits, backend_size);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetTagId", [mdm](const request &req,
-                                   std::string &tag_name) {
-    auto ret = mdm->LocalGetTagId(tag_name);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetTagName", [mdm](const request &req,
-                                     TagId tag) {
-    auto ret = mdm->LocalGetTagName(tag);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcRenameTag", [mdm](const request &req,
-                                    TagId tag,
-                                    const std::string &new_name) {
-    mdm->LocalRenameTag(tag, new_name);
-    req.respond(true);
-  });
-  RegisterRpc("RpcDestroyTag", [mdm](const request &req,
-                                     TagId tag) {
-    mdm->LocalDestroyTag(tag);
-    req.respond(true);
-  });
-  RegisterRpc("RpcTagAddBlob", [mdm](const request &req,
-                                     TagId tag_id,
-                                     BlobId blob_id) {
-    auto ret = mdm->LocalTagAddBlob(tag_id, blob_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcTagRemoveBlob", [mdm](const request &req,
-                                        TagId tag_id,
-                                        BlobId blob_id) {
-    auto ret = mdm->LocalTagRemoveBlob(tag_id, blob_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGroupByTag", [mdm](const request &req,
-                                     TagId tag_id) {
-    auto ret = mdm->LocalGroupByTag(tag_id);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcTagAddTrait", [mdm](const request &req,
-                                      TagId tag_id,
-                                      TraitId trait_id) {
-    mdm->LocalTagAddTrait(tag_id, trait_id);
-    req.respond(true);
-  });
-  RegisterRpc("RpcTagGetTraits", [mdm](const request &req,
-                                      TagId tag_id) {
-    auto ret = mdm->LocalTagGetTraits(tag_id);
-    req.respond(ret);
-  });
-
-  /**====================================
-   * Trait Operations
-   * ===================================*/
-
-  RegisterRpc("RpcRegisterTrait", [mdm](const request &req,
-                                        TraitId trait_id,
-                                        hshm::charbuf &trait_params) {
-    auto ret = mdm->LocalRegisterTrait(trait_id, trait_params);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetTraitId", [mdm](const request &req,
-                                       const std::string &trait_uuid) {
-    auto ret = mdm->LocalGetTraitId(trait_uuid);
-    req.respond(ret);
-  });
-  RegisterRpc("RpcGetTraitParams", [mdm](const request &req,
-                                         TraitId &trait_id) {
-    auto ret = mdm->LocalGetTraitParams(trait_id);
-    req.respond(ret);
-  });
-
-  /**====================================
-   * Buffer Pool Operations
-   * ===================================*/
-
-  RegisterRpc("RpcReleaseBuffers", [bpm](const request &req,
-                                         std::vector<BufferInfo> &buffers) {
-    bpm->LocalReleaseBuffers(buffers);
-    req.respond(true);
-  });
-  RegisterRpc("RpcAllocateAndSetBuffers", [this, bpm](
-                                              const request &req,
-                                              tl::bulk &bulk,
-                                              size_t blob_size,
-                                              PlacementSchema &schema) {
-    hapi::Blob blob(blob_size);
-    this->IoCallServer(req, bulk, IoType::kWrite, blob.data(),
-                       blob.size());
-    auto ret = bpm->LocalAllocateAndSetBuffers(schema, blob);
-    req.respond(ret);
-  });
-
-
-  /**====================================
-   * Buffer Organizer Operations
-   * ===================================*/
-
-  RegisterRpc("RpcWaitForFullFlush", [borg](const request &req) {
-    borg->LocalWaitForFullFlush();
-    req.respond(true);
-  });
-  RegisterRpc("RpcPlaceBlobInBuffers", [this, borg](
-                                           const request &req,
-                                           tl::bulk &bulk,
-                                           size_t blob_size,
-                                           std::vector<BufferInfo> &buffers) {
-    hapi::Blob blob(blob_size);
-    this->IoCallServer(req, bulk, IoType::kWrite, blob.data(), blob.size());
-    borg->LocalPlaceBlobInBuffers(blob, buffers);
-    req.respond(true);
-  });
-  RegisterRpc("RpcReadBlobFromBuffers", [this, borg](
-                                           const request &req,
-                                           tl::bulk &bulk,
-                                           size_t size,
-                                           std::vector<BufferInfo> &buffers) {
-    hapi::Blob blob(size);
-    borg->LocalReadBlobFromBuffers(blob, buffers);
-    this->IoCallServer(req, bulk, IoType::kRead, blob.data(), blob.size());
-    req.respond(true);
-  });
-
-  RPC_AUTOGEN_END
-}
-
-}  // namespace hermes
diff --git a/src/rpc_thallium_serialization.h b/src/rpc_thallium_serialization.h
deleted file mode 100644
index 07b52576a..000000000
--- a/src/rpc_thallium_serialization.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_RPC_THALLIUM_SERIALIZATION_H_
-#define HERMES_SRC_RPC_THALLIUM_SERIALIZATION_H_
-
-#include <thallium.hpp>
-#include <thallium/serialization/stl/pair.hpp>
-#include <thallium/serialization/stl/string.hpp>
-#include <thallium/serialization/stl/vector.hpp>
-#include <thallium/serialization/stl/list.hpp>
-
-#include "hermes_types.h"
-#include "adapter/adapter_types.h"
-#include "statuses.h"
-#include "metadata_types.h"
-#include "data_structures.h"
-#include "hermes_shm/data_structures/serialization/thallium.h"
-
-/** Lets thallium know how to serialize an enum */
-#define SERIALIZE_ENUM(T)\
-  template <typename A>\
-  void save(A &ar, T &mode) {\
-    int cast = static_cast<int>(mode);\
-    ar << cast;\
-  }\
-  template <typename A>\
-  void load(A &ar, T &mode) {\
-    int cast;\
-    ar >> cast;\
-    mode = static_cast<T>(cast);\
-  }
-
-namespace hermes {
-
-/**
- *  Lets Thallium know how to serialize a TagId.
- *
- * This function is called implicitly by Thallium.
- *
- * @param ar An archive provided by Thallium.
- * @param bucket_id The TagId to serialize.
- */
-template <typename A>
-void serialize(A &ar, TagId &tag_id) {
-  ar &tag_id.unique_;
-  ar &tag_id.node_id_;
-}
-
-/**
- *  Lets Thallium know how to serialize a BlobId.
- *
- * This function is called implicitly by Thallium.
- *
- * @param ar An archive provided by Thallium.
- * @param blob_id The BlobId to serialize.
- */
-template <typename A>
-void serialize(A &ar, BlobId &blob_id) {
-  ar &blob_id.unique_;
-  ar &blob_id.node_id_;
-}
-
-/**
- *  Lets Thallium know how to serialize a TraitId.
- *
- * This function is called implicitly by Thallium.
- *
- * @param ar An archive provided by Thallium.
- * @param blob_id The BlobId to serialize.
- */
-template <typename A>
-void serialize(A &ar, TraitId &trait_id) {
-  ar &trait_id.unique_;
-  ar &trait_id.node_id_;
-}
-
-/**
- *  Lets Thallium know how to serialize a TargetId.
- *
- * This function is called implicitly by Thallium.
- *
- * @param ar An archive provided by Thallium.
- * @param target_id The TargetId to serialize.
- */
-template <typename A>
-void serialize(A &ar, TargetId &target_id) {
-  ar &target_id.as_int_;
-}
-
-/**
- *  Lets Thallium know how to serialize a TargetId.
- *
- * This function is called implicitly by Thallium.
- *
- * @param ar An archive provided by Thallium.
- * @param target_id The TargetId to serialize.
- */
-template <typename A>
-void serialize(A &ar, BufferInfo &info) {
-  ar &info.tid_;
-  ar &info.t_off_;
-  ar &info.t_size_;
-  ar &info.blob_off_;
-  ar &info.blob_size_;
-}
-
-/** Lets thallium know how to serialize an MdLockType */
-SERIALIZE_ENUM(MdLockType)
-
-/** Lets thallium know how to serialize a SubPlacement */
-template <typename A>
-void serialize(A &ar, SubPlacement &plcmnt) {
-  ar &plcmnt.size_;
-  ar &plcmnt.tid_;
-}
-
-/** Lets thallium know how to serialize a PlacementSchema */
-template <typename A>
-void serialize(A &ar, PlacementSchema &schema) {
-  ar &schema.plcmnts_;
-}
-
-}  // namespace hermes
-
-namespace hermes::adapter {
-
-/** Lets thallium know how to serialize an AdapterMode */
-SERIALIZE_ENUM(AdapterMode)
-
-/** Lets thallium know how to serialize an AdapterType */
-SERIALIZE_ENUM(AdapterType)
-
-}  // namespace hermes::adapter
-
-namespace hermes::api {
-
-/** Lets thallium know how to serialize a Status */
-template <typename A>
-void save(A &ar, Status &status) {
-  ar << status.code_;
-}
-
-/** Lets thallium know how to deserialize a Status */
-template <typename A>
-void load(A &ar, Status &status) {
-  int code;
-  ar >> code;
-  status = HERMES_STATUS->Get(code);
-}
-
-/** Lets thallium know how to serialize a PlacementPolicy */
-SERIALIZE_ENUM(PlacementPolicy)
-
-}  // namespace hermes::api
-
-#endif  // HERMES_SRC_RPC_THALLIUM_SERIALIZATION_H_
diff --git a/src/statuses.h b/src/statuses.h
deleted file mode 100644
index e17866eb5..000000000
--- a/src/statuses.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_STATUSES_H_
-#define HERMES_SRC_STATUSES_H_
-
-#include "status.h"
-
-namespace hermes {
-
-using api::Status;
-
-class StatusTable {
- public:
-  std::vector<Status> table_;
-
- public:
-  StatusTable() {
-    table_.reserve(500);
-    Define(0, "The function was not implemented");
-    Define(100, "Placement failed. Non-fatal.");
-    Define(102, "DPE could not find solution for the minimize I/O time DPE");
-    Define(200, "Could not allocate the ram tier of storage in BPM");
-    Define(300, "The read exceeds the size of the backend's data (PartialGet)");
-    Define(301, "The read exceeds the size of the backend's data (PartialPut)");
-  }
-
-  void Define(int code, const char *msg) {
-    table_.emplace_back(code, msg);
-  }
-
-  Status Get(int code) {
-    return table_[code];
-  }
-};
-#define HERMES_STATUS \
-  hshm::EasySingleton<hermes::StatusTable>::GetInstance()
-#define HERMES_STATUS_T hermes::StatusTable*
-
-const Status NOT_IMPLEMENTED = HERMES_STATUS->Get(0);
-const Status DPE_PLACEMENT_SCHEMA_EMPTY = HERMES_STATUS->Get(100);
-const Status DPE_NO_SPACE = HERMES_STATUS->Get(101);
-const Status DPE_MIN_IO_TIME_NO_SOLUTION = HERMES_STATUS->Get(102);
-const Status BUFFER_POOL_OUT_OF_RAM = HERMES_STATUS->Get(200);
-const Status PARTIAL_GET_OR_CREATE_OVERFLOW = HERMES_STATUS->Get(300);
-const Status PARTIAL_PUT_OR_CREATE_OVERFLOW = HERMES_STATUS->Get(301);
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_STATUSES_H_
diff --git a/src/thread_manager.h b/src/thread_manager.h
deleted file mode 100644
index 0f7f98ef4..000000000
--- a/src/thread_manager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_THREAD_MANAGER_H_
-#define HERMES_SRC_THREAD_MANAGER_H_
-
-#include "hermes_types.h"
-#include <thallium.hpp>
-#include <future>
-
-namespace hermes {
-
-class ThreadManager {
- public:
-  ABT_xstream execution_stream_;      /**< Argobots execution stream */
-  std::atomic<bool> kill_requested_;  /**< Terminate threads spawned here */
-
- public:
-  /** Default constructor */
-  ThreadManager() : kill_requested_(false) {
-    int ret = ABT_xstream_create(ABT_SCHED_NULL, &execution_stream_);
-    if (ret != ABT_SUCCESS) {
-      HELOG(kFatal, "Could not create argobots xstream");
-    }
-  }
-
-  /** Spawn a for handling a function or lambda */
-  template<typename FuncT, typename ParamsT = void>
-  void Spawn(FuncT &&func, ParamsT *params = nullptr) {
-    int ret = ABT_thread_create_on_xstream(execution_stream_,
-                                 func, (void*)params,
-                                 ABT_THREAD_ATTR_NULL, NULL);
-    if (ret != ABT_SUCCESS) {
-      HELOG(kFatal, "Couldn't spawn worker");
-    }
-  }
-
-  /** Begin terminating threads */
-  void Join() {
-    kill_requested_.store(true);
-    ABT_xstream_join(execution_stream_);
-    ABT_xstream_free(&execution_stream_);
-  }
-
-  /** Whether the threads in this thread manager should still be executing */
-  bool Alive() {
-    return !kill_requested_.load();
-  }
-};
-
-}  // namespace hermes
-
-#define HERMES_THREAD_MANAGER \
-  hshm::EasySingleton<hermes::ThreadManager>::GetInstance()
-
-#endif  // HERMES_SRC_THREAD_MANAGER_H_
diff --git a/src/thread_pool.h b/src/thread_pool.h
deleted file mode 100644
index 3e1f2a366..000000000
--- a/src/thread_pool.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_THREAD_POOL_H_
-#define HERMES_THREAD_POOL_H_
-
-#include <condition_variable>
-#include <future>
-#include <mutex>
-#include <queue>
-#include <thread>
-
-namespace hermes {
-/**
-   A class to represent thread pool
- */
-class ThreadPool {
- private:
-  std::vector<std::thread> threads; /**< a vector of threads */
-  /** high-priority  queue */
-  mutable std::queue<std::packaged_task<void()>> queue_low;
-  /** low-priority queue */
-  mutable std::queue<std::packaged_task<void()>> queue_high;
-  mutable std::mutex mutex;                /**< mutex lock */
-  mutable std::condition_variable condvar; /**< conditional variable */
-
- public:
-  /** construct thread pool with \a num_threads number of threads */
-  explicit ThreadPool(
-      unsigned num_threads = std::thread::hardware_concurrency()) {
-    while (num_threads--) {
-      threads.emplace_back([this] {
-        while (true) {
-          std::unique_lock<std::mutex> lock(mutex);
-          condvar.wait(lock, [this]() {
-            return !queue_high.empty() || !queue_low.empty();
-          });
-          bool high_priority = !queue_high.empty();
-          auto task = high_priority ? std::move(queue_high.front())
-                                    : std::move(queue_low.front());
-          if (task.valid()) {
-            if (high_priority) {
-              queue_high.pop();
-            } else {
-              queue_low.pop();
-            }
-            lock.unlock();
-            // run the task - this cannot throw; any exception
-            // will be stored in the corresponding future
-            task();
-          } else {
-            // an empty task is used to signal end of stream
-            // don't pop it off the top; all threads need to see it
-            break;
-          }
-        }
-      });
-    }
-  }
-
-  /** a template for running thread pool */
-  template <typename F, typename R = std::result_of_t<F && ()>>
-  std::future<R> run(F&& f, bool high_priority = false) const {
-    auto task = std::packaged_task<R()>(std::forward<F>(f));
-    auto future = task.get_future();
-    {
-      std::lock_guard<std::mutex> lock(mutex);
-      // conversion to packaged_task<void()> erases the return type
-      // so it can be stored in the queue. the future will still
-      // contain the correct type
-      if (high_priority) {
-        queue_high.push(std::packaged_task<void()>(std::move(task)));
-      } else {
-        queue_low.push(std::packaged_task<void()>(std::move(task)));
-      }
-    }
-    condvar.notify_one();
-    return future;
-  }
-
-  ~ThreadPool() {
-    // push a single empty task onto the queue and notify all threads,
-    // then wait for them to terminate
-    {
-      std::lock_guard<std::mutex> lock(mutex);
-      queue_low.push({});
-    }
-    condvar.notify_all();
-    for (auto& thread : threads) {
-      thread.join();
-    }
-  }
-};
-}  // namespace hermes
-#endif  // HERMES_THREAD_POOL_H_
diff --git a/src/trait_manager.cc b/src/trait_manager.cc
deleted file mode 100644
index e89fdb9c0..000000000
--- a/src/trait_manager.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes_shm/util/singleton.h"
-#include "hermes.h"
-#include "trait_manager.h"
-#include <filesystem>
-
-namespace stdfs = std::filesystem;
-
-namespace hermes {
-
-void TraitManager::Init() {
-  ServerConfig *config = &HERMES->server_config_;
-
-  // Load the LD_LIBRARY_PATH variable
-  auto ld_lib_path_env = getenv("LD_LIBRARY_PATH");
-  std::string ld_lib_path;
-  if (ld_lib_path_env) {
-    ld_lib_path = ld_lib_path_env;
-  }
-
-  // Load the HERMES_TRAIT_PATH variable
-  std::string hermes_trait_path;
-  auto hermes_trait_path_env = getenv("HERMES_TRAIT_PATH");
-  if (hermes_trait_path_env) {
-    hermes_trait_path = hermes_trait_path_env;
-  }
-
-  // Combine LD_LIBRARY_PATH and HERMES_TRAIT_PATH
-  std::string paths = hermes_trait_path + ":" + ld_lib_path;
-
-  // Find each trait in LD_LIBRARY_PATH
-  for (std::string &trait_rel_path : config->trait_paths_) {
-    if (!FindLoadTrait(paths, trait_rel_path)) {
-      HELOG(kWarning, "Failed to load the trait: {}", trait_rel_path);
-    }
-  }
-}
-
-bool TraitManager::FindLoadTrait(const std::string &paths,
-                                 const std::string &trait_rel_path) {
-  std::stringstream ss(paths);
-  std::string trait_dir;
-  while (std::getline(ss, trait_dir, ':')) {
-    std::string trait_path = hshm::Formatter::format("{}/{}",
-                                                     trait_dir,
-                                                     trait_rel_path);
-    if (!stdfs::exists(trait_path)) {
-      continue;
-    }
-    TraitLibInfo info;
-    info.lib_ = dlopen(trait_path.c_str(), RTLD_GLOBAL | RTLD_NOW);
-    if (!info.lib_) {
-      HELOG(kError, "Could not open the trait library: {}", trait_path);
-      return false;
-    }
-    info.create_trait_ = (create_trait_t)dlsym(info.lib_, "create_trait");
-    if (!info.create_trait_) {
-      HELOG(kError, "The trait {} does not have create_trait symbol",
-            trait_path);
-      return false;
-    }
-    info.get_trait_id_ = (get_trait_id_t)dlsym(info.lib_, "get_trait_id");
-    if (!info.get_trait_id_) {
-      HELOG(kError, "The trait {} does not have get_trait_id symbol",
-            trait_path);
-      return false;
-    }
-    std::string trait_name = info.get_trait_id_();
-    HILOG(kDebug, "Finished loading the trait: {}", trait_name)
-    traits_.emplace(trait_name, std::move(info));
-    return true;
-  }
-  return false;
-}
-
-}  // namespace hermes
diff --git a/src/trait_manager.h b/src/trait_manager.h
deleted file mode 100644
index 6c0f2394a..000000000
--- a/src/trait_manager.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_SRC_TRAIT_MANAGER_H_
-#define HERMES_SRC_TRAIT_MANAGER_H_
-
-#include <dlfcn.h>
-#include "hermes_types.h"
-
-namespace hermes {
-
-/** This trait is useful to the GroupBy function */
-#define HERMES_TRAIT_GROUP_BY BIT_OPT(uint32_t, 0)
-/** This trait is useful to Put & Get */
-#define HERMES_TRAIT_PUT_GET BIT_OPT(uint32_t, 1)
-/** This trait is useful to BORG's Flush operation */
-#define HERMES_TRAIT_FLUSH BIT_OPT(uint32_t, 2)
-/** This trait is a prefetcher */
-#define HERMES_TRAIT_PREFETCHER BIT_OPT(uint32_t, 3)
-
-/** The basic state needed to be stored by every trait */
-struct TraitHeader {
-  char trait_uuid_[64];   /**< Unique name for this instance of trait */
-  char trait_name_[64];   /**< The name of the trait shared object */
-  bitfield32_t flags_;    /**< Where the trait is useful */
-
-  /** Constructor. */
-  explicit TraitHeader(const std::string &trait_uuid,
-                       const std::string &trait_name,
-                       uint32_t flags) {
-    memcpy(trait_uuid_, trait_uuid.c_str(), trait_uuid.size());
-    memcpy(trait_name_, trait_name.c_str(), trait_name.size());
-    trait_uuid_[trait_uuid.size()] = 0;
-    trait_name_[trait_name.size()] = 0;
-    flags_.SetBits(flags);
-  }
-};
-
-/**
- * Represents a custom operation to perform.
- * Traits are independent of Hermes.
- * */
-class Trait {
- public:
-  hshm::charbuf trait_info_;
-  TraitHeader *header_;
-  TraitId trait_id_;
-  std::string trait_uuid_;
-
-  /** Default constructor */
-  Trait() : trait_id_(TraitId::GetNull()) {}
-
-  /** Virtual destructor */
-  virtual ~Trait() = default;
-
-  /** Deserialization constructor */
-  explicit Trait(hshm::charbuf &trait_info)
-      : trait_info_(trait_info),
-        header_(reinterpret_cast<TraitHeader*>(trait_info_.data())),
-        trait_id_(TraitId::GetNull()) {}
-
-  /** Get trait ID */
-  TraitId GetTraitId() {
-    return trait_id_;
-  }
-
-  /** Get trait uuid */
-  const std::string& GetTraitUuid() {
-    return trait_uuid_;
-  }
-
-  /** Get trait class */
-  bitfield32_t& GetTraitFlags() {
-    return header_->flags_;
-  }
-
-  /** Run a method of the trait */
-  virtual void Run(int method, void *params) = 0;
-
-  /** Create the header for the trait */
-  template<typename HeaderT, typename ...Args>
-  HeaderT* CreateHeader(const std::string &trait_uuid,
-                        Args&& ...args) {
-    trait_info_ = hshm::charbuf(sizeof(HeaderT));
-    trait_uuid_ = trait_uuid;
-    header_ = reinterpret_cast<TraitHeader*>(trait_info_.data());
-    hipc::Allocator::ConstructObj<HeaderT>(
-        *GetHeader<HeaderT>(),
-        trait_uuid,
-        std::forward<Args>(args)...);
-    return GetHeader<HeaderT>();
-  }
-
-  /** Get the header of the trait */
-  template<typename HeaderT>
-  HeaderT* GetHeader() {
-    return reinterpret_cast<HeaderT*>(header_);
-  }
-
-  /**
-   * Method to register a trait with Hermes.
-   * Defined automatically in HERMES_TRAIT_H
-   * */
-  virtual void Register() = 0;
-};
-
-extern "C" {
-/** The two methods provided by all traits */
-typedef Trait* (*create_trait_t)(hshm::charbuf &trait_info);
-typedef const char* (*get_trait_id_t)(void);
-}
-
-/**
- * Used internally by trait header file
- * Must be used after a "public:"
- * */
-#define HERMES_TRAIT_H(TYPED_CLASS, TRAIT_ID) \
-  static inline const char* trait_name_ = TRAIT_ID; \
-  void Register() override { \
-    if (trait_id_.IsNull()) { \
-      trait_id_ = HERMES->RegisterTrait<TYPE_UNWRAP(TYPED_CLASS)>(this); \
-    } \
-  }
-
-/** Used internally by trait source file */
-#define HERMES_TRAIT_CC(TRAIT_CLASS) \
-    extern "C" {                              \
-        hermes::Trait* create_trait(hshm::charbuf &trait_info) { \
-          return new TYPE_UNWRAP(TRAIT_CLASS)(trait_info); \
-        } \
-        const char* get_trait_id(void) { return TRAIT_CLASS::trait_name_; } \
-    }
-
-/** All information needed to create a trait */
-struct TraitLibInfo {
-  void *lib_;
-  create_trait_t create_trait_;
-  get_trait_id_t get_trait_id_;
-
-  /** Default constructor */
-  TraitLibInfo() = default;
-
-  /** Destructor */
-  ~TraitLibInfo() {
-    if (lib_) {
-      dlclose(lib_);
-    }
-  }
-
-  /** Emplace constructor */
-  explicit TraitLibInfo(void *lib,
-                        create_trait_t create_trait,
-                        get_trait_id_t get_trait_id)
-      : lib_(lib), create_trait_(create_trait), get_trait_id_(get_trait_id) {}
-
-  /** Copy constructor */
-  TraitLibInfo(const TraitLibInfo &other)
-      : lib_(other.lib_),
-        create_trait_(other.create_trait_),
-        get_trait_id_(other.get_trait_id_) {}
-
-  /** Move constructor */
-  TraitLibInfo(TraitLibInfo &&other) noexcept
-      : lib_(other.lib_),
-        create_trait_(other.create_trait_),
-        get_trait_id_(other.get_trait_id_) {
-    other.lib_ = nullptr;
-    other.create_trait_ = nullptr;
-    other.get_trait_id_ = nullptr;
-  }
-};
-
-/** A module manager to keep track of trait binaries */
-class TraitManager {
- private:
-  std::unordered_map<std::string, TraitLibInfo> traits_;
-
- public:
-  /** Identify the set of all traits and load them */
-  void Init();
-
-  /** Construct a trait from a serialized parameter set */
-  Trait* ConstructTrait(hshm::charbuf &params) {
-    auto hdr = reinterpret_cast<TraitHeader*>(params.data());
-    auto iter = traits_.find(hdr->trait_name_);
-    if (iter == traits_.end()) {
-      HELOG(kError, "Could not find the trait with name: {}",
-            hdr->trait_name_);
-      return nullptr;
-    }
-    TraitLibInfo &info = iter->second;
-    Trait *trait = info.create_trait_(params);
-    return trait;
-  }
-
- private:
-  /** Find the trait library on disk and load it */
-  bool FindLoadTrait(const std::string &paths,
-                     const std::string &trait_rel_path);
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_SRC_TRAIT_MANAGER_H_
diff --git a/tasks/CMakeLists.txt b/tasks/CMakeLists.txt
new file mode 100644
index 000000000..4251d8161
--- /dev/null
+++ b/tasks/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(bdev)
+add_subdirectory(ram_bdev)
+add_subdirectory(posix_bdev)
+add_subdirectory(hermes_mdm)
+add_subdirectory(hermes_blob_mdm)
+add_subdirectory(hermes_bucket_mdm)
+add_subdirectory(hermes_data_op)
+add_subdirectory(data_stager)
\ No newline at end of file
diff --git a/tasks/bdev/CMakeLists.txt b/tasks/bdev/CMakeLists.txt
new file mode 100644
index 000000000..1fea7b11e
--- /dev/null
+++ b/tasks/bdev/CMakeLists.txt
@@ -0,0 +1,9 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/bdev/include/bdev/bdev.h b/tasks/bdev/include/bdev/bdev.h
new file mode 100644
index 000000000..6b20dbdd9
--- /dev/null
+++ b/tasks/bdev/include/bdev/bdev.h
@@ -0,0 +1,184 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_bdev_H_
+#define HRUN_bdev_H_
+
+#include "bdev_tasks.h"
+
+namespace hermes::bdev {
+
+/**
+ * BDEV Client API
+ * */
+class Client : public TaskLibClient {
+ public:
+  DomainId domain_id_;
+  MonitorTask *monitor_task_;
+  size_t max_cap_;      /**< maximum capacity of the target */
+  double bandwidth_;    /**< the bandwidth of the device */
+  double latency_;      /**< the latency of the device */
+  float score_;         /**< Relative importance of this tier */
+
+ public:
+  /** Copy dev info */
+  void CopyDevInfo(DeviceInfo &dev_info) {
+    max_cap_ = dev_info.capacity_;
+    bandwidth_ = dev_info.bandwidth_;
+    latency_ = dev_info.latency_;
+    score_ = 1;
+  }
+
+  /** Async create task state */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name,
+                                      const std::string &lib_name,
+                                      DeviceInfo &dev_info) {
+    domain_id_ = domain_id;
+    id_ = TaskStateId::GetNull();
+    CopyDevInfo(dev_info);
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {4, 4, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, lib_name, id_,
+        queue_info, dev_info);
+  }
+  void AsyncCreateComplete(ConstructTask *task) {
+    if (task->IsComplete()) {
+      id_ = task->id_;
+      queue_id_ = QueueId(id_);
+      monitor_task_ = AsyncMonitor(task->task_node_, 100).ptr_;
+      HRUN_CLIENT->DelTask(task);
+    }
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreateTaskState);
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task =
+        AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    AsyncCreateComplete(task.ptr_);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const std::string &state_name) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id_, id_);
+    monitor_task_->SetModuleComplete();
+  }
+
+  /** BDEV monitoring task */
+  HSHM_ALWAYS_INLINE
+  void AsyncMonitorConstruct(MonitorTask *task,
+                             const TaskNode &task_node,
+                             size_t freq_ms) {
+    HRUN_CLIENT->ConstructTask<MonitorTask>(
+        task, task_node, domain_id_, id_, freq_ms, max_cap_);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Monitor);
+
+  /** Update bdev capacity */
+  void AsyncUpdateCapacityConstruct(UpdateCapacityTask *task,
+                                    const TaskNode &task_node,
+                                    ssize_t size) {
+    HRUN_CLIENT->ConstructTask<UpdateCapacityTask>(
+        task, task_node, domain_id_, id_, size);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(UpdateCapacity);
+
+  /** Get bdev remaining capacity */
+  HSHM_ALWAYS_INLINE
+  size_t GetRemCap() const {
+    return monitor_task_->rem_cap_;
+  }
+
+  /** Allocate buffers from the bdev */
+  HSHM_ALWAYS_INLINE
+  void AsyncAllocateConstruct(AllocateTask *task,
+                              const TaskNode &task_node,
+                              size_t size,
+                              std::vector<BufferInfo> &buffers) {
+    HRUN_CLIENT->ConstructTask<AllocateTask>(
+        task, task_node, domain_id_, id_, size, &buffers);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Allocate);
+
+  /** Free data */
+  HSHM_ALWAYS_INLINE
+  void AsyncFreeConstruct(FreeTask *task,
+                          const TaskNode &task_node,
+                          const std::vector<BufferInfo> &buffers,
+                          bool fire_and_forget) {
+    HRUN_CLIENT->ConstructTask<FreeTask>(
+        task, task_node, domain_id_, id_, buffers, fire_and_forget);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Free);
+
+  /** Allocate buffers from the bdev */
+  HSHM_ALWAYS_INLINE
+  void AsyncWriteConstruct(WriteTask *task,
+                           const TaskNode &task_node,
+                           const char *data, size_t off, size_t size) {
+    HRUN_CLIENT->ConstructTask<WriteTask>(
+        task, task_node, domain_id_, id_, data, off, size);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Write);
+
+  /** Allocate buffers from the bdev */
+  HSHM_ALWAYS_INLINE
+  void AsyncReadConstruct(ReadTask *task,
+                          const TaskNode &task_node,
+                          char *data, size_t off, size_t size) {
+    HRUN_CLIENT->ConstructTask<ReadTask>(
+        task, task_node, domain_id_, id_, data, off, size);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(Read);
+};
+
+class Server {
+ public:
+  ssize_t rem_cap_;
+
+ public:
+  void UpdateCapacity(UpdateCapacityTask *task) {
+    rem_cap_ += task->diff_;
+  }
+
+  void Monitor(MonitorTask *task) {
+    task->rem_cap_ = rem_cap_;
+  }
+};
+
+}  // namespace hermes::bdev
+
+namespace hermes {
+typedef bdev::Client TargetInfo;
+
+struct TargetStats {
+ public:
+  TargetId tgt_id_;
+  size_t rem_cap_;      /**< Current remaining capacity */
+  size_t max_cap_;      /**< maximum capacity of the target */
+  double bandwidth_;    /**< the bandwidth of the device */
+  double latency_;      /**< the latency of the device */
+  float score_;         /**< Relative importance of this tier */
+
+ public:
+  /** Serialize */
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(tgt_id_, max_cap_, bandwidth_,
+       latency_, score_, rem_cap_);
+  }
+};
+}  // namespace hermes
+
+#endif  // HRUN_bdev_H_
diff --git a/tasks/bdev/include/bdev/bdev_lib_exec.h b/tasks/bdev/include/bdev/bdev_lib_exec.h
new file mode 100644
index 000000000..83068c8b8
--- /dev/null
+++ b/tasks/bdev/include/bdev/bdev_lib_exec.h
@@ -0,0 +1,417 @@
+#ifndef HRUN_BDEV_LIB_EXEC_H_
+#define HRUN_BDEV_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kWrite: {
+      Write(reinterpret_cast<WriteTask *>(task), rctx);
+      break;
+    }
+    case Method::kRead: {
+      Read(reinterpret_cast<ReadTask *>(task), rctx);
+      break;
+    }
+    case Method::kAllocate: {
+      Allocate(reinterpret_cast<AllocateTask *>(task), rctx);
+      break;
+    }
+    case Method::kFree: {
+      Free(reinterpret_cast<FreeTask *>(task), rctx);
+      break;
+    }
+    case Method::kMonitor: {
+      Monitor(reinterpret_cast<MonitorTask *>(task), rctx);
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      UpdateCapacity(reinterpret_cast<UpdateCapacityTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kWrite: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<WriteTask *>(task));
+      break;
+    }
+    case Method::kRead: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ReadTask *>(task));
+      break;
+    }
+    case Method::kAllocate: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<AllocateTask *>(task));
+      break;
+    }
+    case Method::kFree: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<FreeTask *>(task));
+      break;
+    }
+    case Method::kMonitor: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<MonitorTask *>(task));
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<UpdateCapacityTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kWrite: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<WriteTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRead: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ReadTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kAllocate: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<AllocateTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kFree: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<FreeTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kMonitor: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<MonitorTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<UpdateCapacityTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kWrite: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<WriteTask*>(orig_task), reinterpret_cast<WriteTask*>(dup_task));
+      break;
+    }
+    case Method::kRead: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ReadTask*>(orig_task), reinterpret_cast<ReadTask*>(dup_task));
+      break;
+    }
+    case Method::kAllocate: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<AllocateTask*>(orig_task), reinterpret_cast<AllocateTask*>(dup_task));
+      break;
+    }
+    case Method::kFree: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<FreeTask*>(orig_task), reinterpret_cast<FreeTask*>(dup_task));
+      break;
+    }
+    case Method::kMonitor: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<MonitorTask*>(orig_task), reinterpret_cast<MonitorTask*>(dup_task));
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<UpdateCapacityTask*>(orig_task), reinterpret_cast<UpdateCapacityTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kWrite: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<WriteTask*>(task));
+      break;
+    }
+    case Method::kRead: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ReadTask*>(task));
+      break;
+    }
+    case Method::kAllocate: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<AllocateTask*>(task));
+      break;
+    }
+    case Method::kFree: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<FreeTask*>(task));
+      break;
+    }
+    case Method::kMonitor: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<MonitorTask*>(task));
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<UpdateCapacityTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kWrite: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<WriteTask*>(task));
+      break;
+    }
+    case Method::kRead: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ReadTask*>(task));
+      break;
+    }
+    case Method::kAllocate: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<AllocateTask*>(task));
+      break;
+    }
+    case Method::kFree: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<FreeTask*>(task));
+      break;
+    }
+    case Method::kMonitor: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<MonitorTask*>(task));
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<UpdateCapacityTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kWrite: {
+      ar << *reinterpret_cast<WriteTask*>(task);
+      break;
+    }
+    case Method::kRead: {
+      ar << *reinterpret_cast<ReadTask*>(task);
+      break;
+    }
+    case Method::kAllocate: {
+      ar << *reinterpret_cast<AllocateTask*>(task);
+      break;
+    }
+    case Method::kFree: {
+      ar << *reinterpret_cast<FreeTask*>(task);
+      break;
+    }
+    case Method::kMonitor: {
+      ar << *reinterpret_cast<MonitorTask*>(task);
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      ar << *reinterpret_cast<UpdateCapacityTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kWrite: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<WriteTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<WriteTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRead: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ReadTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ReadTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kAllocate: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<AllocateTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<AllocateTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kFree: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<FreeTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<FreeTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kMonitor: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<MonitorTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<MonitorTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<UpdateCapacityTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<UpdateCapacityTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kWrite: {
+      ar << *reinterpret_cast<WriteTask*>(task);
+      break;
+    }
+    case Method::kRead: {
+      ar << *reinterpret_cast<ReadTask*>(task);
+      break;
+    }
+    case Method::kAllocate: {
+      ar << *reinterpret_cast<AllocateTask*>(task);
+      break;
+    }
+    case Method::kFree: {
+      ar << *reinterpret_cast<FreeTask*>(task);
+      break;
+    }
+    case Method::kMonitor: {
+      ar << *reinterpret_cast<MonitorTask*>(task);
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      ar << *reinterpret_cast<UpdateCapacityTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kWrite: {
+      ar.Deserialize(replica, *reinterpret_cast<WriteTask*>(task));
+      break;
+    }
+    case Method::kRead: {
+      ar.Deserialize(replica, *reinterpret_cast<ReadTask*>(task));
+      break;
+    }
+    case Method::kAllocate: {
+      ar.Deserialize(replica, *reinterpret_cast<AllocateTask*>(task));
+      break;
+    }
+    case Method::kFree: {
+      ar.Deserialize(replica, *reinterpret_cast<FreeTask*>(task));
+      break;
+    }
+    case Method::kMonitor: {
+      ar.Deserialize(replica, *reinterpret_cast<MonitorTask*>(task));
+      break;
+    }
+    case Method::kUpdateCapacity: {
+      ar.Deserialize(replica, *reinterpret_cast<UpdateCapacityTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kWrite: {
+      return reinterpret_cast<WriteTask*>(task)->GetGroup(group);
+    }
+    case Method::kRead: {
+      return reinterpret_cast<ReadTask*>(task)->GetGroup(group);
+    }
+    case Method::kAllocate: {
+      return reinterpret_cast<AllocateTask*>(task)->GetGroup(group);
+    }
+    case Method::kFree: {
+      return reinterpret_cast<FreeTask*>(task)->GetGroup(group);
+    }
+    case Method::kMonitor: {
+      return reinterpret_cast<MonitorTask*>(task)->GetGroup(group);
+    }
+    case Method::kUpdateCapacity: {
+      return reinterpret_cast<UpdateCapacityTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_BDEV_METHODS_H_
\ No newline at end of file
diff --git a/tasks/bdev/include/bdev/bdev_methods.h b/tasks/bdev/include/bdev/bdev_methods.h
new file mode 100644
index 000000000..c6a398de1
--- /dev/null
+++ b/tasks/bdev/include/bdev/bdev_methods.h
@@ -0,0 +1,14 @@
+#ifndef HRUN_BDEV_METHODS_H_
+#define HRUN_BDEV_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kWrite = kLast + 0;
+  TASK_METHOD_T kRead = kLast + 1;
+  TASK_METHOD_T kAllocate = kLast + 2;
+  TASK_METHOD_T kFree = kLast + 3;
+  TASK_METHOD_T kMonitor = kLast + 4;
+  TASK_METHOD_T kUpdateCapacity = kLast + 5;
+};
+
+#endif  // HRUN_BDEV_METHODS_H_
\ No newline at end of file
diff --git a/tasks/bdev/include/bdev/bdev_methods.yaml b/tasks/bdev/include/bdev/bdev_methods.yaml
new file mode 100644
index 000000000..70173aa3e
--- /dev/null
+++ b/tasks/bdev/include/bdev/bdev_methods.yaml
@@ -0,0 +1,7 @@
+kWrite: 0
+kRead: 1
+kAllocate: 2
+kFree: 3
+kMonitor: 4
+kUpdateCapacity: 5
+kLast: 6
\ No newline at end of file
diff --git a/tasks/bdev/include/bdev/bdev_namespace.h b/tasks/bdev/include/bdev/bdev_namespace.h
new file mode 100644
index 000000000..79e94e114
--- /dev/null
+++ b/tasks/bdev/include/bdev/bdev_namespace.h
@@ -0,0 +1,26 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_TASKS_BDEV_INCLUDE_BDEV_BDEV_NAMESPACE_H_
+#define HRUN_TASKS_BDEV_INCLUDE_BDEV_BDEV_NAMESPACE_H_
+
+#include "bdev_tasks.h"
+#include "bdev.h"
+#include "hrun/hrun_namespace.h"
+
+/** The set of methods in the admin task */
+using ::hermes::bdev::Method;
+using ::hermes::bdev::ConstructTask;
+using ::hermes::bdev::DestructTask;
+using ::hermes::bdev::AllocateTask;
+using ::hermes::bdev::FreeTask;
+using ::hermes::bdev::ReadTask;
+using ::hermes::bdev::WriteTask;
+using ::hermes::bdev::MonitorTask;
+using ::hermes::bdev::UpdateCapacityTask;
+
+/** Create admin requests */
+using ::hermes::bdev::Client;
+
+#endif  // HRUN_TASKS_BDEV_INCLUDE_BDEV_BDEV_NAMESPACE_H_
diff --git a/tasks/bdev/include/bdev/bdev_tasks.h b/tasks/bdev/include/bdev/bdev_tasks.h
new file mode 100644
index 000000000..e160efd8d
--- /dev/null
+++ b/tasks/bdev/include/bdev/bdev_tasks.h
@@ -0,0 +1,312 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_TASKS_BDEV_INCLUDE_BDEV_BDEV_TASKS_H_
+#define HRUN_TASKS_BDEV_INCLUDE_BDEV_BDEV_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hermes/hermes_types.h"
+#include "hermes/config_server.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hermes::bdev {
+
+#include "bdev_methods.h"
+#include "hrun/hrun_namespace.h"
+
+/**
+ * A task to create hermes_mdm
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  IN DeviceInfo info_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const std::string &lib_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info,
+                DeviceInfo &info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            lib_name, id, queue_info) {
+    // Custom params
+    info_ = info;
+  }
+};
+
+/** A task to destroy hermes_mdm */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               TaskStateId &state_id,
+               const DomainId &domain_id)
+  : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in bdev
+ * */
+struct AllocateTask : public Task, TaskFlags<TF_LOCAL> {
+  IN size_t size_;  /**< Size in buf */
+  OUT std::vector<BufferInfo> *buffers_;
+  OUT size_t alloc_size_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  AllocateTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  AllocateTask(hipc::Allocator *alloc,
+            const TaskNode &task_node,
+            const DomainId &domain_id,
+            const TaskStateId &state_id,
+            size_t size,
+            std::vector<BufferInfo> *buffers) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kAllocate;
+    task_flags_.SetBits(TASK_UNORDERED | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = domain_id;
+
+    // Free params
+    size_ = size;
+    buffers_ = buffers;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in bdev
+ * */
+struct FreeTask : public Task, TaskFlags<TF_LOCAL> {
+  IN std::vector<BufferInfo> buffers_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  FreeTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  FreeTask(hipc::Allocator *alloc,
+           const TaskNode &task_node,
+           const DomainId &domain_id,
+           const TaskStateId &state_id,
+           const std::vector<BufferInfo> &buffers,
+           bool fire_and_forget) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kFree;
+    task_flags_.SetBits(0);
+    if (fire_and_forget) {
+      task_flags_.SetBits(TASK_FIRE_AND_FORGET | TASK_UNORDERED | TASK_REMOTE_DEBUG_MARK);
+    }
+    domain_id_ = domain_id;
+
+    // Free params
+    buffers_ = buffers;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in bdev
+ * */
+struct WriteTask : public Task, TaskFlags<TF_LOCAL> {
+  IN const char *buf_;    /**< Data in memory */
+  IN size_t disk_off_;    /**< Offset on disk */
+  IN size_t size_;        /**< Size in buf */
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  WriteTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  WriteTask(hipc::Allocator *alloc,
+            const TaskNode &task_node,
+            const DomainId &domain_id,
+            const TaskStateId &state_id,
+            const char *buf,
+            size_t disk_off,
+            size_t size) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kWrite;
+    task_flags_.SetBits(TASK_UNORDERED | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = domain_id;
+
+    // Free params
+    buf_ = buf;
+    disk_off_ = disk_off;
+    size_ = size;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A custom task in bdev
+ * */
+struct ReadTask : public Task, TaskFlags<TF_LOCAL> {
+  IN char *buf_;         /**< Data in memory */
+  IN size_t disk_off_;   /**< Offset on disk */
+  IN size_t size_;       /**< Size in disk buf */
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ReadTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ReadTask(hipc::Allocator *alloc,
+           const TaskNode &task_node,
+           const DomainId &domain_id,
+           const TaskStateId &state_id,
+           char *buf,
+           size_t disk_off,
+           size_t size) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRead;
+    task_flags_.SetBits(TASK_UNORDERED | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = domain_id;
+
+    // Free params
+    buf_ = buf;
+    disk_off_ = disk_off;
+    size_ = size;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to monitor bdev statistics */
+struct MonitorTask : public Task, TaskFlags<TF_LOCAL> {
+  OUT size_t rem_cap_; /**< Remaining capacity of the target */
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  MonitorTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  MonitorTask(hipc::Allocator *alloc,
+              const TaskNode &task_node,
+              const DomainId &domain_id,
+              const TaskStateId &state_id,
+              size_t freq_ms,
+              size_t rem_cap) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLongRunning;
+    task_state_ = state_id;
+    method_ = Method::kMonitor;
+    task_flags_.SetBits(TASK_LONG_RUNNING | TASK_REMOTE_DEBUG_MARK);
+    SetPeriodMs(freq_ms);
+    domain_id_ = domain_id;
+
+    // Custom
+    rem_cap_ = rem_cap;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to update bdev capacity */
+struct UpdateCapacityTask : public Task, TaskFlags<TF_LOCAL> {
+  IN ssize_t diff_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UpdateCapacityTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UpdateCapacityTask(hipc::Allocator *alloc,
+                     const TaskNode &task_node,
+                     const DomainId &domain_id,
+                     const TaskStateId &state_id,
+                     ssize_t diff) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kUpdateCapacity;
+    task_flags_.SetBits(TASK_FIRE_AND_FORGET | TASK_UNORDERED | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = domain_id;
+
+    // Custom
+    diff_ = diff;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hermes::bdev
+
+#endif  // HRUN_TASKS_BDEV_INCLUDE_BDEV_BDEV_TASKS_H_
diff --git a/tasks/data_stager/CMakeLists.txt b/tasks/data_stager/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/tasks/data_stager/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/data_stager/include/data_stager/data_stager.h b/tasks/data_stager/include/data_stager/data_stager.h
new file mode 100644
index 000000000..dd7fdbc7c
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/data_stager.h
@@ -0,0 +1,177 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_data_stager_H_
+#define HRUN_data_stager_H_
+
+#include "data_stager_tasks.h"
+
+namespace hermes::data_stager {
+
+/** Create data_stager requests */
+class Client : public TaskLibClient {
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Async create a task state */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name,
+                                      const TaskStateId &blob_mdm) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, id_, queue_info, blob_mdm);
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreate)
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task =
+        AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    id_ = task->id_;
+    queue_id_ = QueueId(id_);
+    HRUN_CLIENT->DelTask(task);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /** Register task state */
+  HSHM_ALWAYS_INLINE
+  void AsyncRegisterStagerConstruct(RegisterStagerTask *task,
+                                    const TaskNode &task_node,
+                                    const BucketId &bkt_id,
+                                    const hshm::charbuf &url) {
+    HRUN_CLIENT->ConstructTask<RegisterStagerTask>(
+        task, task_node, id_, bkt_id, url);
+  }
+  HSHM_ALWAYS_INLINE
+  void RegisterStagerRoot(const BucketId &bkt_id,
+                          const hshm::charbuf &url) {
+    LPointer<hrunpq::TypedPushTask<RegisterStagerTask>> task =
+        AsyncRegisterStagerRoot(bkt_id, url);
+    task.ptr_->Wait();
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(RegisterStager);
+
+  /** Unregister task state */
+  HSHM_ALWAYS_INLINE
+  void AsyncUnregisterStagerConstruct(UnregisterStagerTask *task,
+                                      const TaskNode &task_node,
+                                      const BucketId &bkt_id) {
+    HRUN_CLIENT->ConstructTask<UnregisterStagerTask>(
+        task, task_node, id_, bkt_id);
+  }
+  HSHM_ALWAYS_INLINE
+  void UnregisterStagerRoot(const BucketId &bkt_id) {
+    LPointer<hrunpq::TypedPushTask<UnregisterStagerTask>> task =
+        AsyncUnregisterStagerRoot(bkt_id);
+    task.ptr_->Wait();
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(UnregisterStager);
+
+  /** Stage in data from a remote source */
+  HSHM_ALWAYS_INLINE
+  void AsyncStageInConstruct(StageInTask *task,
+                            const TaskNode &task_node,
+                            const BucketId &bkt_id,
+                            const hshm::charbuf &blob_name,
+                            float score,
+                            u32 node_id) {
+    HRUN_CLIENT->ConstructTask<StageInTask>(
+        task, task_node, id_, bkt_id,
+        blob_name, score, node_id);
+  }
+  HSHM_ALWAYS_INLINE
+  void StageInRoot(const BucketId &bkt_id,
+               const hshm::charbuf &blob_name,
+               float score,
+               u32 node_id) {
+    LPointer<hrunpq::TypedPushTask<StageInTask>> task =
+        AsyncStageInRoot(bkt_id, blob_name, score, node_id);
+    task.ptr_->Wait();
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(StageIn);
+
+  /** Stage out data to a remote source */
+  HSHM_ALWAYS_INLINE
+  void AsyncStageOutConstruct(StageOutTask *task,
+                              const TaskNode &task_node,
+                              const BucketId &bkt_id,
+                              const hshm::charbuf &blob_name,
+                              const hipc::Pointer &data,
+                              size_t data_size,
+                              u32 task_flags) {
+    HRUN_CLIENT->ConstructTask<StageOutTask>(
+        task, task_node, id_, bkt_id,
+        blob_name, data, data_size, task_flags);
+  }
+  HSHM_ALWAYS_INLINE
+  void StageOutRoot(const BucketId &bkt_id,
+                    const hshm::charbuf &blob_name,
+                    const hipc::Pointer &data,
+                    size_t data_size,
+                    u32 task_flags) {
+    LPointer<hrunpq::TypedPushTask<StageOutTask>> task =
+        AsyncStageOutRoot(bkt_id, blob_name, data, data_size, task_flags);
+    task.ptr_->Wait();
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(StageOut);
+
+  /** Parse url */
+  static inline
+  bool GetUrlProtocolAndAction(const std::string &url,
+                               std::string &protocol,
+                               std::string &action,
+                               std::vector<std::string> &tokens) {
+    // Determine the protocol + action
+    std::string token;
+    size_t found = url.find("://");
+    if (found == std::string::npos) {
+      return false;
+    }
+    protocol = url.substr(0, found);
+    action = url.substr(found + 3);
+
+    // Divide action into tokens
+    std::stringstream ss(action);
+    while (std::getline(ss, token, ':')) {
+      tokens.push_back(token);
+    }
+    return true;
+  }
+
+  /** Bucket name from url */
+  static inline hshm::charbuf GetTagNameFromUrl(const hshm::string &url) {
+    // Parse url
+    std::string protocol, action;
+    std::vector<std::string> tokens;
+    bool ret = GetUrlProtocolAndAction(url.str(), protocol, action, tokens);
+    if (ret) {
+      std::string &path = tokens[0];
+      return hshm::charbuf(path);
+    } else {
+      return url;
+    }
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_data_stager_H_
diff --git a/tasks/data_stager/include/data_stager/data_stager_lib_exec.h b/tasks/data_stager/include/data_stager/data_stager_lib_exec.h
new file mode 100644
index 000000000..df65d48be
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/data_stager_lib_exec.h
@@ -0,0 +1,329 @@
+#ifndef HRUN_DATA_STAGER_LIB_EXEC_H_
+#define HRUN_DATA_STAGER_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kRegisterStager: {
+      RegisterStager(reinterpret_cast<RegisterStagerTask *>(task), rctx);
+      break;
+    }
+    case Method::kUnregisterStager: {
+      UnregisterStager(reinterpret_cast<UnregisterStagerTask *>(task), rctx);
+      break;
+    }
+    case Method::kStageIn: {
+      StageIn(reinterpret_cast<StageInTask *>(task), rctx);
+      break;
+    }
+    case Method::kStageOut: {
+      StageOut(reinterpret_cast<StageOutTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kRegisterStager: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RegisterStagerTask *>(task));
+      break;
+    }
+    case Method::kUnregisterStager: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<UnregisterStagerTask *>(task));
+      break;
+    }
+    case Method::kStageIn: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<StageInTask *>(task));
+      break;
+    }
+    case Method::kStageOut: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<StageOutTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRegisterStager: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RegisterStagerTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kUnregisterStager: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<UnregisterStagerTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kStageIn: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<StageInTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kStageOut: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<StageOutTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kRegisterStager: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RegisterStagerTask*>(orig_task), reinterpret_cast<RegisterStagerTask*>(dup_task));
+      break;
+    }
+    case Method::kUnregisterStager: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<UnregisterStagerTask*>(orig_task), reinterpret_cast<UnregisterStagerTask*>(dup_task));
+      break;
+    }
+    case Method::kStageIn: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<StageInTask*>(orig_task), reinterpret_cast<StageInTask*>(dup_task));
+      break;
+    }
+    case Method::kStageOut: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<StageOutTask*>(orig_task), reinterpret_cast<StageOutTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kRegisterStager: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RegisterStagerTask*>(task));
+      break;
+    }
+    case Method::kUnregisterStager: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<UnregisterStagerTask*>(task));
+      break;
+    }
+    case Method::kStageIn: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<StageInTask*>(task));
+      break;
+    }
+    case Method::kStageOut: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<StageOutTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kRegisterStager: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RegisterStagerTask*>(task));
+      break;
+    }
+    case Method::kUnregisterStager: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<UnregisterStagerTask*>(task));
+      break;
+    }
+    case Method::kStageIn: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<StageInTask*>(task));
+      break;
+    }
+    case Method::kStageOut: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<StageOutTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kRegisterStager: {
+      ar << *reinterpret_cast<RegisterStagerTask*>(task);
+      break;
+    }
+    case Method::kUnregisterStager: {
+      ar << *reinterpret_cast<UnregisterStagerTask*>(task);
+      break;
+    }
+    case Method::kStageIn: {
+      ar << *reinterpret_cast<StageInTask*>(task);
+      break;
+    }
+    case Method::kStageOut: {
+      ar << *reinterpret_cast<StageOutTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRegisterStager: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RegisterStagerTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RegisterStagerTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kUnregisterStager: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<UnregisterStagerTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<UnregisterStagerTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kStageIn: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<StageInTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<StageInTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kStageOut: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<StageOutTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<StageOutTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kRegisterStager: {
+      ar << *reinterpret_cast<RegisterStagerTask*>(task);
+      break;
+    }
+    case Method::kUnregisterStager: {
+      ar << *reinterpret_cast<UnregisterStagerTask*>(task);
+      break;
+    }
+    case Method::kStageIn: {
+      ar << *reinterpret_cast<StageInTask*>(task);
+      break;
+    }
+    case Method::kStageOut: {
+      ar << *reinterpret_cast<StageOutTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kRegisterStager: {
+      ar.Deserialize(replica, *reinterpret_cast<RegisterStagerTask*>(task));
+      break;
+    }
+    case Method::kUnregisterStager: {
+      ar.Deserialize(replica, *reinterpret_cast<UnregisterStagerTask*>(task));
+      break;
+    }
+    case Method::kStageIn: {
+      ar.Deserialize(replica, *reinterpret_cast<StageInTask*>(task));
+      break;
+    }
+    case Method::kStageOut: {
+      ar.Deserialize(replica, *reinterpret_cast<StageOutTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kRegisterStager: {
+      return reinterpret_cast<RegisterStagerTask*>(task)->GetGroup(group);
+    }
+    case Method::kUnregisterStager: {
+      return reinterpret_cast<UnregisterStagerTask*>(task)->GetGroup(group);
+    }
+    case Method::kStageIn: {
+      return reinterpret_cast<StageInTask*>(task)->GetGroup(group);
+    }
+    case Method::kStageOut: {
+      return reinterpret_cast<StageOutTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_DATA_STAGER_METHODS_H_
\ No newline at end of file
diff --git a/tasks/data_stager/include/data_stager/data_stager_methods.h b/tasks/data_stager/include/data_stager/data_stager_methods.h
new file mode 100644
index 000000000..2f7d2af52
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/data_stager_methods.h
@@ -0,0 +1,12 @@
+#ifndef HRUN_DATA_STAGER_METHODS_H_
+#define HRUN_DATA_STAGER_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kRegisterStager = kLast + 0;
+  TASK_METHOD_T kUnregisterStager = kLast + 1;
+  TASK_METHOD_T kStageIn = kLast + 2;
+  TASK_METHOD_T kStageOut = kLast + 3;
+};
+
+#endif  // HRUN_DATA_STAGER_METHODS_H_
\ No newline at end of file
diff --git a/tasks/data_stager/include/data_stager/data_stager_methods.yaml b/tasks/data_stager/include/data_stager/data_stager_methods.yaml
new file mode 100644
index 000000000..a2cac4953
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/data_stager_methods.yaml
@@ -0,0 +1,4 @@
+kRegisterStager: 0
+kUnregisterStager: 1
+kStageIn: 2
+kStageOut: 3
\ No newline at end of file
diff --git a/tasks/data_stager/include/data_stager/data_stager_tasks.h b/tasks/data_stager/include/data_stager/data_stager_tasks.h
new file mode 100644
index 000000000..39dd2f036
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/data_stager_tasks.h
@@ -0,0 +1,315 @@
+//
+// Created by lukemartinlogan on 8/11/23.
+//
+
+#ifndef HRUN_TASKS_TASK_TEMPL_INCLUDE_data_stager_data_stager_TASKS_H_
+#define HRUN_TASKS_TASK_TEMPL_INCLUDE_data_stager_data_stager_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+#include "hermes/hermes_types.h"
+
+namespace hermes::data_stager {
+
+#include "data_stager_methods.h"
+#include "hrun/hrun_namespace.h"
+using hrun::proc_queue::TypedPushTask;
+using hrun::proc_queue::PushTask;
+
+/**
+ * A task to create data_stager
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  TaskStateId blob_mdm_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc)
+      : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info,
+                const TaskStateId &blob_mdm)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "data_stager", id, queue_info) {
+    // Custom params
+    blob_mdm_ = blob_mdm;
+  }
+
+  HSHM_ALWAYS_INLINE
+  ~ConstructTask() {
+    // Custom params
+  }
+};
+
+/** A task to destroy data_stager */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc)
+      : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * Register a new stager
+ * */
+struct RegisterStagerTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  hermes::BucketId bkt_id_;
+  hipc::ShmArchive<hipc::string> url_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterStagerTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterStagerTask(hipc::Allocator *alloc,
+                     const TaskNode &task_node,
+                     const TaskStateId &state_id,
+                     hermes::BucketId bkt_id,
+                     const hshm::charbuf &url) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = bkt_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRegisterStager;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_FIRE_AND_FORGET);
+    domain_id_ = DomainId::GetGlobal();
+
+    // Custom params
+    bkt_id_ = bkt_id;
+    HSHM_MAKE_AR(url_, alloc, url);
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, RegisterStagerTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, RegisterStagerTask &dup_task) {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(bkt_id_, url_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * Unregister a new stager
+ * */
+struct UnregisterStagerTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  hermes::BucketId bkt_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UnregisterStagerTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UnregisterStagerTask(hipc::Allocator *alloc,
+                       const TaskNode &task_node,
+                       const TaskStateId &state_id,
+                       const hermes::BucketId &bkt_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = bkt_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kUnregisterStager;
+    task_flags_.SetBits(TASK_FIRE_AND_FORGET);
+    domain_id_ = DomainId::GetGlobal();
+
+    // Custom params
+    bkt_id_ = bkt_id;
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, UnregisterStagerTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, UnregisterStagerTask &dup_task) {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(bkt_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A task to stage in data from a remote source
+ * */
+struct StageInTask : public Task, TaskFlags<TF_LOCAL> {
+  hermes::BucketId bkt_id_;
+  hipc::ShmArchive<hipc::charbuf> blob_name_;
+  float score_;
+  u32 node_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  StageInTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  StageInTask(hipc::Allocator *alloc,
+              const TaskNode &task_node,
+              const TaskStateId &state_id,
+              const BucketId &bkt_id,
+              const hshm::charbuf &blob_name,
+              float score,
+              u32 node_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = bkt_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kStageIn;
+    task_flags_.SetBits(TASK_COROUTINE | TASK_LOW_LATENCY | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = DomainId::GetLocal();
+
+    // Custom params
+    bkt_id_ = bkt_id;
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name);
+    score_ = score;
+    node_id_ = node_id;
+  }
+
+  /** Destructor */
+  HSHM_ALWAYS_INLINE
+  ~StageInTask() {
+    HSHM_DESTROY_AR(blob_name_)
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * A task to stage data out of a hermes to a remote source
+ * */
+struct StageOutTask : public Task, TaskFlags<TF_LOCAL> {
+  hermes::BucketId bkt_id_;
+  hipc::ShmArchive<hipc::charbuf> blob_name_;
+  hipc::Pointer data_;
+  size_t data_size_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  StageOutTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  StageOutTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const TaskStateId &state_id,
+               const BucketId &bkt_id,
+               const hshm::charbuf &blob_name,
+               const hipc::Pointer &data,
+               size_t data_size,
+               u32 task_flags): Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = bkt_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kStageOut;
+    task_flags_.SetBits(task_flags | TASK_COROUTINE | TASK_LOW_LATENCY | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = DomainId::GetLocal();
+
+    // Custom params
+    bkt_id_ = bkt_id;
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name);
+    data_ = data;
+    data_size_ = data_size;
+  }
+
+  /** Destructor */
+  HSHM_ALWAYS_INLINE
+  ~StageOutTask() {
+    HSHM_DESTROY_AR(blob_name_)
+    if (IsDataOwner()) {
+      HRUN_CLIENT->FreeBuffer(data_);
+    }
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hrun::data_stager
+
+#endif  // HRUN_TASKS_TASK_TEMPL_INCLUDE_data_stager_data_stager_TASKS_H_
diff --git a/tasks/data_stager/include/data_stager/factory/abstract_stager.h b/tasks/data_stager/include/data_stager/factory/abstract_stager.h
new file mode 100644
index 000000000..2c5dca484
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/factory/abstract_stager.h
@@ -0,0 +1,26 @@
+//
+// Created by lukemartinlogan on 9/30/23.
+//
+
+#ifndef HERMES_TASKS_DATA_STAGER_SRC_ABSTRACT_STAGER_H_
+#define HERMES_TASKS_DATA_STAGER_SRC_ABSTRACT_STAGER_H_
+
+#include "../data_stager.h"
+
+namespace hermes::data_stager {
+
+class AbstractStager {
+ public:
+  std::string url_;
+
+  AbstractStager() = default;
+  ~AbstractStager() = default;
+
+  virtual void RegisterStager(RegisterStagerTask *task, RunContext &rctx) = 0;
+  virtual void StageIn(blob_mdm::Client &blob_mdm, StageInTask *task, RunContext &rctx) = 0;
+  virtual void StageOut(blob_mdm::Client &blob_mdm, StageOutTask *task, RunContext &rctx) = 0;
+};
+
+}  // namespace hermes
+
+#endif  // HERMES_TASKS_DATA_STAGER_SRC_ABSTRACT_STAGER_H_
diff --git a/tasks/data_stager/include/data_stager/factory/binary_stager.h b/tasks/data_stager/include/data_stager/factory/binary_stager.h
new file mode 100644
index 000000000..93b958578
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/factory/binary_stager.h
@@ -0,0 +1,110 @@
+//
+// Created by lukemartinlogan on 9/30/23.
+//
+
+#ifndef HERMES_TASKS_DATA_STAGER_SRC_BINARY_STAGER_H_
+#define HERMES_TASKS_DATA_STAGER_SRC_BINARY_STAGER_H_
+
+#include "abstract_stager.h"
+#include "hermes_adapters/mapper/abstract_mapper.h"
+
+namespace hermes::data_stager {
+
+class BinaryFileStager : public AbstractStager {
+ public:
+  int fd_;
+  size_t page_size_;
+  std::string path_;
+
+ public:
+  /** Default constructor */
+  BinaryFileStager() = default;
+
+  /** Destructor */
+  ~BinaryFileStager() {
+    HERMES_POSIX_API->close(fd_);
+  }
+
+  /** Build file url */
+  static hshm::charbuf BuildFileUrl(const std::string &path, size_t page_size) {
+    std::stringstream ss;
+    ss << "file://" << path << ":" << page_size;
+    return hshm::charbuf(ss.str());
+  }
+
+  /** Parse file url */
+  static void ParseFileUrl(const std::string &url, std::string &path, size_t &page_size) {
+    // Parse url
+    std::string protocol, action;
+    std::vector<std::string> tokens;
+    Client::GetUrlProtocolAndAction(url, protocol, action, tokens);
+    // file://[path]:[page_size]
+    if (protocol == "file") {
+      path = tokens[0];
+      page_size = std::stoul(tokens[1]);
+    }
+  }
+
+  /** Create the data stager payload */
+  void RegisterStager(RegisterStagerTask *task, RunContext &rctx) override {
+    ParseFileUrl(task->url_->str(), path_, page_size_);
+    fd_ = HERMES_POSIX_API->open(path_.c_str(), O_RDWR);
+    if (fd_ < 0) {
+      HELOG(kError, "Failed to open file {}", path_);
+    }
+  }
+
+  /** Stage data in from remote source */
+  void StageIn(blob_mdm::Client &blob_mdm, StageInTask *task, RunContext &rctx) override {
+    adapter::BlobPlacement plcmnt;
+    plcmnt.DecodeBlobName(*task->blob_name_, page_size_);
+    HILOG(kDebug, "Attempting to stage {} bytes from the backend file {} at offset {}",
+          page_size_, url_, plcmnt.bucket_off_);
+    LPointer<char> blob = HRUN_CLIENT->AllocateBuffer(page_size_);
+    ssize_t real_size = HERMES_POSIX_API->pread(fd_,
+                                                blob.ptr_,
+                                                page_size_,
+                                                (off_t)plcmnt.bucket_off_);
+    if (real_size < 0) {
+      HELOG(kError, "Failed to stage in {} bytes from {}",
+            page_size_, url_);
+      return;
+    }
+    memcpy(blob.ptr_ + plcmnt.blob_off_, blob.ptr_, real_size);
+    HILOG(kDebug, "Staged {} bytes from the backend file {}",
+          real_size, url_);
+    hapi::Context ctx;
+    LPointer<blob_mdm::PutBlobTask> put_task =
+        blob_mdm.AsyncPutBlob(task->task_node_ + 1,
+                              task->bkt_id_,
+                              hshm::to_charbuf(*task->blob_name_),
+                              hermes::BlobId::GetNull(),
+                              0, real_size, blob.shm_, task->score_, 0,
+                              ctx, TASK_DATA_OWNER | TASK_LOW_LATENCY);
+    put_task->Wait<TASK_YIELD_CO>(task);
+    HRUN_CLIENT->DelTask(put_task);
+  }
+
+  /** Stage data out to remote source */
+  void StageOut(blob_mdm::Client &blob_mdm, StageOutTask *task, RunContext &rctx) override {
+    adapter::BlobPlacement plcmnt;
+    plcmnt.DecodeBlobName(*task->blob_name_, page_size_);
+    HILOG(kDebug, "Attempting to stage {} bytes to the backend file {} at offset {}",
+          page_size_, url_, plcmnt.bucket_off_);
+    char *data = HRUN_CLIENT->GetPrivatePointer(task->data_);
+    ssize_t real_size = HERMES_POSIX_API->pwrite(fd_,
+                                                 data,
+                                                 task->data_size_,
+                                                 (off_t)plcmnt.bucket_off_);
+    if (real_size < 0) {
+      HELOG(kError, "Failed to stage out {} bytes from {}",
+            task->data_size_, url_);
+    }
+    HILOG(kDebug, "Staged out {} bytes to the backend file {}",
+          real_size, url_);
+  }
+};
+
+}  // namespace hermes::data_stager
+
+#endif  // HERMES_TASKS_DATA_STAGER_SRC_BINARY_STAGER_H_
diff --git a/tasks/data_stager/include/data_stager/factory/stager_factory.h b/tasks/data_stager/include/data_stager/factory/stager_factory.h
new file mode 100644
index 000000000..341b55964
--- /dev/null
+++ b/tasks/data_stager/include/data_stager/factory/stager_factory.h
@@ -0,0 +1,32 @@
+//
+// Created by lukemartinlogan on 9/30/23.
+//
+
+#ifndef HERMES_TASKS_DATA_STAGER_SRC_STAGER_FACTORY_H_
+#define HERMES_TASKS_DATA_STAGER_SRC_STAGER_FACTORY_H_
+
+#include "../data_stager.h"
+#include "abstract_stager.h"
+#include "binary_stager.h"
+
+namespace hermes::data_stager {
+
+class StagerFactory {
+ public:
+  static std::unique_ptr<AbstractStager> Get(const std::string &url) {
+    std::unique_ptr<AbstractStager> stager;
+    if (url.find("file://") == 0) {
+      stager = std::make_unique<BinaryFileStager>();
+    } else if (url.find("parquet://")) {
+    } else if (url.find("hdf5://")) {
+    } else {
+      throw std::runtime_error("Unknown stager type");
+    }
+    stager->url_ = url;
+    return stager;
+  }
+};
+
+}  // namespace hermes
+
+#endif  // HERMES_TASKS_DATA_STAGER_SRC_STAGER_FACTORY_H_
diff --git a/traits/example/CMakeLists.txt b/tasks/data_stager/src/CMakeLists.txt
similarity index 52%
rename from traits/example/CMakeLists.txt
rename to tasks/data_stager/src/CMakeLists.txt
index dca853117..07eca417a 100644
--- a/traits/example/CMakeLists.txt
+++ b/tasks/data_stager/src/CMakeLists.txt
@@ -1,29 +1,41 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(data_stager SHARED
+        data_stager.cc)
+add_dependencies(data_stager ${Hermes_RUNTIME_DEPS})
+target_link_libraries(data_stager ${Hermes_RUNTIME_LIBRARIES})
 
-
-# Creates an example trait
-add_library(hermes_example_trait SHARED
-        example_trait.cc)
-add_dependencies(hermes_example_trait hermes)
-target_link_libraries(hermes_example_trait
-        hermes MPI::MPI_CXX stdc++fs dl)
-
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
 install(
         TARGETS
-        hermes_example_trait
+        data_stager
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
 )
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
 #-----------------------------------------------------------------------------
 # Export all exported targets to the build tree for use by parent project
 #-----------------------------------------------------------------------------
 set(HERMES_EXPORTED_LIBS
-        hermes_example_trait
+        data_stager
         ${HERMES_EXPORTED_LIBS})
 if(NOT HERMES_EXTERNALLY_CONFIGURED)
     EXPORT (
@@ -33,9 +45,10 @@ if(NOT HERMES_EXTERNALLY_CONFIGURED)
             ${HERMES_EXPORTED_TARGETS}.cmake
     )
 endif()
-#-----------------------------------------------------------------------------
-# Add Target(s) to Coverage
-#-----------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
 if(HERMES_ENABLE_COVERAGE)
-    set_coverage_flags(hermes_example_trait)
+    set_coverage_flags(data_stager)
 endif()
diff --git a/tasks/data_stager/src/data_stager.cc b/tasks/data_stager/src/data_stager.cc
new file mode 100644
index 000000000..b99459bd2
--- /dev/null
+++ b/tasks/data_stager/src/data_stager.cc
@@ -0,0 +1,63 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "data_stager/data_stager.h"
+#include "hermes_adapters/mapper/abstract_mapper.h"
+#include "hermes_adapters/posix/posix_api.h"
+#include "hermes_blob_mdm/hermes_blob_mdm.h"
+#include "data_stager/factory/stager_factory.h"
+
+namespace hermes::data_stager {
+
+class Server : public TaskLib {
+ public:
+  std::vector<std::unordered_map<hermes::BucketId, std::unique_ptr<AbstractStager>>> url_map_;
+  blob_mdm::Client blob_mdm_;
+
+ public:
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    url_map_.resize(HRUN_QM_RUNTIME->max_lanes_);
+    blob_mdm_.Init(task->blob_mdm_);
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void RegisterStager(RegisterStagerTask *task, RunContext &rctx) {
+    std::string url = task->url_->str();
+    std::unique_ptr<AbstractStager> stager = StagerFactory::Get(url);
+    stager->RegisterStager(task, rctx);
+    url_map_[rctx.lane_id_].emplace(task->bkt_id_, std::move(stager));
+    task->SetModuleComplete();
+  }
+
+  void UnregisterStager(UnregisterStagerTask *task, RunContext &rctx) {
+    url_map_[rctx.lane_id_].erase(task->bkt_id_);
+    task->SetModuleComplete();
+  }
+
+  void StageIn(StageInTask *task, RunContext &rctx) {
+    AbstractStager &stager = *url_map_[rctx.lane_id_][task->bkt_id_];
+    stager.StageIn(blob_mdm_, task, rctx);
+    task->SetModuleComplete();
+  }
+
+  void StageOut(StageOutTask *task, RunContext &rctx) {
+    AbstractStager &stager = *url_map_[rctx.lane_id_][task->bkt_id_];
+    stager.StageOut(blob_mdm_, task, rctx);
+    task->SetModuleComplete();
+  }
+ public:
+#include "data_stager/data_stager_lib_exec.h"
+};
+
+}  // namespace hrun::data_stager
+
+HRUN_TASK_CC(hermes::data_stager::Server, "data_stager");
diff --git a/tasks/hermes_blob_mdm/CMakeLists.txt b/tasks/hermes_blob_mdm/CMakeLists.txt
new file mode 100644
index 000000000..7cd7a5538
--- /dev/null
+++ b/tasks/hermes_blob_mdm/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hermes Blob MDM Task Library
+#------------------------------------------------------------------------------
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm.h b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm.h
new file mode 100644
index 000000000..140282af1
--- /dev/null
+++ b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm.h
@@ -0,0 +1,482 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_hermes_blob_mdm_H_
+#define HRUN_hermes_blob_mdm_H_
+
+#include "hermes_blob_mdm_tasks.h"
+
+namespace hermes::blob_mdm {
+
+/** Create hermes_blob_mdm requests */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Initialize directly using TaskStateId */
+  void Init(const TaskStateId &id) {
+    id_ = id;
+    queue_id_ = QueueId(id_);
+  }
+
+  /** Create a hermes_blob_mdm */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, id_, queue_info);
+  }
+  void AsyncCreateComplete(ConstructTask *task) {
+    if (task->IsComplete()) {
+      id_ = task->id_;
+      queue_id_ = QueueId(id_);
+      HRUN_CLIENT->DelTask(task);
+    }
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreate);
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task = AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    AsyncCreateComplete(task.ptr_);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /**====================================
+   * Blob Operations
+   * ===================================*/
+
+  /** Sets the BUCKET MDM */
+  void AsyncSetBucketMdmConstruct(SetBucketMdmTask *task,
+                                  const TaskNode &task_node,
+                                  const DomainId &domain_id,
+                                  const TaskStateId &blob_mdm,
+                                  const TaskStateId &stager_mdm,
+                                  const TaskStateId &op_mdm) {
+    HRUN_CLIENT->ConstructTask<SetBucketMdmTask>(
+        task, task_node, domain_id, id_, blob_mdm, stager_mdm, op_mdm);
+  }
+  void SetBucketMdmRoot(const DomainId &domain_id,
+                        const TaskStateId &blob_mdm,
+                        const TaskStateId &stager_mdm,
+                        const TaskStateId &op_mdm) {
+    LPointer<hrunpq::TypedPushTask<SetBucketMdmTask>> push_task =
+        AsyncSetBucketMdmRoot(domain_id, blob_mdm, stager_mdm, op_mdm);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(SetBucketMdm);
+
+  /**
+   * Get \a blob_name BLOB from \a bkt_id bucket
+   * */
+  void AsyncGetOrCreateBlobIdConstruct(GetOrCreateBlobIdTask* task,
+                                       const TaskNode &task_node,
+                                       TagId tag_id,
+                                       const hshm::charbuf &blob_name) {
+    u32 hash = std::hash<hshm::charbuf>{}(blob_name);
+    HRUN_CLIENT->ConstructTask<GetOrCreateBlobIdTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id, blob_name);
+  }
+  BlobId GetOrCreateBlobIdRoot(TagId tag_id, const hshm::charbuf &blob_name) {
+    LPointer<hrunpq::TypedPushTask<GetOrCreateBlobIdTask>> push_task =
+        AsyncGetOrCreateBlobIdRoot(tag_id, blob_name);
+    push_task->Wait();
+    GetOrCreateBlobIdTask *task = push_task->get();
+    BlobId blob_id = task->blob_id_;
+    HRUN_CLIENT->DelTask(push_task);
+    return blob_id;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetOrCreateBlobId);
+
+  /**
+  * Create a blob's metadata
+  *
+  * @param tag_id id of the bucket
+  * @param blob_name semantic blob name
+  * @param blob_id the id of the blob
+  * @param blob_off the offset of the data placed in existing blob
+  * @param blob_size the amount of data being placed
+  * @param blob a SHM pointer to the data to place
+  * @param score the current score of the blob
+  * @param replace whether to replace the blob if it exists
+  * @param[OUT] did_create whether the blob was created or not
+  * */
+  void AsyncPutBlobConstruct(
+      PutBlobTask *task,
+      const TaskNode &task_node,
+      TagId tag_id, const hshm::charbuf &blob_name,
+      const BlobId &blob_id, size_t blob_off, size_t blob_size,
+      const hipc::Pointer &blob, float score,
+      u32 flags,
+      Context ctx = Context(),
+      u32 task_flags = TASK_FIRE_AND_FORGET | TASK_DATA_OWNER | TASK_LOW_LATENCY) {
+    HRUN_CLIENT->ConstructTask<PutBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_name, blob_id,
+        blob_off, blob_size,
+        blob, score, flags, ctx, task_flags);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(PutBlob);
+
+  /** Get a blob's data */
+  void AsyncGetBlobConstruct(GetBlobTask *task,
+                             const TaskNode &task_node,
+                             const TagId &tag_id,
+                             const hshm::charbuf &blob_name,
+                             const BlobId &blob_id,
+                             size_t off,
+                             ssize_t data_size,
+                             hipc::Pointer &data,
+                             Context ctx = Context(),
+                             u32 flags = 0) {
+    // HILOG(kDebug, "Beginning GET (task_node={})", task_node);
+    HRUN_CLIENT->ConstructTask<GetBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_name, blob_id, off, data_size, data, ctx, flags);
+  }
+  size_t GetBlobRoot(const TagId &tag_id,
+                     const BlobId &blob_id,
+                     size_t off,
+                     ssize_t data_size,
+                     hipc::Pointer &data,
+                     Context ctx = Context(),
+                     u32 flags = 0) {
+    LPointer<hrunpq::TypedPushTask<GetBlobTask>> push_task =
+        AsyncGetBlobRoot(tag_id, hshm::charbuf(""), blob_id, off, data_size, data, ctx, flags);
+    push_task->Wait();
+    GetBlobTask *task = push_task->get();
+    data = task->data_;
+    size_t true_size = task->data_size_;
+    HRUN_CLIENT->DelTask(push_task);
+    return true_size;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetBlob);
+
+  /**
+   * Reorganize a blob
+   *
+   * @param blob_id id of the blob being reorganized
+   * @param score the new score of the blob
+   * @param node_id the node to reorganize the blob to
+   * */
+  void AsyncReorganizeBlobConstruct(ReorganizeBlobTask *task,
+                                    const TaskNode &task_node,
+                                    const TagId &tag_id,
+                                    const BlobId &blob_id,
+                                    float score,
+                                    u32 node_id) {
+    // HILOG(kDebug, "Beginning REORGANIZE (task_node={})", task_node);
+    HRUN_CLIENT->ConstructTask<ReorganizeBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id, score, node_id);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(ReorganizeBlob);
+
+  /**
+   * Tag a blob
+   *
+   * @param blob_id id of the blob being tagged
+   * @param tag_name tag name
+   * */
+  void AsyncTagBlobConstruct(TagBlobTask *task,
+                             const TaskNode &task_node,
+                             const TagId &tag_id,
+                             const BlobId &blob_id,
+                             const TagId &tag) {
+    HRUN_CLIENT->ConstructTask<TagBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id, tag);
+  }
+  void TagBlobRoot(const TagId &tag_id,
+                   const BlobId &blob_id,
+                   const TagId &tag) {
+    LPointer<hrunpq::TypedPushTask<TagBlobTask>> push_task =
+       AsyncTagBlobRoot(tag_id, blob_id, tag);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(TagBlob);
+
+  /**
+   * Check if blob has a tag
+   * */
+  void AsyncBlobHasTagConstruct(BlobHasTagTask *task,
+                                const TaskNode &task_node,
+                                const TagId &tag_id,
+                                const BlobId &blob_id,
+                                const TagId &tag) {
+    HRUN_CLIENT->ConstructTask<BlobHasTagTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id, tag);
+  }
+  bool BlobHasTagRoot(const TagId &tag_id,
+                      const BlobId &blob_id,
+                      const TagId &tag) {
+    LPointer<hrunpq::TypedPushTask<BlobHasTagTask>> push_task =
+        AsyncBlobHasTagRoot(tag_id, blob_id, tag);
+    push_task->Wait();
+    BlobHasTagTask *task = push_task->get();
+    bool has_tag = task->has_tag_;
+    HRUN_CLIENT->DelTask(push_task);
+    return has_tag;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(BlobHasTag);
+
+  /**
+   * Get \a blob_name BLOB from \a bkt_id bucket
+   * */
+  void AsyncGetBlobIdConstruct(GetBlobIdTask *task,
+                               const TaskNode &task_node,
+                               const TagId &tag_id,
+                               const hshm::charbuf &blob_name) {
+    u32 hash = std::hash<hshm::charbuf>{}(blob_name);
+    HRUN_CLIENT->ConstructTask<GetBlobIdTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id, blob_name);
+  }
+  BlobId GetBlobIdRoot(const TagId &tag_id,
+                       const hshm::charbuf &blob_name) {
+    LPointer<hrunpq::TypedPushTask<GetBlobIdTask>> push_task =
+        AsyncGetBlobIdRoot(tag_id, blob_name);
+    push_task->Wait();
+    GetBlobIdTask *task = push_task->get();
+    BlobId blob_id = task->blob_id_;
+    HRUN_CLIENT->DelTask(push_task);
+    return blob_id;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetBlobId);
+
+  /**
+   * Get \a blob_name BLOB name from \a blob_id BLOB id
+   * */
+  void AsyncGetBlobNameConstruct(GetBlobNameTask *task,
+                                 const TaskNode &task_node,
+                                 const TagId &tag_id,
+                                 const BlobId &blob_id) {
+    HRUN_CLIENT->ConstructTask<GetBlobNameTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id);
+  }
+  std::string GetBlobNameRoot(const TagId &tag_id,
+                              const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<GetBlobNameTask>> push_task =
+        AsyncGetBlobNameRoot(tag_id, blob_id);
+    push_task->Wait();
+    GetBlobNameTask *task = push_task->get();
+    std::string blob_name = task->blob_name_->str();
+    HRUN_CLIENT->DelTask(push_task);
+    return blob_name;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetBlobName);
+
+  /**
+   * Get \a size from \a blob_id BLOB id
+   * */
+  void AsyncGetBlobSizeConstruct(GetBlobSizeTask *task,
+                                 const TaskNode &task_node,
+                                 const TagId &tag_id,
+                                 const hshm::charbuf &blob_name,
+                                 const BlobId &blob_id) {
+    // HILOG(kDebug, "Getting blob size {}", task_node);
+    HRUN_CLIENT->ConstructTask<GetBlobSizeTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_name, blob_id);
+  }
+  size_t GetBlobSizeRoot(const TagId &tag_id,
+                         const hshm::charbuf &blob_name,
+                         const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<GetBlobSizeTask>> push_task =
+        AsyncGetBlobSizeRoot(tag_id, blob_name, blob_id);
+    push_task->Wait();
+    GetBlobSizeTask *task = push_task->get();
+    size_t size = task->size_;
+    HRUN_CLIENT->DelTask(push_task);
+    return size;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetBlobSize);
+
+  /**
+   * Get \a score from \a blob_id BLOB id
+   * */
+  void AsyncGetBlobScoreConstruct(GetBlobScoreTask *task,
+                                  const TaskNode &task_node,
+                                  const TagId &tag_id,
+                                  const BlobId &blob_id) {
+    HRUN_CLIENT->ConstructTask<GetBlobScoreTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id);
+  }
+  float GetBlobScoreRoot(const TagId &tag_id,
+                         const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<GetBlobScoreTask>> push_task =
+        AsyncGetBlobScoreRoot(tag_id, blob_id);
+    push_task->Wait();
+    GetBlobScoreTask *task = push_task->get();
+    float score = task->score_;
+    HRUN_CLIENT->DelTask(push_task);
+    return score;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetBlobScore);
+
+  /**
+   * Get \a blob_id blob's buffers
+   * */
+  void AsyncGetBlobBuffersConstruct(GetBlobBuffersTask *task,
+                                    const TaskNode &task_node,
+                                    const TagId &tag_id,
+                                    const BlobId &blob_id) {
+    HRUN_CLIENT->ConstructTask<GetBlobBuffersTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id);
+  }
+  std::vector<BufferInfo> GetBlobBuffersRoot(const TagId &tag_id,
+                                             const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<GetBlobBuffersTask>> push_task = AsyncGetBlobBuffersRoot(tag_id, blob_id);
+    push_task->Wait();
+    GetBlobBuffersTask *task = push_task->get();
+    std::vector<BufferInfo> buffers =
+        hshm::to_stl_vector<BufferInfo>(*task->buffers_);
+    HRUN_CLIENT->DelTask(push_task);
+    return buffers;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetBlobBuffers)
+
+  /**
+   * Rename \a blob_id blob to \a new_blob_name new blob name
+   * in \a bkt_id bucket.
+   * */
+  void AsyncRenameBlobConstruct(RenameBlobTask *task,
+                                const TaskNode &task_node,
+                                const TagId &tag_id,
+                                const BlobId &blob_id,
+                                const hshm::charbuf &new_blob_name) {
+    HRUN_CLIENT->ConstructTask<RenameBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id, new_blob_name);
+  }
+  void RenameBlobRoot(const TagId &tag_id,
+                      const BlobId &blob_id,
+                      const hshm::charbuf &new_blob_name) {
+    LPointer<hrunpq::TypedPushTask<RenameBlobTask>> push_task =
+        AsyncRenameBlobRoot(tag_id, blob_id, new_blob_name);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(RenameBlob);
+
+  /**
+   * Truncate a blob to a new size
+   * */
+  void AsyncTruncateBlobConstruct(TruncateBlobTask *task,
+                                  const TaskNode &task_node,
+                                  const TagId &tag_id,
+                                  const BlobId &blob_id,
+                                  size_t new_size) {
+    HRUN_CLIENT->ConstructTask<TruncateBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_), id_,
+        tag_id, blob_id, new_size);
+  }
+  void TruncateBlobRoot(const TagId &tag_id,
+                        const BlobId &blob_id,
+                        size_t new_size) {
+    LPointer<hrunpq::TypedPushTask<TruncateBlobTask>> push_task =
+        AsyncTruncateBlobRoot(tag_id, blob_id, new_size);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(TruncateBlob);
+
+  /**
+   * Destroy \a blob_id blob in \a bkt_id bucket
+   * */
+  void AsyncDestroyBlobConstruct(DestroyBlobTask *task,
+                                 const TaskNode &task_node,
+                                 const TagId &tag_id,
+                                 const BlobId &blob_id) {
+    HRUN_CLIENT->ConstructTask<DestroyBlobTask>(
+        task, task_node, DomainId::GetNode(blob_id.node_id_),
+        id_, tag_id, blob_id);
+  }
+  void DestroyBlobRoot(const TagId &tag_id,
+                       const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<DestroyBlobTask>> push_task =
+        AsyncDestroyBlobRoot(tag_id, blob_id);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(DestroyBlob);
+
+  /** Initialize automatic flushing */
+  void AsyncFlushDataConstruct(FlushDataTask *task,
+                               const TaskNode &task_node) {
+    HRUN_CLIENT->ConstructTask<FlushDataTask>(
+        task, task_node, id_);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(FlushData);
+
+  /**
+   * Get all blob metadata
+   * */
+  void AsyncPollBlobMetadataConstruct(PollBlobMetadataTask *task,
+                                  const TaskNode &task_node) {
+    HRUN_CLIENT->ConstructTask<PollBlobMetadataTask>(
+        task, task_node, id_);
+  }
+  std::vector<BlobInfo> PollBlobMetadataRoot() {
+    LPointer<hrunpq::TypedPushTask<PollBlobMetadataTask>> push_task =
+        AsyncPollBlobMetadataRoot();
+    push_task->Wait();
+    PollBlobMetadataTask *task = push_task->get();
+    std::vector<BlobInfo> blob_mdms =
+        task->DeserializeBlobMetadata();
+    HRUN_CLIENT->DelTask(push_task);
+    return blob_mdms;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(PollBlobMetadata);
+
+  /**
+  * Get all target metadata
+  * */
+  void AsyncPollTargetMetadataConstruct(PollTargetMetadataTask *task,
+                                        const TaskNode &task_node) {
+    HRUN_CLIENT->ConstructTask<PollTargetMetadataTask>(
+        task, task_node, id_);
+  }
+  std::vector<TargetStats> PollTargetMetadataRoot() {
+    LPointer<hrunpq::TypedPushTask<PollTargetMetadataTask>> push_task =
+        AsyncPollTargetMetadataRoot();
+    push_task->Wait();
+    PollTargetMetadataTask *task = push_task->get();
+    std::vector<TargetStats> target_mdms =
+        task->DeserializeTargetMetadata();
+    HRUN_CLIENT->DelTask(push_task);
+    return target_mdms;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(PollTargetMetadata);
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_hermes_blob_mdm_H_
diff --git a/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_lib_exec.h b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_lib_exec.h
new file mode 100644
index 000000000..9b702250e
--- /dev/null
+++ b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_lib_exec.h
@@ -0,0 +1,945 @@
+#ifndef HRUN_HERMES_BLOB_MDM_LIB_EXEC_H_
+#define HRUN_HERMES_BLOB_MDM_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kPutBlob: {
+      PutBlob(reinterpret_cast<PutBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetBlob: {
+      GetBlob(reinterpret_cast<GetBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kTruncateBlob: {
+      TruncateBlob(reinterpret_cast<TruncateBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestroyBlob: {
+      DestroyBlob(reinterpret_cast<DestroyBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kTagBlob: {
+      TagBlob(reinterpret_cast<TagBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kBlobHasTag: {
+      BlobHasTag(reinterpret_cast<BlobHasTagTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetBlobId: {
+      GetBlobId(reinterpret_cast<GetBlobIdTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      GetOrCreateBlobId(reinterpret_cast<GetOrCreateBlobIdTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetBlobName: {
+      GetBlobName(reinterpret_cast<GetBlobNameTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetBlobSize: {
+      GetBlobSize(reinterpret_cast<GetBlobSizeTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetBlobScore: {
+      GetBlobScore(reinterpret_cast<GetBlobScoreTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      GetBlobBuffers(reinterpret_cast<GetBlobBuffersTask *>(task), rctx);
+      break;
+    }
+    case Method::kRenameBlob: {
+      RenameBlob(reinterpret_cast<RenameBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      ReorganizeBlob(reinterpret_cast<ReorganizeBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      SetBucketMdm(reinterpret_cast<SetBucketMdmTask *>(task), rctx);
+      break;
+    }
+    case Method::kFlushData: {
+      FlushData(reinterpret_cast<FlushDataTask *>(task), rctx);
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      PollBlobMetadata(reinterpret_cast<PollBlobMetadataTask *>(task), rctx);
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      PollTargetMetadata(reinterpret_cast<PollTargetMetadataTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kPutBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<PutBlobTask *>(task));
+      break;
+    }
+    case Method::kGetBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetBlobTask *>(task));
+      break;
+    }
+    case Method::kTruncateBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<TruncateBlobTask *>(task));
+      break;
+    }
+    case Method::kDestroyBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestroyBlobTask *>(task));
+      break;
+    }
+    case Method::kTagBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<TagBlobTask *>(task));
+      break;
+    }
+    case Method::kBlobHasTag: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<BlobHasTagTask *>(task));
+      break;
+    }
+    case Method::kGetBlobId: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetBlobIdTask *>(task));
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetOrCreateBlobIdTask *>(task));
+      break;
+    }
+    case Method::kGetBlobName: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetBlobNameTask *>(task));
+      break;
+    }
+    case Method::kGetBlobSize: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetBlobSizeTask *>(task));
+      break;
+    }
+    case Method::kGetBlobScore: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetBlobScoreTask *>(task));
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetBlobBuffersTask *>(task));
+      break;
+    }
+    case Method::kRenameBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RenameBlobTask *>(task));
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ReorganizeBlobTask *>(task));
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<SetBucketMdmTask *>(task));
+      break;
+    }
+    case Method::kFlushData: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<FlushDataTask *>(task));
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<PollBlobMetadataTask *>(task));
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<PollTargetMetadataTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kPutBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<PutBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kTruncateBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<TruncateBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestroyBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestroyBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kTagBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<TagBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kBlobHasTag: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<BlobHasTagTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetBlobId: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetBlobIdTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetOrCreateBlobIdTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetBlobName: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetBlobNameTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetBlobSize: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetBlobSizeTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetBlobScore: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetBlobScoreTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetBlobBuffersTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRenameBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RenameBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ReorganizeBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<SetBucketMdmTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kFlushData: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<FlushDataTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<PollBlobMetadataTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<PollTargetMetadataTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kPutBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<PutBlobTask*>(orig_task), reinterpret_cast<PutBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kGetBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetBlobTask*>(orig_task), reinterpret_cast<GetBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kTruncateBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<TruncateBlobTask*>(orig_task), reinterpret_cast<TruncateBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kDestroyBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestroyBlobTask*>(orig_task), reinterpret_cast<DestroyBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kTagBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<TagBlobTask*>(orig_task), reinterpret_cast<TagBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kBlobHasTag: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<BlobHasTagTask*>(orig_task), reinterpret_cast<BlobHasTagTask*>(dup_task));
+      break;
+    }
+    case Method::kGetBlobId: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetBlobIdTask*>(orig_task), reinterpret_cast<GetBlobIdTask*>(dup_task));
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetOrCreateBlobIdTask*>(orig_task), reinterpret_cast<GetOrCreateBlobIdTask*>(dup_task));
+      break;
+    }
+    case Method::kGetBlobName: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetBlobNameTask*>(orig_task), reinterpret_cast<GetBlobNameTask*>(dup_task));
+      break;
+    }
+    case Method::kGetBlobSize: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetBlobSizeTask*>(orig_task), reinterpret_cast<GetBlobSizeTask*>(dup_task));
+      break;
+    }
+    case Method::kGetBlobScore: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetBlobScoreTask*>(orig_task), reinterpret_cast<GetBlobScoreTask*>(dup_task));
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetBlobBuffersTask*>(orig_task), reinterpret_cast<GetBlobBuffersTask*>(dup_task));
+      break;
+    }
+    case Method::kRenameBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RenameBlobTask*>(orig_task), reinterpret_cast<RenameBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ReorganizeBlobTask*>(orig_task), reinterpret_cast<ReorganizeBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<SetBucketMdmTask*>(orig_task), reinterpret_cast<SetBucketMdmTask*>(dup_task));
+      break;
+    }
+    case Method::kFlushData: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<FlushDataTask*>(orig_task), reinterpret_cast<FlushDataTask*>(dup_task));
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<PollBlobMetadataTask*>(orig_task), reinterpret_cast<PollBlobMetadataTask*>(dup_task));
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<PollTargetMetadataTask*>(orig_task), reinterpret_cast<PollTargetMetadataTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPutBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<PutBlobTask*>(task));
+      break;
+    }
+    case Method::kGetBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetBlobTask*>(task));
+      break;
+    }
+    case Method::kTruncateBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<TruncateBlobTask*>(task));
+      break;
+    }
+    case Method::kDestroyBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestroyBlobTask*>(task));
+      break;
+    }
+    case Method::kTagBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<TagBlobTask*>(task));
+      break;
+    }
+    case Method::kBlobHasTag: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<BlobHasTagTask*>(task));
+      break;
+    }
+    case Method::kGetBlobId: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetBlobIdTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetOrCreateBlobIdTask*>(task));
+      break;
+    }
+    case Method::kGetBlobName: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetBlobNameTask*>(task));
+      break;
+    }
+    case Method::kGetBlobSize: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetBlobSizeTask*>(task));
+      break;
+    }
+    case Method::kGetBlobScore: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetBlobScoreTask*>(task));
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetBlobBuffersTask*>(task));
+      break;
+    }
+    case Method::kRenameBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RenameBlobTask*>(task));
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ReorganizeBlobTask*>(task));
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<SetBucketMdmTask*>(task));
+      break;
+    }
+    case Method::kFlushData: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<FlushDataTask*>(task));
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<PollBlobMetadataTask*>(task));
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<PollTargetMetadataTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPutBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<PutBlobTask*>(task));
+      break;
+    }
+    case Method::kGetBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetBlobTask*>(task));
+      break;
+    }
+    case Method::kTruncateBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<TruncateBlobTask*>(task));
+      break;
+    }
+    case Method::kDestroyBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestroyBlobTask*>(task));
+      break;
+    }
+    case Method::kTagBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<TagBlobTask*>(task));
+      break;
+    }
+    case Method::kBlobHasTag: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<BlobHasTagTask*>(task));
+      break;
+    }
+    case Method::kGetBlobId: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetBlobIdTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetOrCreateBlobIdTask*>(task));
+      break;
+    }
+    case Method::kGetBlobName: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetBlobNameTask*>(task));
+      break;
+    }
+    case Method::kGetBlobSize: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetBlobSizeTask*>(task));
+      break;
+    }
+    case Method::kGetBlobScore: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetBlobScoreTask*>(task));
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetBlobBuffersTask*>(task));
+      break;
+    }
+    case Method::kRenameBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RenameBlobTask*>(task));
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ReorganizeBlobTask*>(task));
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<SetBucketMdmTask*>(task));
+      break;
+    }
+    case Method::kFlushData: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<FlushDataTask*>(task));
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<PollBlobMetadataTask*>(task));
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<PollTargetMetadataTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kPutBlob: {
+      ar << *reinterpret_cast<PutBlobTask*>(task);
+      break;
+    }
+    case Method::kGetBlob: {
+      ar << *reinterpret_cast<GetBlobTask*>(task);
+      break;
+    }
+    case Method::kTruncateBlob: {
+      ar << *reinterpret_cast<TruncateBlobTask*>(task);
+      break;
+    }
+    case Method::kDestroyBlob: {
+      ar << *reinterpret_cast<DestroyBlobTask*>(task);
+      break;
+    }
+    case Method::kTagBlob: {
+      ar << *reinterpret_cast<TagBlobTask*>(task);
+      break;
+    }
+    case Method::kBlobHasTag: {
+      ar << *reinterpret_cast<BlobHasTagTask*>(task);
+      break;
+    }
+    case Method::kGetBlobId: {
+      ar << *reinterpret_cast<GetBlobIdTask*>(task);
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      ar << *reinterpret_cast<GetOrCreateBlobIdTask*>(task);
+      break;
+    }
+    case Method::kGetBlobName: {
+      ar << *reinterpret_cast<GetBlobNameTask*>(task);
+      break;
+    }
+    case Method::kGetBlobSize: {
+      ar << *reinterpret_cast<GetBlobSizeTask*>(task);
+      break;
+    }
+    case Method::kGetBlobScore: {
+      ar << *reinterpret_cast<GetBlobScoreTask*>(task);
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      ar << *reinterpret_cast<GetBlobBuffersTask*>(task);
+      break;
+    }
+    case Method::kRenameBlob: {
+      ar << *reinterpret_cast<RenameBlobTask*>(task);
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      ar << *reinterpret_cast<ReorganizeBlobTask*>(task);
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      ar << *reinterpret_cast<SetBucketMdmTask*>(task);
+      break;
+    }
+    case Method::kFlushData: {
+      ar << *reinterpret_cast<FlushDataTask*>(task);
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      ar << *reinterpret_cast<PollBlobMetadataTask*>(task);
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      ar << *reinterpret_cast<PollTargetMetadataTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kPutBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<PutBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<PutBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kTruncateBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<TruncateBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<TruncateBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestroyBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestroyBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestroyBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kTagBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<TagBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<TagBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kBlobHasTag: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<BlobHasTagTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<BlobHasTagTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetBlobId: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetBlobIdTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetBlobIdTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetOrCreateBlobIdTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetOrCreateBlobIdTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetBlobName: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetBlobNameTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetBlobNameTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetBlobSize: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetBlobSizeTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetBlobSizeTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetBlobScore: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetBlobScoreTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetBlobScoreTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetBlobBuffersTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetBlobBuffersTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRenameBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RenameBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RenameBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ReorganizeBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ReorganizeBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<SetBucketMdmTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<SetBucketMdmTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kFlushData: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<FlushDataTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<FlushDataTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<PollBlobMetadataTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<PollBlobMetadataTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<PollTargetMetadataTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<PollTargetMetadataTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kPutBlob: {
+      ar << *reinterpret_cast<PutBlobTask*>(task);
+      break;
+    }
+    case Method::kGetBlob: {
+      ar << *reinterpret_cast<GetBlobTask*>(task);
+      break;
+    }
+    case Method::kTruncateBlob: {
+      ar << *reinterpret_cast<TruncateBlobTask*>(task);
+      break;
+    }
+    case Method::kDestroyBlob: {
+      ar << *reinterpret_cast<DestroyBlobTask*>(task);
+      break;
+    }
+    case Method::kTagBlob: {
+      ar << *reinterpret_cast<TagBlobTask*>(task);
+      break;
+    }
+    case Method::kBlobHasTag: {
+      ar << *reinterpret_cast<BlobHasTagTask*>(task);
+      break;
+    }
+    case Method::kGetBlobId: {
+      ar << *reinterpret_cast<GetBlobIdTask*>(task);
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      ar << *reinterpret_cast<GetOrCreateBlobIdTask*>(task);
+      break;
+    }
+    case Method::kGetBlobName: {
+      ar << *reinterpret_cast<GetBlobNameTask*>(task);
+      break;
+    }
+    case Method::kGetBlobSize: {
+      ar << *reinterpret_cast<GetBlobSizeTask*>(task);
+      break;
+    }
+    case Method::kGetBlobScore: {
+      ar << *reinterpret_cast<GetBlobScoreTask*>(task);
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      ar << *reinterpret_cast<GetBlobBuffersTask*>(task);
+      break;
+    }
+    case Method::kRenameBlob: {
+      ar << *reinterpret_cast<RenameBlobTask*>(task);
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      ar << *reinterpret_cast<ReorganizeBlobTask*>(task);
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      ar << *reinterpret_cast<SetBucketMdmTask*>(task);
+      break;
+    }
+    case Method::kFlushData: {
+      ar << *reinterpret_cast<FlushDataTask*>(task);
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      ar << *reinterpret_cast<PollBlobMetadataTask*>(task);
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      ar << *reinterpret_cast<PollTargetMetadataTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kPutBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<PutBlobTask*>(task));
+      break;
+    }
+    case Method::kGetBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<GetBlobTask*>(task));
+      break;
+    }
+    case Method::kTruncateBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<TruncateBlobTask*>(task));
+      break;
+    }
+    case Method::kDestroyBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<DestroyBlobTask*>(task));
+      break;
+    }
+    case Method::kTagBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<TagBlobTask*>(task));
+      break;
+    }
+    case Method::kBlobHasTag: {
+      ar.Deserialize(replica, *reinterpret_cast<BlobHasTagTask*>(task));
+      break;
+    }
+    case Method::kGetBlobId: {
+      ar.Deserialize(replica, *reinterpret_cast<GetBlobIdTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateBlobId: {
+      ar.Deserialize(replica, *reinterpret_cast<GetOrCreateBlobIdTask*>(task));
+      break;
+    }
+    case Method::kGetBlobName: {
+      ar.Deserialize(replica, *reinterpret_cast<GetBlobNameTask*>(task));
+      break;
+    }
+    case Method::kGetBlobSize: {
+      ar.Deserialize(replica, *reinterpret_cast<GetBlobSizeTask*>(task));
+      break;
+    }
+    case Method::kGetBlobScore: {
+      ar.Deserialize(replica, *reinterpret_cast<GetBlobScoreTask*>(task));
+      break;
+    }
+    case Method::kGetBlobBuffers: {
+      ar.Deserialize(replica, *reinterpret_cast<GetBlobBuffersTask*>(task));
+      break;
+    }
+    case Method::kRenameBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<RenameBlobTask*>(task));
+      break;
+    }
+    case Method::kReorganizeBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<ReorganizeBlobTask*>(task));
+      break;
+    }
+    case Method::kSetBucketMdm: {
+      ar.Deserialize(replica, *reinterpret_cast<SetBucketMdmTask*>(task));
+      break;
+    }
+    case Method::kFlushData: {
+      ar.Deserialize(replica, *reinterpret_cast<FlushDataTask*>(task));
+      break;
+    }
+    case Method::kPollBlobMetadata: {
+      ar.Deserialize(replica, *reinterpret_cast<PollBlobMetadataTask*>(task));
+      break;
+    }
+    case Method::kPollTargetMetadata: {
+      ar.Deserialize(replica, *reinterpret_cast<PollTargetMetadataTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kPutBlob: {
+      return reinterpret_cast<PutBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetBlob: {
+      return reinterpret_cast<GetBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kTruncateBlob: {
+      return reinterpret_cast<TruncateBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestroyBlob: {
+      return reinterpret_cast<DestroyBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kTagBlob: {
+      return reinterpret_cast<TagBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kBlobHasTag: {
+      return reinterpret_cast<BlobHasTagTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetBlobId: {
+      return reinterpret_cast<GetBlobIdTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetOrCreateBlobId: {
+      return reinterpret_cast<GetOrCreateBlobIdTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetBlobName: {
+      return reinterpret_cast<GetBlobNameTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetBlobSize: {
+      return reinterpret_cast<GetBlobSizeTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetBlobScore: {
+      return reinterpret_cast<GetBlobScoreTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetBlobBuffers: {
+      return reinterpret_cast<GetBlobBuffersTask*>(task)->GetGroup(group);
+    }
+    case Method::kRenameBlob: {
+      return reinterpret_cast<RenameBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kReorganizeBlob: {
+      return reinterpret_cast<ReorganizeBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kSetBucketMdm: {
+      return reinterpret_cast<SetBucketMdmTask*>(task)->GetGroup(group);
+    }
+    case Method::kFlushData: {
+      return reinterpret_cast<FlushDataTask*>(task)->GetGroup(group);
+    }
+    case Method::kPollBlobMetadata: {
+      return reinterpret_cast<PollBlobMetadataTask*>(task)->GetGroup(group);
+    }
+    case Method::kPollTargetMetadata: {
+      return reinterpret_cast<PollTargetMetadataTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_HERMES_BLOB_MDM_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_methods.h b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_methods.h
new file mode 100644
index 000000000..7bd0cc751
--- /dev/null
+++ b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_methods.h
@@ -0,0 +1,26 @@
+#ifndef HRUN_HERMES_BLOB_MDM_METHODS_H_
+#define HRUN_HERMES_BLOB_MDM_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kPutBlob = kLast + 0;
+  TASK_METHOD_T kGetBlob = kLast + 1;
+  TASK_METHOD_T kTruncateBlob = kLast + 2;
+  TASK_METHOD_T kDestroyBlob = kLast + 3;
+  TASK_METHOD_T kTagBlob = kLast + 4;
+  TASK_METHOD_T kBlobHasTag = kLast + 6;
+  TASK_METHOD_T kGetBlobId = kLast + 8;
+  TASK_METHOD_T kGetOrCreateBlobId = kLast + 9;
+  TASK_METHOD_T kGetBlobName = kLast + 10;
+  TASK_METHOD_T kGetBlobSize = kLast + 11;
+  TASK_METHOD_T kGetBlobScore = kLast + 12;
+  TASK_METHOD_T kGetBlobBuffers = kLast + 13;
+  TASK_METHOD_T kRenameBlob = kLast + 14;
+  TASK_METHOD_T kReorganizeBlob = kLast + 15;
+  TASK_METHOD_T kSetBucketMdm = kLast + 16;
+  TASK_METHOD_T kFlushData = kLast + 17;
+  TASK_METHOD_T kPollBlobMetadata = kLast + 18;
+  TASK_METHOD_T kPollTargetMetadata = kLast + 19;
+};
+
+#endif  // HRUN_HERMES_BLOB_MDM_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_methods.yaml b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_methods.yaml
new file mode 100644
index 000000000..a886bf876
--- /dev/null
+++ b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_methods.yaml
@@ -0,0 +1,20 @@
+kPutBlob: 0
+kGetBlob: 1
+kTruncateBlob: 2
+kDestroyBlob: 3
+kTagBlob: 4
+#kUntagBlob: 5
+kBlobHasTag: 6
+#kGetBlobTags: 7
+kGetBlobId: 8
+kGetOrCreateBlobId: 9
+kGetBlobName: 10
+kGetBlobSize: 11
+kGetBlobScore: 12
+kGetBlobBuffers: 13
+kRenameBlob: 14
+kReorganizeBlob: 15
+kSetBucketMdm: 16
+kFlushData: 17
+kPollBlobMetadata: 18
+kPollTargetMetadata: 19
\ No newline at end of file
diff --git a/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_tasks.h b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_tasks.h
new file mode 100644
index 000000000..3852fb921
--- /dev/null
+++ b/tasks/hermes_blob_mdm/include/hermes_blob_mdm/hermes_blob_mdm_tasks.h
@@ -0,0 +1,1423 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_TASKS_HERMES_BLOB_MDM_INCLUDE_HERMES_BLOB_MDM_HERMES_BLOB_MDM_TASKS_H_
+#define HRUN_TASKS_HERMES_BLOB_MDM_INCLUDE_HERMES_BLOB_MDM_HERMES_BLOB_MDM_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hermes/hermes_types.h"
+#include "bdev/bdev.h"
+#include "hrun/api/hrun_client.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hermes::blob_mdm {
+
+#include "hermes_blob_mdm_methods.h"
+#include "hrun/hrun_namespace.h"
+
+using hrun::Task;
+using hrun::TaskFlags;
+using hrun::DataTransfer;
+
+/** Phases of the construct task */
+using hrun::Admin::CreateTaskStatePhase;
+class ConstructTaskPhase : public CreateTaskStatePhase {
+ public:
+  TASK_METHOD_T kCreateTaskStates = kLast + 0;
+  TASK_METHOD_T kWaitForTaskStates = kLast + 1;
+};
+
+/**
+ * A task to create hermes_mdm
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "hermes_blob_mdm", id, queue_info) {
+  }
+};
+
+/** A task to destroy hermes_mdm */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               const TaskStateId &state_id)
+  : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** Set the BUCKET MDM ID */
+struct SetBucketMdmTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  IN TaskStateId bkt_mdm_;
+  IN TaskStateId stager_mdm_;
+  IN TaskStateId op_mdm_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  SetBucketMdmTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  SetBucketMdmTask(hipc::Allocator *alloc,
+                   const TaskNode &task_node,
+                   const DomainId &domain_id,
+                   const TaskStateId &state_id,
+                   const TaskStateId &bkt_mdm,
+                   const TaskStateId &stager_mdm,
+                   const TaskStateId &op_mdm) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = state_id;
+    method_ = Method::kSetBucketMdm;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    bkt_mdm_ = bkt_mdm;
+    stager_mdm_ = stager_mdm;
+    op_mdm_ = op_mdm;
+  }
+
+  /** Destructor */
+  ~SetBucketMdmTask() {}
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, SetBucketMdmTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, SetBucketMdmTask &dup_task) {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(bkt_mdm_, stager_mdm_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+};
+
+/**====================================
+ * Blob Operations
+ * ===================================*/
+
+/**
+ * Get \a blob_name BLOB from \a bkt_id bucket
+ * */
+struct GetOrCreateBlobIdTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN hipc::ShmArchive<hipc::charbuf> blob_name_;
+  OUT BlobId blob_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetOrCreateBlobIdTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetOrCreateBlobIdTask(hipc::Allocator *alloc,
+                        const TaskNode &task_node,
+                        const DomainId &domain_id,
+                        const TaskStateId &state_id,
+                        const TagId &tag_id,
+                        const hshm::charbuf &blob_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = std::hash<hshm::charbuf>{}(blob_name);
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetOrCreateBlobId;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name)
+  }
+
+  /** Destructor */
+  ~GetOrCreateBlobIdTask() {
+    HSHM_DESTROY_AR(blob_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_name_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(blob_id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** Phases for the put task */
+class PutBlobPhase {
+ public:
+  TASK_METHOD_T kCreate = 0;
+  TASK_METHOD_T kAllocate = 1;
+  TASK_METHOD_T kWaitAllocate = 2;
+  TASK_METHOD_T kModify = 3;
+  TASK_METHOD_T kWaitModify = 4;
+};
+
+#define HERMES_BLOB_REPLACE BIT_OPT(u32, 0)
+#define HERMES_BLOB_APPEND BIT_OPT(u32, 1)
+#define HERMES_DID_STAGE_IN BIT_OPT(u32, 2)
+#define HERMES_IS_FILE BIT_OPT(u32, 3)
+#define HERMES_BLOB_DID_CREATE BIT_OPT(u32, 4)
+#define HERMES_GET_BLOB_ID BIT_OPT(u32, 5)
+#define HERMES_HAS_DERIVED BIT_OPT(u32, 6)
+
+/** A task to put data in a blob */
+struct PutBlobTask : public Task, TaskFlags<TF_SRL_ASYM_START | TF_SRL_SYM_END> {
+  IN TagId tag_id_;
+  IN hipc::ShmArchive<hipc::charbuf> blob_name_;
+  IN size_t blob_off_;
+  IN size_t data_size_;
+  IN hipc::Pointer data_;
+  IN float score_;
+  IN bitfield32_t flags_;
+  IN BlobId blob_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PutBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PutBlobTask(hipc::Allocator *alloc,
+              const TaskNode &task_node,
+              const DomainId &domain_id,
+              const TaskStateId &state_id,
+              const TagId &tag_id,
+              const hshm::charbuf &blob_name,
+              const BlobId &blob_id,
+              size_t blob_off,
+              size_t data_size,
+              const hipc::Pointer &data,
+              float score,
+              u32 flags,
+              const Context &ctx,
+              u32 task_flags) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kPutBlob;
+    task_flags_ = bitfield32_t(task_flags);
+    task_flags_.SetBits(TASK_COROUTINE);
+    if (!blob_id.IsNull()) {
+      lane_hash_ = blob_id.hash_;
+      domain_id_ = domain_id;
+    } else {
+      lane_hash_ = std::hash<hshm::charbuf>{}(blob_name);
+      domain_id_ = DomainId::GetNode(HASH_TO_NODE_ID(lane_hash_));
+    }
+
+    // Custom params
+    tag_id_ = tag_id;
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name);
+    blob_id_ = blob_id;
+    blob_off_ = blob_off;
+    data_size_ = data_size;
+    data_ = data;
+    score_ = score;
+    flags_ = bitfield32_t(flags | ctx.flags_.bits_);
+  }
+
+  /** Destructor */
+  ~PutBlobTask() {
+    HSHM_DESTROY_AR(blob_name_);
+    if (IsDataOwner()) {
+      HRUN_CLIENT->FreeBuffer(data_);
+    }
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SaveStart(Ar &ar) {
+    DataTransfer xfer(DT_RECEIVER_READ,
+                      HERMES_MEMORY_MANAGER->Convert<char>(data_),
+                      data_size_, domain_id_);
+    task_serialize<Ar>(ar);
+    ar & xfer;
+    ar(tag_id_, blob_name_, blob_id_, blob_off_, data_size_, score_, flags_);
+  }
+
+  /** Deserialize message call */
+  template<typename Ar>
+  void LoadStart(Ar &ar) {
+    DataTransfer xfer;
+    task_serialize<Ar>(ar);
+    ar & xfer;
+    data_ = HERMES_MEMORY_MANAGER->Convert<void, hipc::Pointer>(xfer.data_);
+    ar(tag_id_, blob_name_, blob_id_, blob_off_, data_size_, score_, flags_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    if (flags_.Any(HERMES_GET_BLOB_ID)) {
+      ar(blob_id_);
+    }
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Phases for the get task */
+class GetBlobPhase {
+ public:
+  TASK_METHOD_T kStart = 0;
+  TASK_METHOD_T kWait = 1;
+};
+
+/** A task to get data from a blob */
+struct GetBlobTask : public Task, TaskFlags<TF_SRL_ASYM_START | TF_SRL_SYM_END> {
+  IN TagId tag_id_;
+  IN hipc::ShmArchive<hipc::charbuf> blob_name_;
+  INOUT BlobId blob_id_;
+  IN size_t blob_off_;
+  IN hipc::Pointer data_;
+  INOUT ssize_t data_size_;
+  IN bitfield32_t flags_;
+  TEMP int phase_ = GetBlobPhase::kStart;
+  TEMP hipc::ShmArchive<std::vector<bdev::ReadTask*>> bdev_reads_;
+  TEMP PutBlobTask *stage_task_ = nullptr;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobTask(hipc::Allocator *alloc,
+              const TaskNode &task_node,
+              const DomainId &domain_id,
+              const TaskStateId &state_id,
+              const TagId &tag_id,
+              const hshm::charbuf &blob_name,
+              const BlobId &blob_id,
+              size_t off,
+              ssize_t data_size,
+              hipc::Pointer &data,
+              const Context &ctx,
+              u32 flags) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    if (!blob_id.IsNull()) {
+      lane_hash_ = blob_id.hash_;
+      domain_id_ = domain_id;
+    } else {
+      lane_hash_ = std::hash<hshm::charbuf>{}(blob_name);
+      domain_id_ = DomainId::GetNode(HASH_TO_NODE_ID(lane_hash_));
+    }
+
+    // Custom params
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    blob_off_ = off;
+    data_size_ = data_size;
+    data_ = data;
+    flags_ = bitfield32_t(flags);
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name);
+  }
+
+  /** Convert data to a data structure */
+  template<typename T>
+  HSHM_ALWAYS_INLINE
+  void Get(T &obj) {
+    char *data = HRUN_CLIENT->GetPrivatePointer(data_);
+    std::stringstream ss(std::string(data, data_size_));
+    cereal::BinaryInputArchive ar(ss);
+    ar >> obj;
+  }
+
+  /** Convert data to a data structure */
+  template<typename T>
+  HSHM_ALWAYS_INLINE
+  T Get() {
+    T obj;
+    return Get(obj);
+  }
+
+  /** Destructor */
+  ~GetBlobTask() {
+    HSHM_DESTROY_AR(blob_name_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SaveStart(Ar &ar) {
+    DataTransfer xfer(DT_RECEIVER_WRITE,
+                      HERMES_MEMORY_MANAGER->Convert<char>(data_),
+                      data_size_, domain_id_);
+    task_serialize<Ar>(ar);
+    ar & xfer;
+    ar(tag_id_, blob_name_, blob_id_, blob_off_, data_size_, flags_);
+  }
+
+  /** Deserialize message call */
+  template<typename Ar>
+  void LoadStart(Ar &ar) {
+    DataTransfer xfer;
+    task_serialize<Ar>(ar);
+    ar & xfer;
+    data_ = HERMES_MEMORY_MANAGER->Convert<void, hipc::Pointer>(xfer.data_);
+    ar(tag_id_, blob_name_, blob_id_, blob_off_, data_size_, flags_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    if (flags_.Any(HERMES_GET_BLOB_ID)) {
+      ar(blob_id_);
+    }
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to tag a blob */
+struct TagBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  IN TagId tag_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagBlobTask(hipc::Allocator *alloc,
+              const TaskNode &task_node,
+              const DomainId &domain_id,
+              const TaskStateId &state_id,
+              const TagId &tag_id,
+              const BlobId &blob_id,
+              const TagId &tag) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kTagBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    tag_ = tag;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(blob_id_, tag_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/**
+ * Check if blob has a tag
+ * */
+struct BlobHasTagTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  IN TagId tag_;
+  OUT bool has_tag_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  BlobHasTagTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  BlobHasTagTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 const TagId &tag_id,
+                 const BlobId &blob_id,
+                 const TagId &tag) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kBlobHasTag;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    tag_ = tag;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_, tag_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(has_tag_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/**
+ * Get \a blob_name BLOB from \a bkt_id bucket
+ * */
+struct GetBlobIdTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN hipc::ShmArchive<hipc::charbuf> blob_name_;
+  OUT BlobId blob_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobIdTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobIdTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const TaskStateId &state_id,
+                const TagId &tag_id,
+                const hshm::charbuf &blob_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = std::hash<hshm::charbuf>{}(blob_name);
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetBlobId;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name)
+  }
+
+  /** Destructor */
+  ~GetBlobIdTask() {
+    HSHM_DESTROY_AR(blob_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_name_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(blob_id_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/**
+ * Get \a blob_name BLOB name from \a blob_id BLOB id
+ * */
+struct GetBlobNameTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  OUT hipc::ShmArchive<hipc::string> blob_name_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobNameTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobNameTask(hipc::Allocator *alloc,
+                  const TaskNode &task_node,
+                  const DomainId &domain_id,
+                  const TaskStateId &state_id,
+                  const TagId &tag_id,
+                  const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetBlobName;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    HSHM_MAKE_AR0(blob_name_, alloc)
+  }
+
+  /** Destructor */
+  ~GetBlobNameTask() {
+    HSHM_DESTROY_AR(blob_name_)
+  };
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(blob_name_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Get \a score from \a blob_id BLOB id */
+struct GetBlobSizeTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN hipc::ShmArchive<hipc::charbuf> blob_name_;
+  IN BlobId blob_id_;
+  OUT size_t size_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobSizeTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobSizeTask(hipc::Allocator *alloc,
+                  const TaskNode &task_node,
+                  const DomainId &domain_id,
+                  const TaskStateId &state_id,
+                  const TagId &tag_id,
+                  const hshm::charbuf &blob_name,
+                  const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetBlobSize;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    if (!blob_id.IsNull()) {
+      lane_hash_ = blob_id.hash_;
+      domain_id_ = domain_id;
+    } else {
+      lane_hash_ = std::hash<hshm::charbuf>{}(blob_name);
+      domain_id_ = DomainId::GetNode(HASH_TO_NODE_ID(lane_hash_));
+    }
+
+    // Custom
+    tag_id_ = tag_id;
+    HSHM_MAKE_AR(blob_name_, alloc, blob_name)
+    blob_id_ = blob_id;
+  }
+
+  /** Destructor */
+  ~GetBlobSizeTask() {
+    HSHM_DESTROY_AR(blob_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_name_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(size_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Get \a score from \a blob_id BLOB id */
+struct GetBlobScoreTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  OUT float score_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobScoreTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobScoreTask(hipc::Allocator *alloc,
+                   const TaskNode &task_node,
+                   const DomainId &domain_id,
+                   const TaskStateId &state_id,
+                   const TagId &tag_id,
+                   const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetBlobScore;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(score_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Get \a blob_id blob's buffers */
+struct GetBlobBuffersTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  OUT hipc::ShmArchive<hipc::vector<BufferInfo>> buffers_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobBuffersTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetBlobBuffersTask(hipc::Allocator *alloc,
+                     const TaskNode &task_node,
+                     const DomainId &domain_id,
+                     const TaskStateId &state_id,
+                     const TagId &tag_id,
+                     const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetBlobBuffers;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    HSHM_MAKE_AR0(buffers_, alloc)
+  }
+
+  /** Destructor */
+  ~GetBlobBuffersTask() {
+    HSHM_DESTROY_AR(buffers_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(buffers_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/**
+ * Rename \a blob_id blob to \a new_blob_name new blob name
+ * in \a bkt_id bucket.
+ * */
+struct RenameBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  IN hipc::ShmArchive<hipc::charbuf> new_blob_name_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RenameBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RenameBlobTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 const TagId &tag_id,
+                 const BlobId &blob_id,
+                 const hshm::charbuf &new_blob_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRenameBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    HSHM_MAKE_AR(new_blob_name_, alloc, new_blob_name)
+  }
+
+  /** Destructor */
+  ~RenameBlobTask() {
+    HSHM_DESTROY_AR(new_blob_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(new_blob_name_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to truncate a blob */
+struct TruncateBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  IN u64 size_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TruncateBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TruncateBlobTask(hipc::Allocator *alloc,
+                   const TaskNode &task_node,
+                   const DomainId &domain_id,
+                   const TaskStateId &state_id,
+                   const TagId &tag_id,
+                   const BlobId &blob_id,
+                   u64 size) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kTruncateBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    size_ = size;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_, size_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Phases of the destroy blob task */
+struct DestroyBlobPhase {
+  TASK_METHOD_T kFreeBuffers = 0;
+  TASK_METHOD_T kWaitFreeBuffers = 1;
+};
+
+/** A task to destroy a blob */
+struct DestroyBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+  TEMP int phase_ = DestroyBlobPhase::kFreeBuffers;
+  TEMP hipc::ShmArchive<std::vector<bdev::FreeTask *>> free_tasks_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestroyBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestroyBlobTask(hipc::Allocator *alloc,
+                  const TaskNode &task_node,
+                  const DomainId &domain_id,
+                  const TaskStateId &state_id,
+                  const TagId &tag_id,
+                  const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kDestroyBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Phases of the destroy blob task */
+struct ReorganizeBlobPhase {
+  TASK_METHOD_T kGet = 0;
+  TASK_METHOD_T kWaitGet = 1;
+  TASK_METHOD_T kPut = 2;
+};
+
+/** A task to reorganize a blob's composition in the hierarchy */
+struct ReorganizeBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN BlobId blob_id_;
+  IN float score_;
+  IN u32 node_id_;
+  TEMP int phase_ = ReorganizeBlobPhase::kGet;
+  TEMP hipc::Pointer data_;
+  TEMP size_t data_size_;
+  TEMP GetBlobTask *get_task_;
+  TEMP PutBlobTask *put_task_;
+  TEMP TagId tag_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ReorganizeBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ReorganizeBlobTask(hipc::Allocator *alloc,
+                     const TaskNode &task_node,
+                     const DomainId &domain_id,
+                     const TaskStateId &state_id,
+                     const TagId &tag_id,
+                     const BlobId &blob_id,
+                     float score,
+                     u32 node_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = blob_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kReorganizeBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_FIRE_AND_FORGET);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+    score_ = score;
+    node_id_ = node_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_, score_, node_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to reorganize a blob's composition in the hierarchy */
+struct FlushDataTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  FlushDataTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  FlushDataTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kFlushData;
+    task_flags_.SetBits(
+        TASK_LANE_ALL |
+        TASK_FIRE_AND_FORGET |
+        TASK_LONG_RUNNING |
+        TASK_COROUTINE |
+        TASK_REMOTE_DEBUG_MARK);
+    SetPeriodSec(2);  // TODO(llogan): don't hardcode this
+    domain_id_ = DomainId::GetLocal();
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, FlushDataTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, FlushDataTask &dup_task) {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to collect blob metadata */
+struct PollBlobMetadataTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  OUT hipc::ShmArchive<hipc::string> my_blob_mdms_;
+  TEMP hipc::ShmArchive<hipc::vector<hipc::string>> blob_mdms_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PollBlobMetadataTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PollBlobMetadataTask(hipc::Allocator *alloc,
+                       const TaskNode &task_node,
+                       const TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kPollBlobMetadata;
+    task_flags_.SetBits(TASK_LANE_ALL);
+    domain_id_ = DomainId::GetGlobal();
+
+    // Custom params
+    HSHM_MAKE_AR0(my_blob_mdms_, alloc)
+    HSHM_MAKE_AR0(blob_mdms_, alloc)
+  }
+
+  /** Serialize blob info */
+  void SerializeBlobMetadata(const std::vector<BlobInfo> &blob_info) {
+    std::stringstream ss;
+    cereal::BinaryOutputArchive ar(ss);
+    ar << blob_info;
+    (*my_blob_mdms_) = ss.str();
+  }
+
+  /** Deserialize blob info */
+  void DeserializeBlobMetadata(const std::string &srl, std::vector<BlobInfo> &blob_mdms) {
+    std::vector<BlobInfo> tmp_blob_mdms;
+    std::stringstream ss(srl);
+    cereal::BinaryInputArchive ar(ss);
+    ar >> tmp_blob_mdms;
+    for (BlobInfo &blob_info : tmp_blob_mdms) {
+      blob_mdms.emplace_back(blob_info);
+    }
+  }
+
+  /** Get combined output of all replicas */
+  std::vector<BlobInfo> MergeBlobMetadata() {
+    std::vector<BlobInfo> blob_mdms;
+    for (const hipc::string &srl : *blob_mdms_) {
+      DeserializeBlobMetadata(srl.str(), blob_mdms);
+    }
+    return blob_mdms;
+  }
+
+  /** Deserialize final query output */
+  std::vector<BlobInfo> DeserializeBlobMetadata() {
+    std::vector<BlobInfo> blob_mdms;
+    DeserializeBlobMetadata(my_blob_mdms_->str(), blob_mdms);
+    return blob_mdms;
+  }
+
+  /** Destructor */
+  ~PollBlobMetadataTask() {
+    HSHM_DESTROY_AR(my_blob_mdms_)
+    HSHM_DESTROY_AR(blob_mdms_)
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, PollBlobMetadataTask &other) {
+    task_dup(other);
+    HSHM_MAKE_AR(blob_mdms_, alloc, *other.blob_mdms_)
+    HSHM_MAKE_AR(my_blob_mdms_, alloc, *other.my_blob_mdms_)
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, PollBlobMetadataTask &dup_task) {
+    (*blob_mdms_)[replica] = (*dup_task.my_blob_mdms_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(my_blob_mdms_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar((*blob_mdms_)[replica]);
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {
+    blob_mdms_->resize(count);
+  }
+
+  /** Finalize replication */
+  void ReplicateEnd() {
+    std::vector<BlobInfo> blob_mdms = MergeBlobMetadata();
+    SerializeBlobMetadata(blob_mdms);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** A task to collect blob metadata */
+struct PollTargetMetadataTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  OUT hipc::ShmArchive<hipc::string> my_target_mdms_;
+  TEMP hipc::ShmArchive<hipc::vector<hipc::string>> target_mdms_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PollTargetMetadataTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PollTargetMetadataTask(hipc::Allocator *alloc,
+                         const TaskNode &task_node,
+                         const TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kPollTargetMetadata;
+    task_flags_.SetBits(TASK_COROUTINE);
+    domain_id_ = DomainId::GetGlobal();
+
+    // Custom params
+    HSHM_MAKE_AR0(my_target_mdms_, alloc)
+    HSHM_MAKE_AR0(target_mdms_, alloc)
+  }
+
+  /** Serialize target info */
+  void SerializeTargetMetadata(const std::vector<TargetStats> &target_info) {
+    std::stringstream ss;
+    cereal::BinaryOutputArchive ar(ss);
+    ar << target_info;
+    (*my_target_mdms_) = ss.str();
+  }
+
+  /** Deserialize target info */
+  void DeserializeTargetMetadata(const std::string &srl, std::vector<TargetStats> &target_mdms) {
+    std::vector<TargetStats> tmp_target_mdms;
+    std::stringstream ss(srl);
+    cereal::BinaryInputArchive ar(ss);
+    ar >> tmp_target_mdms;
+    for (TargetStats &target_info : tmp_target_mdms) {
+      target_mdms.emplace_back(target_info);
+    }
+  }
+
+  /** Get combined output of all replicas */
+  std::vector<TargetStats> MergeTargetMetadata() {
+    std::vector<TargetStats> target_mdms;
+    for (const hipc::string &srl : *target_mdms_) {
+      DeserializeTargetMetadata(srl.str(), target_mdms);
+    }
+    return target_mdms;
+  }
+
+  /** Deserialize final query output */
+  std::vector<TargetStats> DeserializeTargetMetadata() {
+    std::vector<TargetStats> target_mdms;
+    DeserializeTargetMetadata(my_target_mdms_->str(), target_mdms);
+    return target_mdms;
+  }
+
+  /** Destructor */
+  ~PollTargetMetadataTask() {
+    HSHM_DESTROY_AR(my_target_mdms_)
+    HSHM_DESTROY_AR(target_mdms_)
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, PollTargetMetadataTask &other) {
+    task_dup(other);
+    HSHM_MAKE_AR(target_mdms_, alloc, *other.target_mdms_)
+    HSHM_MAKE_AR(my_target_mdms_, alloc, *other.my_target_mdms_)
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, PollTargetMetadataTask &dup_task) {
+    (*target_mdms_)[replica] = (*dup_task.my_target_mdms_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(my_target_mdms_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar((*target_mdms_)[replica]);
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {
+    target_mdms_->resize(count);
+  }
+
+  /** Finalize replication */
+  void ReplicateEnd() {
+    std::vector<TargetStats> target_mdms = MergeTargetMetadata();
+    SerializeTargetMetadata(target_mdms);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hermes::blob_mdm
+
+#endif //HRUN_TASKS_HERMES_BLOB_MDM_INCLUDE_HERMES_BLOB_MDM_HERMES_BLOB_MDM_TASKS_H_
diff --git a/tasks/hermes_blob_mdm/src/CMakeLists.txt b/tasks/hermes_blob_mdm/src/CMakeLists.txt
new file mode 100644
index 000000000..bf38a7084
--- /dev/null
+++ b/tasks/hermes_blob_mdm/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(hermes_blob_mdm SHARED
+        hermes_blob_mdm.cc)
+add_dependencies(hermes_blob_mdm ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hermes_blob_mdm ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        hermes_blob_mdm
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hermes_blob_mdm
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(hermes_blob_mdm)
+endif()
diff --git a/tasks/hermes_blob_mdm/src/hermes_blob_mdm.cc b/tasks/hermes_blob_mdm/src/hermes_blob_mdm.cc
new file mode 100644
index 000000000..e7f0065c8
--- /dev/null
+++ b/tasks/hermes_blob_mdm/src/hermes_blob_mdm.cc
@@ -0,0 +1,703 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "hermes/config_server.h"
+#include "hermes_blob_mdm/hermes_blob_mdm.h"
+#include "hermes_adapters/mapper/mapper_factory.h"
+#include "hermes/dpe/dpe_factory.h"
+#include "hermes_adapters/posix/posix_api.h"
+#include "bdev/bdev.h"
+#include "data_stager/data_stager.h"
+#include "hermes_data_op/hermes_data_op.h"
+
+namespace hermes::blob_mdm {
+
+/** Type name simplification for the various map types */
+typedef std::unordered_map<hshm::charbuf, BlobId> BLOB_ID_MAP_T;
+typedef std::unordered_map<BlobId, BlobInfo> BLOB_MAP_T;
+typedef hipc::mpsc_queue<IoStat> IO_PATTERN_LOG_T;
+
+class Server : public TaskLib {
+ public:
+  /**====================================
+   * Configuration
+   * ===================================*/
+  u32 node_id_;
+
+  /**====================================
+   * Maps
+   * ===================================*/
+  std::vector<BLOB_ID_MAP_T> blob_id_map_;
+  std::vector<BLOB_MAP_T> blob_map_;
+  std::atomic<u64> id_alloc_;
+
+  /**====================================
+  * I/O pattern log
+  * ===================================*/
+  IO_PATTERN_LOG_T *io_pattern_log_;
+  bool enable_io_tracing_;
+  bool is_mpi_;
+
+  /**====================================
+   * Targets + devices
+   * ===================================*/
+  std::vector<bdev::ConstructTask*> target_tasks_;
+  std::vector<bdev::Client> targets_;
+  std::unordered_map<TargetId, TargetInfo*> target_map_;
+  Client blob_mdm_;
+  bucket_mdm::Client bkt_mdm_;
+  data_stager::Client stager_mdm_;
+  data_op::Client op_mdm_;
+  LPointer<FlushDataTask> flush_task_;
+
+ public:
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    id_alloc_ = 0;
+    node_id_ = HRUN_CLIENT->node_id_;
+    // Initialize blob maps
+    blob_id_map_.resize(HRUN_QM_RUNTIME->max_lanes_);
+    blob_map_.resize(HRUN_QM_RUNTIME->max_lanes_);
+    // Initialize targets
+    target_tasks_.reserve(HERMES_SERVER_CONF.devices_.size());
+    for (DeviceInfo &dev : HERMES_SERVER_CONF.devices_) {
+      std::string dev_type;
+      if (dev.mount_dir_.empty()) {
+        dev_type = "ram_bdev";
+        dev.mount_point_ = hshm::Formatter::format("{}/{}", dev.mount_dir_, dev.dev_name_);
+      } else {
+        dev_type = "posix_bdev";
+      }
+      targets_.emplace_back();
+      bdev::Client &client = targets_.back();
+      bdev::ConstructTask *create_task = client.AsyncCreate(
+          task->task_node_ + 1,
+          DomainId::GetLocal(),
+          "hermes_" + dev.dev_name_,
+          dev_type,
+          dev).ptr_;
+      target_tasks_.emplace_back(create_task);
+    }
+    for (int i = 0; i < target_tasks_.size(); ++i) {
+      bdev::ConstructTask *tgt_task = target_tasks_[i];
+      tgt_task->Wait<TASK_YIELD_CO>(task);
+      bdev::Client &client = targets_[i];
+      client.AsyncCreateComplete(tgt_task);
+      target_map_.emplace(client.id_, &client);
+    }
+    blob_mdm_.Init(id_);
+    HILOG(kInfo, "(node {}) Created Blob MDM", HRUN_CLIENT->node_id_);
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+ private:
+  /** Get the globally unique blob name */
+  const hshm::charbuf GetBlobNameWithBucket(TagId tag_id, const hshm::charbuf &blob_name) {
+    hshm::charbuf new_name(sizeof(TagId) + blob_name.size());
+    hrun::LocalSerialize srl(new_name);
+    srl << tag_id.node_id_;
+    srl << tag_id.unique_;
+    srl << blob_name;
+    return new_name;
+  }
+
+ public:
+  /**
+   * Set the Bucket MDM
+   * */
+  void SetBucketMdm(SetBucketMdmTask *task, RunContext &rctx) {
+    if (bkt_mdm_.id_.IsNull()) {
+      bkt_mdm_.Init(task->bkt_mdm_);
+      stager_mdm_.Init(task->stager_mdm_);
+      op_mdm_.Init(task->op_mdm_);
+      // TODO(llogan): Add back
+      // flush_task_ = blob_mdm_.AsyncFlushData(task->task_node_ + 1);
+    }
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Long-running task to stage out data periodically
+   * */
+  void FlushData(FlushDataTask *task, RunContext &rctx) {
+    // Get the blob info data structure
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    for (auto &it : blob_map) {
+      BlobInfo &blob_info = it.second;
+      if (blob_info.last_flush_ > 0 &&
+          blob_info.mod_count_ > blob_info.last_flush_) {
+        HILOG(kDebug, "Flushing blob {} (mod_count={}, last_flush={})",
+              blob_info.blob_id_, blob_info.mod_count_, blob_info.last_flush_);
+        blob_info.last_flush_ = 1;
+        blob_info.mod_count_ = 0;
+        blob_info.access_freq_ = 0;
+        blob_info.UpdateWriteStats();
+        LPointer<char> data = HRUN_CLIENT->AllocateBuffer(blob_info.blob_size_);
+        LPointer<GetBlobTask> get_blob =
+            blob_mdm_.AsyncGetBlob(task->task_node_ + 1,
+                                   blob_info.tag_id_,
+                                   blob_info.name_,
+                                   blob_info.blob_id_,
+                                   0, blob_info.blob_size_,
+                                   data.shm_);
+        get_blob->Wait<TASK_YIELD_CO>(task);
+        stager_mdm_.AsyncStageOut(task->task_node_ + 1,
+                                  blob_info.tag_id_,
+                                  blob_info.name_,
+                                  data.shm_, blob_info.blob_size_,
+                                  TASK_DATA_OWNER | TASK_FIRE_AND_FORGET);
+      }
+    }
+    // task->SetModuleComplete();
+  }
+
+  /**
+   * Create a blob's metadata
+   * */
+  void PutBlob(PutBlobTask *task, RunContext &rctx) {
+    // Get the blob info data structure
+    hshm::charbuf blob_name = hshm::to_charbuf(*task->blob_name_);
+    if (task->blob_id_.IsNull()) {
+      task->blob_id_ = GetOrCreateBlobId(task->tag_id_, task->lane_hash_,
+                                         blob_name, rctx, task->flags_);
+    }
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    BlobInfo &blob_info = blob_map[task->blob_id_];
+
+    // Update the blob info
+    if (task->flags_.Any(HERMES_BLOB_DID_CREATE)) {
+      blob_info.name_ = std::move(blob_name);
+      blob_info.blob_id_ = task->blob_id_;
+      blob_info.tag_id_ = task->tag_id_;
+      blob_info.blob_size_ = 0;
+      blob_info.max_blob_size_ = 0;
+      blob_info.score_ = task->score_;
+      blob_info.mod_count_ = 0;
+      blob_info.access_freq_ = 0;
+      blob_info.last_flush_ = 0;
+      blob_info.UpdateWriteStats();
+      if (task->flags_.Any(HERMES_IS_FILE)) {
+        blob_info.mod_count_ = 1;
+        blob_info.last_flush_ = 1;
+        LPointer<data_stager::StageInTask> stage_task =
+            stager_mdm_.AsyncStageIn(task->task_node_ + 1,
+                                     task->tag_id_,
+                                     blob_info.name_,
+                                     task->score_, 0);
+        stage_task->Wait<TASK_YIELD_CO>(task);
+        HRUN_CLIENT->DelTask(stage_task);
+      }
+    } else {
+      // Modify existing blob
+      blob_info.UpdateWriteStats();
+    }
+    if (task->flags_.Any(HERMES_BLOB_REPLACE)) {
+      PutBlobFreeBuffersPhase(blob_info, task, rctx);
+    }
+
+    // Determine amount of additional buffering space needed
+    size_t needed_space = task->blob_off_ + task->data_size_;
+    size_t size_diff = 0;
+    if (needed_space > blob_info.max_blob_size_) {
+      size_diff = needed_space - blob_info.max_blob_size_;
+    }
+    blob_info.blob_size_ += size_diff;
+    HILOG(kDebug, "The size diff is {} bytes", size_diff)
+
+    // Use DPE
+    std::vector<PlacementSchema> schema_vec;
+    if (size_diff > 0) {
+      Context ctx;
+      auto *dpe = DpeFactory::Get(ctx.dpe_);
+      dpe->Placement({size_diff}, targets_, ctx, schema_vec);
+    }
+
+    // Allocate blob buffers
+    for (PlacementSchema &schema : schema_vec) {
+      for (size_t sub_idx = 0; sub_idx < schema.plcmnts_.size(); ++sub_idx) {
+        SubPlacement &placement = schema.plcmnts_[sub_idx];
+        TargetInfo &bdev = *target_map_[placement.tid_];
+        LPointer<bdev::AllocateTask> alloc_task =
+            bdev.AsyncAllocate(task->task_node_ + 1,
+                               placement.size_,
+                               blob_info.buffers_);
+        alloc_task->Wait<TASK_YIELD_CO>(task);
+        if (alloc_task->alloc_size_ < alloc_task->size_) {
+          // SubPlacement &next_placement = schema.plcmnts_[sub_idx + 1];
+          // size_t diff = alloc_task->size_ - alloc_task->alloc_size_;
+          // next_placement.size_ += diff;
+          HELOG(kFatal, "Ran outta space in this tier -- will fix soon")
+        }
+        HRUN_CLIENT->DelTask(alloc_task);
+      }
+    }
+
+    // Place blob in buffers
+    std::vector<LPointer<bdev::WriteTask>> write_tasks;
+    write_tasks.reserve(blob_info.buffers_.size());
+    size_t blob_off = 0, buf_off = 0;
+    char *blob_buf = HRUN_CLIENT->GetPrivatePointer(task->data_);
+    HILOG(kDebug, "Number of buffers {}", blob_info.buffers_.size());
+    for (BufferInfo &buf : blob_info.buffers_) {
+      size_t blob_left = blob_off;
+      size_t blob_right = blob_off + buf.t_size_;
+      if (blob_left <= task->blob_off_ && task->blob_off_ < blob_right) {
+        size_t rel_off = task->blob_off_ - blob_off;
+        size_t tgt_off = buf.t_off_ + rel_off;
+        size_t buf_size = buf.t_size_ - rel_off;
+        if (blob_off + buf_size > task->blob_off_ + task->data_size_) {
+          buf_size = task->blob_off_ + task->data_size_ - blob_off;
+        }
+        HILOG(kDebug, "Writing {} bytes at off {} from target {}", buf_size, tgt_off, buf.tid_)
+        TargetInfo &target = *target_map_[buf.tid_];
+        LPointer<bdev::WriteTask> write_task =
+            target.AsyncWrite(task->task_node_ + 1,
+                              blob_buf + buf_off,
+                              tgt_off, buf_size);
+        write_tasks.emplace_back(write_task);
+        buf_off += buf_size;
+      }
+      blob_off += buf.t_size_;
+    }
+    blob_info.max_blob_size_ = blob_off;
+
+    // Wait for the placements to complete
+    for (LPointer<bdev::WriteTask> &write_task : write_tasks) {
+      write_task->Wait<TASK_YIELD_CO>(task);
+      HRUN_CLIENT->DelTask(write_task);
+    }
+
+    // Update information
+    int update_mode = bucket_mdm::UpdateSizeMode::kAdd;
+    if (task->flags_.Any(HERMES_IS_FILE)) {
+      update_mode = bucket_mdm::UpdateSizeMode::kCap;
+    }
+    bkt_mdm_.AsyncUpdateSize(task->task_node_ + 1,
+                             task->tag_id_,
+                             task->blob_off_ + task->data_size_,
+                             update_mode);
+    if (task->flags_.Any(HERMES_BLOB_DID_CREATE)) {
+      bkt_mdm_.AsyncTagAddBlob(task->task_node_ + 1,
+                               task->tag_id_,
+                               task->blob_id_);
+    }
+    if (task->flags_.Any(HERMES_HAS_DERIVED)) {
+      op_mdm_.AsyncRegisterData(task->task_node_ + 1,
+                                task->tag_id_,
+                                task->blob_name_->str(),
+                                task->blob_id_,
+                                task->blob_off_,
+                                task->data_size_);
+    }
+
+    // Free data
+    task->SetModuleComplete();
+  }
+
+  /** Release buffers */
+  void PutBlobFreeBuffersPhase(BlobInfo &blob_info, PutBlobTask *task, RunContext &rctx) {
+    for (BufferInfo &buf : blob_info.buffers_) {
+      TargetInfo &target = *target_map_[buf.tid_];
+      std::vector<BufferInfo> buf_vec = {buf};
+      // target.AsyncFree(task->task_node_ + 1, std::move(buf_vec), true);
+    }
+    blob_info.buffers_.clear();
+    blob_info.max_blob_size_ = 0;
+    blob_info.blob_size_ = 0;
+  }
+
+  /** Get a blob's data */
+  void GetBlob(GetBlobTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case GetBlobPhase::kStart: {
+        GetBlobGetPhase(task, rctx);
+      }
+      case GetBlobPhase::kWait: {
+        GetBlobWaitPhase(task, rctx);
+      }
+    }
+  }
+
+  void GetBlobGetPhase(GetBlobTask *task, RunContext &rctx) {
+    if (task->blob_id_.IsNull()) {
+      hshm::charbuf blob_name = hshm::to_charbuf(*task->blob_name_);
+      task->blob_id_ = GetOrCreateBlobId(task->tag_id_, task->lane_hash_,
+                                         blob_name, rctx, task->flags_);
+    }
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    BlobInfo &blob_info = blob_map[task->blob_id_];
+    HSHM_MAKE_AR0(task->bdev_reads_, nullptr);
+    std::vector<bdev::ReadTask*> &read_tasks = *task->bdev_reads_;
+    read_tasks.reserve(blob_info.buffers_.size());
+    HILOG(kDebug, "Getting blob {} of size {} starting at offset {} (total_blob_size={}, buffers={})",
+          task->blob_id_, task->data_size_, task->blob_off_, blob_info.blob_size_, blob_info.buffers_.size());
+    size_t blob_off = 0, buf_off = 0;
+    hipc::mptr<char> blob_data_mptr(task->data_);
+    char *blob_buf = blob_data_mptr.get();
+    for (BufferInfo &buf : blob_info.buffers_) {
+      size_t blob_left = blob_off;
+      size_t blob_right = blob_off + buf.t_size_;
+      if (blob_left <= task->blob_off_ && task->blob_off_ < blob_right) {
+        size_t rel_off = task->blob_off_ - blob_off;
+        size_t tgt_off = buf.t_off_ + rel_off;
+        size_t buf_size = buf.t_size_ - rel_off;
+        if (blob_off + buf_size > task->blob_off_ + task->data_size_) {
+          buf_size = task->blob_off_ + task->data_size_ - blob_off;
+        }
+        HILOG(kDebug, "Loading {} bytes at off {} from target {}", buf_size, tgt_off, buf.tid_)
+        TargetInfo &target = *target_map_[buf.tid_];
+        bdev::ReadTask *read_task = target.AsyncRead(task->task_node_ + 1,
+                                                     blob_buf + buf_off,
+                                                     tgt_off, buf_size).ptr_;
+        read_tasks.emplace_back(read_task);
+        buf_off += buf_size;
+      }
+      blob_off += buf.t_size_;
+    }
+    task->phase_ = GetBlobPhase::kWait;
+  }
+
+  void GetBlobWaitPhase(GetBlobTask *task, RunContext &rctx) {
+    std::vector<bdev::ReadTask*> &read_tasks = *task->bdev_reads_;
+    for (bdev::ReadTask *&read_task : read_tasks) {
+      if (!read_task->IsComplete()) {
+        return;
+      }
+    }
+    for (bdev::ReadTask *&read_task : read_tasks) {
+      HRUN_CLIENT->DelTask(read_task);
+    }
+    HSHM_DESTROY_AR(task->bdev_reads_);
+    HILOG(kDebug, "GetBlobTask complete");
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Tag a blob
+   * */
+  void TagBlob(TagBlobTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob = it->second;
+    blob.tags_.push_back(task->tag_);
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Check if blob has a tag
+   * */
+  void BlobHasTag(BlobHasTagTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob = it->second;
+    task->has_tag_ = std::find(blob.tags_.begin(),
+                               blob.tags_.end(),
+                               task->tag_) != blob.tags_.end();
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Create \a blob_id BLOB ID
+   * */
+  BlobId GetOrCreateBlobId(TagId &tag_id, u32 lane_hash,
+                           const hshm::charbuf &blob_name, RunContext &rctx,
+                           bitfield32_t &flags) {
+    hshm::charbuf blob_name_unique = GetBlobNameWithBucket(tag_id, blob_name);
+    BLOB_ID_MAP_T &blob_id_map = blob_id_map_[rctx.lane_id_];
+    auto it = blob_id_map.find(blob_name_unique);
+    if (it == blob_id_map.end()) {
+      BlobId blob_id = BlobId(node_id_, lane_hash, id_alloc_.fetch_add(1));
+      blob_id_map.emplace(blob_name_unique, blob_id);
+      flags.SetBits(HERMES_BLOB_DID_CREATE);
+      BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+      blob_map.emplace(blob_id, BlobInfo());
+      return blob_id;
+    }
+    return it->second;
+  }
+  void GetOrCreateBlobId(GetOrCreateBlobIdTask *task, RunContext &rctx) {
+    hshm::charbuf blob_name = hshm::to_charbuf(*task->blob_name_);
+    bitfield32_t flags;
+    task->blob_id_ = GetOrCreateBlobId(task->tag_id_, task->lane_hash_, blob_name, rctx, flags);
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Get \a blob_name BLOB from \a bkt_id bucket
+   * */
+  HSHM_ALWAYS_INLINE
+  void GetBlobId(GetBlobIdTask *task, RunContext &rctx) {
+    hshm::charbuf blob_name = hshm::to_charbuf(*task->blob_name_);
+    hshm::charbuf blob_name_unique = GetBlobNameWithBucket(task->tag_id_, blob_name);
+    BLOB_ID_MAP_T &blob_id_map = blob_id_map_[rctx.lane_id_];
+    auto it = blob_id_map.find(blob_name_unique);
+    if (it == blob_id_map.end()) {
+      task->blob_id_ = BlobId::GetNull();
+      task->SetModuleComplete();
+      HILOG(kDebug, "Failed to find blob {} in {}", blob_name.str(), task->tag_id_);
+      return;
+    }
+    task->blob_id_ = it->second;
+    HILOG(kDebug, "Found blob {} / {} in {}", task->blob_id_, blob_name.str(), task->tag_id_);
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Get \a blob_name BLOB name from \a blob_id BLOB id
+   * */
+  void GetBlobName(GetBlobNameTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob = it->second;
+    (*task->blob_name_) = blob.name_;
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Get \a score from \a blob_id BLOB id
+   * */
+  void GetBlobSize(GetBlobSizeTask *task, RunContext &rctx) {
+    if (task->blob_id_.IsNull()) {
+      bitfield32_t flags;
+      task->blob_id_ = GetOrCreateBlobId(task->tag_id_, task->lane_hash_,
+                                         hshm::to_charbuf(*task->blob_name_),
+                                         rctx, flags);
+    }
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->size_ = 0;
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob = it->second;
+    task->size_ = blob.blob_size_;
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Get \a score from \a blob_id BLOB id
+   * */
+  void GetBlobScore(GetBlobScoreTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob = it->second;
+    task->score_ = blob.score_;
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Get \a blob_id blob's buffers
+   * */
+  void GetBlobBuffers(GetBlobBuffersTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob = it->second;
+    (*task->buffers_) = blob.buffers_;
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Rename \a blob_id blob to \a new_blob_name new blob name
+   * in \a bkt_id bucket.
+   * */
+  void RenameBlob(RenameBlobTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BLOB_ID_MAP_T &blob_id_map = blob_id_map_[rctx.lane_id_];
+    BlobInfo &blob = it->second;
+    blob_id_map.erase(blob.name_);
+    blob_id_map[blob.name_] = task->blob_id_;
+    blob.name_ = hshm::to_charbuf(*task->new_blob_name_);
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Truncate a blob to a new size
+   * */
+  void TruncateBlob(TruncateBlobTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    auto it = blob_map.find(task->blob_id_);
+    if (it == blob_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    BlobInfo &blob_info = it->second;
+    // TODO(llogan): truncate blob
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Destroy \a blob_id blob in \a bkt_id bucket
+   * */
+  void DestroyBlob(DestroyBlobTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case DestroyBlobPhase::kFreeBuffers: {
+        BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+        auto it = blob_map.find(task->blob_id_);
+        if (it == blob_map.end()) {
+          task->SetModuleComplete();
+          return;
+        }
+        BLOB_ID_MAP_T &blob_id_map = blob_id_map_[rctx.lane_id_];
+        BlobInfo &blob_info = it->second;
+        hshm::charbuf unique_name = GetBlobNameWithBucket(blob_info.tag_id_, blob_info.name_);
+        blob_id_map.erase(unique_name);
+        HSHM_MAKE_AR0(task->free_tasks_, nullptr);
+        task->free_tasks_->reserve(blob_info.buffers_.size());
+        for (BufferInfo &buf : blob_info.buffers_) {
+          TargetInfo &tgt_info = *target_map_[buf.tid_];
+          std::vector<BufferInfo> buf_vec = {buf};
+          bdev::FreeTask *free_task = tgt_info.AsyncFree(
+              task->task_node_ + 1, std::move(buf_vec), false).ptr_;
+          task->free_tasks_->emplace_back(free_task);
+        }
+        task->phase_ = DestroyBlobPhase::kWaitFreeBuffers;
+      }
+      case DestroyBlobPhase::kWaitFreeBuffers: {
+        std::vector<bdev::FreeTask *> &free_tasks = *task->free_tasks_;
+        for (bdev::FreeTask *&free_task : free_tasks) {
+          if (!free_task->IsComplete()) {
+            return;
+          }
+        }
+        for (bdev::FreeTask *&free_task : free_tasks) {
+          HRUN_CLIENT->DelTask(free_task);
+        }
+        BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+        BlobInfo &blob_info = blob_map[task->blob_id_];
+        bkt_mdm_.AsyncUpdateSize(task->task_node_ + 1,
+                                 task->tag_id_,
+                                 -(ssize_t)blob_info.blob_size_,
+                                 bucket_mdm::UpdateSizeMode::kAdd);
+        HSHM_DESTROY_AR(task->free_tasks_);
+        blob_map.erase(task->blob_id_);
+        task->SetModuleComplete();
+      }
+    }
+  }
+
+  /**
+   * Reorganize \a blob_id blob in \a bkt_id bucket
+   * */
+  void ReorganizeBlob(ReorganizeBlobTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case ReorganizeBlobPhase::kGet: {
+        BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+        auto it = blob_map.find(task->blob_id_);
+        if (it == blob_map.end()) {
+          task->SetModuleComplete();
+          return;
+        }
+        BlobInfo &blob_info = it->second;
+        task->data_ = HRUN_CLIENT->AllocateBuffer(blob_info.blob_size_).shm_;
+        task->data_size_ = blob_info.blob_size_;
+        task->get_task_ = blob_mdm_.AsyncGetBlob(task->task_node_ + 1,
+                                                 task->tag_id_,
+                                                 hshm::charbuf(""),
+                                                 task->blob_id_,
+                                                 0,
+                                                 task->data_size_,
+                                                 task->data_).ptr_;
+        task->tag_id_ = blob_info.tag_id_;
+        task->phase_ = ReorganizeBlobPhase::kWaitGet;
+      }
+      case ReorganizeBlobPhase::kWaitGet: {
+        if (!task->get_task_->IsComplete()) {
+          return;
+        }
+        HRUN_CLIENT->DelTask(task->get_task_);
+        task->phase_ = ReorganizeBlobPhase::kPut;
+      }
+      case ReorganizeBlobPhase::kPut: {
+        task->put_task_ = blob_mdm_.AsyncPutBlob(task->task_node_ + 1,
+                                                 task->tag_id_, hshm::charbuf(""),
+                                                 task->blob_id_, 0,
+                                                 task->data_size_,
+                                                 task->data_,
+                                                 task->score_,
+                                                 HERMES_BLOB_REPLACE).ptr_;
+        task->SetModuleComplete();
+      }
+    }
+  }
+
+  /**
+   * Get all metadata about a blob
+   * */
+  HSHM_ALWAYS_INLINE
+  void PollBlobMetadata(PollBlobMetadataTask *task, RunContext &rctx) {
+    BLOB_MAP_T &blob_map = blob_map_[rctx.lane_id_];
+    std::vector<BlobInfo> blob_mdms;
+    blob_mdms.reserve(blob_map.size());
+    for (const std::pair<BlobId, BlobInfo> &blob_part : blob_map) {
+      const BlobInfo &blob_info = blob_part.second;
+      blob_mdms.emplace_back(blob_info);
+    }
+    task->SerializeBlobMetadata(blob_mdms);
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Get all metadata about a blob
+   * */
+  HSHM_ALWAYS_INLINE
+  void PollTargetMetadata(PollTargetMetadataTask *task, RunContext &rctx) {
+    std::vector<TargetStats> target_mdms;
+    target_mdms.reserve(targets_.size());
+    for (const bdev::Client &bdev_client : targets_) {
+      bool is_remote = bdev_client.domain_id_.IsRemote(HRUN_RPC->GetNumHosts(), HRUN_CLIENT->node_id_);
+      if (is_remote) {
+        continue;
+      }
+      TargetStats stats;
+      stats.tgt_id_ = bdev_client.id_;
+      stats.rem_cap_ = bdev_client.monitor_task_->rem_cap_;
+      stats.max_cap_ = bdev_client.max_cap_;
+      stats.bandwidth_ = bdev_client.bandwidth_;
+      stats.latency_ = bdev_client.latency_;
+      stats.score_ = bdev_client.score_;
+      target_mdms.emplace_back(stats);
+    }
+    task->SerializeTargetMetadata(target_mdms);
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "hermes_blob_mdm/hermes_blob_mdm_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hermes::blob_mdm::Server, "hermes_blob_mdm");
diff --git a/tasks/hermes_bucket_mdm/CMakeLists.txt b/tasks/hermes_bucket_mdm/CMakeLists.txt
new file mode 100644
index 000000000..be52b3c1e
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hermes Bucket MDM Task Library
+#------------------------------------------------------------------------------
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm.h b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm.h
new file mode 100644
index 000000000..ad6d66e52
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm.h
@@ -0,0 +1,341 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_hermes_bucket_mdm_H_
+#define HRUN_hermes_bucket_mdm_H_
+
+#include "hermes_bucket_mdm_tasks.h"
+
+namespace hermes::bucket_mdm {
+
+/** Create hermes_bucket_mdm requests */
+class Client : public TaskLibClient {
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Create a hermes_bucket_mdm */
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(const DomainId &domain_id,
+                  const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    id_ = HRUN_ADMIN->CreateTaskStateRoot<ConstructTask>(
+        domain_id, state_name, id_, queue_info);
+    queue_id_ = QueueId(id_);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /**====================================
+   * Tag Operations
+   * ===================================*/
+
+  /** Sets the BLOB MDM */
+  void AsyncSetBlobMdmConstruct(SetBlobMdmTask *task,
+                                const TaskNode &task_node,
+                                const DomainId &domain_id,
+                                const TaskStateId &blob_mdm,
+                                const TaskStateId &stager_mdm) {
+    HRUN_CLIENT->ConstructTask<SetBlobMdmTask>(
+        task, task_node, domain_id, id_, blob_mdm, stager_mdm);
+  }
+  void SetBlobMdmRoot(const DomainId &domain_id,
+                      const TaskStateId &blob_mdm,
+                      const TaskStateId &stager_mdm) {
+    LPointer<hrunpq::TypedPushTask<SetBlobMdmTask>> push_task =
+        AsyncSetBlobMdmRoot(domain_id, blob_mdm, stager_mdm);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(SetBlobMdm);
+
+  /** Update statistics after blob PUT (fire & forget) */
+  HSHM_ALWAYS_INLINE
+  void AsyncUpdateSizeConstruct(UpdateSizeTask *task,
+                                const TaskNode &task_node,
+                                TagId tag_id,
+                                size_t update,
+                                int mode) {
+    HRUN_CLIENT->ConstructTask<UpdateSizeTask>(
+        task, task_node, DomainId::GetNode(tag_id.node_id_), id_,
+        tag_id, update, mode);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(UpdateSize);
+
+  /** Append data to the bucket (fire & forget) */
+  HSHM_ALWAYS_INLINE
+  void AsyncAppendBlobSchemaConstruct(AppendBlobSchemaTask *task,
+                                      const TaskNode &task_node,
+                                      TagId tag_id,
+                                      size_t data_size,
+                                      size_t page_size) {
+    HRUN_CLIENT->ConstructTask<AppendBlobSchemaTask>(
+        task, task_node, DomainId::GetNode(tag_id.node_id_), id_,
+        tag_id, data_size, page_size);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(AppendBlobSchema);
+
+  /** Append data to the bucket (fire & forget) */
+  HSHM_ALWAYS_INLINE
+  void AsyncAppendBlobConstruct(
+      AppendBlobTask *task,
+      const TaskNode &task_node,
+      TagId tag_id,
+      size_t data_size,
+      const hipc::Pointer &data,
+      size_t page_size,
+      float score,
+      u32 node_id,
+      const Context &ctx) {
+    HRUN_CLIENT->ConstructTask<AppendBlobTask>(
+        task, task_node, DomainId::GetLocal(), id_,
+        tag_id, data_size, data, page_size, score, node_id, ctx);
+  }
+  HSHM_ALWAYS_INLINE
+  void AppendBlobRoot(TagId tag_id,
+                      size_t data_size,
+                      const hipc::Pointer &data,
+                      size_t page_size,
+                      float score,
+                      u32 node_id,
+                      const Context &ctx) {
+    AsyncAppendBlobRoot(tag_id, data_size, data, page_size, score, node_id, ctx);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(AppendBlob);
+
+  /** Create a tag or get the ID of existing tag */
+  HSHM_ALWAYS_INLINE
+  void AsyncGetOrCreateTagConstruct(GetOrCreateTagTask *task,
+                                    const TaskNode &task_node,
+                                    const hshm::charbuf &tag_name,
+                                    bool blob_owner,
+                                    const std::vector<TraitId> &traits,
+                                    size_t backend_size,
+                                    u32 flags) {
+    HILOG(kDebug, "Creating a tag {}", tag_name.str());
+    u32 hash = std::hash<hshm::charbuf>{}(tag_name);
+    HRUN_CLIENT->ConstructTask<GetOrCreateTagTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_name, blob_owner, traits, backend_size, flags);
+  }
+  HSHM_ALWAYS_INLINE
+  TagId GetOrCreateTagRoot(const hshm::charbuf &tag_name,
+                           bool blob_owner,
+                           const std::vector<TraitId> &traits,
+                           size_t backend_size,
+                           u32 flags) {
+    LPointer<hrunpq::TypedPushTask<GetOrCreateTagTask>> push_task =
+        AsyncGetOrCreateTagRoot(tag_name, blob_owner, traits, backend_size, flags);
+    push_task->Wait();
+    GetOrCreateTagTask *task = push_task->get();
+    TagId tag_id = task->tag_id_;
+    HRUN_CLIENT->DelTask(push_task);
+    return tag_id;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetOrCreateTag);
+
+  /** Get tag ID */
+  void AsyncGetTagIdConstruct(GetTagIdTask *task,
+                              const TaskNode &task_node,
+                              const hshm::charbuf &tag_name) {
+    u32 hash = std::hash<hshm::charbuf>{}(tag_name);
+    HRUN_CLIENT->ConstructTask<GetTagIdTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_name);
+  }
+  TagId GetTagIdRoot(const hshm::charbuf &tag_name) {
+    LPointer<hrunpq::TypedPushTask<GetTagIdTask>> push_task =
+        AsyncGetTagIdRoot(tag_name);
+    push_task->Wait();
+    GetTagIdTask *task = push_task->get();
+    TagId tag_id = task->tag_id_;
+    HRUN_CLIENT->DelTask(push_task);
+    return tag_id;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetTagId);
+
+  /** Get tag name */
+  void AsyncGetTagNameConstruct(GetTagNameTask *task,
+                                const TaskNode &task_node,
+                                const TagId &tag_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<GetTagNameTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id);
+  }
+  hshm::string GetTagNameRoot(const TagId &tag_id) {
+    LPointer<hrunpq::TypedPushTask<GetTagNameTask>> push_task =
+        AsyncGetTagNameRoot(tag_id);
+    push_task->Wait();
+    GetTagNameTask *task = push_task->get();
+    hshm::string tag_name = hshm::to_charbuf<hipc::string>(*task->tag_name_.get());
+    HRUN_CLIENT->DelTask(push_task);
+    return tag_name;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetTagName);
+
+  /** Rename tag */
+  void AsyncRenameTagConstruct(RenameTagTask *task,
+                               const TaskNode &task_node,
+                               const TagId &tag_id,
+                               const hshm::charbuf &new_tag_name) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<RenameTagTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id, new_tag_name);
+  }
+  void RenameTagRoot(const TagId &tag_id, const hshm::charbuf &new_tag_name) {
+    LPointer<hrunpq::TypedPushTask<RenameTagTask>> push_task =
+        AsyncRenameTagRoot(tag_id, new_tag_name);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(RenameTag);
+
+  /** Destroy tag */
+  void AsyncDestroyTagConstruct(DestroyTagTask *task,
+                                const TaskNode &task_node,
+                                const TagId &tag_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<DestroyTagTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id);
+  }
+  void DestroyTagRoot(const TagId &tag_id) {
+    LPointer<hrunpq::TypedPushTask<DestroyTagTask>> push_task =
+        AsyncDestroyTagRoot(tag_id);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(DestroyTag);
+
+  /** Add a blob to a tag */
+  void AsyncTagAddBlobConstruct(TagAddBlobTask *task,
+                                const TaskNode &task_node,
+                                const TagId &tag_id,
+                                const BlobId &blob_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<TagAddBlobTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id, blob_id);
+  }
+  void TagAddBlobRoot(const TagId &tag_id, const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<TagAddBlobTask>> push_task =
+        AsyncTagAddBlobRoot(tag_id, blob_id);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(TagAddBlob);
+
+  /** Remove a blob from a tag */
+  void AsyncTagRemoveBlobConstruct(TagRemoveBlobTask *task,
+                                   const TaskNode &task_node,
+                                   const TagId &tag_id, const BlobId &blob_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<TagRemoveBlobTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id, blob_id);
+  }
+  void TagRemoveBlobRoot(const TagId &tag_id, const BlobId &blob_id) {
+    LPointer<hrunpq::TypedPushTask<TagRemoveBlobTask>> push_task =
+        AsyncTagRemoveBlobRoot(tag_id, blob_id);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(TagRemoveBlob);
+
+  /** Clear blobs from a tag */
+  void AsyncTagClearBlobsConstruct(TagClearBlobsTask *task,
+                                   const TaskNode &task_node,
+                                   const TagId &tag_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<TagClearBlobsTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id);
+  }
+  void TagClearBlobsRoot(const TagId &tag_id) {
+    LPointer<hrunpq::TypedPushTask<TagClearBlobsTask>> push_task =
+        AsyncTagClearBlobsRoot(tag_id);
+    push_task->Wait();
+    HRUN_CLIENT->DelTask(push_task);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(TagClearBlobs);
+
+  /** Get the size of a bucket */
+  void AsyncGetSizeConstruct(GetSizeTask *task,
+                             const TaskNode &task_node,
+                             const TagId &tag_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<GetSizeTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id);
+  }
+  size_t GetSizeRoot(const TagId &tag_id) {
+    LPointer<hrunpq::TypedPushTask<GetSizeTask>> push_task =
+        AsyncGetSizeRoot(tag_id);
+    push_task->Wait();
+    GetSizeTask *task = push_task->get();
+    size_t size = task->size_;
+    HRUN_CLIENT->DelTask(push_task);
+    return size;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetSize);
+
+  /** Get contained blob ids */
+  void AsyncGetContainedBlobIdsConstruct(GetContainedBlobIdsTask *task,
+                             const TaskNode &task_node,
+                             const TagId &tag_id) {
+    u32 hash = tag_id.hash_;
+    HRUN_CLIENT->ConstructTask<GetContainedBlobIdsTask>(
+        task, task_node, DomainId::GetNode(HASH_TO_NODE_ID(hash)), id_,
+        tag_id);
+  }
+  std::vector<BlobId> GetContainedBlobIdsRoot(const TagId &tag_id) {
+    LPointer<hrunpq::TypedPushTask<GetContainedBlobIdsTask>> push_task =
+        AsyncGetContainedBlobIdsRoot(tag_id);
+    push_task->Wait();
+    GetContainedBlobIdsTask *task = push_task->get();
+    std::vector<BlobId> blob_ids = task->blob_ids_->vec();
+    HRUN_CLIENT->DelTask(push_task);
+    return blob_ids;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(GetContainedBlobIds);
+
+  /**
+  * Get all tag metadata
+  * */
+  void AsyncPollTagMetadataConstruct(PollTagMetadataTask *task,
+                                        const TaskNode &task_node) {
+    HRUN_CLIENT->ConstructTask<PollTagMetadataTask>(
+        task, task_node, id_);
+  }
+  std::vector<TagInfo> PollTagMetadataRoot() {
+    LPointer<hrunpq::TypedPushTask<PollTagMetadataTask>> push_task =
+        AsyncPollTagMetadataRoot();
+    push_task->Wait();
+    PollTagMetadataTask *task = push_task->get();
+    std::vector<TagInfo> target_mdms =
+        task->DeserializeTagMetadata();
+    HRUN_CLIENT->DelTask(push_task);
+    return target_mdms;
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(PollTagMetadata);
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_hermes_bucket_mdm_H_
diff --git a/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_lib_exec.h b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_lib_exec.h
new file mode 100644
index 000000000..323022042
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_lib_exec.h
@@ -0,0 +1,813 @@
+#ifndef HRUN_HERMES_BUCKET_MDM_LIB_EXEC_H_
+#define HRUN_HERMES_BUCKET_MDM_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      GetOrCreateTag(reinterpret_cast<GetOrCreateTagTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetTagId: {
+      GetTagId(reinterpret_cast<GetTagIdTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetTagName: {
+      GetTagName(reinterpret_cast<GetTagNameTask *>(task), rctx);
+      break;
+    }
+    case Method::kRenameTag: {
+      RenameTag(reinterpret_cast<RenameTagTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestroyTag: {
+      DestroyTag(reinterpret_cast<DestroyTagTask *>(task), rctx);
+      break;
+    }
+    case Method::kTagAddBlob: {
+      TagAddBlob(reinterpret_cast<TagAddBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      TagRemoveBlob(reinterpret_cast<TagRemoveBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      TagClearBlobs(reinterpret_cast<TagClearBlobsTask *>(task), rctx);
+      break;
+    }
+    case Method::kUpdateSize: {
+      UpdateSize(reinterpret_cast<UpdateSizeTask *>(task), rctx);
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      AppendBlobSchema(reinterpret_cast<AppendBlobSchemaTask *>(task), rctx);
+      break;
+    }
+    case Method::kAppendBlob: {
+      AppendBlob(reinterpret_cast<AppendBlobTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetSize: {
+      GetSize(reinterpret_cast<GetSizeTask *>(task), rctx);
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      SetBlobMdm(reinterpret_cast<SetBlobMdmTask *>(task), rctx);
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      GetContainedBlobIds(reinterpret_cast<GetContainedBlobIdsTask *>(task), rctx);
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      PollTagMetadata(reinterpret_cast<PollTagMetadataTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetOrCreateTagTask *>(task));
+      break;
+    }
+    case Method::kGetTagId: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetTagIdTask *>(task));
+      break;
+    }
+    case Method::kGetTagName: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetTagNameTask *>(task));
+      break;
+    }
+    case Method::kRenameTag: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RenameTagTask *>(task));
+      break;
+    }
+    case Method::kDestroyTag: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestroyTagTask *>(task));
+      break;
+    }
+    case Method::kTagAddBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<TagAddBlobTask *>(task));
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<TagRemoveBlobTask *>(task));
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<TagClearBlobsTask *>(task));
+      break;
+    }
+    case Method::kUpdateSize: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<UpdateSizeTask *>(task));
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<AppendBlobSchemaTask *>(task));
+      break;
+    }
+    case Method::kAppendBlob: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<AppendBlobTask *>(task));
+      break;
+    }
+    case Method::kGetSize: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetSizeTask *>(task));
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<SetBlobMdmTask *>(task));
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<GetContainedBlobIdsTask *>(task));
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<PollTagMetadataTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetOrCreateTagTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetTagId: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetTagIdTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetTagName: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetTagNameTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRenameTag: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RenameTagTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestroyTag: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestroyTagTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kTagAddBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<TagAddBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<TagRemoveBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<TagClearBlobsTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kUpdateSize: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<UpdateSizeTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<AppendBlobSchemaTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kAppendBlob: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<AppendBlobTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetSize: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetSizeTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<SetBlobMdmTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<GetContainedBlobIdsTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<PollTagMetadataTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetOrCreateTagTask*>(orig_task), reinterpret_cast<GetOrCreateTagTask*>(dup_task));
+      break;
+    }
+    case Method::kGetTagId: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetTagIdTask*>(orig_task), reinterpret_cast<GetTagIdTask*>(dup_task));
+      break;
+    }
+    case Method::kGetTagName: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetTagNameTask*>(orig_task), reinterpret_cast<GetTagNameTask*>(dup_task));
+      break;
+    }
+    case Method::kRenameTag: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RenameTagTask*>(orig_task), reinterpret_cast<RenameTagTask*>(dup_task));
+      break;
+    }
+    case Method::kDestroyTag: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestroyTagTask*>(orig_task), reinterpret_cast<DestroyTagTask*>(dup_task));
+      break;
+    }
+    case Method::kTagAddBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<TagAddBlobTask*>(orig_task), reinterpret_cast<TagAddBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<TagRemoveBlobTask*>(orig_task), reinterpret_cast<TagRemoveBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<TagClearBlobsTask*>(orig_task), reinterpret_cast<TagClearBlobsTask*>(dup_task));
+      break;
+    }
+    case Method::kUpdateSize: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<UpdateSizeTask*>(orig_task), reinterpret_cast<UpdateSizeTask*>(dup_task));
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<AppendBlobSchemaTask*>(orig_task), reinterpret_cast<AppendBlobSchemaTask*>(dup_task));
+      break;
+    }
+    case Method::kAppendBlob: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<AppendBlobTask*>(orig_task), reinterpret_cast<AppendBlobTask*>(dup_task));
+      break;
+    }
+    case Method::kGetSize: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetSizeTask*>(orig_task), reinterpret_cast<GetSizeTask*>(dup_task));
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<SetBlobMdmTask*>(orig_task), reinterpret_cast<SetBlobMdmTask*>(dup_task));
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<GetContainedBlobIdsTask*>(orig_task), reinterpret_cast<GetContainedBlobIdsTask*>(dup_task));
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<PollTagMetadataTask*>(orig_task), reinterpret_cast<PollTagMetadataTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetOrCreateTagTask*>(task));
+      break;
+    }
+    case Method::kGetTagId: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetTagIdTask*>(task));
+      break;
+    }
+    case Method::kGetTagName: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetTagNameTask*>(task));
+      break;
+    }
+    case Method::kRenameTag: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RenameTagTask*>(task));
+      break;
+    }
+    case Method::kDestroyTag: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestroyTagTask*>(task));
+      break;
+    }
+    case Method::kTagAddBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<TagAddBlobTask*>(task));
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<TagRemoveBlobTask*>(task));
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<TagClearBlobsTask*>(task));
+      break;
+    }
+    case Method::kUpdateSize: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<UpdateSizeTask*>(task));
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<AppendBlobSchemaTask*>(task));
+      break;
+    }
+    case Method::kAppendBlob: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<AppendBlobTask*>(task));
+      break;
+    }
+    case Method::kGetSize: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetSizeTask*>(task));
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<SetBlobMdmTask*>(task));
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<GetContainedBlobIdsTask*>(task));
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<PollTagMetadataTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetOrCreateTagTask*>(task));
+      break;
+    }
+    case Method::kGetTagId: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetTagIdTask*>(task));
+      break;
+    }
+    case Method::kGetTagName: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetTagNameTask*>(task));
+      break;
+    }
+    case Method::kRenameTag: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RenameTagTask*>(task));
+      break;
+    }
+    case Method::kDestroyTag: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestroyTagTask*>(task));
+      break;
+    }
+    case Method::kTagAddBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<TagAddBlobTask*>(task));
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<TagRemoveBlobTask*>(task));
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<TagClearBlobsTask*>(task));
+      break;
+    }
+    case Method::kUpdateSize: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<UpdateSizeTask*>(task));
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<AppendBlobSchemaTask*>(task));
+      break;
+    }
+    case Method::kAppendBlob: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<AppendBlobTask*>(task));
+      break;
+    }
+    case Method::kGetSize: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetSizeTask*>(task));
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<SetBlobMdmTask*>(task));
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<GetContainedBlobIdsTask*>(task));
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<PollTagMetadataTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      ar << *reinterpret_cast<GetOrCreateTagTask*>(task);
+      break;
+    }
+    case Method::kGetTagId: {
+      ar << *reinterpret_cast<GetTagIdTask*>(task);
+      break;
+    }
+    case Method::kGetTagName: {
+      ar << *reinterpret_cast<GetTagNameTask*>(task);
+      break;
+    }
+    case Method::kRenameTag: {
+      ar << *reinterpret_cast<RenameTagTask*>(task);
+      break;
+    }
+    case Method::kDestroyTag: {
+      ar << *reinterpret_cast<DestroyTagTask*>(task);
+      break;
+    }
+    case Method::kTagAddBlob: {
+      ar << *reinterpret_cast<TagAddBlobTask*>(task);
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      ar << *reinterpret_cast<TagRemoveBlobTask*>(task);
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      ar << *reinterpret_cast<TagClearBlobsTask*>(task);
+      break;
+    }
+    case Method::kUpdateSize: {
+      ar << *reinterpret_cast<UpdateSizeTask*>(task);
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      ar << *reinterpret_cast<AppendBlobSchemaTask*>(task);
+      break;
+    }
+    case Method::kAppendBlob: {
+      ar << *reinterpret_cast<AppendBlobTask*>(task);
+      break;
+    }
+    case Method::kGetSize: {
+      ar << *reinterpret_cast<GetSizeTask*>(task);
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      ar << *reinterpret_cast<SetBlobMdmTask*>(task);
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      ar << *reinterpret_cast<GetContainedBlobIdsTask*>(task);
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      ar << *reinterpret_cast<PollTagMetadataTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetOrCreateTagTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetOrCreateTagTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetTagId: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetTagIdTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetTagIdTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetTagName: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetTagNameTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetTagNameTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRenameTag: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RenameTagTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RenameTagTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestroyTag: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestroyTagTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestroyTagTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kTagAddBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<TagAddBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<TagAddBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<TagRemoveBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<TagRemoveBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<TagClearBlobsTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<TagClearBlobsTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kUpdateSize: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<UpdateSizeTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<UpdateSizeTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<AppendBlobSchemaTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<AppendBlobSchemaTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kAppendBlob: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<AppendBlobTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<AppendBlobTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetSize: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetSizeTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetSizeTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<SetBlobMdmTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<SetBlobMdmTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<GetContainedBlobIdsTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<GetContainedBlobIdsTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<PollTagMetadataTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<PollTagMetadataTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      ar << *reinterpret_cast<GetOrCreateTagTask*>(task);
+      break;
+    }
+    case Method::kGetTagId: {
+      ar << *reinterpret_cast<GetTagIdTask*>(task);
+      break;
+    }
+    case Method::kGetTagName: {
+      ar << *reinterpret_cast<GetTagNameTask*>(task);
+      break;
+    }
+    case Method::kRenameTag: {
+      ar << *reinterpret_cast<RenameTagTask*>(task);
+      break;
+    }
+    case Method::kDestroyTag: {
+      ar << *reinterpret_cast<DestroyTagTask*>(task);
+      break;
+    }
+    case Method::kTagAddBlob: {
+      ar << *reinterpret_cast<TagAddBlobTask*>(task);
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      ar << *reinterpret_cast<TagRemoveBlobTask*>(task);
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      ar << *reinterpret_cast<TagClearBlobsTask*>(task);
+      break;
+    }
+    case Method::kUpdateSize: {
+      ar << *reinterpret_cast<UpdateSizeTask*>(task);
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      ar << *reinterpret_cast<AppendBlobSchemaTask*>(task);
+      break;
+    }
+    case Method::kAppendBlob: {
+      ar << *reinterpret_cast<AppendBlobTask*>(task);
+      break;
+    }
+    case Method::kGetSize: {
+      ar << *reinterpret_cast<GetSizeTask*>(task);
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      ar << *reinterpret_cast<SetBlobMdmTask*>(task);
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      ar << *reinterpret_cast<GetContainedBlobIdsTask*>(task);
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      ar << *reinterpret_cast<PollTagMetadataTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kGetOrCreateTag: {
+      ar.Deserialize(replica, *reinterpret_cast<GetOrCreateTagTask*>(task));
+      break;
+    }
+    case Method::kGetTagId: {
+      ar.Deserialize(replica, *reinterpret_cast<GetTagIdTask*>(task));
+      break;
+    }
+    case Method::kGetTagName: {
+      ar.Deserialize(replica, *reinterpret_cast<GetTagNameTask*>(task));
+      break;
+    }
+    case Method::kRenameTag: {
+      ar.Deserialize(replica, *reinterpret_cast<RenameTagTask*>(task));
+      break;
+    }
+    case Method::kDestroyTag: {
+      ar.Deserialize(replica, *reinterpret_cast<DestroyTagTask*>(task));
+      break;
+    }
+    case Method::kTagAddBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<TagAddBlobTask*>(task));
+      break;
+    }
+    case Method::kTagRemoveBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<TagRemoveBlobTask*>(task));
+      break;
+    }
+    case Method::kTagClearBlobs: {
+      ar.Deserialize(replica, *reinterpret_cast<TagClearBlobsTask*>(task));
+      break;
+    }
+    case Method::kUpdateSize: {
+      ar.Deserialize(replica, *reinterpret_cast<UpdateSizeTask*>(task));
+      break;
+    }
+    case Method::kAppendBlobSchema: {
+      ar.Deserialize(replica, *reinterpret_cast<AppendBlobSchemaTask*>(task));
+      break;
+    }
+    case Method::kAppendBlob: {
+      ar.Deserialize(replica, *reinterpret_cast<AppendBlobTask*>(task));
+      break;
+    }
+    case Method::kGetSize: {
+      ar.Deserialize(replica, *reinterpret_cast<GetSizeTask*>(task));
+      break;
+    }
+    case Method::kSetBlobMdm: {
+      ar.Deserialize(replica, *reinterpret_cast<SetBlobMdmTask*>(task));
+      break;
+    }
+    case Method::kGetContainedBlobIds: {
+      ar.Deserialize(replica, *reinterpret_cast<GetContainedBlobIdsTask*>(task));
+      break;
+    }
+    case Method::kPollTagMetadata: {
+      ar.Deserialize(replica, *reinterpret_cast<PollTagMetadataTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetOrCreateTag: {
+      return reinterpret_cast<GetOrCreateTagTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetTagId: {
+      return reinterpret_cast<GetTagIdTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetTagName: {
+      return reinterpret_cast<GetTagNameTask*>(task)->GetGroup(group);
+    }
+    case Method::kRenameTag: {
+      return reinterpret_cast<RenameTagTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestroyTag: {
+      return reinterpret_cast<DestroyTagTask*>(task)->GetGroup(group);
+    }
+    case Method::kTagAddBlob: {
+      return reinterpret_cast<TagAddBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kTagRemoveBlob: {
+      return reinterpret_cast<TagRemoveBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kTagClearBlobs: {
+      return reinterpret_cast<TagClearBlobsTask*>(task)->GetGroup(group);
+    }
+    case Method::kUpdateSize: {
+      return reinterpret_cast<UpdateSizeTask*>(task)->GetGroup(group);
+    }
+    case Method::kAppendBlobSchema: {
+      return reinterpret_cast<AppendBlobSchemaTask*>(task)->GetGroup(group);
+    }
+    case Method::kAppendBlob: {
+      return reinterpret_cast<AppendBlobTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetSize: {
+      return reinterpret_cast<GetSizeTask*>(task)->GetGroup(group);
+    }
+    case Method::kSetBlobMdm: {
+      return reinterpret_cast<SetBlobMdmTask*>(task)->GetGroup(group);
+    }
+    case Method::kGetContainedBlobIds: {
+      return reinterpret_cast<GetContainedBlobIdsTask*>(task)->GetGroup(group);
+    }
+    case Method::kPollTagMetadata: {
+      return reinterpret_cast<PollTagMetadataTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_HERMES_BUCKET_MDM_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_methods.h b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_methods.h
new file mode 100644
index 000000000..0146a45ce
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_methods.h
@@ -0,0 +1,23 @@
+#ifndef HRUN_HERMES_BUCKET_MDM_METHODS_H_
+#define HRUN_HERMES_BUCKET_MDM_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kGetOrCreateTag = kLast + 0;
+  TASK_METHOD_T kGetTagId = kLast + 1;
+  TASK_METHOD_T kGetTagName = kLast + 2;
+  TASK_METHOD_T kRenameTag = kLast + 3;
+  TASK_METHOD_T kDestroyTag = kLast + 4;
+  TASK_METHOD_T kTagAddBlob = kLast + 5;
+  TASK_METHOD_T kTagRemoveBlob = kLast + 6;
+  TASK_METHOD_T kTagClearBlobs = kLast + 10;
+  TASK_METHOD_T kUpdateSize = kLast + 11;
+  TASK_METHOD_T kAppendBlobSchema = kLast + 12;
+  TASK_METHOD_T kAppendBlob = kLast + 13;
+  TASK_METHOD_T kGetSize = kLast + 14;
+  TASK_METHOD_T kSetBlobMdm = kLast + 15;
+  TASK_METHOD_T kGetContainedBlobIds = kLast + 16;
+  TASK_METHOD_T kPollTagMetadata = kLast + 17;
+};
+
+#endif  // HRUN_HERMES_BUCKET_MDM_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_methods.yaml b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_methods.yaml
new file mode 100644
index 000000000..527f10a58
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_methods.yaml
@@ -0,0 +1,18 @@
+kGetOrCreateTag: 0
+kGetTagId: 1
+kGetTagName: 2
+kRenameTag: 3
+kDestroyTag: 4
+kTagAddBlob: 5
+kTagRemoveBlob: 6
+# kTagGroupBy: 7
+# kTagAddTrait: 8
+# kTagRemoveTrait: 9
+kTagClearBlobs: 10
+kUpdateSize: 11
+kAppendBlobSchema: 12
+kAppendBlob: 13
+kGetSize: 14
+kSetBlobMdm: 15
+kGetContainedBlobIds: 16
+kPollTagMetadata: 17
\ No newline at end of file
diff --git a/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_tasks.h b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_tasks.h
new file mode 100644
index 000000000..24eaf2dad
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/include/hermes_bucket_mdm/hermes_bucket_mdm_tasks.h
@@ -0,0 +1,1031 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_TASKS_HERMES_BUCKET_MDM_INCLUDE_HERMES_BUCKET_MDM_HERMES_BUCKET_MDM_TASKS_H_
+#define HRUN_TASKS_HERMES_BUCKET_MDM_INCLUDE_HERMES_BUCKET_MDM_HERMES_BUCKET_MDM_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hermes/hermes_types.h"
+#include "bdev/bdev.h"
+#include "hermes_blob_mdm/hermes_blob_mdm.h"
+#include "hrun/api/hrun_client.h"
+#include "hrun/hrun_namespace.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hermes::bucket_mdm {
+
+#include "hermes_bucket_mdm_methods.h"
+#include "hrun/hrun_namespace.h"
+
+/**
+ * A task to create hermes_bucket_mdm
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "hermes_bucket_mdm", id, queue_info) {
+  }
+};
+
+/** A task to destroy hermes_bucket_mdm */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/** Set the BLOB MDM ID */
+struct SetBlobMdmTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  IN TaskStateId blob_mdm_;
+  IN TaskStateId stager_mdm_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  SetBlobMdmTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  SetBlobMdmTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 const TaskStateId &blob_mdm,
+                 const TaskStateId &stager_mdm) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kAdmin;
+    task_state_ = state_id;
+    method_ = Method::kSetBlobMdm;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    blob_mdm_ = blob_mdm;
+    stager_mdm_ = stager_mdm;
+  }
+
+  /** Destructor */
+  ~SetBlobMdmTask() {}
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, SetBlobMdmTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, SetBlobMdmTask &dup_task) {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(blob_mdm_, stager_mdm_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+};
+
+class UpdateSizeMode {
+ public:
+  TASK_METHOD_T kAdd = 0;
+  TASK_METHOD_T kCap = 1;
+};
+
+/** Update bucket size */
+struct UpdateSizeTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN ssize_t update_;
+  IN int mode_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UpdateSizeTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  UpdateSizeTask(hipc::Allocator *alloc,
+              const TaskNode &task_node,
+              const DomainId &domain_id,
+              const TaskStateId &state_id,
+              const TagId &tag_id,
+              ssize_t update,
+              int mode) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kUpdateSize;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_FIRE_AND_FORGET);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    update_ = update;
+    mode_ = mode;
+  }
+
+  /** Destructor */
+  ~UpdateSizeTask() {}
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, update_, mode_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** Phases for the append task */
+class AppendBlobPhase {
+ public:
+  TASK_METHOD_T kGetBlobIds = 0;
+  TASK_METHOD_T kWaitBlobIds = 1;
+  TASK_METHOD_T kWaitPutBlobs = 2;
+};
+
+/** A struct to store the  */
+struct AppendInfo {
+  size_t blob_off_;
+  size_t data_size_;
+  hshm::charbuf blob_name_;
+  BlobId blob_id_;
+  blob_mdm::GetOrCreateBlobIdTask *blob_id_task_;
+  blob_mdm::PutBlobTask *put_task_;
+
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(blob_off_, data_size_, blob_name_, blob_id_);
+  }
+};
+
+/** A task to append data to a bucket */
+struct AppendBlobSchemaTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN size_t data_size_;
+  IN size_t page_size_;
+  TEMP int phase_ = AppendBlobPhase::kGetBlobIds;
+  TEMP hipc::ShmArchive<std::vector<AppendInfo>> append_info_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  AppendBlobSchemaTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  AppendBlobSchemaTask(hipc::Allocator *alloc,
+                       const TaskNode &task_node,
+                       const DomainId &domain_id,
+                       const TaskStateId &state_id,
+                       const TagId &tag_id,
+                       size_t data_size,
+                       size_t page_size) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kAppendBlobSchema;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    data_size_ = data_size;
+    page_size_ = page_size;
+  }
+
+  /** Destructor */
+  ~AppendBlobSchemaTask() {}
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, data_size_, page_size_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(append_info_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to append data to a bucket */
+struct AppendBlobTask : public Task, TaskFlags<TF_LOCAL> {
+  IN TagId tag_id_;
+  IN size_t data_size_;
+  IN hipc::Pointer data_;
+  IN size_t page_size_;
+  IN u32 node_id_;
+  IN float score_;
+  TEMP int phase_ = AppendBlobPhase::kGetBlobIds;
+  TEMP AppendBlobSchemaTask *schema_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  AppendBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  AppendBlobTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 const TagId &tag_id,
+                 size_t data_size,
+                 const hipc::Pointer &data,
+                 size_t page_size,
+                 float score,
+                 u32 node_id,
+                 const Context &ctx) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kAppendBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_FIRE_AND_FORGET | TASK_DATA_OWNER | TASK_UNORDERED | TASK_REMOTE_DEBUG_MARK);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    data_size_ = data_size;
+    data_ = data;
+    score_ = score;
+    page_size_ = page_size;
+    node_id_ = node_id;
+  }
+
+  /** Destructor */
+  ~AppendBlobTask() {
+    if (IsDataOwner()) {
+      HRUN_CLIENT->FreeBuffer(data_);
+    }
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to get or create a tag */
+struct GetOrCreateTagTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN hipc::ShmArchive<hipc::string> tag_name_;
+  IN bool blob_owner_;
+  IN hipc::ShmArchive<hipc::vector<TraitId>> traits_;
+  IN size_t backend_size_;
+  IN bitfield32_t flags_;
+  OUT TagId tag_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetOrCreateTagTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetOrCreateTagTask(hipc::Allocator *alloc,
+                     const TaskNode &task_node,
+                     const DomainId &domain_id,
+                     const TaskStateId &state_id,
+                     const hshm::charbuf &tag_name,
+                     bool blob_owner,
+                     const std::vector<TraitId> &traits,
+                     size_t backend_size,
+                     u32 flags) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = std::hash<hshm::charbuf>{}(tag_name);
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetOrCreateTag;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    blob_owner_ = blob_owner;
+    backend_size_ = backend_size;
+    HSHM_MAKE_AR(tag_name_, alloc, tag_name)
+    HSHM_MAKE_AR(traits_, alloc, traits)
+    flags_ = bitfield32_t(flags);
+  }
+
+  /** Destructor */
+  ~GetOrCreateTagTask() {
+    HSHM_DESTROY_AR(tag_name_)
+    HSHM_DESTROY_AR(traits_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_name_, blob_owner_, traits_, backend_size_, flags_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(tag_id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    group.resize(tag_name_->size());
+    memcpy(group.data(), tag_name_->data(), tag_name_->size());
+    return 0;
+  }
+};
+
+/** A task to get a tag id */
+struct GetTagIdTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN hipc::ShmArchive<hipc::string> tag_name_;
+  OUT TagId tag_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetTagIdTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetTagIdTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               const TaskStateId &state_id,
+               const hshm::charbuf &tag_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = std::hash<hshm::charbuf>{}(tag_name);
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetTagId;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    HSHM_MAKE_AR(tag_name_, alloc, tag_name)
+  }
+
+  /** Destructor */
+  ~GetTagIdTask() {
+    HSHM_DESTROY_AR(tag_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_name_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(tag_id_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    group.resize(tag_name_->size());
+    memcpy(group.data(), tag_name_->data(), tag_name_->size());
+    return 0;
+  }
+};
+
+/** A task to get a tag name */
+struct GetTagNameTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  OUT hipc::ShmArchive<hipc::string> tag_name_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetTagNameTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetTagNameTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 const TagId &tag_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetTagName;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+  }
+
+  /** Destructor */
+  ~GetTagNameTask() {
+    HSHM_DESTROY_AR(tag_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(tag_name_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to rename a tag */
+struct RenameTagTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN hipc::ShmArchive<hipc::string> tag_name_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RenameTagTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RenameTagTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const TaskStateId &state_id,
+                const TagId &tag_id,
+                const hshm::charbuf &tag_name) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRenameTag;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    HSHM_MAKE_AR(tag_name_, alloc, tag_name)
+  }
+
+  /** Destructor */
+  ~RenameTagTask() {
+    HSHM_DESTROY_AR(tag_name_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(tag_name_);
+  }
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+class DestroyTagPhase {
+ public:
+  TASK_METHOD_T kDestroyBlobs = 0;
+  TASK_METHOD_T kWaitDestroyBlobs = 1;
+};
+
+/** A task to destroy a tag */
+struct DestroyTagTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  TEMP int phase_ = DestroyTagPhase::kDestroyBlobs;
+  TEMP hipc::ShmArchive<std::vector<blob_mdm::DestroyBlobTask*>> destroy_blob_tasks_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestroyTagTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestroyTagTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 TagId tag_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kDestroyTag;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to add a blob to the tag */
+struct TagAddBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagAddBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagAddBlobTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 TagId tag_id,
+                 const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kTagAddBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY | TASK_FIRE_AND_FORGET);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to remove a blob from a tag */
+struct TagRemoveBlobTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  IN BlobId blob_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagRemoveBlobTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagRemoveBlobTask(hipc::Allocator *alloc,
+                    const TaskNode &task_node,
+                    const DomainId &domain_id,
+                    const TaskStateId &state_id,
+                    TagId tag_id,
+                    const BlobId &blob_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kTagRemoveBlob;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    blob_id_ = blob_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to get the group of blobs associated with a tag */
+struct TagGroupByTask : public Task, TaskFlags<TF_SRL_SYM> {};
+
+/** A task to associate a tag with a trait */
+struct TagAddTraitTask : public Task, TaskFlags<TF_SRL_SYM> {};
+
+/** A task to remove a trait from a tag */
+struct TagRemoveTraitTask : public Task, TaskFlags<TF_SRL_SYM> {};
+
+/** A task to destroy all blobs in the tag */
+struct TagClearBlobsTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagClearBlobsTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  TagClearBlobsTask(hipc::Allocator *alloc,
+                    const TaskNode &task_node,
+                    const DomainId &domain_id,
+                    const TaskStateId &state_id,
+                    TagId tag_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kTagClearBlobs;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+
+   /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to destroy all blobs in the tag */
+struct GetSizeTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  OUT size_t size_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetSizeTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetSizeTask(hipc::Allocator *alloc,
+                    const TaskNode &task_node,
+                    const DomainId &domain_id,
+                    const TaskStateId &state_id,
+                    TagId tag_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetSize;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(size_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to destroy all blobs in the tag */
+struct GetContainedBlobIdsTask : public Task, TaskFlags<TF_SRL_SYM> {
+  IN TagId tag_id_;
+  OUT hipc::ShmArchive<hipc::vector<BlobId>> blob_ids_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetContainedBlobIdsTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  GetContainedBlobIdsTask(hipc::Allocator *alloc,
+                          const TaskNode &task_node,
+                          const DomainId &domain_id,
+                          const TaskStateId &state_id,
+                          const TagId &tag_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = tag_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kGetContainedBlobIds;
+    task_flags_.SetBits(TASK_LOW_LATENCY);
+    domain_id_ = domain_id;
+
+    // Custom params
+    tag_id_ = tag_id;
+    HSHM_MAKE_AR0(blob_ids_, alloc)
+  }
+
+  /** Destructor */
+  ~GetContainedBlobIdsTask() {
+    HSHM_DESTROY_AR(blob_ids_)
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(tag_id_, blob_ids_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar(blob_ids_);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    hrun::LocalSerialize srl(group);
+    srl << tag_id_.unique_;
+    srl << tag_id_.node_id_;
+    return 0;
+  }
+};
+
+/** A task to collect blob metadata */
+struct PollTagMetadataTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  OUT hipc::ShmArchive<hipc::string> my_tag_mdms_;
+  TEMP hipc::ShmArchive<hipc::vector<hipc::string>> tag_mdms_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PollTagMetadataTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  PollTagMetadataTask(hipc::Allocator *alloc,
+                       const TaskNode &task_node,
+                       const TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kPollTagMetadata;
+    task_flags_.SetBits(TASK_LANE_ALL);
+    domain_id_ = DomainId::GetGlobal();
+
+    // Custom params
+    HSHM_MAKE_AR0(my_tag_mdms_, alloc)
+    HSHM_MAKE_AR0(tag_mdms_, alloc)
+  }
+
+  /** Serialize tag info */
+  void SerializeTagMetadata(const std::vector<TagInfo> &tag_info) {
+    std::stringstream ss;
+    cereal::BinaryOutputArchive ar(ss);
+    ar << tag_info;
+    (*my_tag_mdms_) = ss.str();
+  }
+
+  /** Deserialize tag info */
+  void DeserializeTagMetadata(const std::string &srl, std::vector<TagInfo> &tag_mdms) {
+    std::vector<TagInfo> tmp_tag_mdms;
+    std::stringstream ss(srl);
+    cereal::BinaryInputArchive ar(ss);
+    ar >> tmp_tag_mdms;
+    for (TagInfo &tag_info : tmp_tag_mdms) {
+      tag_mdms.emplace_back(tag_info);
+    }
+  }
+
+  /** Get combined output of all replicas */
+  std::vector<TagInfo> MergeTagMetadata() {
+    std::vector<TagInfo> tag_mdms;
+    for (const hipc::string &srl : *tag_mdms_) {
+      DeserializeTagMetadata(srl.str(), tag_mdms);
+    }
+    return tag_mdms;
+  }
+
+  /** Deserialize final query output */
+  std::vector<TagInfo> DeserializeTagMetadata() {
+    std::vector<TagInfo> tag_mdms;
+    DeserializeTagMetadata(my_tag_mdms_->str(), tag_mdms);
+    return tag_mdms;
+  }
+
+  /** Destructor */
+  ~PollTagMetadataTask() {
+    HSHM_DESTROY_AR(my_tag_mdms_)
+    HSHM_DESTROY_AR(tag_mdms_)
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, PollTagMetadataTask &other) {
+    task_dup(other);
+    HSHM_MAKE_AR(tag_mdms_, alloc, *other.tag_mdms_)
+    HSHM_MAKE_AR(my_tag_mdms_, alloc, *other.my_tag_mdms_)
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, PollTagMetadataTask &dup_task) {
+    (*tag_mdms_)[replica] = (*dup_task.my_tag_mdms_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(my_tag_mdms_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+    ar((*tag_mdms_)[replica]);
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {
+    tag_mdms_->resize(count);
+  }
+
+  /** Finalize replication */
+  void ReplicateEnd() {
+    std::vector<TagInfo> tag_mdms = MergeTagMetadata();
+    SerializeTagMetadata(tag_mdms);
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hermes::bucket_mdm
+
+#endif  // HRUN_TASKS_HERMES_BUCKET_MDM_INCLUDE_HERMES_BUCKET_MDM_HERMES_BUCKET_MDM_TASKS_H_
diff --git a/tasks/hermes_bucket_mdm/src/CMakeLists.txt b/tasks/hermes_bucket_mdm/src/CMakeLists.txt
new file mode 100644
index 000000000..fb7484699
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(hermes_bucket_mdm SHARED
+        hermes_bucket_mdm.cc)
+add_dependencies(hermes_bucket_mdm ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hermes_bucket_mdm ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        hermes_bucket_mdm
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hermes_bucket_mdm
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(hermes_bucket_mdm)
+endif()
diff --git a/tasks/hermes_bucket_mdm/src/hermes_bucket_mdm.cc b/tasks/hermes_bucket_mdm/src/hermes_bucket_mdm.cc
new file mode 100644
index 000000000..4e167e0ee
--- /dev/null
+++ b/tasks/hermes_bucket_mdm/src/hermes_bucket_mdm.cc
@@ -0,0 +1,410 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "hermes/config_server.h"
+#include "hermes_bucket_mdm/hermes_bucket_mdm.h"
+#include "hermes_adapters/mapper/abstract_mapper.h"
+#include "hermes/dpe/dpe_factory.h"
+#include "bdev/bdev.h"
+#include "data_stager/data_stager.h"
+
+namespace hermes::bucket_mdm {
+
+typedef std::unordered_map<hshm::charbuf, TagId> TAG_ID_MAP_T;
+typedef std::unordered_map<TagId, TagInfo> TAG_MAP_T;
+
+class Server : public TaskLib {
+ public:
+  std::vector<TAG_ID_MAP_T> tag_id_map_;
+  std::vector<TAG_MAP_T> tag_map_;
+  u32 node_id_;
+  std::atomic<u64> id_alloc_;
+  Client bkt_mdm_;
+  blob_mdm::Client blob_mdm_;
+  data_stager::Client stager_mdm_;
+
+ public:
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    id_alloc_ = 0;
+    node_id_ = HRUN_CLIENT->node_id_;
+    bkt_mdm_.Init(id_);
+    tag_id_map_.resize(HRUN_QM_RUNTIME->max_lanes_);
+    tag_map_.resize(HRUN_QM_RUNTIME->max_lanes_);
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Set the Blob MDM
+   * */
+  void SetBlobMdm(SetBlobMdmTask *task, RunContext &rctx) {
+    blob_mdm_.Init(task->blob_mdm_);
+    stager_mdm_.Init(task->stager_mdm_);
+    task->SetModuleComplete();
+  }
+
+  /** Update the size of the bucket */
+  void UpdateSize(UpdateSizeTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    TagInfo &tag_info = tag_map[task->tag_id_];
+    ssize_t internal_size = (ssize_t) tag_info.internal_size_;
+    if (task->mode_ == UpdateSizeMode::kAdd) {
+      internal_size += task->update_;
+    } else {
+      internal_size = std::max(task->update_, internal_size);
+    }
+    HILOG(kDebug, "Updating size of tag {} from {} to {} with update {} (mode={})",
+          task->tag_id_, tag_info.internal_size_, internal_size, task->update_, task->mode_)
+    tag_info.internal_size_ = (size_t) internal_size;
+    task->SetModuleComplete();
+  }
+
+  /**
+   * Create the PartialPuts for append operations.
+   * */
+  void AppendBlobSchema(AppendBlobSchemaTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case AppendBlobPhase::kGetBlobIds: {
+        HILOG(kDebug, "(node {}) Getting blob IDs for tag {} (task_node={})",
+              HRUN_CLIENT->node_id_, task->tag_id_, task->task_node_)
+        TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+        TagInfo &tag_info = tag_map[task->tag_id_];
+        size_t bucket_size = tag_info.internal_size_;
+        size_t cur_page = bucket_size / task->page_size_;
+        size_t cur_page_off = bucket_size % task->page_size_;
+        size_t update_size = task->page_size_ - cur_page_off;
+        size_t max_pages = task->data_size_ / task->page_size_ + 1;
+        size_t cur_size = 0;
+        HILOG(kDebug, "(node {}) Bucket size {}, page_size {}, cur_page {} (task_node={})",
+              HRUN_CLIENT->node_id_, bucket_size, task->page_size_, cur_page, task->task_node_)
+        HSHM_MAKE_AR0(task->append_info_, nullptr);
+        std::vector<AppendInfo> &append_info = *task->append_info_;
+        append_info.reserve(max_pages);
+        while (cur_size < task->data_size_) {
+          if (update_size > task->data_size_) {
+            update_size = task->data_size_;
+          }
+          append_info.emplace_back();
+          AppendInfo &append = append_info.back();
+          append.blob_name_ = hshm::charbuf(std::to_string(cur_page));
+          append.data_size_ = update_size;
+          append.blob_off_ = cur_page_off;
+          append.blob_id_task_ = blob_mdm_.AsyncGetOrCreateBlobId(task->task_node_ + 1,
+                                                                  task->tag_id_,
+                                                                  append.blob_name_).ptr_;
+          cur_size += update_size;
+          cur_page_off = 0;
+          ++cur_page;
+          update_size = task->page_size_;
+        }
+        task->phase_ = AppendBlobPhase::kWaitBlobIds;
+      }
+      case AppendBlobPhase::kWaitBlobIds: {
+        std::vector<AppendInfo> &append_info = *task->append_info_;
+        for (AppendInfo &append : append_info) {
+          if (!append.blob_id_task_->IsComplete()) {
+            return;
+          }
+        }
+        HILOG(kDebug, "(node {}) Finished blob IDs for tag {} (task_node={})",
+              HRUN_CLIENT->node_id_, task->tag_id_, task->task_node_)
+        for (AppendInfo &append : append_info) {
+          append.blob_id_ = append.blob_id_task_->blob_id_;
+          HRUN_CLIENT->DelTask(append.blob_id_task_);
+        }
+        task->SetModuleComplete();
+      }
+    }
+  }
+
+  /**
+   * Append data to a bucket. Assumes that the blobs in the bucket
+   * are named 0 ... N. Each blob is assumed to have a certain
+   * fixed page size.
+   * */
+  void AppendBlob(AppendBlobTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case AppendBlobPhase::kGetBlobIds: {
+        HILOG(kDebug, "(node {}) Appending {} bytes to bucket {} (task_node={})",
+              HRUN_CLIENT->node_id_, task->data_size_, task->tag_id_, task->task_node_);
+        task->schema_ = bkt_mdm_.AsyncAppendBlobSchema(task->task_node_ + 1,
+                                                       task->tag_id_,
+                                                       task->data_size_,
+                                                       task->page_size_).ptr_;
+        task->phase_ = AppendBlobPhase::kWaitBlobIds;
+      }
+      case AppendBlobPhase::kWaitBlobIds: {
+        if (!task->schema_->IsComplete()) {
+          return;
+        }
+        std::vector<AppendInfo> &append_info = *task->schema_->append_info_;
+        size_t buf_off = 0;
+        HILOG(kDebug, "(node {}) Got blob schema of size {} for tag {} (task_node={})",
+              HRUN_CLIENT->node_id_, append_info.size(), task->tag_id_, task->task_node_)
+        for (AppendInfo &append : append_info) {
+          HILOG(kDebug, "(node {}) Spawning blob {} of size {} for tag {} (task_node={} blob_mdm={})",
+                HRUN_CLIENT->node_id_, append.blob_name_.str(), append.data_size_,
+                task->tag_id_, task->task_node_, blob_mdm_.id_);
+          append.put_task_ = blob_mdm_.AsyncPutBlob(task->task_node_ + 1,
+                                                    task->tag_id_,
+                                                    append.blob_name_,
+                                                    append.blob_id_,
+                                                    append.blob_off_,
+                                                    append.data_size_,
+                                                    task->data_ + buf_off,
+                                                    task->score_, 0,
+                                                    Context(), 0).ptr_;
+          HILOG(kDebug, "(node {}) Finished spawning blob {} of size {} for tag {} (task_node={} blob_mdm={})",
+                HRUN_CLIENT->node_id_, append.blob_name_.str(), append.data_size_,
+                task->tag_id_, task->task_node_, blob_mdm_.id_);
+          buf_off += append.data_size_;
+        }
+        task->phase_ = AppendBlobPhase::kWaitPutBlobs;
+      }
+      case AppendBlobPhase::kWaitPutBlobs: {
+        std::vector<AppendInfo> &append_info = *task->schema_->append_info_;
+        for (AppendInfo &append : append_info) {
+          if (!append.put_task_->IsComplete()) {
+            return;
+          }
+        }
+        HILOG(kDebug, "(node {}) PUT blobs for tag {} (task_node={})",
+              HRUN_CLIENT->node_id_, task->tag_id_, task->task_node_)
+        for (AppendInfo &append : append_info) {
+          HRUN_CLIENT->DelTask(append.put_task_);
+        }
+        HSHM_DESTROY_AR(task->schema_->append_info_);
+        HRUN_CLIENT->DelTask(task->schema_);
+        task->SetModuleComplete();
+      }
+    }
+  }
+
+  /** Get or create a tag */
+  void GetOrCreateTag(GetOrCreateTagTask *task, RunContext &rctx) {
+    TagId tag_id;
+    HILOG(kDebug, "Creating a tag on lane {}", rctx.lane_id_);
+
+    // Check if the tag exists
+    TAG_ID_MAP_T &tag_id_map = tag_id_map_[rctx.lane_id_];
+    hshm::string url = hshm::to_charbuf(*task->tag_name_);
+    hshm::charbuf tag_name = data_stager::Client::GetTagNameFromUrl(url);
+    bool did_create = false;
+    if (tag_name.size() > 0) {
+      did_create = tag_id_map.find(tag_name) == tag_id_map.end();
+    }
+
+    // Emplace bucket if it does not already exist
+    if (did_create) {
+      TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+      tag_id.unique_ = id_alloc_.fetch_add(1);
+      tag_id.hash_ = task->lane_hash_;
+      tag_id.node_id_ = HRUN_RUNTIME->rpc_.node_id_;
+      HILOG(kDebug, "Creating tag for the first time: {} {}", tag_name.str(), tag_id)
+      tag_id_map.emplace(tag_name, tag_id);
+      tag_map.emplace(tag_id, TagInfo());
+      TagInfo &tag_info = tag_map[tag_id];
+      tag_info.name_ = tag_name;
+      tag_info.tag_id_ = tag_id;
+      tag_info.owner_ = task->blob_owner_;
+      tag_info.internal_size_ = task->backend_size_;
+      if (task->flags_.Any(HERMES_IS_FILE)) {
+        stager_mdm_.AsyncRegisterStager(task->task_node_ + 1,
+                                        tag_id,
+                                        hshm::charbuf(task->tag_name_->str()));
+      }
+    } else {
+      if (tag_name.size()) {
+        HILOG(kDebug, "Found existing tag: {}", tag_name.str())
+        tag_id = tag_id_map[tag_name];
+      } else {
+        HILOG(kDebug, "Found existing tag: {}", task->tag_id_)
+        tag_id = task->tag_id_;
+      }
+    }
+
+    task->tag_id_ = tag_id;
+    // task->did_create_ = did_create;
+    task->SetModuleComplete();
+  }
+
+  /** Get tag ID */
+  void GetTagId(GetTagIdTask *task, RunContext &rctx) {
+    TAG_ID_MAP_T &tag_id_map = tag_id_map_[rctx.lane_id_];
+    hshm::charbuf tag_name = hshm::to_charbuf(*task->tag_name_);
+    auto it = tag_id_map.find(tag_name);
+    if (it == tag_id_map.end()) {
+      task->tag_id_ = TagId::GetNull();
+      task->SetModuleComplete();
+      return;
+    }
+    task->tag_id_ = it->second;
+    task->SetModuleComplete();
+  }
+
+  /** Get tag name */
+  void GetTagName(GetTagNameTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    (*task->tag_name_) = it->second.name_;
+    task->SetModuleComplete();
+  }
+
+  /** Rename tag */
+  void RenameTag(RenameTagTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    (*task->tag_name_) = (*task->tag_name_);
+    task->SetModuleComplete();
+  }
+
+  /** Destroy tag */
+  void DestroyTag(DestroyTagTask *task, RunContext &rctx) {
+    switch (task->phase_) {
+      case DestroyTagPhase::kDestroyBlobs: {
+        TAG_ID_MAP_T &tag_id_map = tag_id_map_[rctx.lane_id_];
+        TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+        TagInfo &tag = tag_map[task->tag_id_];
+        tag_id_map.erase(tag.name_);
+        HSHM_MAKE_AR0(task->destroy_blob_tasks_, nullptr);
+        std::vector<blob_mdm::DestroyBlobTask*> blob_tasks = *task->destroy_blob_tasks_;
+        blob_tasks.reserve(tag.blobs_.size());
+        for (BlobId &blob_id : tag.blobs_) {
+          blob_mdm::DestroyBlobTask *blob_task =
+              blob_mdm_.AsyncDestroyBlob(task->task_node_ + 1, task->tag_id_, blob_id).ptr_;
+          blob_tasks.emplace_back(blob_task);
+        }
+        stager_mdm_.AsyncUnregisterStager(task->task_node_ + 1,
+                                          task->tag_id_);
+        task->phase_ = DestroyTagPhase::kWaitDestroyBlobs;
+        return;
+      }
+      case DestroyTagPhase::kWaitDestroyBlobs: {
+        std::vector<blob_mdm::DestroyBlobTask*> blob_tasks = *task->destroy_blob_tasks_;
+        for (blob_mdm::DestroyBlobTask *&blob_task : blob_tasks) {
+          if (!blob_task->IsComplete()) {
+            return;
+          }
+        }
+        for (blob_mdm::DestroyBlobTask *&blob_task : blob_tasks) {
+          HRUN_CLIENT->DelTask(blob_task);
+        }
+        HSHM_DESTROY_AR(task->destroy_blob_tasks_);
+        TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+        tag_map.erase(task->tag_id_);
+        task->SetModuleComplete();
+      }
+    }
+  }
+
+  /** Add a blob to a tag */
+  void TagAddBlob(TagAddBlobTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    TagInfo &tag = it->second;
+    tag.blobs_.emplace_back(task->blob_id_);
+    task->SetModuleComplete();
+  }
+
+  /** Remove a blob from a tag */
+  void TagRemoveBlob(TagRemoveBlobTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    TagInfo &tag = it->second;
+    auto blob_it = std::find(tag.blobs_.begin(), tag.blobs_.end(), task->blob_id_);
+    tag.blobs_.erase(blob_it);
+    task->SetModuleComplete();
+  }
+
+  /** Clear blobs from a tag */
+  void TagClearBlobs(TagClearBlobsTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    TagInfo &tag = it->second;
+    tag.blobs_.clear();
+    tag.internal_size_ = 0;
+    task->SetModuleComplete();
+  }
+
+  /** Get size of the bucket */
+  void GetSize(GetSizeTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->size_ = 0;
+      task->SetModuleComplete();
+      return;
+    }
+    TagInfo &tag = it->second;
+    task->size_ = tag.internal_size_;
+    task->SetModuleComplete();
+  }
+
+  /** Get contained blob IDs */
+  void GetContainedBlobIds(GetContainedBlobIdsTask *task, RunContext &rctx) {
+    TAG_MAP_T &tag_map = tag_map_[rctx.lane_id_];
+    auto it = tag_map.find(task->tag_id_);
+    if (it == tag_map.end()) {
+      task->SetModuleComplete();
+      return;
+    }
+    TagInfo &tag = it->second;
+    hipc::vector<BlobId> &blobs = (*task->blob_ids_);
+    blobs.reserve(tag.blobs_.size());
+    for (BlobId &blob_id : tag.blobs_) {
+      blobs.emplace_back(blob_id);
+    }
+    task->SetModuleComplete();
+  }
+
+  /**
+  * Get all metadata about a blob
+  * */
+  HSHM_ALWAYS_INLINE
+  void PollTagMetadata(PollTagMetadataTask *task, RunContext &rctx) {
+    TAG_MAP_T &blob_map = tag_map_[rctx.lane_id_];
+    std::vector<TagInfo> tag_mdms;
+    tag_mdms.reserve(blob_map.size());
+    for (const std::pair<TagId, TagInfo> &tag_part : blob_map) {
+      const TagInfo &tag_info = tag_part.second;
+      tag_mdms.emplace_back(tag_info);
+    }
+    task->SerializeTagMetadata(tag_mdms);
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "hermes_bucket_mdm/hermes_bucket_mdm_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hermes::bucket_mdm::Server, "hermes_bucket_mdm");
diff --git a/tasks/hermes_data_op/CMakeLists.txt b/tasks/hermes_data_op/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/tasks/hermes_data_op/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op.h b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op.h
new file mode 100644
index 000000000..54c583f2d
--- /dev/null
+++ b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op.h
@@ -0,0 +1,101 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_hermes_data_op_H_
+#define HRUN_hermes_data_op_H_
+
+#include "hermes_data_op_tasks.h"
+
+namespace hermes::data_op {
+
+/** Create hermes_data_op requests */
+class Client : public TaskLibClient {
+
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Async create a task state */
+  HSHM_ALWAYS_INLINE
+  LPointer<ConstructTask> AsyncCreate(const TaskNode &task_node,
+                                      const DomainId &domain_id,
+                                      const std::string &state_name,
+                                      TaskStateId &bkt_mdm_id,
+                                      TaskStateId &blob_mdm_id) {
+    id_ = TaskStateId::GetNull();
+    QueueManagerInfo &qm = HRUN_CLIENT->server_config_.queue_manager_;
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, qm.queue_depth_, 0},
+        {1, 1, qm.queue_depth_, QUEUE_LONG_RUNNING},
+        {qm.max_lanes_, qm.max_lanes_, qm.queue_depth_, QUEUE_LOW_LATENCY}
+    };
+    return HRUN_ADMIN->AsyncCreateTaskState<ConstructTask>(
+        task_node, domain_id, state_name, id_, queue_info,
+        bkt_mdm_id, blob_mdm_id);
+  }
+  HRUN_TASK_NODE_ROOT(AsyncCreate)
+  template<typename ...Args>
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(Args&& ...args) {
+    LPointer<ConstructTask> task =
+        AsyncCreateRoot(std::forward<Args>(args)...);
+    task->Wait();
+    id_ = task->id_;
+    queue_id_ = QueueId(id_);
+    HRUN_CLIENT->DelTask(task);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+
+  /** Register the OpGraph to perform on data */
+  HSHM_ALWAYS_INLINE
+  void AsyncRegisterOpConstruct(RegisterOpTask *task,
+                                const TaskNode &task_node,
+                                const OpGraph &op_graph) {
+    HRUN_CLIENT->ConstructTask<RegisterOpTask>(
+        task, task_node, DomainId::GetGlobal(), id_, op_graph);
+  }
+  HSHM_ALWAYS_INLINE
+  void RegisterOpRoot(const OpGraph &op_graph) {
+    LPointer<hrunpq::TypedPushTask<RegisterOpTask>> task =
+        AsyncRegisterOpRoot(op_graph);
+    task.ptr_->Wait();
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(RegisterOp);
+
+  /** Register data as ready for operations to be performed */
+  HSHM_ALWAYS_INLINE
+  void AsyncRegisterDataConstruct(RegisterDataTask *task,
+                                  const TaskNode &task_node,
+                                  const BucketId &bkt_id,
+                                  const std::string &blob_name,
+                                  const BlobId &blob_id,
+                                  size_t off,
+                                  size_t size) {
+    HRUN_CLIENT->ConstructTask<RegisterDataTask>(
+        task, task_node, id_, bkt_id,
+        blob_name, blob_id, off, size);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(RegisterData);
+
+  /** Async task to run operators */
+  HSHM_ALWAYS_INLINE
+  void AsyncRunOpConstruct(RunOpTask *task,
+                           const TaskNode &task_node) {
+    HRUN_CLIENT->ConstructTask<RunOpTask>(
+        task, task_node, id_);
+  }
+  HRUN_TASK_NODE_PUSH_ROOT(RunOp);
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_hermes_data_op_H_
diff --git a/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_lib_exec.h b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_lib_exec.h
new file mode 100644
index 000000000..51413ffc1
--- /dev/null
+++ b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_lib_exec.h
@@ -0,0 +1,285 @@
+#ifndef HRUN_HERMES_DATA_OP_LIB_EXEC_H_
+#define HRUN_HERMES_DATA_OP_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+    case Method::kRegisterOp: {
+      RegisterOp(reinterpret_cast<RegisterOpTask *>(task), rctx);
+      break;
+    }
+    case Method::kRegisterData: {
+      RegisterData(reinterpret_cast<RegisterDataTask *>(task), rctx);
+      break;
+    }
+    case Method::kRunOp: {
+      RunOp(reinterpret_cast<RunOpTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+    case Method::kRegisterOp: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RegisterOpTask *>(task));
+      break;
+    }
+    case Method::kRegisterData: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RegisterDataTask *>(task));
+      break;
+    }
+    case Method::kRunOp: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<RunOpTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRegisterOp: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RegisterOpTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRegisterData: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RegisterDataTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kRunOp: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<RunOpTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+    case Method::kRegisterOp: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RegisterOpTask*>(orig_task), reinterpret_cast<RegisterOpTask*>(dup_task));
+      break;
+    }
+    case Method::kRegisterData: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RegisterDataTask*>(orig_task), reinterpret_cast<RegisterDataTask*>(dup_task));
+      break;
+    }
+    case Method::kRunOp: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<RunOpTask*>(orig_task), reinterpret_cast<RunOpTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kRegisterOp: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RegisterOpTask*>(task));
+      break;
+    }
+    case Method::kRegisterData: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RegisterDataTask*>(task));
+      break;
+    }
+    case Method::kRunOp: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<RunOpTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kRegisterOp: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RegisterOpTask*>(task));
+      break;
+    }
+    case Method::kRegisterData: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RegisterDataTask*>(task));
+      break;
+    }
+    case Method::kRunOp: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<RunOpTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kRegisterOp: {
+      ar << *reinterpret_cast<RegisterOpTask*>(task);
+      break;
+    }
+    case Method::kRegisterData: {
+      ar << *reinterpret_cast<RegisterDataTask*>(task);
+      break;
+    }
+    case Method::kRunOp: {
+      ar << *reinterpret_cast<RunOpTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRegisterOp: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RegisterOpTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RegisterOpTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRegisterData: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RegisterDataTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RegisterDataTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kRunOp: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<RunOpTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<RunOpTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+    case Method::kRegisterOp: {
+      ar << *reinterpret_cast<RegisterOpTask*>(task);
+      break;
+    }
+    case Method::kRegisterData: {
+      ar << *reinterpret_cast<RegisterDataTask*>(task);
+      break;
+    }
+    case Method::kRunOp: {
+      ar << *reinterpret_cast<RunOpTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+    case Method::kRegisterOp: {
+      ar.Deserialize(replica, *reinterpret_cast<RegisterOpTask*>(task));
+      break;
+    }
+    case Method::kRegisterData: {
+      ar.Deserialize(replica, *reinterpret_cast<RegisterDataTask*>(task));
+      break;
+    }
+    case Method::kRunOp: {
+      ar.Deserialize(replica, *reinterpret_cast<RunOpTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+    case Method::kRegisterOp: {
+      return reinterpret_cast<RegisterOpTask*>(task)->GetGroup(group);
+    }
+    case Method::kRegisterData: {
+      return reinterpret_cast<RegisterDataTask*>(task)->GetGroup(group);
+    }
+    case Method::kRunOp: {
+      return reinterpret_cast<RunOpTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_HERMES_DATA_OP_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_methods.h b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_methods.h
new file mode 100644
index 000000000..06cc34c2b
--- /dev/null
+++ b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_methods.h
@@ -0,0 +1,11 @@
+#ifndef HRUN_HERMES_DATA_OP_METHODS_H_
+#define HRUN_HERMES_DATA_OP_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+  TASK_METHOD_T kRegisterOp = kLast + 0;
+  TASK_METHOD_T kRegisterData = kLast + 1;
+  TASK_METHOD_T kRunOp = kLast + 2;
+};
+
+#endif  // HRUN_HERMES_DATA_OP_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_methods.yaml b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_methods.yaml
new file mode 100644
index 000000000..372caa08e
--- /dev/null
+++ b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_methods.yaml
@@ -0,0 +1,3 @@
+kRegisterOp: 0
+kRegisterData: 1
+kRunOp: 2
\ No newline at end of file
diff --git a/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_tasks.h b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_tasks.h
new file mode 100644
index 000000000..65f4f7651
--- /dev/null
+++ b/tasks/hermes_data_op/include/hermes_data_op/hermes_data_op_tasks.h
@@ -0,0 +1,311 @@
+//
+// Created by lukemartinlogan on 8/11/23.
+//
+
+#ifndef HRUN_TASKS_TASK_TEMPL_INCLUDE_hermes_data_op_hermes_data_op_TASKS_H_
+#define HRUN_TASKS_TASK_TEMPL_INCLUDE_hermes_data_op_hermes_data_op_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "proc_queue/proc_queue.h"
+#include "hermes/hermes_types.h"
+#include "hermes_data_op/hermes_data_op.h"
+#include "hermes_bucket_mdm/hermes_bucket_mdm.h"
+
+namespace hermes::data_op {
+
+#include "hermes_data_op_methods.h"
+#include "hrun/hrun_namespace.h"
+using hrun::proc_queue::TypedPushTask;
+using hrun::proc_queue::PushTask;
+
+/** The bucket to use for op data */
+struct OpBucketName {
+  std::string url_;  // URL of bucket
+  BucketId bkt_id_;  // Bucket ID (internal)
+  LPointer<bucket_mdm::GetOrCreateTagTask>
+      bkt_id_task_;  // Task to get bucket ID (internal)
+
+  /** Default constructor */
+  OpBucketName() = default;
+
+  /** Emplace constructor */
+  OpBucketName(const std::string &url) : url_(url) {}
+
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(url_);
+  }
+};
+
+/** An operation to perform on a set of inputs */
+struct Op {
+  std::vector<OpBucketName> in_;  // Input URLs, indicates data format as well
+  OpBucketName var_name_;         // Output URL
+  std::string op_name_;           // Operation name
+  u32 op_id_;                     // Operation ID (internal)
+
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(in_, var_name_, op_name_);
+  }
+};
+
+/** The graph of operations to perform on data */
+struct OpGraph {
+  std::vector<Op> ops_;
+
+  template<typename Ar>
+  void serialize(Ar &ar) {
+    ar(ops_);
+  }
+};
+
+/**
+ * A task to create hermes_data_op
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  IN TaskStateId bkt_mdm_;
+  IN TaskStateId blob_mdm_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc)
+  : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info,
+                const TaskStateId &bkt_mdm_id,
+                const TaskStateId &blob_mdm_id)
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "hermes_data_op", id, queue_info) {
+    // Custom params
+    bkt_mdm_ = bkt_mdm_id;
+    blob_mdm_ = blob_mdm_id;
+  }
+
+  HSHM_ALWAYS_INLINE
+  ~ConstructTask() {
+    // Custom params
+  }
+};
+
+/** A task to destroy hermes_data_op */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc)
+  : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               TaskStateId &state_id)
+  : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * Register an operation to perform on data
+ * */
+struct RegisterOpTask : public Task, TaskFlags<TF_SRL_SYM | TF_REPLICA> {
+  IN hipc::ShmArchive<hipc::string> op_graph_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterOpTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterOpTask(hipc::Allocator *alloc,
+                 const TaskNode &task_node,
+                 const DomainId &domain_id,
+                 const TaskStateId &state_id,
+                 const OpGraph &graph) : Task(alloc) {
+    // Store OpGraph
+    std::stringstream ss;
+    cereal::BinaryOutputArchive ar(ss);
+    ar << graph;
+    std::string op_graph_str = ss.str();
+    HSHM_MAKE_AR(op_graph_, alloc, op_graph_str);
+
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = std::hash<std::string>{}(op_graph_str);
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRegisterOp;
+    task_flags_.SetBits(TASK_COROUTINE);
+    domain_id_ = domain_id;
+  }
+
+  /** Get opgraph */
+  OpGraph GetOpGraph() {
+    OpGraph graph;
+    std::stringstream ss(op_graph_->str());
+    cereal::BinaryInputArchive ar(ss);
+    ar >> graph;
+    return graph;
+  }
+
+  /** Destructor */
+  ~RegisterOpTask() {
+    HSHM_DESTROY_AR(op_graph_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(op_graph_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, RegisterOpTask &other) {
+    task_dup(other);
+    HSHM_MAKE_AR(op_graph_, alloc, *other.op_graph_);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, RegisterOpTask &dup_task) {
+  }
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * Register some data as being available for derived
+ * quantity calculation
+ * */
+struct OpData {
+  BucketId bkt_id_;
+  BlobId blob_id_;
+  size_t off_;
+  size_t size_;
+  u64 data_id_;
+  std::string blob_name_;
+  int refcnt_;
+
+  OpData() : refcnt_(0) {}
+};
+struct RegisterDataTask : public Task, TaskFlags<TF_LOCAL> {
+  IN OpData data_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterDataTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RegisterDataTask(hipc::Allocator *alloc,
+            const TaskNode &task_node,
+            const TaskStateId &state_id,
+            const BucketId &bkt_id,
+            const std::string &blob_name,
+            const BlobId &blob_id,
+            size_t off,
+            size_t size) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = bkt_id.hash_;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRegisterData;
+    task_flags_.SetBits(TASK_COROUTINE | TASK_FIRE_AND_FORGET);
+    domain_id_ = DomainId::GetLocal();
+
+    // Custom params
+    data_.bkt_id_ = bkt_id;
+    data_.blob_name_ = blob_name;
+    data_.blob_id_ = blob_id;
+    data_.off_ = off;
+    data_.size_ = size;
+  }
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+/**
+ * Run an operation over a piece of data
+ * */
+struct RunOpTask : public Task, TaskFlags<TF_LOCAL | TF_REPLICA> {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RunOpTask(hipc::Allocator *alloc) : Task(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  RunOpTask(hipc::Allocator *alloc,
+             const TaskNode &task_node,
+             const TaskStateId &state_id) : Task(alloc) {
+    // Initialize task
+    task_node_ = task_node;
+    lane_hash_ = 0;
+    prio_ = TaskPrio::kLowLatency;
+    task_state_ = state_id;
+    method_ = Method::kRunOp;
+    task_flags_.SetBits(TASK_LONG_RUNNING | TASK_COROUTINE | TASK_LANE_ALL);
+    SetPeriodSec(1);  // TODO(llogan): don't hardcode this
+    domain_id_ = DomainId::GetLocal();
+  }
+
+  /** Duplicate message */
+  void Dup(hipc::Allocator *alloc, RunOpTask &other) {
+    task_dup(other);
+  }
+
+  /** Process duplicate message output */
+  void DupEnd(u32 replica, RunOpTask &dup_task) {}
+
+  /** Begin replication */
+  void ReplicateStart(u32 count) {}
+
+  /** Finalize replication */
+  void ReplicateEnd() {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hermes::data_op
+
+#endif  // HRUN_TASKS_TASK_TEMPL_INCLUDE_hermes_data_op_hermes_data_op_TASKS_H_
diff --git a/tasks/hermes_data_op/src/CMakeLists.txt b/tasks/hermes_data_op/src/CMakeLists.txt
new file mode 100644
index 000000000..96ca3eac9
--- /dev/null
+++ b/tasks/hermes_data_op/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(hermes_data_op SHARED
+        hermes_data_op.cc)
+add_dependencies(hermes_data_op ${Hermes_RUNTIME_DEPS})
+target_link_libraries(hermes_data_op ${Hermes_RUNTIME_LIBRARIES})
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        hermes_data_op
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hermes_data_op
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(hermes_data_op)
+endif()
diff --git a/tasks/hermes_data_op/src/hermes_data_op.cc b/tasks/hermes_data_op/src/hermes_data_op.cc
new file mode 100644
index 000000000..9aebb1052
--- /dev/null
+++ b/tasks/hermes_data_op/src/hermes_data_op.cc
@@ -0,0 +1,210 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "hermes_data_op/hermes_data_op.h"
+#include "hermes_bucket_mdm/hermes_bucket_mdm.h"
+
+namespace hermes::data_op {
+
+struct OpPendingData {
+  std::list<OpData> pending_;
+  u32 num_refs_;
+  u64 data_id_;
+
+  OpPendingData() : num_refs_(0) {}
+};
+
+class Server : public TaskLib {
+ public:
+  std::vector<std::list<OpGraph>> op_graphs_;
+  std::unordered_map<std::string, u32> op_id_map_;
+  Mutex op_data_lock_;
+  std::unordered_map<BucketId, OpPendingData> op_data_map_;
+  hermes::bucket_mdm::Client bkt_mdm_;
+  hermes::blob_mdm::Client blob_mdm_;
+  Client client_;
+  LPointer<RunOpTask> run_task_;
+
+ public:
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    bkt_mdm_.Init(task->bkt_mdm_);
+    blob_mdm_.Init(task->blob_mdm_);
+    client_.Init(id_);
+    op_id_map_["min"] = 0;
+    op_id_map_["max"] = 1;
+    run_task_ = client_.AsyncRunOp(task->task_node_ + 1);
+    op_graphs_.resize(HRUN_QM_RUNTIME->max_lanes_);
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void RegisterOp(RegisterOpTask *task, RunContext &rctx) {
+    // Load OpGraph
+    op_graphs_[rctx.lane_id_].push_back(task->GetOpGraph());
+    OpGraph &op_graph = op_graphs_[rctx.lane_id_].back();
+
+    // Get or create all needed bucket IDs
+    std::vector<TraitId> traits;
+    for (Op &op : op_graph.ops_) {
+      // Spawn bucket ID task for each input
+      for (OpBucketName &bkt_name : op.in_) {
+        bkt_name.bkt_id_task_ =
+            bkt_mdm_.AsyncGetOrCreateTag(task->task_node_ + 1,
+                                         hshm::charbuf(bkt_name.url_),
+                                         true,
+                                         traits, 0, 0);
+      }
+      // Spawn bucket ID task for the output
+      op.var_name_.bkt_id_task_ =
+          bkt_mdm_.AsyncGetOrCreateTag(task->task_node_ + 1,
+                                       hshm::charbuf(op.var_name_.url_),
+                                       true,
+                                       traits, 0, 0);
+      // Set the op ID
+      op.op_id_ = op_id_map_[op.op_name_];
+    }
+
+    // Complete all bucket ID tasks
+    for (Op &op : op_graph.ops_) {
+      // Spawn bucket ID task for each input
+      for (OpBucketName &bkt_name : op.in_) {
+        bkt_name.bkt_id_task_->Wait<TASK_YIELD_CO>(task);
+        bkt_name.bkt_id_ = bkt_name.bkt_id_task_->tag_id_;
+        op_data_map_.emplace(bkt_name.bkt_id_, OpPendingData());
+        HRUN_CLIENT->DelTask(bkt_name.bkt_id_task_);
+      }
+      // Spawn bucket ID task for the output
+      op.var_name_.bkt_id_task_->Wait<TASK_YIELD_CO>(task);
+      op.var_name_.bkt_id_ = op.var_name_.bkt_id_task_->tag_id_;
+      op_data_map_.emplace(op.var_name_.bkt_id_, OpPendingData());
+      HRUN_CLIENT->DelTask(op.var_name_.bkt_id_task_);
+    }
+
+    // Get number of operations that depend on each data object
+    for (Op &op : op_graph.ops_) {
+      for (OpBucketName &bkt_name : op.in_) {
+        op_data_map_[bkt_name.bkt_id_].num_refs_++;
+      }
+    }
+
+    // Store the operator to perform
+    task->SetModuleComplete();
+  }
+
+  void RegisterData(RegisterDataTask *task, RunContext &rctx) {
+    if (!op_data_lock_.TryLock(0)) {
+      return;
+    }
+    OpPendingData &op_data = op_data_map_[task->data_.bkt_id_];
+    task->data_.data_id_ = op_data.data_id_++;
+    op_data.pending_.emplace_back(task->data_);
+    op_data_lock_.Unlock();
+    task->SetModuleComplete();
+  }
+
+  void RunOp(RunOpTask *task, RunContext &rctx) {
+    for (OpGraph &op_graph : op_graphs_[rctx.lane_id_]) {
+      for (Op &op : op_graph.ops_) {
+        switch(op.op_id_) {
+          case 0:
+            RunMin(task, op);
+            break;
+          case 1:
+            RunMax(task, op);
+            break;
+        }
+      }
+    }
+  }
+
+  std::list<OpData> GetPendingData(Op &op) {
+    std::list<OpData> pending;
+    if (!op_data_lock_.TryLock(0)) {
+      return pending;
+    }
+    for (OpBucketName &bkt_name : op.in_) {
+      OpPendingData &op_data = op_data_map_[bkt_name.bkt_id_];
+      pending = op_data.pending_;
+      std::list<OpData> pruned;
+      for (auto iter = pending.begin(); iter != pending.end(); ++iter) {
+        OpData &data = *iter;
+        ++data.refcnt_;
+        if (data.refcnt_ < op_data.num_refs_) {
+          pruned.push_back(data);
+        }
+        op_data.pending_ = pruned;
+      }
+    }
+    op_data_lock_.Unlock();
+    return pending;
+  }
+
+  void RunMin(RunOpTask *task, Op &op) {
+    // Get the pending data from Hermes
+    std::list<OpData> op_data = GetPendingData(op);
+    if (op_data.empty()) {
+      return;
+    }
+
+    // Get the input data from Hermes
+    typedef std::tuple<OpData&,
+                       LPointer<char>,
+                       LPointer<blob_mdm::GetBlobTask>> DataPair;
+    std::vector<DataPair> in_tasks;
+    for (OpData &data : op_data) {
+      // Get the input data
+      LPointer<char> data_ptr = HRUN_CLIENT->AllocateBuffer(data.size_);
+      LPointer<blob_mdm::GetBlobTask> in_task =
+          blob_mdm_.AsyncGetBlob(task->task_node_ + 1,
+                                 data.bkt_id_,
+                                 hshm::charbuf(""), data.blob_id_,
+                                 data.off_, data.size_,
+                                 data_ptr.shm_);
+      in_tasks.emplace_back(data, data_ptr, in_task);
+    }
+
+    // Calculate the min of input data
+    for (DataPair &data_pair : in_tasks) {
+      // Wait for data to be available
+      OpData &data = std::get<0>(data_pair);
+      LPointer<char> &data_ptr = std::get<1>(data_pair);
+      LPointer<blob_mdm::GetBlobTask> &in_task = std::get<2>(data_pair);
+      in_task->Wait<TASK_YIELD_CO>(task);
+
+      // Calaculate the minimum
+      LPointer<char> min_ptr = HRUN_CLIENT->AllocateBuffer(sizeof(float));
+      float &min = *((float*)min_ptr.ptr_);
+      min = std::numeric_limits<float>::max();
+      for (size_t i = 0; i < in_task->data_size_; i += sizeof(float)) {
+        min = std::min(min, *(float*)(data_ptr.ptr_ + i));
+      }
+
+      // Store the minimum in Hermes
+      std::string min_blob_name = data.blob_name_;
+      blob_mdm_.AsyncPutBlob(task->task_node_ + 1,
+                             op.var_name_.bkt_id_,
+                             hshm::charbuf(min_blob_name),
+                             BlobId::GetNull(),
+                             0, sizeof(float),
+                             min_ptr.shm_, 0, 0);
+    }
+  }
+
+  void RunMax(RunOpTask *task, Op &op) {
+  }
+
+ public:
+#include "hermes_data_op/hermes_data_op_lib_exec.h"
+};
+
+}  // namespace hermes::data_op
+
+HRUN_TASK_CC(hermes::data_op::Server, "hermes_data_op");
diff --git a/tasks/hermes_mdm/CMakeLists.txt b/tasks/hermes_mdm/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/tasks/hermes_mdm/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm.h b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm.h
new file mode 100644
index 000000000..0420c3629
--- /dev/null
+++ b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm.h
@@ -0,0 +1,43 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_hermes_mdm_H_
+#define HRUN_hermes_mdm_H_
+
+#include "hermes_mdm_tasks.h"
+
+namespace hermes::mdm {
+
+/** Create requests */
+class Client : public TaskLibClient {
+ public:
+  /** Default constructor */
+  Client() = default;
+
+  /** Destructor */
+  ~Client() = default;
+
+  /** Create a hermes_mdm */
+  HSHM_ALWAYS_INLINE
+  void CreateRoot(const DomainId &domain_id,
+                  const std::string &state_name) {
+    id_ = TaskStateId::GetNull();
+    std::vector<PriorityInfo> queue_info = {
+        {1, 1, 1, 0},
+    };
+    id_ = HRUN_ADMIN->CreateTaskStateRoot<ConstructTask>(
+        domain_id, state_name, id_, queue_info);
+    queue_id_ = QueueId(id_);
+  }
+
+  /** Destroy task state + queue */
+  HSHM_ALWAYS_INLINE
+  void DestroyRoot(const DomainId &domain_id) {
+    HRUN_ADMIN->DestroyTaskStateRoot(domain_id, id_);
+  }
+};
+
+}  // namespace hrun
+
+#endif  // HRUN_hermes_mdm_H_
diff --git a/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_lib_exec.h b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_lib_exec.h
new file mode 100644
index 000000000..17c627803
--- /dev/null
+++ b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_lib_exec.h
@@ -0,0 +1,153 @@
+#ifndef HRUN_HERMES_MDM_LIB_EXEC_H_
+#define HRUN_HERMES_MDM_LIB_EXEC_H_
+
+/** Execute a task */
+void Run(u32 method, Task *task, RunContext &rctx) override {
+  switch (method) {
+    case Method::kConstruct: {
+      Construct(reinterpret_cast<ConstructTask *>(task), rctx);
+      break;
+    }
+    case Method::kDestruct: {
+      Destruct(reinterpret_cast<DestructTask *>(task), rctx);
+      break;
+    }
+  }
+}
+/** Delete a task */
+void Del(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<ConstructTask *>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      HRUN_CLIENT->DelTask(reinterpret_cast<DestructTask *>(task));
+      break;
+    }
+  }
+}
+/** Duplicate a task */
+void Dup(u32 method, Task *orig_task, std::vector<LPointer<Task>> &dups) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<ConstructTask*>(orig_task), dups);
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE(reinterpret_cast<DestructTask*>(orig_task), dups);
+      break;
+    }
+  }
+}
+/** Register the duplicate output with the origin task */
+void DupEnd(u32 method, u32 replica, Task *orig_task, Task *dup_task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<ConstructTask*>(orig_task), reinterpret_cast<ConstructTask*>(dup_task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_DUPLICATE_END(replica, reinterpret_cast<DestructTask*>(orig_task), reinterpret_cast<DestructTask*>(dup_task));
+      break;
+    }
+  }
+}
+/** Ensure there is space to store replicated outputs */
+void ReplicateStart(u32 method, u32 count, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_START(count, reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+  }
+}
+/** Determine success and handle failures */
+void ReplicateEnd(u32 method, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      hrun::CALL_REPLICA_END(reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+  }
+}
+/** Serialize a task when initially pushing into remote */
+std::vector<DataTransfer> SaveStart(u32 method, BinaryOutputArchive<true> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when popping from remote queue */
+TaskPointer LoadStart(u32 method, BinaryInputArchive<true> &ar) override {
+  TaskPointer task_ptr;
+  switch (method) {
+    case Method::kConstruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<ConstructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<ConstructTask*>(task_ptr.ptr_);
+      break;
+    }
+    case Method::kDestruct: {
+      task_ptr.ptr_ = HRUN_CLIENT->NewEmptyTask<DestructTask>(task_ptr.shm_);
+      ar >> *reinterpret_cast<DestructTask*>(task_ptr.ptr_);
+      break;
+    }
+  }
+  return task_ptr;
+}
+/** Serialize a task when returning from remote queue */
+std::vector<DataTransfer> SaveEnd(u32 method, BinaryOutputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar << *reinterpret_cast<ConstructTask*>(task);
+      break;
+    }
+    case Method::kDestruct: {
+      ar << *reinterpret_cast<DestructTask*>(task);
+      break;
+    }
+  }
+  return ar.Get();
+}
+/** Deserialize a task when returning from remote queue */
+void LoadEnd(u32 replica, u32 method, BinaryInputArchive<false> &ar, Task *task) override {
+  switch (method) {
+    case Method::kConstruct: {
+      ar.Deserialize(replica, *reinterpret_cast<ConstructTask*>(task));
+      break;
+    }
+    case Method::kDestruct: {
+      ar.Deserialize(replica, *reinterpret_cast<DestructTask*>(task));
+      break;
+    }
+  }
+}
+/** Get the grouping of the task */
+u32 GetGroup(u32 method, Task *task, hshm::charbuf &group) override {
+  switch (method) {
+    case Method::kConstruct: {
+      return reinterpret_cast<ConstructTask*>(task)->GetGroup(group);
+    }
+    case Method::kDestruct: {
+      return reinterpret_cast<DestructTask*>(task)->GetGroup(group);
+    }
+  }
+  return -1;
+}
+
+#endif  // HRUN_HERMES_MDM_METHODS_H_
\ No newline at end of file
diff --git a/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_methods.h b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_methods.h
new file mode 100644
index 000000000..2dc9001ad
--- /dev/null
+++ b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_methods.h
@@ -0,0 +1,8 @@
+#ifndef HRUN_HERMES_MDM_METHODS_H_
+#define HRUN_HERMES_MDM_METHODS_H_
+
+/** The set of methods in the admin task */
+struct Method : public TaskMethod {
+};
+
+#endif  // HRUN_HERMES_MDM_METHODS_H_
\ No newline at end of file
diff --git a/hermes_shm/scripts/hermes_shm/packages/hermes_shm/__init__.py b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_methods.yaml
similarity index 100%
rename from hermes_shm/scripts/hermes_shm/packages/hermes_shm/__init__.py
rename to tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_methods.yaml
diff --git a/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_tasks.h b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_tasks.h
new file mode 100644
index 000000000..1a590cd07
--- /dev/null
+++ b/tasks/hermes_mdm/include/hermes_mdm/hermes_mdm_tasks.h
@@ -0,0 +1,89 @@
+//
+// Created by lukemartinlogan on 8/14/23.
+//
+
+#ifndef HRUN_TASKS_HERMES_MDM_INCLUDE_HERMES_MDM_HERMES_MDM_TASKS_H_
+#define HRUN_TASKS_HERMES_MDM_INCLUDE_HERMES_MDM_HERMES_MDM_TASKS_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hermes/hermes_types.h"
+#include "bdev/bdev.h"
+#include "proc_queue/proc_queue.h"
+
+namespace hermes::mdm {
+
+#include "hermes_mdm_methods.h"
+#include "hrun/hrun_namespace.h"
+
+/**
+ * A task to create hermes_mdm
+ * */
+using hrun::Admin::CreateTaskStateTask;
+struct ConstructTask : public CreateTaskStateTask {
+  IN hipc::ShmArchive<hipc::string> server_config_path_;
+
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc) : CreateTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  ConstructTask(hipc::Allocator *alloc,
+                const TaskNode &task_node,
+                const DomainId &domain_id,
+                const std::string &state_name,
+                const TaskStateId &id,
+                const std::vector<PriorityInfo> &queue_info,
+                const std::string &server_config_path = "")
+      : CreateTaskStateTask(alloc, task_node, domain_id, state_name,
+                            "hermes_mdm", id, queue_info) {
+    // Custom params
+    HSHM_MAKE_AR(server_config_path_, alloc, server_config_path);
+  }
+
+  /** Destructor */
+  HSHM_ALWAYS_INLINE
+  ~ConstructTask() {
+    HSHM_DESTROY_AR(server_config_path_);
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    CreateTaskStateTask::SerializeStart(ar);
+    ar(server_config_path_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {}
+};
+
+/** A task to destroy hermes_mdm */
+using hrun::Admin::DestroyTaskStateTask;
+struct DestructTask : public DestroyTaskStateTask {
+  /** SHM default constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc) : DestroyTaskStateTask(alloc) {}
+
+  /** Emplace constructor */
+  HSHM_ALWAYS_INLINE explicit
+  DestructTask(hipc::Allocator *alloc,
+               const TaskNode &task_node,
+               const DomainId &domain_id,
+               const TaskStateId &state_id)
+      : DestroyTaskStateTask(alloc, task_node, domain_id, state_id) {}
+
+  /** Create group */
+  HSHM_ALWAYS_INLINE
+  u32 GetGroup(hshm::charbuf &group) {
+    return TASK_UNORDERED;
+  }
+};
+
+}  // namespace hermes::mdm
+
+#endif  // HRUN_TASKS_HERMES_MDM_INCLUDE_HERMES_MDM_HERMES_MDM_TASKS_H_
diff --git a/tasks/hermes_mdm/src/CMakeLists.txt b/tasks/hermes_mdm/src/CMakeLists.txt
new file mode 100644
index 000000000..da27855f2
--- /dev/null
+++ b/tasks/hermes_mdm/src/CMakeLists.txt
@@ -0,0 +1,54 @@
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(hermes_mdm SHARED
+        hermes_mdm.cc)
+add_dependencies(hermes_mdm ${Hermes_RUNTIME_DEPS} hermes)
+target_link_libraries(hermes_mdm ${Hermes_RUNTIME_LIBRARIES} hermes)
+
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        hermes_mdm
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
+
+#-----------------------------------------------------------------------------
+# Add Target(s) to CMake Install for import into other projects
+#-----------------------------------------------------------------------------
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
+
+#-----------------------------------------------------------------------------
+# Export all exported targets to the build tree for use by parent project
+#-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        hermes_mdm
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(hermes_mdm)
+endif()
diff --git a/tasks/hermes_mdm/src/hermes_mdm.cc b/tasks/hermes_mdm/src/hermes_mdm.cc
new file mode 100644
index 000000000..60351b68c
--- /dev/null
+++ b/tasks/hermes_mdm/src/hermes_mdm.cc
@@ -0,0 +1,46 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "hermes/config_server.h"
+#include "hermes_mdm/hermes_mdm.h"
+#include "hermes_blob_mdm/hermes_blob_mdm.h"
+#include "hermes_bucket_mdm/hermes_bucket_mdm.h"
+#include "hermes/dpe/dpe_factory.h"
+#include "bdev/bdev.h"
+
+namespace hermes::mdm {
+
+class Server : public TaskLib {
+ public:
+  /**====================================
+   * Configuration
+   * ===================================*/
+   u32 node_id_;
+   blob_mdm::Client blob_mdm_;
+   bucket_mdm::Client bkt_mdm_;
+
+ public:
+  Server() = default;
+
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    HILOG(kDebug, "ConstructTaskPhase::kLoadConfig")
+    std::string config_path = task->server_config_path_->str();
+    HERMES_CONF->LoadServerConfig(config_path);
+    node_id_ = HRUN_CLIENT->node_id_;
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "hermes_mdm/hermes_mdm_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hermes::mdm::Server, "hermes_mdm");
diff --git a/tasks/posix_bdev/CMakeLists.txt b/tasks/posix_bdev/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/tasks/posix_bdev/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/posix_bdev/include/posix_bdev/posix_bdev.h b/tasks/posix_bdev/include/posix_bdev/posix_bdev.h
new file mode 100644
index 000000000..d7dc2bca2
--- /dev/null
+++ b/tasks/posix_bdev/include/posix_bdev/posix_bdev.h
@@ -0,0 +1,20 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_posix_bdev_H_
+#define HRUN_posix_bdev_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hermes/hermes_types.h"
+#include "bdev/bdev.h"
+#include "hrun/hrun_namespace.h"
+
+namespace hermes::posix_bdev {
+#include "bdev/bdev_namespace.h"
+}  // namespace hrun
+
+#endif  // HRUN_posix_bdev_H_
diff --git a/adapter/kvstore/CMakeLists.txt b/tasks/posix_bdev/src/CMakeLists.txt
similarity index 54%
rename from adapter/kvstore/CMakeLists.txt
rename to tasks/posix_bdev/src/CMakeLists.txt
index dcafdcf73..75695cf98 100644
--- a/adapter/kvstore/CMakeLists.txt
+++ b/tasks/posix_bdev/src/CMakeLists.txt
@@ -1,37 +1,17 @@
-#-----------------------------------------------------------------------------
-# Build KVStore adapter
-#-----------------------------------------------------------------------------
-include_directories(
-        ${CMAKE_SOURCE_DIR}
-        ${HERMES_SRC_DIR}
-        ${HERMES_ADAPTER_DIR}
-        ${HERMES_IO_CLIENT_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR})
-
-# Create KVStore Adapter
-set(INTERCEPTOR_DEPS hermes)
-add_library(hermes_kvstore SHARED
-        ${CMAKE_CURRENT_SOURCE_DIR}/kvstore.cc)
-add_dependencies(hermes_kvstore ${INTERCEPTOR_DEPS})
-target_link_libraries(hermes_kvstore ${INTERCEPTOR_DEPS})
-
-#-----------------------------------------------------------------------------
-# Build Java API
-#-----------------------------------------------------------------------------
-add_custom_command(TARGET hermes_kvstore POST_BUILD
-        COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/java &&
-        ${CMAKE_CURRENT_SOURCE_DIR}/java/gradlew build -x test)
-add_custom_target(build_hermes_kvstore_java
-        COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/java &&
-        ${CMAKE_CURRENT_SOURCE_DIR}/java/gradlew build -x test)
-pytest(kvstore test_hermes_kvstore_java)
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(posix_bdev SHARED
+        posix_bdev.cc)
+add_dependencies(posix_bdev ${Hermes_RUNTIME_DEPS})
+target_link_libraries(posix_bdev ${Hermes_RUNTIME_LIBRARIES})
 
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
 install(
         TARGETS
-        hermes_kvstore
+        posix_bdev
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
@@ -40,23 +20,35 @@ install(
 )
 
 #-----------------------------------------------------------------------------
-# Export all exported targets to the build tree for use by parent project
+# Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
-set(HERMES_EXPORTED_LIBS
-        hermes_kvstore
-        ${HERMES_EXPORTED_LIBS})
-if(NOT HERMES_EXTERNALLY_CONFIGURED)
-EXPORT (
-        TARGETS
-        ${HERMES_EXPORTED_LIBS}
+install(
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
         FILE
         ${HERMES_EXPORTED_TARGETS}.cmake
 )
-endif()
 
 #-----------------------------------------------------------------------------
-# Add Target(s) to Coverage
+# Export all exported targets to the build tree for use by parent project
 #-----------------------------------------------------------------------------
+set(HERMES_EXPORTED_LIBS
+        posix_bdev
+        ${HERMES_EXPORTED_LIBS})
+if(NOT HERMES_EXTERNALLY_CONFIGURED)
+    EXPORT (
+            TARGETS
+            ${HERMES_EXPORTED_LIBS}
+            FILE
+            ${HERMES_EXPORTED_TARGETS}.cmake
+    )
+endif()
+
+#------------------------------------------------------------------------------
+# Coverage
+#------------------------------------------------------------------------------
 if(HERMES_ENABLE_COVERAGE)
-    set_coverage_flags(hermes_kvstore)
+    set_coverage_flags(posix_bdev)
 endif()
diff --git a/tasks/posix_bdev/src/posix_bdev.cc b/tasks/posix_bdev/src/posix_bdev.cc
new file mode 100644
index 000000000..6e2d7e51e
--- /dev/null
+++ b/tasks/posix_bdev/src/posix_bdev.cc
@@ -0,0 +1,90 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "posix_bdev/posix_bdev.h"
+#include "hermes/slab_allocator.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+namespace hermes::posix_bdev {
+
+class Server : public TaskLib {
+ public:
+  SlabAllocator alloc_;
+  int fd_;
+  std::string path_;
+
+ public:
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    DeviceInfo &dev_info = task->info_;
+    alloc_.Init(id_, dev_info.capacity_, dev_info.slab_sizes_);
+    std::string text = dev_info.mount_dir_ +
+        "/" + "slab_" + dev_info.dev_name_;
+    auto canon = stdfs::weakly_canonical(text).string();
+    dev_info.mount_point_ = canon;
+    path_ = canon;
+    fd_ = open(dev_info.mount_point_.c_str(),
+                  O_TRUNC | O_CREAT | O_RDWR, 0666);
+    if (fd_ < 0) {
+      HELOG(kError, "Failed to open file: {}", dev_info.mount_point_);
+    }
+    HILOG(kInfo, "Created {} at {} of size {}",
+          dev_info.dev_name_, dev_info.mount_point_, dev_info.capacity_);
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+  void Allocate(AllocateTask *task, RunContext &rctx) {
+    alloc_.Allocate(task->size_, *task->buffers_, task->alloc_size_);
+    HILOG(kDebug, "Allocated {}/{} bytes ({})", task->alloc_size_, task->size_, path_);
+    task->SetModuleComplete();
+  }
+
+  void Free(FreeTask *task, RunContext &rctx) {
+    alloc_.Free(task->buffers_);
+    task->SetModuleComplete();
+  }
+
+  void Write(WriteTask *task, RunContext &rctx) {
+    HILOG(kDebug, "Writing {} bytes to {}", task->size_, path_);
+    ssize_t count = pwrite(fd_, task->buf_, task->size_, (off_t)task->disk_off_);
+    if (count != task->size_) {
+      HELOG(kError, "BORG: wrote {} bytes, but expected {}: {}",
+            count, task->size_, strerror(errno));
+    }
+    task->SetModuleComplete();
+  }
+
+  void Read(ReadTask *task, RunContext &rctx) {
+    HILOG(kDebug, "Reading {} bytes from {}", task->size_, path_);
+    ssize_t count = pread(fd_, task->buf_, task->size_, (off_t)task->disk_off_);
+    if (count != task->size_) {
+      HELOG(kError, "BORG: read {} bytes, but expected {}",
+            count, task->size_);
+    }
+    task->SetModuleComplete();
+  }
+
+  void Monitor(MonitorTask *task, RunContext &rctx) {
+  }
+
+  void UpdateCapacity(UpdateCapacityTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "bdev/bdev_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hermes::posix_bdev::Server, "posix_bdev");
diff --git a/tasks/ram_bdev/CMakeLists.txt b/tasks/ram_bdev/CMakeLists.txt
new file mode 100644
index 000000000..d48611782
--- /dev/null
+++ b/tasks/ram_bdev/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------
+# Build Hrun Admin Task Library
+#------------------------------------------------------------------------------
+include_directories(include)
+add_subdirectory(src)
+
+#-----------------------------------------------------------------------------
+# Install HRUN Admin Task Library Headers
+#-----------------------------------------------------------------------------
+install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/tasks/ram_bdev/include/ram_bdev/ram_bdev.h b/tasks/ram_bdev/include/ram_bdev/ram_bdev.h
new file mode 100644
index 000000000..602b07af3
--- /dev/null
+++ b/tasks/ram_bdev/include/ram_bdev/ram_bdev.h
@@ -0,0 +1,21 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#ifndef HRUN_ram_bdev_H_
+#define HRUN_ram_bdev_H_
+
+#include "hrun/api/hrun_client.h"
+#include "hrun/task_registry/task_lib.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/queue_manager/queue_manager_client.h"
+#include "hermes/hermes_types.h"
+#include "bdev/bdev.h"
+#include "hrun/hrun_namespace.h"
+
+namespace hermes::ram_bdev {
+#include "bdev/bdev_namespace.h"
+}  // namespace hrun
+
+
+#endif  // HRUN_ram_bdev_H_
diff --git a/hermes_shm/src/CMakeLists.txt b/tasks/ram_bdev/src/CMakeLists.txt
similarity index 56%
rename from hermes_shm/src/CMakeLists.txt
rename to tasks/ram_bdev/src/CMakeLists.txt
index 3a1e6e0fe..1bf7dd79e 100644
--- a/hermes_shm/src/CMakeLists.txt
+++ b/tasks/ram_bdev/src/CMakeLists.txt
@@ -1,40 +1,41 @@
-cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
+#------------------------------------------------------------------------------
+# Build Small Message Task Library
+#------------------------------------------------------------------------------
+add_library(ram_bdev SHARED
+        ram_bdev.cc)
+add_dependencies(ram_bdev ${Hermes_RUNTIME_DEPS})
+target_link_libraries(ram_bdev ${Hermes_RUNTIME_LIBRARIES})
 
-set(CMAKE_CXX_STANDARD 17)
-
-#-----------------------------------------------------------------------------
-# Build HSHM
-#-----------------------------------------------------------------------------
-add_library(hermes_shm_data_structures SHARED
-        thread/mutex.cc
-        thread/rwlock.cc
-        memory/malloc_allocator.cc
-        memory/stack_allocator.cc
-        memory/scalable_page_allocator.cc
-        memory/memory_registry.cc
-        memory/memory_manager.cc
-        data_structure_singleton.cc)
-target_link_libraries(hermes_shm_data_structures
-        yaml-cpp pthread -lrt -ldl OpenMP::OpenMP_CXX
-        $<$<BOOL:${HERMES_RPC_THALLIUM}>:thallium>)
+#------------------------------------------------------------------------------
+# Install Small Message Task Library
+#------------------------------------------------------------------------------
+install(
+        TARGETS
+        ram_bdev
+        EXPORT
+        ${HERMES_EXPORTED_TARGETS}
+        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
+        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
+)
 
 #-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
+# Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
-install(TARGETS
-        hermes_shm_data_structures
+install(
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
+        DESTINATION
+        ${HERMES_INSTALL_DATA_DIR}/cmake/hermes
+        FILE
+        ${HERMES_EXPORTED_TARGETS}.cmake
+)
 
 #-----------------------------------------------------------------------------
 # Export all exported targets to the build tree for use by parent project
 #-----------------------------------------------------------------------------
 set(HERMES_EXPORTED_LIBS
-        hermes_shm_data_structures
+        ram_bdev
         ${HERMES_EXPORTED_LIBS})
 if(NOT HERMES_EXTERNALLY_CONFIGURED)
     EXPORT (
@@ -45,10 +46,9 @@ if(NOT HERMES_EXTERNALLY_CONFIGURED)
     )
 endif()
 
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Coverage
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 if(HERMES_ENABLE_COVERAGE)
-    set_coverage_flags(hermes_shm_data_structures)
+    set_coverage_flags(ram_bdev)
 endif()
-
diff --git a/tasks/ram_bdev/src/ram_bdev.cc b/tasks/ram_bdev/src/ram_bdev.cc
new file mode 100644
index 000000000..f993b335c
--- /dev/null
+++ b/tasks/ram_bdev/src/ram_bdev.cc
@@ -0,0 +1,69 @@
+//
+// Created by lukemartinlogan on 6/29/23.
+//
+
+#include "hrun_admin/hrun_admin.h"
+#include "hrun/api/hrun_runtime.h"
+#include "ram_bdev/ram_bdev.h"
+#include "hermes/slab_allocator.h"
+
+namespace hermes::ram_bdev {
+
+class Server : public TaskLib {
+ public:
+  SlabAllocator alloc_;
+  char *mem_ptr_;
+
+ public:
+  void Construct(ConstructTask *task, RunContext &rctx) {
+    DeviceInfo &dev_info = task->info_;
+    alloc_.Init(id_, dev_info.capacity_, dev_info.slab_sizes_);
+    mem_ptr_ = (char*)malloc(dev_info.capacity_);
+    HILOG(kDebug, "Created {} at {} of size {}",
+          dev_info.dev_name_, dev_info.mount_point_, dev_info.capacity_);
+    task->SetModuleComplete();
+  }
+
+  void Destruct(DestructTask *task, RunContext &rctx) {
+    free(mem_ptr_);
+    task->SetModuleComplete();
+  }
+
+  void Allocate(AllocateTask *task, RunContext &rctx) {
+    HILOG(kDebug, "Allocating {} bytes (RAM)", task->size_);
+    alloc_.Allocate(task->size_, *task->buffers_, task->alloc_size_);
+    HILOG(kDebug, "Allocated {} bytes (RAM)", task->alloc_size_);
+    task->SetModuleComplete();
+  }
+
+  void Free(FreeTask *task, RunContext &rctx) {
+    alloc_.Free(task->buffers_);
+    task->SetModuleComplete();
+  }
+
+  void Write(WriteTask *task, RunContext &rctx) {
+    HILOG(kDebug, "Writing {} bytes to RAM", task->size_);
+    memcpy(mem_ptr_ + task->disk_off_, task->buf_, task->size_);
+    task->SetModuleComplete();
+  }
+
+  void Read(ReadTask *task, RunContext &rctx) {
+    HILOG(kDebug, "Reading {} bytes from RAM", task->size_);
+    memcpy(task->buf_, mem_ptr_ + task->disk_off_, task->size_);
+    task->SetModuleComplete();
+  }
+
+  void Monitor(MonitorTask *task, RunContext &rctx) {
+  }
+
+  void UpdateCapacity(UpdateCapacityTask *task, RunContext &rctx) {
+    task->SetModuleComplete();
+  }
+
+ public:
+#include "bdev/bdev_lib_exec.h"
+};
+
+}  // namespace hrun
+
+HRUN_TASK_CC(hermes::ram_bdev::Server, "ram_bdev");
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 507adf32c..ca96d7b40 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,63 +1,4 @@
-#------------------------------------------------------------------------------
-# Include source and build directories
-#------------------------------------------------------------------------------
-include_directories(
-  ${PROJECT_SOURCE_DIR}
-  ${PROJECT_SOURCE_DIR}/src/api
-  ${PROJECT_SOURCE_DIR}/gotcha_intercept
-  ${PROJECT_SOURCE_DIR}/io_client
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${HERMES_INCLUDES_BUILD_TIME}
-)
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
 
-#------------------------------------------------------------------------------
-# Single-node API tests
-#------------------------------------------------------------------------------
-set(API_TESTS
-        test_bucket
-        test_buffer_pool
-        test_trait
-        test_tag
-        test_binlog)
-
-find_program(BASH_PROGRAM bash)
-
-add_executable(test_config test_config.cc main.cc)
-add_dependencies(test_config hermes)
-target_link_libraries(test_config ${LIBRT}
-        hermes
-        MPI::MPI_CXX
-        $<$<BOOL:${HERMES_RPC_THALLIUM}>:thallium>
-        Catch2::Catch2)
-
-foreach(program ${API_TESTS})
-  add_executable(${program} ${program}.cc main_mpi.cc)
-  add_dependencies(${program} hermes hermes_example_trait)
-  target_link_libraries(${program} ${LIBRT}
-          hermes hermes_example_trait
-          MPI::MPI_CXX
-          $<$<BOOL:${HERMES_RPC_THALLIUM}>:thallium>
-          Catch2::Catch2)
-  pytest(native ${program})
-endforeach()
-
-#------------------------------------------------------------------------------
-# Multi-node API tests
-#------------------------------------------------------------------------------
-set(API_TESTS
-        test_multinode_put_get)
-
-find_program(BASH_PROGRAM bash)
-
-foreach(program ${API_TESTS})
-  add_executable(${program} ${program}.cc main_mpi.cc)
-  add_dependencies(${program} hermes)
-  target_link_libraries(${program} ${LIBRT}
-          hermes
-          MPI::MPI_CXX
-          $<$<BOOL:${HERMES_RPC_THALLIUM}>:thallium>
-          Catch2::Catch2)
-  set(script ${CMAKE_SOURCE_DIR}/test/mpi.sh)
-  pytest(native ${program})
-endforeach()
\ No newline at end of file
+add_subdirectory(unit)
\ No newline at end of file
diff --git a/test/data/apriori_schema.yaml b/test/data/apriori_schema.yaml
deleted file mode 100644
index ab909b8b0..000000000
--- a/test/data/apriori_schema.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-0:
-  - op_count_range: [5, 5]
-    prefetch:
-      - bucket: /tmp/test_hermes/hi.txt
-        promote_blobs: [ 3, 4 ]
-        demote_blobs: [ 1, 2 ]
-  - op_count_range: [7, 7]
-    prefetch:
-      - bucket: /tmp/test_hermes/hi.txt
-        promote_blobs: [ 5, 6 ]
-        demote_blobs: [ 3, 4 ]
-  - op_count_range: [9, 9]
-    prefetch:
-        - bucket: /tmp/test_hermes/hi.txt
-          promote_blobs: [ 5, 6 ]
-          demote_blobs: [ 3, 4 ]
-  - op_count_range: [11, 11]
-    prefetch:
-        - bucket: /tmp/test_hermes/hi.txt
-          promote_blobs: [ 7, 8 ]
-          demote_blobs: [ 5, 6 ]
diff --git a/test/data/hermes_client.yaml b/test/data/hermes_client.yaml
deleted file mode 100644
index e95d71736..000000000
--- a/test/data/hermes_client.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-stop_daemon: false
-path_inclusions: ["/tmp/test_hermes"]
-path_exclusions: ["/"]
-file_page_size: 1024KB
-base_adapter_mode: kDefault
-file_adapter_configs:
-  - path: "/"
-    page_size: 1MB
-    mode: kDefault
\ No newline at end of file
diff --git a/test/data/hermes_client_specific.yaml b/test/data/hermes_client_specific.yaml
deleted file mode 100644
index e95d71736..000000000
--- a/test/data/hermes_client_specific.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-stop_daemon: false
-path_inclusions: ["/tmp/test_hermes"]
-path_exclusions: ["/"]
-file_page_size: 1024KB
-base_adapter_mode: kDefault
-file_adapter_configs:
-  - path: "/"
-    page_size: 1MB
-    mode: kDefault
\ No newline at end of file
diff --git a/test/data/hermes_server.yaml b/test/data/hermes_server.yaml
deleted file mode 100644
index 348ce1e30..000000000
--- a/test/data/hermes_server.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-# Example Hermes configuration file
-
-### Define properties of the storage devices
-devices:
-  # The name of the device.
-  # It can be whatever the user wants, there are no special names
-  ram:
-    # The mount point of each device. RAM should be the empty string. For block
-    # devices, this is the directory where Hermes will create buffering files. For
-    # object storage or cloud targets, this will be a url.
-    mount_point: ""
-
-    # The maximum buffering capacity in MiB of each device. Here we say that all 4
-    # devices get 50 MiB of buffering capacity.
-    capacity: 1000MB
-
-    # The size of the smallest available buffer in KiB. In general this should be
-    # the page size of your system for byte addressable storage, and the block size
-    # of the storage device for block addressable storage.
-    block_size: 4KB
-
-    # The number of blocks (the size of which is chosen in block_sizes_kb) that each
-    # device should contain for each slab (controlled by num_slabs). This allows for
-    # precise control of the distibution of buffer sizes.
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-
-    # The maximum theoretical bandwidth (as advertised by the manufacturer) in
-    # Possible units: KBps, MBps, GBps
-    bandwidth: 6000MBps
-
-    # The latency of each device (as advertised by the manufacturer).
-    # Possible units: ns, us, ms, s
-    latency: 15us
-
-    # For each device, indicate '1' if it is shared among nodes (e.g., burst
-    # buffers), or '0' if it is per node (e.g., local NVMe).
-    is_shared_device: false
-
-    # For each device, the minimum and maximum percent capacity threshold at which
-    # the BufferOrganizer will trigger. Decreasing the maximum thresholds will cause
-    # the BufferOrganizer to move data to lower devices, making more room in faster
-    # devices (ideal for write-heavy workloads). Conversely, increasing the minimum
-    # threshold will cause data to be moved from slower devices into faster devices
-    # (ideal for read-heavy workloads). For example, a maximum capacity threshold of
-    # 0.8 would have the effect of always keeping 20% of the device's space free for
-    # incoming writes. Conversely, a minimum capacity threshold of 0.3 would ensure
-    # that the device is always at least 30% occupied.
-    borg_capacity_thresh: [0.0, 1.0]
-
-  nvme:
-    mount_point: "./"
-    capacity: 50MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 1GBps
-    latency: 600us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  ssd:
-    mount_point: "./"
-    capacity: 50MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 500MBps
-    latency: 1200us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  pfs:
-    mount_point: "./"
-    capacity: 16GB
-    block_size: 64KB # The stripe size of PFS
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 100MBps # Per-device bandwidth
-    latency: 200ms
-    is_shared_device: true
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-### Define properties of RPCs
-rpc:
-  # A path to a file containing a list of server names, 1 per line. If your
-  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
-  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
-  # option is not empty, it will override anything in `rpc_server_base_name`.
-  host_file: ""
-
-  # Host names are constructed as "base_name +
-  # host_number + rpc_server_suffix." Each entry in the rpc_host_number_range_list
-  # can be either a single number, or a range, which is 2 numbers separated by a
-  # hyphen (-). For example the list {01, 03-05, 07, 08-10} will be expanded to
-  # {01, 03, 04, 05, 07, 08, 09, 10}.
-  host_names: ["localhost"]
-
-  # The RPC protocol. This must come from the documentation of the specific RPC
-  # library in use.
-  protocol: "ofi+sockets"
-
-  # RPC domain name for verbs transport. Blank for tcp.
-  domain: ""
-
-  # Desired RPC port number.
-  port: 8080
-
-  # The number of handler threads for each RPC server.
-  num_threads: 4
-
-### Define properties of the BORG
-buffer_organizer:
-  # The number of threads used in the background organization of internal Hermes buffers.
-  num_threads: 1
-
-  # Desired RPC port number for buffer organizer.
-  port: 8081
-
-### Define the default data placement policy
-dpe:
-  # Choose Random, RoundRobin, or MinimizeIoTime
-  default_placement_policy: "MinimizeIoTime"
-
-  # If true (1) the RoundRobin placement policy algorithm will split each Blob
-  # into a random number of smaller Blobs.
-  default_rr_split: 0
-
-# The shared memory prefix for the hermes shared memory segment. A user name
-# will be automatically appended.
-shmem_name: "/hermes_shm_"
-
-# The interval in milliseconds at which to update the global system view.
-system_view_state_update_interval_ms: 1000
\ No newline at end of file
diff --git a/test/data/hermes_server_ares.yaml b/test/data/hermes_server_ares.yaml
deleted file mode 100644
index 393d8adf3..000000000
--- a/test/data/hermes_server_ares.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-# Example Hermes configuration file
-
-### Define properties of the storage devices
-devices:
-  # The name of the device.
-  # It can be whatever the user wants, there are no special names
-  ram:
-    # The mount point of each device. RAM should be the empty string. For block
-    # devices, this is the directory where Hermes will create buffering files. For
-    # object storage or cloud targets, this will be a url.
-    mount_point: ""
-
-    # The maximum buffering capacity in MiB of each device. Here we say that all 4
-    # devices get 50 MiB of buffering capacity.
-    capacity: 5000MB
-
-    # The size of the smallest available buffer in KiB. In general this should be
-    # the page size of your system for byte addressable storage, and the block size
-    # of the storage device for block addressable storage.
-    block_size: 4KB
-
-    # The number of blocks (the size of which is chosen in block_sizes_kb) that each
-    # device should contain for each slab (controlled by num_slabs). This allows for
-    # precise control of the distibution of buffer sizes.
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-
-    # The maximum theoretical bandwidth (as advertised by the manufacturer) in
-    # Possible units: KBps, MBps, GBps
-    bandwidth: 6000MBps
-
-    # The latency of each device (as advertised by the manufacturer).
-    # Possible units: ns, us, ms, s
-    latency: 15us
-
-    # For each device, indicate '1' if it is shared among nodes (e.g., burst
-    # buffers), or '0' if it is per node (e.g., local NVMe).
-    is_shared_device: false
-
-    # For each device, the minimum and maximum percent capacity threshold at which
-    # the BufferOrganizer will trigger. Decreasing the maximum thresholds will cause
-    # the BufferOrganizer to move data to lower devices, making more room in faster
-    # devices (ideal for write-heavy workloads). Conversely, increasing the minimum
-    # threshold will cause data to be moved from slower devices into faster devices
-    # (ideal for read-heavy workloads). For example, a maximum capacity threshold of
-    # 0.8 would have the effect of always keeping 20% of the device's space free for
-    # incoming writes. Conversely, a minimum capacity threshold of 0.3 would ensure
-    # that the device is always at least 30% occupied.
-    borg_capacity_thresh: [0.0, 1.0]
-
-  nvme:
-    mount_point: "./"
-    capacity: 50MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 1GBps
-    latency: 600us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  ssd:
-    mount_point: "./"
-    capacity: 50MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 500MBps
-    latency: 1200us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  pfs:
-    mount_point: "./"
-    capacity: inf
-    block_size: 64KB # The stripe size of PFS
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 100MBps # Per-device bandwidth
-    latency: 200ms
-    is_shared_device: true
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-### Define properties of RPCs
-rpc:
-  # A path to a file containing a list of server names, 1 per line. If your
-  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
-  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
-  # option is not empty, it will override anything in `rpc_server_base_name`.
-  host_file: "${HOME}/hostfile.txt"
-
-  # Host names are constructed as "base_name +
-  # host_number + rpc_server_suffix." Each entry in the rpc_host_number_range_list
-  # can be either a single number, or a range, which is 2 numbers separated by a
-  # hyphen (-). For example the list {01, 03-05, 07, 08-10} will be expanded to
-  # {01, 03, 04, 05, 07, 08, 09, 10}.
-  host_names: ["localhost"]
-
-  # The RPC protocol. This must come from the documentation of the specific RPC
-  # library in use.
-  protocol: "ofi+sockets"
-
-  # RPC domain name for verbs transport. Blank for tcp.
-  domain: ""
-
-  # Desired RPC port number.
-  port: 8080
-
-  # The number of handler threads for each RPC server.
-  num_threads: 4
-
-### Define properties of the BORG
-buffer_organizer:
-  # The number of threads used in the background organization of internal Hermes buffers.
-  num_threads: 1
-
-  # Desired RPC port number for buffer organizer.
-  port: 8081
-
-### Define the default data placement policy
-dpe:
-  # Choose Random, RoundRobin, or MinimizeIoTime
-  default_placement_policy: "MinimizeIoTime"
-
-  # If true (1) the RoundRobin placement policy algorithm will split each Blob
-  # into a random number of smaller Blobs.
-  default_rr_split: 0
-
-# The shared memory prefix for the hermes shared memory segment. A user name
-# will be automatically appended.
-shmem_name: "/hermes_shm_"
-
-# The interval in milliseconds at which to update the global system view.
-system_view_state_update_interval_ms: 1000
\ No newline at end of file
diff --git a/test/data/hermes_server_bpm.yaml b/test/data/hermes_server_bpm.yaml
deleted file mode 100644
index 092a1a0dd..000000000
--- a/test/data/hermes_server_bpm.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-# Example Hermes configuration file
-
-### Define properties of the storage devices
-devices:
-  # The name of the device.
-  # It can be whatever the user wants, there are no special names
-  ram:
-    # The mount point of each device. RAM should be the empty string. For block
-    # devices, this is the directory where Hermes will create buffering files. For
-    # object storage or cloud targets, this will be a url.
-    mount_point: ""
-
-    # The maximum buffering capacity in MiB of each device. Here we say that all 4
-    # devices get 50 MiB of buffering capacity.
-    capacity: 50MB
-
-    # The size of the smallest available buffer in KiB. In general this should be
-    # the page size of your system for byte addressable storage, and the block size
-    # of the storage device for block addressable storage.
-    block_size: 4KB
-
-    # The number of blocks (the size of which is chosen in block_sizes_kb) that each
-    # device should contain for each slab (controlled by num_slabs). This allows for
-    # precise control of the distibution of buffer sizes.
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-
-    # The maximum theoretical bandwidth (as advertised by the manufacturer) in
-    # Possible units: KBps, MBps, GBps
-    bandwidth: 6000MBps
-
-    # The latency of each device (as advertised by the manufacturer).
-    # Possible units: ns, us, ms, s
-    latency: 15us
-
-    # For each device, indicate '1' if it is shared among nodes (e.g., burst
-    # buffers), or '0' if it is per node (e.g., local NVMe).
-    is_shared_device: false
-
-    # For each device, the minimum and maximum percent capacity threshold at which
-    # the BufferOrganizer will trigger. Decreasing the maximum thresholds will cause
-    # the BufferOrganizer to move data to lower devices, making more room in faster
-    # devices (ideal for write-heavy workloads). Conversely, increasing the minimum
-    # threshold will cause data to be moved from slower devices into faster devices
-    # (ideal for read-heavy workloads). For example, a maximum capacity threshold of
-    # 0.8 would have the effect of always keeping 20% of the device's space free for
-    # incoming writes. Conversely, a minimum capacity threshold of 0.3 would ensure
-    # that the device is always at least 30% occupied.
-    borg_capacity_thresh: [0.0, 1.0]
-
-  nvme:
-    mount_point: "./"
-    capacity: 50MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 1GBps
-    latency: 600us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  ssd:
-    mount_point: "./"
-    capacity: 50MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 500MBps
-    latency: 1200us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  pfs:
-    mount_point: "./"
-    capacity: 16GB
-    block_size: 64KB # The stripe size of PFS
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 100MBps # Per-device bandwidth
-    latency: 200ms
-    is_shared_device: true
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-### Define properties of RPCs
-rpc:
-  # A path to a file containing a list of server names, 1 per line. If your
-  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
-  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
-  # option is not empty, it will override anything in `rpc_server_base_name`.
-  host_file: ""
-
-  # Host names are constructed as "base_name +
-  # host_number + rpc_server_suffix." Each entry in the rpc_host_number_range_list
-  # can be either a single number, or a range, which is 2 numbers separated by a
-  # hyphen (-). For example the list {01, 03-05, 07, 08-10} will be expanded to
-  # {01, 03, 04, 05, 07, 08, 09, 10}.
-  host_names: ["localhost"]
-
-  # The RPC protocol. This must come from the documentation of the specific RPC
-  # library in use.
-  protocol: "ofi+sockets"
-
-  # RPC domain name for verbs transport. Blank for tcp.
-  domain: ""
-
-  # Desired RPC port number.
-  port: 8080
-
-  # The number of handler threads for each RPC server.
-  num_threads: 4
-
-### Define properties of the BORG
-buffer_organizer:
-  # The number of threads used in the background organization of internal Hermes buffers.
-  num_threads: 1
-
-  # Desired RPC port number for buffer organizer.
-  port: 8081
-
-### Define the default data placement policy
-dpe:
-  # Choose Random, RoundRobin, or MinimizeIoTime
-  default_placement_policy: "MinimizeIoTime"
-
-  # If true (1) the RoundRobin placement policy algorithm will split each Blob
-  # into a random number of smaller Blobs.
-  default_rr_split: 0
-
-# The shared memory prefix for the hermes shared memory segment. A user name
-# will be automatically appended.
-shmem_name: "/hermes_shm_"
-
-# The interval in milliseconds at which to update the global system view.
-system_view_state_update_interval_ms: 1000
\ No newline at end of file
diff --git a/test/data/hermes_server_ci.yaml b/test/data/hermes_server_ci.yaml
deleted file mode 100644
index 7183dbd97..000000000
--- a/test/data/hermes_server_ci.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# Example Hermes configuration file
-
-### Define properties of the storage devices
-devices:
-  # The name of the device.
-  # It can be whatever the user wants, there are no special names
-  ram:
-    # The mount point of each device. RAM should be the empty string. For block
-    # devices, this is the directory where Hermes will create buffering files. For
-    # object storage or cloud targets, this will be a url.
-    mount_point: ""
-
-    # The maximum buffering capacity in MiB of each device. Here we say that all 4
-    # devices get 50 MiB of buffering capacity.
-    capacity: 100MB
-
-    # The size of the smallest available buffer in KiB. In general this should be
-    # the page size of your system for byte addressable storage, and the block size
-    # of the storage device for block addressable storage.
-    block_size: 4KB
-
-    # The number of blocks (the size of which is chosen in block_sizes_kb) that each
-    # device should contain for each slab (controlled by num_slabs). This allows for
-    # precise control of the distibution of buffer sizes.
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-
-    # The maximum theoretical bandwidth (as advertised by the manufacturer) in
-    # Possible units: KBps, MBps, GBps
-    bandwidth: 6000MBps
-
-    # The latency of each device (as advertised by the manufacturer).
-    # Possible units: ns, us, ms, s
-    latency: 15us
-
-    # For each device, indicate '1' if it is shared among nodes (e.g., burst
-    # buffers), or '0' if it is per node (e.g., local NVMe).
-    is_shared_device: false
-
-    # For each device, the minimum and maximum percent capacity threshold at which
-    # the BufferOrganizer will trigger. Decreasing the maximum thresholds will cause
-    # the BufferOrganizer to move data to lower devices, making more room in faster
-    # devices (ideal for write-heavy workloads). Conversely, increasing the minimum
-    # threshold will cause data to be moved from slower devices into faster devices
-    # (ideal for read-heavy workloads). For example, a maximum capacity threshold of
-    # 0.8 would have the effect of always keeping 20% of the device's space free for
-    # incoming writes. Conversely, a minimum capacity threshold of 0.3 would ensure
-    # that the device is always at least 30% occupied.
-    borg_capacity_thresh: [0.0, 1.0]
-
-  nvme:
-    mount_point: "./"
-    capacity: 100MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 1GBps
-    latency: 600us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  ssd:
-    mount_point: "./"
-    capacity: 100MB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 500MBps
-    latency: 1200us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  pfs:
-    mount_point: "./"
-    capacity: 4GB
-    block_size: 64KB # The stripe size of PFS
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 100MBps # Per-device bandwidth
-    latency: 200ms
-    is_shared_device: true
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-### Define properties of RPCs
-rpc:
-  # A path to a file containing a list of server names, 1 per line. If your
-  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
-  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
-  # option is not empty, it will override anything in `rpc_server_base_name`.
-  host_file: "hermes_hosts"
-
-  # Host names are constructed as "base_name +
-  # host_number + rpc_server_suffix." Each entry in the rpc_host_number_range_list
-  # can be either a single number, or a range, which is 2 numbers separated by a
-  # hyphen (-). For example the list {01, 03-05, 07, 08-10} will be expanded to
-  # {01, 03, 04, 05, 07, 08, 09, 10}.
-  host_names: []
-
-  # The RPC protocol. This must come from the documentation of the specific RPC
-  # library in use.
-  protocol: "ofi+sockets"
-
-  # RPC domain name for verbs transport. Blank for tcp.
-  domain: ""
-
-  # Desired RPC port number.
-  port: 8080
-
-  # The number of handler threads for each RPC server.
-  num_threads: 4
-
-### Define properties of the BORG
-buffer_organizer:
-  # The number of threads used in the background organization of internal Hermes buffers.
-  num_threads: 1
-
-  # Desired RPC port number for buffer organizer.
-  port: 8081
-
-### Define the default data placement policy
-dpe:
-  # Choose Random, RoundRobin, or MinimizeIoTime
-  default_placement_policy: "MinimizeIoTime"
-
-  # If true (1) the RoundRobin placement policy algorithm will split each Blob
-  # into a random number of smaller Blobs.
-  default_rr_split: 0
-
-# The shared memory prefix for the hermes shared memory segment. A user name
-# will be automatically appended.
-shmem_name: "/hermes_shm_"
-
-# The interval in milliseconds at which to update the global system view.
-system_view_state_update_interval_ms: 1000
-
-### Define prefetcher properties
-prefetch:
-  enabled: true
-  io_trace_path: "${HOME}/test/io_trace.yaml"
-  epoch_ms: 50
-  is_mpi: true
\ No newline at end of file
diff --git a/test/data/hermes_server_prefetch.yaml b/test/data/hermes_server_prefetch.yaml
deleted file mode 100644
index 24306b43d..000000000
--- a/test/data/hermes_server_prefetch.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Example Hermes configuration file
-
-### Define properties of the storage devices
-devices:
-  # The name of the device.
-  # It can be whatever the user wants, there are no special names
-  ram:
-    # The mount point of each device. RAM should be the empty string. For block
-    # devices, this is the directory where Hermes will create buffering files. For
-    # object storage or cloud targets, this will be a url.
-    mount_point: ""
-
-    # The maximum buffering capacity in MiB of each device. Here we say that all 4
-    # devices get 50 MiB of buffering capacity.
-    capacity: 6000MB
-
-    # The size of the smallest available buffer in KiB. In general this should be
-    # the page size of your system for byte addressable storage, and the block size
-    # of the storage device for block addressable storage.
-    block_size: 4KB
-
-    # The number of blocks (the size of which is chosen in block_sizes_kb) that each
-    # device should contain for each slab (controlled by num_slabs). This allows for
-    # precise control of the distibution of buffer sizes.
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB, 16MB ]
-
-    # The maximum theoretical bandwidth (as advertised by the manufacturer) in
-    # Possible units: KBps, MBps, GBps
-    bandwidth: 6000MBps
-
-    # The latency of each device (as advertised by the manufacturer).
-    # Possible units: ns, us, ms, s
-    latency: 15us
-
-    # For each device, indicate '1' if it is shared among nodes (e.g., burst
-    # buffers), or '0' if it is per node (e.g., local NVMe).
-    is_shared_device: false
-
-    # For each device, the minimum and maximum percent capacity threshold at which
-    # the BufferOrganizer will trigger. Decreasing the maximum thresholds will cause
-    # the BufferOrganizer to move data to lower devices, making more room in faster
-    # devices (ideal for write-heavy workloads). Conversely, increasing the minimum
-    # threshold will cause data to be moved from slower devices into faster devices
-    # (ideal for read-heavy workloads). For example, a maximum capacity threshold of
-    # 0.8 would have the effect of always keeping 20% of the device's space free for
-    # incoming writes. Conversely, a minimum capacity threshold of 0.3 would ensure
-    # that the device is always at least 30% occupied.
-    borg_capacity_thresh: [0.0, 1.0]
-
-  nvme:
-    mount_point: "./"
-    capacity: 10GB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 1GBps
-    latency: 600us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  ssd:
-    mount_point: "./"
-    capacity: 10GB
-    block_size: 4KB
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 500MBps
-    latency: 1200us
-    is_shared_device: false
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-  pfs:
-    mount_point: "./"
-    capacity: inf
-    block_size: 64KB # The stripe size of PFS
-    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
-    bandwidth: 100MBps # Per-device bandwidth
-    latency: 200ms
-    is_shared_device: true
-    borg_capacity_thresh: [ 0.0, 1.0 ]
-
-### Define properties of RPCs
-rpc:
-  # A path to a file containing a list of server names, 1 per line. If your
-  # servers are named according to a pattern (e.g., server-1, server-2, etc.),
-  # prefer the `rpc_server_base_name` and `rpc_host_number_range` options. If this
-  # option is not empty, it will override anything in `rpc_server_base_name`.
-  host_file: ""
-
-  # Host names are constructed as "base_name +
-  # host_number + rpc_server_suffix." Each entry in the rpc_host_number_range_list
-  # can be either a single number, or a range, which is 2 numbers separated by a
-  # hyphen (-). For example the list {01, 03-05, 07, 08-10} will be expanded to
-  # {01, 03, 04, 05, 07, 08, 09, 10}.
-  host_names: ["localhost"]
-
-  # The RPC protocol. This must come from the documentation of the specific RPC
-  # library in use.
-  protocol: "ofi+sockets"
-
-  # RPC domain name for verbs transport. Blank for tcp.
-  domain: ""
-
-  # Desired RPC port number.
-  port: 8080
-
-  # The number of handler threads for each RPC server.
-  num_threads: 4
-
-### Define properties of the BORG
-buffer_organizer:
-  # The number of threads used in the background organization of internal Hermes buffers.
-  num_threads: 1
-
-  # Desired RPC port number for buffer organizer.
-  port: 8081
-
-### Define the default data placement policy
-dpe:
-  # Choose Random, RoundRobin, or MinimizeIoTime
-  default_placement_policy: "MinimizeIoTime"
-
-  # If true (1) the RoundRobin placement policy algorithm will split each Blob
-  # into a random number of smaller Blobs.
-  default_rr_split: 0
-
-# The shared memory prefix for the hermes shared memory segment. A user name
-# will be automatically appended.
-shmem_name: "/hermes_shm_"
-
-# The interval in milliseconds at which to update the global system view.
-system_view_state_update_interval_ms: 1000
-
-### Define prefetcher properties
-prefetch:
-  enabled: true
-  io_trace_path: "${HOME}/test/io_trace.yaml"
-  apriori_schema_path: "${HOME}/apriori_schema.yaml"
-  epoch_ms: 50
-  is_mpi: true
\ No newline at end of file
diff --git a/test/hostfile.txt b/test/hostfile.txt
deleted file mode 100644
index 6c2d49ee5..000000000
--- a/test/hostfile.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ares-comp-01
-ares-comp-02
-
-ares-comp-[03-05,08-10]
diff --git a/test/test_binlog.cc b/test/test_binlog.cc
deleted file mode 100644
index 9fbe9daa6..000000000
--- a/test/test_binlog.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <cstdlib>
-#include <string>
-
-#include "binlog.h"
-#include "hermes_types.h"
-#include "basic_test.h"
-#include <filesystem>
-
-namespace hapi = hermes::api;
-namespace stdfs = std::filesystem;
-
-void MainPretest() {
-}
-
-void MainPosttest() {
-}
-
-std::vector<hermes::IoStat> create_stats(
-  size_t bytes, int num_ranks, size_t &entries_per_rank) {
-  std::vector<hermes::IoStat> stats;
-  size_t max_entries = bytes / sizeof(hermes::IoStat);
-  entries_per_rank = max_entries / num_ranks;
-  stats.reserve(num_ranks * entries_per_rank);
-  for (int rank = 0; rank < num_ranks; ++rank) {
-    for (size_t i = 0; i < entries_per_rank; ++i) {
-      stats.emplace_back();
-      auto &stat = stats.back();
-      stat.rank_ = rank;
-      stat.type_ = (i % 2) ? hermes::IoType::kRead : hermes::IoType::kWrite;
-      stat.blob_id_ = hermes::BlobId(i, rank);
-      stat.blob_size_ = 8 * (i + 1);
-    }
-  }
-  return stats;
-}
-
-void verify_log(hermes::BinaryLog<hermes::IoStat> log,
-                int num_ranks, size_t entries_per_rank) {
-  for (int rank = 0; rank < num_ranks; ++rank) {
-    hermes::IoStat stat;
-    size_t i = 0;
-    while (log.GetEntry(rank, i, stat)) {
-      REQUIRE(stat.blob_id_.node_id_ == rank);
-      REQUIRE(stat.blob_id_.unique_ == i);
-      i += 1;
-    }
-    REQUIRE(i == entries_per_rank);
-  }
-}
-
-TEST_CASE("TestBinlog") {
-  int num_ranks = 16;
-  size_t log_bytes = MEGABYTES(1);
-  size_t chunk_bytes = log_bytes / 4;
-  size_t entries_per_rank;
-  std::string path =  "/tmp/log.bin";
-
-  // Create chunk
-  std::vector<hermes::IoStat> stats = create_stats(
-    chunk_bytes, num_ranks, entries_per_rank);
-
-  // Attempt flushing the log
-  hermes::BinaryLog<hermes::IoStat> log;
-  log.Init(path, log_bytes);
-  log.Ingest(stats);
-  verify_log(log, num_ranks, entries_per_rank);
-  log.Flush();
-  REQUIRE(stdfs::file_size(path) == 0);
-
-  // Actually flush the log when capacity reached
-  log.Ingest(stats);
-  log.Ingest(stats);
-  log.Ingest(stats);
-  log.Ingest(stats);
-  log.Flush();
-  REQUIRE(stdfs::file_size(path) > 0);
-}
diff --git a/test/test_bucket.cc b/test/test_bucket.cc
deleted file mode 100644
index 5325f8b1c..000000000
--- a/test/test_bucket.cc
+++ /dev/null
@@ -1,212 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <cstdlib>
-#include <string>
-
-#include <mpi.h>
-#include "hermes_shm/util/logging.h"
-#include "hermes.h"
-#include "bucket.h"
-
-#include "basic_test.h"
-
-namespace hapi = hermes::api;
-
-void MainPretest() {
-  hapi::Hermes::Create(hermes::HermesType::kClient);
-}
-
-void MainPosttest() {
-  HERMES->Clear();
-  HERMES->Finalize();
-}
-
-void TestBlobCreates(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  size_t num_blobs = 256;
-  size_t blob_size = KILOBYTES(4);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-
-  for (size_t i = 0; i < num_blobs; ++i) {
-    hermes::Blob blob(blob_size);
-    std::string name = std::to_string(i);
-    char nonce = i % 256;
-    memset(blob.data(), nonce, blob_size);
-    bkt.Put(name, blob, blob_id, ctx);
-  }
-
-  for (size_t i = 0; i < num_blobs; ++i) {
-    std::string name = std::to_string(i);
-    char nonce = i % 256;
-    hermes::Blob blob;
-    bkt.GetBlobId(name, blob_id);
-    REQUIRE(!blob_id.IsNull());
-    bkt.Get(blob_id, blob, ctx);
-    REQUIRE(blob.size() == blob_size);
-    REQUIRE(VerifyBuffer(blob.data(), blob_size, nonce));
-  }
-}
-
-void TestBlobOverride(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  auto bkt2 = hermes->GetBucket("hello");
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  hermes::Blob blob(1024);
-  for (size_t i = 0; i < 1024; ++i) {
-    memset(blob.data(), i, 1024);
-    bkt2.Put("0", blob, blob_id, ctx);
-    hermes::Blob ret;
-    bkt.Get(blob_id, ret, ctx);
-    REQUIRE(ret.size() == 1024);
-    REQUIRE(VerifyBuffer(ret.data(), 1024, i));
-  }
-}
-
-void TestBucketRename(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  bkt.Rename("hello2");
-  auto bkt1 = hermes->GetBucket("hello");
-  auto bkt2 = hermes->GetBucket("hello2");
-
-  REQUIRE(!bkt2.IsNull());
-  REQUIRE(bkt1.GetId() != bkt2.GetId());
-  REQUIRE(bkt.GetId() == bkt2.GetId());
-}
-
-void TestBucketClear(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  size_t num_blobs = 16;
-  size_t blob_size = MEGABYTES(32);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-
-  for (size_t i = 0; i < num_blobs; ++i) {
-    hermes::Blob blob(blob_size);
-    std::string name = std::to_string(i);
-    char nonce = i % 256;
-    memset(blob.data(), nonce, blob_size);
-    bkt.Put(name, std::move(blob), blob_id, ctx);
-  }
-
-  bkt.Clear();
-
-  REQUIRE(bkt.GetSize() == 0);
-  auto blobs = bkt.GetContainedBlobIds();
-  REQUIRE(blobs.size() == 0);
-}
-
-void TestBucketDestroy(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  size_t num_blobs = 1;
-  size_t blob_size = MEGABYTES(32);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-
-  for (size_t i = 0; i < num_blobs; ++i) {
-    hermes::Blob blob(blob_size);
-    std::string name = std::to_string(i);
-    char nonce = i % 256;
-    memset(blob.data(), nonce, blob_size);
-    bkt.Put(name, blob, blob_id, ctx);
-  }
-
-  bkt.Destroy();
-
-  // Check if the bucket can be re-obtained
-  auto new_bkt = hermes->GetBucket("hello");
-  REQUIRE(bkt.GetId() != new_bkt.GetId());
-  REQUIRE(new_bkt.GetSize() == 0);
-}
-
-void TestBlobRename(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  hapi::Blob blob(1024);
-  hermes::BlobId blob_id;
-  hapi::Context ctx;
-  bkt.Put("0", blob, blob_id, ctx);
-  bkt.RenameBlob(blob_id, "1", ctx);
-
-  {
-    hermes::BlobId blob_get_id;
-    bkt.GetBlobId("0", blob_get_id);
-    REQUIRE(blob_get_id.IsNull());
-  }
-
-  {
-    hermes::BlobId blob_get_id;
-    bkt.GetBlobId("1", blob_get_id);
-    REQUIRE(!blob_get_id.IsNull());
-    REQUIRE(blob_get_id == blob_id);
-  }
-}
-
-void TestBlobDestroy(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  hapi::Blob blob(1024);
-  hermes::BlobId blob_id;
-  hapi::Context ctx;
-  bkt.Put("0", blob, blob_id, ctx);
-  bkt.DestroyBlob(blob_id, ctx);
-  {
-    hermes::BlobId blob_id_get;
-    bkt.GetBlobId("0", blob_id_get);
-    REQUIRE(blob_id_get.IsNull());
-  }
-}
-
-TEST_CASE("TestCreateBlobName") {
-  HERMES->Clear();
-  hermes::TagId bkt_id(1, 1);
-  std::string blob_name("0");
-  hipc::uptr<hipc::charbuf> n1 =
-      hermes::MetadataManager::CreateBlobName(bkt_id, blob_name);
-  hipc::uptr<hipc::charbuf> n2 =
-      hermes::MetadataManager::CreateBlobName(bkt_id, blob_name);
-  REQUIRE(*n1 == *n2);
-}
-
-TEST_CASE("TestBlobCreates") {
-  HERMES->Clear();
-  TestBlobCreates(HERMES);
-}
-
-TEST_CASE("TestBlobOverride") {
-  TestBlobOverride(HERMES);
-}
-
-TEST_CASE("TestBucketRename") {
-  HERMES->Clear();
-  TestBucketRename(HERMES);
-}
-
-TEST_CASE("TestBucketClear") {
-  HERMES->Clear();
-  TestBucketClear(HERMES);
-}
-
-TEST_CASE("TestBucketDestroy") {
-  HERMES->Clear();
-  TestBucketDestroy(HERMES);
-}
-
-TEST_CASE("TestBlobRename") {
-  HERMES->Clear();
-  TestBlobRename(HERMES);
-}
-
-TEST_CASE("TestBlobDestroy") {
-  HERMES->Clear();
-  TestBlobDestroy(HERMES);
-}
diff --git a/test/test_buffer_pool.cc b/test/test_buffer_pool.cc
deleted file mode 100644
index db0f4caa8..000000000
--- a/test/test_buffer_pool.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <cstdlib>
-#include <string>
-
-#include <mpi.h>
-#include "hermes_shm/util/logging.h"
-#include "hermes.h"
-#include "buffer_pool.h"
-
-#include "basic_test.h"
-
-namespace hapi = hermes::api;
-
-void MainPretest() {
-  hapi::Hermes::Create(hermes::HermesType::kClient);
-}
-
-void MainPosttest() {
-  HERMES->Finalize();
-}
-
-TEST_CASE("TestBufferPool") {
-  std::vector<std::pair<size_t, int>> sizes = {
-    {23, 1},   // 23B blob on 1 target
-    {KILOBYTES(1), 1},   // 1KB blob on 1 target
-    {KILOBYTES(4), 1},   // 4KB blob on 1 target
-    {KILOBYTES(8), 1},   // 8KB blob on 1 target
-    {KILOBYTES(16), 1},  // 16KB blob on 1 target
-    {KILOBYTES(64), 1},  // 64KB blob on 1 target
-    {MEGABYTES(4), 1},  // 4MB blob on 1 target
-
-    {KILOBYTES(4), 3},   // 4KB blob on 3 targets
-    {KILOBYTES(8), 3},   // 8KB blob on 3 targets
-    {KILOBYTES(16), 3},  // 16KB blob on 3 targets
-    {KILOBYTES(64), 3},  // 64KB blob on 3 targets
-    {MEGABYTES(4), 3},  // 4MB blob on 3 targets
-    {MEGABYTES(4) + KILOBYTES(32), 3},  // 4MB blob on 3 targets
-
-    // This will test the ability to "trickle down"
-    {MEGABYTES(256), 1},  // 256MB blob on 1 target
-  };
-
-  for (auto &[size, num_targets] : sizes) {
-    // Divide the blob among targets
-    hermes::PlacementSchema schema;
-    size_t tgt_size = size / num_targets;
-    size_t last_size = tgt_size + (size % num_targets);
-    for (int i = 0; i < num_targets; ++i) {
-      hermes::TargetInfo &target = (*HERMES->mdm_.targets_)[i];
-      if (i < num_targets - 1) {
-        schema.plcmnts_.emplace_back(tgt_size, target.id_);
-      } else {
-        schema.plcmnts_.emplace_back(last_size, target.id_);
-      }
-    }
-
-    // Create the blob to write
-    hermes::Blob write_blob(size);
-    memset(write_blob.data(), 10, size);
-
-    // Allocate the buffers and set them
-    std::vector<hermes::BufferInfo> buffers =
-        HERMES->bpm_.LocalAllocateAndSetBuffers(schema, write_blob);
-
-    // Read back the buffers
-    hermes::Blob read_blob(size);
-    HERMES->borg_.LocalReadBlobFromBuffers(read_blob, buffers);
-
-    // Verify they are the same
-    REQUIRE(read_blob.size() == size);
-    REQUIRE(VerifyBuffer(read_blob.data(), size, 10));
-
-    // Release buffers
-    HERMES->bpm_.LocalReleaseBuffers(buffers);
-  }
-}
diff --git a/test/test_config.cc b/test/test_config.cc
deleted file mode 100644
index 27aabdf85..000000000
--- a/test/test_config.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes.h"
-#include "basic_test.h"
-
-void MainPretest() {
-}
-
-void MainPosttest() {
-}
-
-TEST_CASE("Hostfile") {
-  auto vec = hermes::RpcContext::ParseHostfile("hostfile.txt");
-  REQUIRE(vec.size() == 8);
-  REQUIRE(vec[0] == "ares-comp-01");
-  REQUIRE(vec[1] == "ares-comp-02");
-  REQUIRE(vec[2] == "ares-comp-03");
-  REQUIRE(vec[3] == "ares-comp-04");
-  REQUIRE(vec[4] == "ares-comp-05");
-  REQUIRE(vec[5] == "ares-comp-08");
-  REQUIRE(vec[6] == "ares-comp-09");
-  REQUIRE(vec[7] == "ares-comp-10");
-}
-
-TEST_CASE("HostName") {
-  SECTION("Simple host name") {
-    std::vector<std::string> host_names;
-    hshm::ConfigParse::ParseHostNameString("localhost", host_names);
-    REQUIRE(host_names.size() == 1);
-    REQUIRE(host_names[0] == "localhost");
-  }
-
-  SECTION("Host name with range at the end") {
-    std::vector<std::string> host_names;
-    hshm::ConfigParse::ParseHostNameString("ares-comp-[0-4]",
-                                                    host_names);
-    REQUIRE(host_names.size() == 5);
-    REQUIRE(host_names[0] == "ares-comp-0");
-    REQUIRE(host_names[1] == "ares-comp-1");
-    REQUIRE(host_names[2] == "ares-comp-2");
-    REQUIRE(host_names[3] == "ares-comp-3");
-    REQUIRE(host_names[4] == "ares-comp-4");
-  }
-
-  SECTION("Host name with fixed number range") {
-    std::vector<std::string> host_names;
-    hshm::ConfigParse::ParseHostNameString("ares-comp-[08-12]",
-                                                    host_names);
-    REQUIRE(host_names.size() == 5);
-    REQUIRE(host_names[0] == "ares-comp-08");
-    REQUIRE(host_names[1] == "ares-comp-09");
-    REQUIRE(host_names[2] == "ares-comp-10");
-    REQUIRE(host_names[3] == "ares-comp-11");
-    REQUIRE(host_names[4] == "ares-comp-12");
-  }
-
-  SECTION("Host name with fixed number range and suffix") {
-    std::vector<std::string> host_names;
-    hshm::ConfigParse::ParseHostNameString("ares-comp-[08-12]-hello",
-                                        host_names);
-    REQUIRE(host_names.size() == 5);
-    REQUIRE(host_names[0] == "ares-comp-08-hello");
-    REQUIRE(host_names[1] == "ares-comp-09-hello");
-    REQUIRE(host_names[2] == "ares-comp-10-hello");
-    REQUIRE(host_names[3] == "ares-comp-11-hello");
-    REQUIRE(host_names[4] == "ares-comp-12-hello");
-  }
-
-  SECTION("Host name with multiple ranges") {
-    std::vector<std::string> host_names;
-    hshm::ConfigParse::ParseHostNameString(
-        "ares-comp-[08-10,13-14,25]-hello", host_names);
-    REQUIRE(host_names.size() == 6);
-    REQUIRE(host_names[0] == "ares-comp-08-hello");
-    REQUIRE(host_names[1] == "ares-comp-09-hello");
-    REQUIRE(host_names[2] == "ares-comp-10-hello");
-    REQUIRE(host_names[3] == "ares-comp-13-hello");
-    REQUIRE(host_names[4] == "ares-comp-14-hello");
-    REQUIRE(host_names[5] == "ares-comp-25-hello");
-  }
-}
diff --git a/test/test_multinode_put_get.cc b/test/test_multinode_put_get.cc
deleted file mode 100644
index 7f7a88358..000000000
--- a/test/test_multinode_put_get.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <iostream>
-#include <hermes_shm/util/timer.h>
-#include <mpi.h>
-#include "hermes.h"
-#include "hermes_shm/util/formatter.h"
-#include "bucket.h"
-#include "basic_test.h"
-
-static const int kBlobSize = KILOBYTES(64);
-static const int kBlobsPerRank = 1024;
-
-void MainPretest() {
-  hapi::Hermes::Create(hermes::HermesType::kClient);
-}
-
-void MainPosttest() {
-  int rank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Barrier(MPI_COMM_WORLD);
-  if (rank == 0) {
-    HERMES->Finalize();
-  }
-}
-
-// Put to my bucket
-void PutTest(int rank) {
-  std::string bkt_name = hshm::Formatter::format("bucket{}", rank);
-  auto bkt = HERMES->GetBucket(bkt_name);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  hermes::Blob blob(kBlobSize);
-  for (size_t i = 0; i < kBlobsPerRank; ++i) {
-    std::string name = std::to_string(i);
-    memset(blob.data(), i, kBlobSize);
-    bkt.Put(name, blob, blob_id, ctx);
-  }
-}
-
-// Get from a different rank
-void GetTest(int rank, int nprocs) {
-  std::string bkt_name = hshm::Formatter::format(
-      "bucket{}", (rank + 1) % nprocs);
-  auto bkt = HERMES->GetBucket(bkt_name);
-  hermes::api::Context ctx;
-  hermes::BlobId blob_id;
-  for (size_t i = 0; i < kBlobsPerRank; ++i) {
-    std::string name = std::to_string(i);
-    hermes::Blob ret;
-    bkt.GetBlobId(name, blob_id);
-    bkt.Get(blob_id, ret, ctx);
-    REQUIRE(VerifyBuffer(ret.data(), kBlobSize, i));
-  }
-}
-
-TEST_CASE("ParallelPutGetDifferentBuckets") {
-  int rank, nprocs;
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
-  MPI_Barrier(MPI_COMM_WORLD);
-  PutTest(rank);
-  MPI_Barrier(MPI_COMM_WORLD);
-  GetTest(rank, nprocs);
-}
diff --git a/test/test_tag.cc b/test/test_tag.cc
deleted file mode 100644
index 48b2964c5..000000000
--- a/test/test_tag.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <cstdlib>
-#include <string>
-
-#include <mpi.h>
-#include "hermes_shm/util/logging.h"
-#include "hermes.h"
-#include "bucket.h"
-
-#include "basic_test.h"
-
-namespace hapi = hermes::api;
-
-using hermes::TagId;
-
-void MainPretest() {
-  hapi::Hermes::Create(hermes::HermesType::kClient);
-}
-
-void MainPosttest() {
-  HERMES->Finalize();
-}
-
-void TestTag(hapi::Hermes *hermes) {
-  auto bkt = hermes->GetBucket("hello");
-  size_t num_blobs = 100;
-  size_t blob_size = KILOBYTES(4);
-  hermes::api::Context ctx;
-  std::vector<hermes::BlobId> blob_ids(num_blobs);
-
-  // Create some blobs
-  for (size_t i = 0; i < num_blobs; ++i) {
-    hermes::Blob blob(blob_size);
-    std::string name = std::to_string(i);
-    char nonce = i % 256;
-    memset(blob.data(), nonce, blob_size);
-    bkt.Put(name, std::move(blob), blob_ids[i], ctx);
-  }
-
-  // Create two tags
-  TagId tag1 = HERMES->CreateTag("tag1");
-
-  // Tag some blobs
-  for (size_t i = 0; i < num_blobs; ++i) {
-    bkt.TagBlob(blob_ids[i], tag1);
-  }
-
-  // Query by tag
-  auto tags = HERMES->GroupBy(tag1);
-  REQUIRE(tags.size() == 100);
-}
-
-TEST_CASE("TestTag") {
-  TestTag(HERMES);
-}
diff --git a/test/test_trait.cc b/test/test_trait.cc
deleted file mode 100644
index f23c052ee..000000000
--- a/test/test_trait.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Distributed under BSD 3-Clause license.                                   *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Illinois Institute of Technology.                        *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of Hermes. The full Hermes copyright notice, including  *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the top directory. If you do not  *
- * have access to the file, you may request a copy from help@hdfgroup.org.   *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <cstdlib>
-#include <string>
-
-#include <mpi.h>
-#include "hermes_shm/util/logging.h"
-#include "hermes.h"
-#include "bucket.h"
-#include "traits/example/example_trait.h"
-
-#include "basic_test.h"
-
-namespace hapi = hermes::api;
-
-using hermes::TagId;
-
-void MainPretest() {
-  hapi::Hermes::Create(hermes::HermesType::kClient);
-}
-
-void MainPosttest() {
-  HERMES->Finalize();
-}
-
-void TestTrait() {
-  auto bkt = HERMES->GetBucket("hello");
-  size_t num_blobs = 100;
-  hermes::api::Context ctx;
-  std::vector<hermes::BlobId> blob_ids(num_blobs);
-
-  // Create a trait
-  HERMES->RegisterTrait<hapi::ExampleTrait>("ex", 5);
-
-  // Get the trait id
-  hermes::TraitId trait_id = HERMES->GetTraitId("ex");
-  REQUIRE(!trait_id.IsNull());
-
-  // Get the trait itself
-  auto *trait = HERMES->GetTrait(trait_id);
-  hapi::ExampleTraitParams params;
-  trait->Run(0, &params);
-  auto hello = params.hello_;
-  REQUIRE(hello == 5);
-}
-
-TEST_CASE("TestTrait") {
-  TestTrait();
-}
-
diff --git a/test/test_utils.h b/test/test_utils.h
deleted file mode 100644
index eaaa83ea9..000000000
--- a/test/test_utils.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TEST_TEST_UTILS_H_
-#define HERMES_TEST_TEST_UTILS_H_
-
-#include <iostream>
-#include <cstdlib>
-
-static inline bool VerifyBuffer(char *ptr, size_t size, char nonce) {
-  for (size_t i = 0; i < size; ++i) {
-    if (ptr[i] != nonce) {
-      std::cout << "Mismatch at: " << (int)i << std::endl;
-      return false;
-    }
-  }
-  return true;
-}
-
-static inline bool CompareBuffers(char *p1, size_t s1, char *p2, size_t s2,
-                           size_t off) {
-  if (s1 != s2) {
-    return false;
-  }
-  for (size_t i = off; i < s1; ++i) {
-    if (p1[i] != p2[i]) {
-      std::cout << "Mismatch at: " << (int)i << std::endl;
-      return false;
-    }
-  }
-  return true;
-}
-
-#endif  // HERMES_TEST_TEST_UTILS_H_
diff --git a/test/tests.py b/test/tests.py
deleted file mode 100644
index 4c7921189..000000000
--- a/test/tests.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from py_hermes_ci.test_manager import TestManager
-from jarvis_util import *
-
-
-class NativeTestManager(TestManager):
-    def spawn_all_nodes(self):
-        return self.spawn_info()
-
-    def set_paths(self):
-        self.TEST_BUCKET_CMD = f"{self.CMAKE_BINARY_DIR}/bin/test_bucket"
-        self.TEST_BUFFER_POOL_CMD = f"{self.CMAKE_BINARY_DIR}/bin/test_buffer_pool"
-        self.TEST_TRAIT_CMD = f"{self.CMAKE_BINARY_DIR}/bin/test_trait"
-        self.TEST_TAG_CMD = f"{self.CMAKE_BINARY_DIR}/bin/test_tag"
-        self.TEST_BINLOG_CMD = f"{self.CMAKE_BINARY_DIR}/bin/test_binlog"
-        self.TEST_MULTINODE_PUT_GET_CMD = f"{self.CMAKE_BINARY_DIR}/bin/test_multinode_put_get"
-
-    def test_bucket(self):
-        spawn_info = self.spawn_info(nprocs=1,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(self.TEST_BUCKET_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_buffer_pool(self):
-        spawn_info = self.spawn_info(nprocs=1,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(self.TEST_BUFFER_POOL_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_trait(self):
-        spawn_info = self.spawn_info(nprocs=1,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(self.TEST_TRAIT_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_tag(self):
-        spawn_info = self.spawn_info(nprocs=1,
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(self.TEST_TAG_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
-
-    def test_binlog(self):
-        node = Exec(self.TEST_BINLOG_CMD)
-
-    def test_multinode_put_get(self):
-        spawn_info = self.spawn_info(nprocs=2,
-                                     ppn=1,
-                                     hostfile=None,  # TODO(llogan)
-                                     hermes_conf='hermes_server')
-        self.start_daemon(spawn_info)
-        node = Exec(self.TEST_MULTINODE_PUT_GET_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
new file mode 100644
index 000000000..559ffe832
--- /dev/null
+++ b/test/unit/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/tasks/hrun_admin/include)
+add_subdirectory(ipc)
+add_subdirectory(hermes)
+add_subdirectory(hermes_adapters)
+add_subdirectory(boost)
diff --git a/test/data/asan.supp b/test/unit/asan.supp
similarity index 94%
rename from test/data/asan.supp
rename to test/unit/asan.supp
index 5ad2683cd..c17008e89 100644
--- a/test/data/asan.supp
+++ b/test/unit/asan.supp
@@ -7,4 +7,4 @@ leak:librdmacm.so
 leak:libhwloc.so
 leak:libmpich.so
 leak:aiori-HDF5.c
-leak:ior.c
+leak:ior.c
\ No newline at end of file
diff --git a/test/basic_test.h b/test/unit/basic_test.h
similarity index 58%
rename from test/basic_test.h
rename to test/unit/basic_test.h
index 14ee8d480..a5428131d 100644
--- a/test/basic_test.h
+++ b/test/unit/basic_test.h
@@ -10,17 +10,45 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef HERMES_SHM_TEST_UNIT_BASIC_TEST_H_
-#define HERMES_SHM_TEST_UNIT_BASIC_TEST_H_
+#ifndef HRUN_TEST_UNIT_BASIC_TEST_H_
+#define HRUN_TEST_UNIT_BASIC_TEST_H_
 
 #define CATCH_CONFIG_RUNNER
 #include <catch2/catch_all.hpp>
-#include "test_utils.h"
 
 namespace cl = Catch::Clara;
 cl::Parser define_options();
 
+#include <iostream>
+#include <cstdlib>
+
+static inline bool VerifyBuffer(char *ptr, size_t size, char nonce) {
+  for (size_t i = 0; i < size; ++i) {
+    if (ptr[i] != nonce) {
+      std::cout << (int)ptr[i] << std::endl;
+      return false;
+    }
+  }
+  return true;
+}
+
+static inline bool CompareBuffers(char *p1, size_t s1, char *p2, size_t s2,
+                                  size_t off) {
+  if (s1 != s2) {
+    return false;
+  }
+  for (size_t i = off; i < s1; ++i) {
+    if (p1[i] != p2[i]) {
+      std::cout << "Mismatch at: " << (int)i << std::endl;
+      return false;
+    }
+  }
+  return true;
+}
+
 void MainPretest();
 void MainPosttest();
 
-#endif  // HERMES_SHM_TEST_UNIT_BASIC_TEST_H_
+#define PAGE_DIVIDE(TEXT)
+
+#endif  // HRUN_TEST_UNIT_BASIC_TEST_H_
diff --git a/hermes_shm/test/unit/thread/CMakeLists.txt b/test/unit/boost/CMakeLists.txt
similarity index 58%
rename from hermes_shm/test/unit/thread/CMakeLists.txt
rename to test/unit/boost/CMakeLists.txt
index 7b4560ae4..019a213c8 100644
--- a/hermes_shm/test/unit/thread/CMakeLists.txt
+++ b/test/unit/boost/CMakeLists.txt
@@ -1,37 +1,43 @@
 cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
+project(hermes)
 
 set(CMAKE_CXX_STANDARD 17)
 
 #------------------------------------------------------------------------------
 # Build Tests
 #------------------------------------------------------------------------------
-add_executable(test_thread_exec
+
+add_executable(test_boost_exec
         ${TEST_MAIN}/main.cc
         test_init.cc
-        test_thread.cc
-        test_lock.cc)
-add_dependencies(test_thread_exec hermes_shm_data_structures)
-target_link_libraries(test_thread_exec
-        hermes_shm_data_structures
-        thallium
-        Catch2::Catch2
-        MPI::MPI_CXX
-        OpenMP::OpenMP_CXX)
+        test_boost.cc
+)
+add_dependencies(test_boost_exec
+        ${Hermes_RUNTIME_DEPS} hermes)
+target_link_libraries(test_boost_exec
+        ${Hermes_RUNTIME_LIBRARIES} Catch2::Catch2 MPI::MPI_CXX)
 
 #------------------------------------------------------------------------------
 # Test Cases
 #------------------------------------------------------------------------------
-add_test(NAME test_thread COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_thread_exec)
+
+#add_test(NAME test_boost COMMAND
+#        ${CMAKE_BINARY_DIR}/bin/test_messages "TestBoost")
 
 #------------------------------------------------------------------------------
 # Install Targets
 #------------------------------------------------------------------------------
 install(TARGETS
-        test_thread_exec
+        test_boost_exec
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
+
+#-----------------------------------------------------------------------------
+# Coverage
+#-----------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(test_boost_exec)
+endif()
diff --git a/test/unit/boost/test_boost.cc b/test/unit/boost/test_boost.cc
new file mode 100644
index 000000000..4b5a525ac
--- /dev/null
+++ b/test/unit/boost/test_boost.cc
@@ -0,0 +1,133 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "basic_test.h"
+#include <boost/context/fiber_fcontext.hpp>
+#include "hermes_shm/util/timer.h"
+#include "hermes_shm/util/logging.h"
+#include <boost/coroutine2/all.hpp>
+
+
+void function() {
+}
+
+TEST_CASE("TestBoostFiber") {
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+
+  for (size_t i = 0; i < ops; ++i) {
+    int a;
+    boost::context::fiber source([&a](boost::context::fiber &&sink) {
+      function();
+      return std::move(sink);
+    });
+  }
+
+  t.Pause();
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+template< std::size_t Max, std::size_t Default, std::size_t Min >
+class simple_stack_allocator {
+ public:
+  static std::size_t maximum_stacksize() {
+    return Max;
+  }
+
+  static std::size_t default_stacksize() {
+    return Default;
+  }
+
+  static std::size_t minimum_stacksize() {
+    return Min;
+  }
+
+  void *allocate(std::size_t size) const {
+    BOOST_ASSERT(minimum_stacksize() <= size);
+    BOOST_ASSERT(maximum_stacksize() >= size);
+    void *limit = malloc(size);
+    if (!limit) throw std::bad_alloc();
+    return static_cast<char *>(limit) + size;
+  }
+
+  void deallocate(void * vp, std::size_t size) const {
+    BOOST_ASSERT(vp);
+    BOOST_ASSERT(minimum_stacksize() <= size);
+    BOOST_ASSERT(maximum_stacksize() >= size);
+
+    void *limit = static_cast<char *>(vp) - size;
+    free(limit);
+  }
+};
+
+typedef simple_stack_allocator<
+    8 * 1024 * 1024,
+    64 * 1024,
+    32> stack_allocator;
+
+int value1;
+namespace bctx = boost::context::detail;
+
+bctx::transfer_t shared_xfer;
+
+void f3(bctx::transfer_t t) {
+  ++value1;
+  shared_xfer = t;
+  shared_xfer = bctx::jump_fcontext(shared_xfer.fctx, 0);
+  ++value1;
+  shared_xfer = bctx::jump_fcontext(shared_xfer.fctx, shared_xfer.data);
+}
+
+
+TEST_CASE("TestBoostFcontext") {
+  value1 = 0;
+  stack_allocator alloc;
+  int size = KILOBYTES(64);
+
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+
+  for (size_t i = 0; i < ops; ++i) {
+    void *sp = alloc.allocate(size);
+    shared_xfer.fctx = bctx::make_fcontext(sp, size, f3);
+    shared_xfer = bctx::jump_fcontext(shared_xfer.fctx, 0);
+    shared_xfer = bctx::jump_fcontext(shared_xfer.fctx, 0);
+    alloc.deallocate(sp, size);
+  }
+
+  t.Pause();
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+namespace co = boost::coroutines2;
+
+void myCoroutine(co::coroutine<void>::push_type& yield) {
+  for (int i = 1; i <= 5; ++i) {
+    yield();
+  }
+}
+
+TEST_CASE("TestBoostCoroutine") {
+  hshm::Timer t;
+  t.Resume();
+  size_t ops = (1 << 20);
+
+  for (size_t i = 0; i < ops; ++i) {
+    co::coroutine<void>::pull_type myCoroutineInstance(myCoroutine);
+    myCoroutineInstance();
+  }
+
+  t.Pause();
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
diff --git a/hermes_shm/benchmark/allocator/test_init.cc b/test/unit/boost/test_init.cc
similarity index 89%
rename from hermes_shm/benchmark/allocator/test_init.cc
rename to test/unit/boost/test_init.cc
index 06c925a4e..1757fe387 100644
--- a/hermes_shm/benchmark/allocator/test_init.cc
+++ b/test/unit/boost/test_init.cc
@@ -10,9 +10,10 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+
+#include "hrun/api/hrun_client.h"
+#include "basic_test.h"
 #include "test_init.h"
-#include "hermes_shm/data_structures/ipc/vector.h"
-#include "hermes_shm/memory/allocator/stack_allocator.h"
 
 void MainPretest() {
 }
diff --git a/hermes_shm/test/unit/types/test_init.cc b/test/unit/boost/test_init.h
similarity index 85%
rename from hermes_shm/test/unit/types/test_init.cc
rename to test/unit/boost/test_init.h
index 82bac123b..cb3b36df7 100644
--- a/hermes_shm/test/unit/types/test_init.cc
+++ b/test/unit/boost/test_init.h
@@ -11,8 +11,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
-#include "basic_test.h"
+#ifndef HRUN_TEST_UNIT_IPC_TEST_INIT_H_
+#define HRUN_TEST_UNIT_IPC_TEST_INIT_H_
 
-void MainPretest() {}
+#include "hrun/hrun_types.h"
 
-void MainPosttest() {}
+#endif  // HRUN_TEST_UNIT_IPC_TEST_INIT_H_
diff --git a/test/unit/external/CMakeLists.txt b/test/unit/external/CMakeLists.txt
new file mode 100644
index 000000000..5e9284ba1
--- /dev/null
+++ b/test/unit/external/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
+
+include_directories(/home/lukemartinlogan/Documents/Projects/PhD/hermes/test/unit)
+set(CMAKE_CXX_STANDARD 17)
+find_package(Hermes REQUIRED)
+find_package(MPI REQUIRED COMPONENTS C CXX)
+include_directories(${Hermes_INCLUDE_DIRS})
+add_executable(test_hermes_external_compile
+        ../../main_mpi.cc
+        ../hermes/test_init.cc
+        ../hermes/test_bucket.cc
+)
+target_link_libraries(test_hermes_external_compile
+        ${Hermes_LIBRARIES} Catch2::Catch2 MPI::MPI_CXX)
+message("${Hermes_LIBRARIES}")
+
diff --git a/test/unit/external/CPPLINT.cfg b/test/unit/external/CPPLINT.cfg
new file mode 100644
index 000000000..ff51e24b9
--- /dev/null
+++ b/test/unit/external/CPPLINT.cfg
@@ -0,0 +1 @@
+exclude_files=.*build
\ No newline at end of file
diff --git a/hermes_shm/test/unit/data_structures/backend/CMakeLists.txt b/test/unit/hermes/CMakeLists.txt
similarity index 57%
rename from hermes_shm/test/unit/data_structures/backend/CMakeLists.txt
rename to test/unit/hermes/CMakeLists.txt
index f4c1a2ab6..a0ab24237 100644
--- a/hermes_shm/test/unit/data_structures/backend/CMakeLists.txt
+++ b/test/unit/hermes/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
+project(hermes)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -7,33 +7,38 @@ set(CMAKE_CXX_STANDARD 17)
 # Build Tests
 #------------------------------------------------------------------------------
 
-add_executable(test_memory_exec
+add_executable(test_hermes_exec
         ${TEST_MAIN}/main_mpi.cc
         test_init.cc
-        backend.cc
-        memory_slots.cc
-        memory_manager.cc)
-add_dependencies(test_memory_exec hermes_shm_data_structures)
-target_link_libraries(test_memory_exec
-        hermes_shm_data_structures Catch2::Catch2 MPI::MPI_CXX)
+        test_bucket.cc
+)
+add_dependencies(test_hermes_exec
+        ${Hermes_CLIENT_DEPS} hermes)
+target_link_libraries(test_hermes_exec
+        ${Hermes_CLIENT_LIBRARIES} hermes Catch2::Catch2 MPI::MPI_CXX)
+
 #------------------------------------------------------------------------------
 # Test Cases
 #------------------------------------------------------------------------------
 
-add_test(NAME test_memory_slots COMMAND
-        mpirun -n 2 ${CMAKE_BINARY_DIR}/bin/test_memory_exec "MemorySlot")
-add_test(NAME test_reserve COMMAND
-        ${CMAKE_BINARY_DIR}/bin/test_memory_exec "BackendReserve")
-add_test(NAME test_memory_manager COMMAND
-        mpirun -n 2 ${CMAKE_BINARY_DIR}/bin/test_memory_exec "MemoryManager")
+# STRING TESTS
+#add_test(NAME test_ipc COMMAND
+#        ${CMAKE_BINARY_DIR}/bin/test_messages "TestIpc")
 
 #------------------------------------------------------------------------------
 # Install Targets
 #------------------------------------------------------------------------------
 install(TARGETS
-        test_memory_exec
+        test_hermes_exec
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
+
+#-----------------------------------------------------------------------------
+# Coverage
+#-----------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(test_messages)
+endif()
diff --git a/test/unit/hermes/config/hermes_server.yaml b/test/unit/hermes/config/hermes_server.yaml
new file mode 100644
index 000000000..d7b3dcf3f
--- /dev/null
+++ b/test/unit/hermes/config/hermes_server.yaml
@@ -0,0 +1,114 @@
+# Example Hermes configuration file
+
+### Define properties of the storage devices
+devices:
+  ram:
+    mount_point: ""
+    capacity: 4GB
+    block_size: 4KB
+    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
+    bandwidth: 6000MBps
+    latency: 15us
+    is_shared_device: false
+    borg_capacity_thresh: [0.0, 1.0]
+
+  nvme:
+    mount_point: "./"
+    capacity: 100MB
+    block_size: 4KB
+    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
+    bandwidth: 1GBps
+    latency: 600us
+    is_shared_device: false
+    borg_capacity_thresh: [ 0.0, 1.0 ]
+
+  ssd:
+    mount_point: "./"
+    capacity: 100MB
+    block_size: 4KB
+    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
+    bandwidth: 500MBps
+    latency: 1200us
+    is_shared_device: false
+    borg_capacity_thresh: [ 0.0, 1.0 ]
+
+  pfs:
+    mount_point: "./"
+    capacity: 100MB
+    block_size: 64KB # The stripe size of PFS
+    slab_sizes: [ 4KB, 16KB, 64KB, 1MB ]
+    bandwidth: 100MBps # Per-device bandwidth
+    latency: 200ms
+    is_shared_device: true
+    borg_capacity_thresh: [ 0.0, 1.0 ]
+
+### Define properties of RPCs
+rpc:
+  host_file: ""
+  host_names: ["localhost"]
+  protocol: "ofi+sockets"
+  domain: ""
+  port: 8080
+  num_threads: 4
+
+### Define properties of the BORG
+buffer_organizer:
+  num_threads: 1
+  flush_period: 1024
+  blob_reorg_period: 1024
+  recency_min: 0
+  recency_max: 60
+  freq_max: 15
+  freq_min: 0
+
+### Define the default data placement policy
+dpe:
+  default_placement_policy: "MinimizeIoTime"
+  default_rr_split: 0
+
+### Define I/O tracing properties
+tracing:
+  enabled: false
+  output: ""
+
+### Define prefetcher properties
+prefetch:
+  enabled: false
+  io_trace_path: ""
+  apriori_schema_path: ""
+  epoch_ms: 50
+  is_mpi: false
+
+### Define mdm properties
+mdm:
+  est_blob_count: 100000
+  est_bucket_count: 100000
+  est_num_traits: 256
+
+# The interval in milliseconds at which to update the global system view.
+system_view_state_update_interval_ms: 1000
+
+### Runtime orchestration settings
+work_orchestrator:
+  # The number of worker threads to spawn
+  max_workers: 4
+
+### Queue Manager settings
+queue_manager:
+  queue_depth: 256
+  max_lanes: 16
+  max_queues: 1024
+  shm_allocator: kScalablePageAllocator
+  shm_name: "hrun_shm"
+  shm_size: 0g
+
+### Task Registry
+task_registry: [
+  'hermes_mdm',
+  'hermes_blob_mdm',
+  'hermes_bucket_mdm',
+  'hermes_data_op',
+  'data_stager',
+  'posix_bdev',
+  'ram_bdev'
+]
\ No newline at end of file
diff --git a/test/unit/hermes/test_bucket.cc b/test/unit/hermes/test_bucket.cc
new file mode 100644
index 000000000..941ea4bac
--- /dev/null
+++ b/test/unit/hermes/test_bucket.cc
@@ -0,0 +1,574 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "basic_test.h"
+#include "hrun/api/hrun_client.h"
+#include "hrun_admin/hrun_admin.h"
+#include "hermes/hermes.h"
+#include "hermes/bucket.h"
+#include "data_stager/factory/binary_stager.h"
+#include <mpi.h>
+
+TEST_CASE("TestHermesConnect") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+  HERMES->ClientInit();
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesPut1n") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  if (rank == 0) {
+    // Create a bucket
+    hermes::Context ctx;
+    hermes::Bucket bkt("hello");
+
+    size_t count_per_proc = 16;
+    size_t off = rank * count_per_proc;
+    size_t max_blobs = 4;
+    size_t proc_count = off + count_per_proc;
+    for (size_t i = off; i < proc_count; ++i) {
+      HILOG(kInfo, "Iteration: {}", i);
+      // Put a blob
+      hermes::Blob blob(KILOBYTES(4));
+      memset(blob.data(), i % 256, blob.size());
+      hermes::BlobId blob_id =
+          bkt.Put(std::to_string(i % max_blobs), blob, ctx);
+
+      // Get a blob
+      HILOG(kInfo, "Put {} returned successfully", i);
+      size_t size = bkt.GetBlobSize(blob_id);
+      REQUIRE(blob.size() == size);
+    }
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesPut") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+
+    // Get a blob
+    HILOG(kInfo, "Put {} returned successfully", i);
+    size_t size = bkt.GetBlobSize(blob_id);
+    REQUIRE(blob.size() == size);
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesPutGet") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  HILOG(kInfo, "WE ARE HERE!!!")
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+  HILOG(kInfo, "BUCKET LOADED!!!")
+
+  size_t count_per_proc = 4;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (int rep = 0; rep < 4; ++rep) {
+    for (size_t i = off; i < proc_count; ++i) {
+      HILOG(kInfo, "Iteration: {} with blob name {}", i, std::to_string(i));
+      // Put a blob
+      hermes::Blob blob(KILOBYTES(4));
+      memset(blob.data(), i % 256, blob.size());
+      hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+      HILOG(kInfo, "(iteration {}) Using BlobID: {}", i, blob_id);
+      // Get a blob
+      hermes::Blob blob2;
+      bkt.Get(blob_id, blob2, ctx);
+      REQUIRE(blob.size() == blob2.size());
+      REQUIRE(blob == blob2);
+    }
+  }
+}
+
+TEST_CASE("TestHermesPartialPutGet") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  HILOG(kInfo, "WE ARE HERE!!!")
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+  HILOG(kInfo, "BUCKET LOADED!!!")
+
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  size_t half_blob = KILOBYTES(4);
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Make left and right blob
+    hermes::Blob lblob(half_blob);
+    memset(lblob.data(), i % 256, lblob.size());
+    hermes::Blob rblob(half_blob);
+    memset(rblob.data(), (i + 1) % 256, rblob.size());
+
+    // PartialPut a blob
+    hermes::BlobId lblob_id =
+        bkt.PartialPut(std::to_string(i), lblob, 0, ctx);
+    hermes::BlobId rblob_id =
+        bkt.PartialPut(std::to_string(i), rblob, half_blob, ctx);
+    REQUIRE(lblob_id == rblob_id);
+
+    // PartialGet a blob
+    hermes::Blob lblob2(half_blob);
+    hermes::Blob rblob2(half_blob);
+    bkt.PartialGet(lblob_id, lblob2, 0, ctx);
+    bkt.PartialGet(rblob_id, rblob2, half_blob, ctx);
+    REQUIRE(lblob2.size() == half_blob);
+    REQUIRE(rblob2.size() == half_blob);
+    REQUIRE(lblob == lblob2);
+    REQUIRE(rblob == rblob2);
+    REQUIRE(lblob2 != rblob2);
+  }
+}
+
+TEST_CASE("TestHermesSerializedPutGet") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+
+  size_t count_per_proc = 4;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (int rep = 0; rep < 4; ++rep) {
+    for (size_t i = off; i < proc_count; ++i) {
+      HILOG(kInfo, "Iteration: {} with blob name {}", i, std::to_string(i));
+      // Put a blob
+      std::vector<int> data(1024, i);
+      hermes::BlobId blob_id = bkt.Put(std::to_string(i), data, ctx);
+      HILOG(kInfo, "(iteration {}) Using BlobID: {}", i, blob_id);
+      // Get a blob
+      std::vector<int> data2(1024, i);
+      bkt.Get(blob_id, data2, ctx);
+      REQUIRE(data == data2);
+    }
+  }
+}
+
+TEST_CASE("TestHermesBlobDestroy") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+    bkt.DestroyBlob(blob_id, ctx);
+    REQUIRE(!bkt.ContainsBlob(std::to_string(i)));
+  }
+}
+
+TEST_CASE("TestHermesBucketDestroy") {
+  // TODO(llogan): need to inform bucket when a blob has been placed in it
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    bkt.Put(std::to_string(i), blob, ctx);
+  }
+
+  bkt.Destroy();
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  for (size_t i = off; i < proc_count; ++i) {
+    REQUIRE(!bkt.ContainsBlob(std::to_string(i)));
+  }
+}
+
+TEST_CASE("TestHermesReorganizeBlob") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("hello");
+
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+    bkt.ReorganizeBlob(blob_id, .5, 0, ctx);
+    hermes::Blob blob2;
+    bkt.Get(blob_id, blob2, ctx);
+    REQUIRE(blob.size() == blob2.size());
+    REQUIRE(blob == blob2);
+  }
+
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "ContainsBlob Iteration: {}", i);
+    REQUIRE(bkt.ContainsBlob(std::to_string(i)));
+  }
+
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesBucketAppend") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("append_test");
+
+  // Put a few blobs in the bucket
+  size_t page_size = KILOBYTES(4);
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    bkt.Append(blob, page_size, ctx);
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "ContainsBlob Iteration: {}", i);
+    REQUIRE(bkt.ContainsBlob(std::to_string(i)));
+    HILOG(kInfo, "ContainsBlob Iteration: {} SUCCESS", i);
+  }
+  // REQUIRE(bkt.GetSize() == count_per_proc * nprocs * page_size);
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesBucketAppend1n") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  if (rank == 0) {
+    // Initialize Hermes on all nodes
+    HERMES->ClientInit();
+
+    // Create a bucket
+    hermes::Context ctx;
+    hermes::Bucket bkt("append_test");
+
+    // Put a few blobs in the bucket
+    size_t page_size = KILOBYTES(4);
+    size_t count_per_proc = 16;
+    size_t off = rank * count_per_proc;
+    size_t proc_count = off + count_per_proc;
+    for (size_t i = off; i < proc_count; ++i) {
+      HILOG(kInfo, "Iteration: {}", i);
+      // Put a blob
+      hermes::Blob blob(KILOBYTES(4));
+      memset(blob.data(), i % 256, blob.size());
+      bkt.Append(blob, page_size, ctx);
+      hermes::Blob blob2;
+      bkt.Get(std::to_string(i), blob2, ctx);
+      REQUIRE(blob.size() == blob2.size());
+      REQUIRE(blob == blob2);
+    }
+    for (size_t i = off; i < proc_count; ++i) {
+      HILOG(kInfo, "ContainsBlob Iteration: {}", i);
+      REQUIRE(bkt.ContainsBlob(std::to_string(i)));
+    }
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesMultiGetBucket") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("append_test" + std::to_string(rank));
+  u32 num_blobs = 1024;
+
+  // Put a few blobs in the bucket
+  for (int i = 0; i < num_blobs; ++i) {
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+    HILOG(kInfo, "(iteration {}) Using BlobID: {}", i, blob_id);
+    // Get a blob
+    hermes::Blob blob2;
+    bkt.Get(blob_id, blob2, ctx);
+    REQUIRE(blob.size() == blob2.size());
+    REQUIRE(blob == blob2);
+  }
+
+  // Get contained blob ids
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesGetContainedBlobIds") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("append_test" + std::to_string(rank));
+  u32 num_blobs = 1024;
+
+  // Put a few blobs in the bucket
+  for (int i = 0; i < num_blobs; ++i) {
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+    HILOG(kInfo, "(iteration {}) Using BlobID: {}", i, blob_id);
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  // Get contained blob ids
+  std::vector<hermes::BlobId> blob_ids;
+  blob_ids = bkt.GetContainedBlobIds();
+  REQUIRE(blob_ids.size() == num_blobs);
+  MPI_Barrier(MPI_COMM_WORLD);
+}
+
+TEST_CASE("TestHermesDataStager") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // create dataset
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  size_t page_size = KILOBYTES(4);
+  size_t file_size = nprocs * page_size * 16;
+  std::vector<char> data(file_size, 0);
+  if (rank == 0) {
+    FILE *file = fopen("/tmp/test.txt", "w");
+    fwrite(data.data(), sizeof(char), data.size(), file);
+    fclose(file);
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a stageable bucket
+  using hermes::data_stager::BinaryFileStager;
+  hermes::Context ctx;
+  ctx.flags_.SetBits(HERMES_IS_FILE);
+  hshm::charbuf url =
+      BinaryFileStager::BuildFileUrl("/tmp/test.txt", page_size);
+  hermes::Bucket bkt(url.str(), file_size, HERMES_IS_FILE);
+
+  // Put a few blobs in the bucket
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(page_size / 2);
+    memset(blob.data(), i % 256, blob.size());
+    hshm::charbuf blob_name = hermes::adapter::BlobPlacement::CreateBlobName(i);
+    bkt.PartialPut(blob_name.str(), blob, 0, ctx);
+    hermes::Blob blob2;
+    bkt.Get(blob_name.str(), blob2, ctx);
+    REQUIRE(blob2.size() == page_size);
+    hermes::Blob full_blob(page_size);
+    memcpy(full_blob.data(), blob.data(), blob.size());
+    memcpy(full_blob.data() + blob.size(), data.data(), page_size / 2);
+    REQUIRE(full_blob == blob2);
+  }
+  for (size_t i = off; i < proc_count; ++i) {
+    hshm::charbuf blob_name = hermes::adapter::BlobPlacement::CreateBlobName(i);
+    HILOG(kInfo, "ContainsBlob Iteration: {}", i);
+    REQUIRE(bkt.ContainsBlob(blob_name.str()));
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  // Verify staging happened
+}
+
+TEST_CASE("TestHermesDataOp") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket that supports derived quantities
+  using hermes::data_stager::BinaryFileStager;
+  hermes::Context ctx;
+  ctx.flags_.SetBits(HERMES_HAS_DERIVED);
+  std::string url = "data_bkt";
+  hermes::Bucket bkt(url, 0, HERMES_HAS_DERIVED);
+
+  // Create the derived quantity with
+  hermes::data_op::OpGraph op_graph;
+  hermes::data_op::Op op;
+  op.in_.emplace_back(url);
+  op.var_name_.url_ = url + "_min";
+  op.op_name_ = "min";
+  op_graph.ops_.emplace_back(op);
+  HERMES->RegisterOp(op_graph);
+
+  size_t count_per_proc = 16;
+  size_t off = rank * count_per_proc;
+  size_t proc_count = off + count_per_proc;
+  size_t page_size = KILOBYTES(4);
+
+  // Put a few blobs in the bucket
+  for (size_t i = off; i < proc_count; ++i) {
+    HILOG(kInfo, "Iteration: {}", i);
+    // Put a blob
+    hermes::Blob blob(page_size);
+    memset(blob.data(), i % 256, blob.size());
+    std::string blob_name = std::to_string(i);
+    bkt.Put(blob_name, blob, ctx);
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  // HRUN_ADMIN->FlushRoot(DomainId::GetGlobal());
+  // Verify derived operator happens
+  hermes::Bucket bkt_min("data_bkt_min", 0, 0);
+  size_t size = bkt_min.GetSize();
+  REQUIRE(size == sizeof(float) * count_per_proc * nprocs);
+}
+
+TEST_CASE("TestHermesCollectMetadata") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+
+  // Initialize Hermes on all nodes
+  HERMES->ClientInit();
+
+  // Create a bucket
+  hermes::Context ctx;
+  hermes::Bucket bkt("append_test" + std::to_string(rank));
+  u32 num_blobs = 1024;
+
+  // Put a few blobs in the bucket
+  for (int i = 0; i < num_blobs; ++i) {
+    hermes::Blob blob(KILOBYTES(4));
+    memset(blob.data(), i % 256, blob.size());
+    hermes::BlobId blob_id = bkt.Put(std::to_string(i), blob, ctx);
+    HILOG(kInfo, "(iteration {}) Using BlobID: {}", i, blob_id);
+  }
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  // Get contained blob ids
+  hermes::MetadataTable table = HERMES->CollectMetadataSnapshot();
+  REQUIRE(table.blob_info_.size() == 1024 * nprocs);
+  REQUIRE(table.bkt_info_.size() == 1);
+  REQUIRE(table.target_info_.size() >= 4);
+  MPI_Barrier(MPI_COMM_WORLD);
+}
diff --git a/hermes_shm/test/unit/allocators/test_init.cc b/test/unit/hermes/test_init.cc
similarity index 87%
rename from hermes_shm/test/unit/allocators/test_init.cc
rename to test/unit/hermes/test_init.cc
index e3026af72..91734b043 100644
--- a/hermes_shm/test/unit/allocators/test_init.cc
+++ b/test/unit/hermes/test_init.cc
@@ -11,11 +11,13 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
+#include "hrun/api/hrun_client.h"
+#include "basic_test.h"
 #include "test_init.h"
 
-void Posttest() {
+void MainPretest() {
+  TRANSPARENT_HRUN();
 }
 
-void MainPretest() {}
-
-void MainPosttest() {}
+void MainPosttest() {
+}
diff --git a/test/unit/hermes/test_init.h b/test/unit/hermes/test_init.h
new file mode 100644
index 000000000..cb3b36df7
--- /dev/null
+++ b/test/unit/hermes/test_init.h
@@ -0,0 +1,19 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+#ifndef HRUN_TEST_UNIT_IPC_TEST_INIT_H_
+#define HRUN_TEST_UNIT_IPC_TEST_INIT_H_
+
+#include "hrun/hrun_types.h"
+
+#endif  // HRUN_TEST_UNIT_IPC_TEST_INIT_H_
diff --git a/adapter/test/CMakeLists.txt b/test/unit/hermes_adapters/CMakeLists.txt
similarity index 94%
rename from adapter/test/CMakeLists.txt
rename to test/unit/hermes_adapters/CMakeLists.txt
index db34230ac..72962ce60 100644
--- a/adapter/test/CMakeLists.txt
+++ b/test/unit/hermes_adapters/CMakeLists.txt
@@ -2,6 +2,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHERMES_PRELOAD -DHERMES_RPC_THALLIUM")
 set(ADAPTER_COMMON ${CMAKE_CURRENT_SOURCE_DIR}/catch_config.h)
 set(HERMES_ADAPTER_TEST_DIR ${HERMES_ADAPTER_DIR}/test)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
 find_package(Catch2 REQUIRED)
 find_program(BASH_PROGRAM bash)
 find_package(OpenMP REQUIRED COMPONENTS C CXX)
diff --git a/adapter/test/adapter_test_utils.h b/test/unit/hermes_adapters/adapter_test_utils.h
similarity index 98%
rename from adapter/test/adapter_test_utils.h
rename to test/unit/hermes_adapters/adapter_test_utils.h
index 3b668c052..bfdfe9f7d 100644
--- a/adapter/test/adapter_test_utils.h
+++ b/test/unit/hermes_adapters/adapter_test_utils.h
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <cstdio>
 #include <string>
-#include <test/basic_test.h>
+#include <basic_test.h>
 
 bool FilesystemSupportsTmpfile() {
   bool result = false;
diff --git a/adapter/test/catch_config.h b/test/unit/hermes_adapters/catch_config.h
similarity index 100%
rename from adapter/test/catch_config.h
rename to test/unit/hermes_adapters/catch_config.h
diff --git a/adapter/test/mpiio/CMakeLists.txt b/test/unit/hermes_adapters/mpiio/CMakeLists.txt
similarity index 92%
rename from adapter/test/mpiio/CMakeLists.txt
rename to test/unit/hermes_adapters/mpiio/CMakeLists.txt
index 10e6c2fb6..7fafaf3f0 100644
--- a/adapter/test/mpiio/CMakeLists.txt
+++ b/test/unit/hermes_adapters/mpiio/CMakeLists.txt
@@ -3,7 +3,7 @@ add_executable(mpiio_adapter_test mpiio_adapter_test.cpp ${ADAPTER_COMMON})
 
 add_executable(hermes_mpiio_adapter_test mpiio_adapter_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_mpiio_adapter_test hermes_mpiio)
-add_dependencies(hermes_mpiio_adapter_test hermes_mpiio hermes_daemon)
+add_dependencies(hermes_mpiio_adapter_test hermes_mpiio)
 set_target_properties(hermes_mpiio_adapter_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(mpiio test_hermes_mpiio_basic_sync)
 pytest(mpiio test_hermes_mpiio_basic_async)
@@ -32,7 +32,7 @@ if(HERMES_INSTALL_TESTS)
 endif()
 
 add_executable(mpi_parallel parallel.cc)
-add_dependencies(mpi_parallel hermes_mpiio hermes_daemon)
+add_dependencies(mpi_parallel hermes_mpiio)
 target_link_libraries(mpi_parallel hermes_mpiio  Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX)
 set_target_properties(mpi_parallel PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 
diff --git a/adapter/test/mpiio/mpiio_adapter_basic_test.cpp b/test/unit/hermes_adapters/mpiio/mpiio_adapter_basic_test.cpp
similarity index 100%
rename from adapter/test/mpiio/mpiio_adapter_basic_test.cpp
rename to test/unit/hermes_adapters/mpiio/mpiio_adapter_basic_test.cpp
diff --git a/adapter/test/mpiio/mpiio_adapter_test.cpp b/test/unit/hermes_adapters/mpiio/mpiio_adapter_test.cpp
similarity index 97%
rename from adapter/test/mpiio/mpiio_adapter_test.cpp
rename to test/unit/hermes_adapters/mpiio/mpiio_adapter_test.cpp
index addcee72d..8c94d3cdb 100644
--- a/adapter/test/mpiio/mpiio_adapter_test.cpp
+++ b/test/unit/hermes_adapters/mpiio/mpiio_adapter_test.cpp
@@ -18,7 +18,7 @@
 #include "adapter_test_utils.h"
 #include "catch_config.h"
 #if HERMES_INTERCEPT == 1
-#include "filesystem/filesystem.h"
+#include "hermes_adapters/filesystem/filesystem.h"
 #endif
 
 #include "adapter_test_utils.h"
@@ -63,7 +63,7 @@ hermes::adapter::mpiio::test::Info info;
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
   info.write_data = GenRandom(args.request_size);
@@ -155,11 +155,11 @@ int pretest() {
   MPI_Barrier(MPI_COMM_WORLD);
   REQUIRE(info.total_size > 0);
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.shared_new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.shared_existing_file_cmp, false);
 #endif
   return 0;
@@ -173,8 +173,8 @@ void Clear() {
 
 int posttest(bool compare_data = true) {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
 #endif
   if (compare_data && stdfs::exists(info.new_file) &&
       stdfs::exists(info.new_file_cmp)) {
@@ -243,10 +243,10 @@ int posttest(bool compare_data = true) {
   Clear();
 
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
 #endif
   return 0;
 }
diff --git a/adapter/test/mpiio/parallel.cc b/test/unit/hermes_adapters/mpiio/parallel.cc
similarity index 100%
rename from adapter/test/mpiio/parallel.cc
rename to test/unit/hermes_adapters/mpiio/parallel.cc
diff --git a/adapter/test/mpiio/tests.py b/test/unit/hermes_adapters/mpiio/tests.py
similarity index 100%
rename from adapter/test/mpiio/tests.py
rename to test/unit/hermes_adapters/mpiio/tests.py
diff --git a/adapter/test/posix/CMakeLists.txt b/test/unit/hermes_adapters/posix/CMakeLists.txt
similarity index 88%
rename from adapter/test/posix/CMakeLists.txt
rename to test/unit/hermes_adapters/posix/CMakeLists.txt
index 2c86c227e..3f6775206 100644
--- a/adapter/test/posix/CMakeLists.txt
+++ b/test/unit/hermes_adapters/posix/CMakeLists.txt
@@ -15,14 +15,14 @@ pytest(posix test_posix_basic_mpi)
 
 add_executable(hermes_posix_adapter_test posix_adapter_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_posix_adapter_test hermes_posix)
-add_dependencies(hermes_posix_adapter_test hermes_posix hermes_daemon)
+add_dependencies(hermes_posix_adapter_test hermes_posix)
 set_target_properties(hermes_posix_adapter_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(posix test_hermes_posix_basic_small)
 pytest(posix test_hermes_posix_basic_large)
 
 add_executable(hermes_posix_adapter_mpi_test posix_adapter_mpi_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_posix_adapter_mpi_test hermes_posix)
-add_dependencies(hermes_posix_adapter_mpi_test hermes_posix hermes_daemon)
+add_dependencies(hermes_posix_adapter_mpi_test hermes_posix)
 set_target_properties(hermes_posix_adapter_mpi_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(posix test_hermes_posix_basic_mpi_small)
 pytest(posix test_hermes_posix_basic_mpi_large)
@@ -34,10 +34,12 @@ target_link_libraries(posix_simple_io_mpi hermes_posix)
 
 add_executable(hermes_posix_simple_io_omp posix_simple_io_omp.cc)
 add_dependencies(hermes_posix_simple_io_omp hermes_posix)
-target_link_libraries(hermes_posix_simple_io_omp hermes_posix)
+target_link_libraries(hermes_posix_simple_io_omp
+        hermes_posix Catch2::Catch2 OpenMP::OpenMP_CXX)
 
 add_executable(posix_simple_io_omp posix_simple_io_omp.cc)
-target_link_libraries(posix_simple_io_omp)
+target_link_libraries(posix_simple_io_omp
+        ${HermesShm_LIBRARIES} Catch2::Catch2 OpenMP::OpenMP_CXX)
 
 pytest(posix test_hermes_posix_simple_io_omp_default)
 pytest(posix test_hermes_posix_simple_io_omp_scratch)
diff --git a/adapter/test/posix/hdf5_write_read.py b/test/unit/hermes_adapters/posix/hdf5_write_read.py
similarity index 100%
rename from adapter/test/posix/hdf5_write_read.py
rename to test/unit/hermes_adapters/posix/hdf5_write_read.py
diff --git a/adapter/test/posix/posix_adapter_basic_test.cpp b/test/unit/hermes_adapters/posix/posix_adapter_basic_test.cpp
similarity index 100%
rename from adapter/test/posix/posix_adapter_basic_test.cpp
rename to test/unit/hermes_adapters/posix/posix_adapter_basic_test.cpp
diff --git a/adapter/test/posix/posix_adapter_mpi_test.cpp b/test/unit/hermes_adapters/posix/posix_adapter_mpi_test.cpp
similarity index 93%
rename from adapter/test/posix/posix_adapter_mpi_test.cpp
rename to test/unit/hermes_adapters/posix/posix_adapter_mpi_test.cpp
index db9260928..501b5e07f 100644
--- a/adapter/test/posix/posix_adapter_mpi_test.cpp
+++ b/test/unit/hermes_adapters/posix/posix_adapter_mpi_test.cpp
@@ -22,8 +22,8 @@
 #include "adapter_test_utils.h"
 
 #if HERMES_INTERCEPT == 1
-#include "adapter/posix/posix_api.h"
-#include "adapter/posix/posix_fs_api.h"
+#include "hermes_adapters/posix/posix_api.h"
+#include "hermes_adapters/posix/posix_fs_api.h"
 #endif
 
 namespace stdfs = std::filesystem;
@@ -84,7 +84,7 @@ std::vector<char> gen_random(const int len) {
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
   info.write_data = gen_random(args.request_size);
@@ -192,9 +192,9 @@ int pretest() {
   REQUIRE(info.total_size > 0);
   MPI_Barrier(MPI_COMM_WORLD);
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.existing_shared_file_cmp, false);
 #endif
   return 0;
@@ -208,9 +208,9 @@ void Clear() {
 
 int posttest(bool compare_data = true) {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.existing_shared_file, false);
 #endif
   if (compare_data && stdfs::exists(info.new_file) &&
@@ -316,13 +316,13 @@ int posttest(bool compare_data = true) {
   Clear();
 
   #if HERMES_INTERCEPT == 1
-    HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, true);
-    HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, true);
-    HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-    HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
-    HERMES->client_config_.SetAdapterPathTracking(
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, true);
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, true);
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(
         info.existing_shared_file, true);
-    HERMES->client_config_.SetAdapterPathTracking(
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(
         info.existing_shared_file_cmp, true);
   #endif
   return 0;
diff --git a/adapter/test/posix/posix_adapter_rs_test.cpp b/test/unit/hermes_adapters/posix/posix_adapter_rs_test.cpp
similarity index 100%
rename from adapter/test/posix/posix_adapter_rs_test.cpp
rename to test/unit/hermes_adapters/posix/posix_adapter_rs_test.cpp
diff --git a/adapter/test/posix/posix_adapter_shared_test.cpp b/test/unit/hermes_adapters/posix/posix_adapter_shared_test.cpp
similarity index 100%
rename from adapter/test/posix/posix_adapter_shared_test.cpp
rename to test/unit/hermes_adapters/posix/posix_adapter_shared_test.cpp
diff --git a/adapter/test/posix/posix_adapter_test.cpp b/test/unit/hermes_adapters/posix/posix_adapter_test.cpp
similarity index 94%
rename from adapter/test/posix/posix_adapter_test.cpp
rename to test/unit/hermes_adapters/posix/posix_adapter_test.cpp
index 96d0dea18..0c5e1350d 100644
--- a/adapter/test/posix/posix_adapter_test.cpp
+++ b/test/unit/hermes_adapters/posix/posix_adapter_test.cpp
@@ -16,14 +16,14 @@
 
 #include <filesystem>
 #include <iostream>
-#include "hermes.h"
+#include "hermes/hermes.h"
 #include <stdio.h>
 
 #include "catch_config.h"
-#include "adapter/posix/posix_api.h"
+#include "hermes_adapters/posix/posix_api.h"
 
 #if HERMES_INTERCEPT == 1
-#include "adapter/posix/posix_fs_api.h"
+#include "hermes_adapters/posix/posix_fs_api.h"
 #endif
 
 #include "adapter_test_utils.h"
@@ -76,7 +76,7 @@ std::vector<char> gen_random(const int len) {
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
   info.write_data = gen_random(args.request_size);
@@ -92,17 +92,17 @@ int finalize() {
 
 void IgnoreAllFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
 #endif
 }
 
 void TrackFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
 #endif
 }
 
diff --git a/adapter/test/posix/posix_simple_io_mpi.cc b/test/unit/hermes_adapters/posix/posix_simple_io_mpi.cc
similarity index 99%
rename from adapter/test/posix/posix_simple_io_mpi.cc
rename to test/unit/hermes_adapters/posix/posix_simple_io_mpi.cc
index 3efe24c0b..5299e1a18 100644
--- a/adapter/test/posix/posix_simple_io_mpi.cc
+++ b/test/unit/hermes_adapters/posix/posix_simple_io_mpi.cc
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <cstdlib>
 #include <cstring>
-#include "test/test_utils.h"
+#include "basic_test.h"
 
 int main(int argc, char **argv) {
   int rank = 0, nprocs = 1;
diff --git a/adapter/test/posix/posix_simple_io_omp.cc b/test/unit/hermes_adapters/posix/posix_simple_io_omp.cc
similarity index 95%
rename from adapter/test/posix/posix_simple_io_omp.cc
rename to test/unit/hermes_adapters/posix/posix_simple_io_omp.cc
index 6918d1397..f470be1a5 100644
--- a/adapter/test/posix/posix_simple_io_omp.cc
+++ b/test/unit/hermes_adapters/posix/posix_simple_io_omp.cc
@@ -15,15 +15,16 @@
 #include <dlfcn.h>
 #include <iostream>
 #include "hermes_shm/util/logging.h"
+#include "hermes_shm/util/config_parse.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <cstdlib>
 #include <cstring>
-#include "test/test_utils.h"
+#include "basic_test.h"
 
-static const int kNumProcs = 4;
+static const int kNumProcs = 1;
 
 void TestThread(char *path,
                 int do_read,
@@ -130,14 +131,14 @@ void TestThread(char *path,
 int main(int argc, char **argv) {
   if (argc != 6) {
     std::cout << "USAGE: ./posix_simple_io"
-              << " [path] [read] [block_size (kb)] [count]"
+              << " [path] [read] [block_size] [count]"
               << " [off (blocks)]";
     exit(1);
   }
 
   char *path = argv[1];
   int do_read = atoi(argv[2]);
-  int block_size = atoi(argv[3])*1024;
+  int block_size = hshm::ConfigParse::ParseSize(argv[3]);
   int count = atoi(argv[4]);
   int block_off = atoi(argv[5]);
   if (do_read) {
diff --git a/adapter/test/posix/tests.py b/test/unit/hermes_adapters/posix/tests.py
similarity index 100%
rename from adapter/test/posix/tests.py
rename to test/unit/hermes_adapters/posix/tests.py
diff --git a/adapter/test/stdio/CMakeLists.txt b/test/unit/hermes_adapters/stdio/CMakeLists.txt
similarity index 91%
rename from adapter/test/stdio/CMakeLists.txt
rename to test/unit/hermes_adapters/stdio/CMakeLists.txt
index 800efc3ad..d14367619 100644
--- a/adapter/test/stdio/CMakeLists.txt
+++ b/test/unit/hermes_adapters/stdio/CMakeLists.txt
@@ -22,20 +22,20 @@ add_executable(stdio_adapter_mpi_test stdio_adapter_mpi_test.cpp ${ADAPTER_COMMO
 
 add_executable(hermes_stdio_adapter_test stdio_adapter_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_stdio_adapter_test hermes_stdio)
-add_dependencies(hermes_stdio_adapter_test hermes_stdio hermes_daemon)
+add_dependencies(hermes_stdio_adapter_test hermes_stdio)
 set_target_properties(hermes_stdio_adapter_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(stdio test_hermes_stdio_basic_small)
 pytest(stdio test_hermes_stdio_basic_large)
 
 add_executable(hermes_stdio_low_buf_adapter_test stdio_adapter_low_buffer_space_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_stdio_low_buf_adapter_test hermes_stdio)
-add_dependencies(hermes_stdio_low_buf_adapter_test hermes_stdio hermes_daemon)
+add_dependencies(hermes_stdio_low_buf_adapter_test hermes_stdio)
 set_target_properties(hermes_stdio_low_buf_adapter_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(stdio test_hermes_stdio_low_buf)
 
 add_executable(hermes_stdio_adapter_mode_test stdio_adapter_mode_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_stdio_adapter_mode_test hermes_stdio)
-add_dependencies(hermes_stdio_adapter_mode_test hermes_stdio hermes_daemon)
+add_dependencies(hermes_stdio_adapter_mode_test hermes_stdio)
 set_target_properties(hermes_stdio_adapter_mode_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(stdio test_hermes_stdio_bypass)
 pytest(stdio test_hermes_stdio_default)
@@ -43,7 +43,7 @@ pytest(stdio test_hermes_stdio_scratch)
 
 add_executable(hermes_stdio_adapter_mpi_test stdio_adapter_mpi_test.cpp ${ADAPTER_COMMON})
 target_link_libraries(hermes_stdio_adapter_mpi_test hermes_stdio)
-add_dependencies(hermes_stdio_adapter_mpi_test hermes_stdio hermes_daemon)
+add_dependencies(hermes_stdio_adapter_mpi_test hermes_stdio)
 set_target_properties(hermes_stdio_adapter_mpi_test PROPERTIES COMPILE_FLAGS "-DHERMES_INTERCEPT=1")
 pytest(stdio test_hermes_stdio_mpi_small)
 pytest(stdio test_hermes_stdio_mpi_large)
diff --git a/adapter/test/stdio/stdio_adapter_basic_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_basic_test.cpp
similarity index 100%
rename from adapter/test/stdio/stdio_adapter_basic_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_basic_test.cpp
diff --git a/adapter/test/stdio/stdio_adapter_func_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_func_test.cpp
similarity index 100%
rename from adapter/test/stdio/stdio_adapter_func_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_func_test.cpp
diff --git a/adapter/test/stdio/stdio_adapter_low_buffer_space_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_low_buffer_space_test.cpp
similarity index 93%
rename from adapter/test/stdio/stdio_adapter_low_buffer_space_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_low_buffer_space_test.cpp
index 943ce94b4..337c81f86 100644
--- a/adapter/test/stdio/stdio_adapter_low_buffer_space_test.cpp
+++ b/test/unit/hermes_adapters/stdio/stdio_adapter_low_buffer_space_test.cpp
@@ -20,8 +20,8 @@
 #include "adapter_test_utils.h"
 #include "catch_config.h"
 #if HERMES_INTERCEPT == 1
-#include "adapter/stdio/stdio_api.h"
-#include "adapter/stdio/stdio_fs_api.h"
+#include "hermes_adapters/stdio/stdio_api.h"
+#include "hermes_adapters/stdio/stdio_fs_api.h"
 #endif
 
 namespace stdfs = std::filesystem;
@@ -59,7 +59,7 @@ hermes::adapter::stdio::test::Info info;
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
   info.write_data = GenRandom(args.request_size);
@@ -104,8 +104,8 @@ int pretest() {
   }
   REQUIRE(info.total_size > 0);
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
 #endif
   return 0;
 }
@@ -118,8 +118,8 @@ void Clear() {
 
 int posttest(bool compare_data = true) {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
 #endif
   if (compare_data && stdfs::exists(info.new_file) &&
       stdfs::exists(info.new_file_cmp)) {
@@ -191,10 +191,10 @@ int posttest(bool compare_data = true) {
   Clear();
 
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
 #endif
   return 0;
 }
diff --git a/adapter/test/stdio/stdio_adapter_mapper_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_mapper_test.cpp
similarity index 96%
rename from adapter/test/stdio/stdio_adapter_mapper_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_mapper_test.cpp
index e3cd45dd2..5214074fe 100644
--- a/adapter/test/stdio/stdio_adapter_mapper_test.cpp
+++ b/test/unit/hermes_adapters/stdio/stdio_adapter_mapper_test.cpp
@@ -13,10 +13,10 @@
 #include <filesystem>
 
 #include "catch_config.h"
-#include "adapter_constants.h"
-#include "src/hermes_types.h"
-#include "mapper/mapper_factory.h"
-#include "adapter/stdio/stdio_fs_api.h"
+#include "hermes/hermes_types.h"
+#include "hermes_adapters/adapter_constants.h"
+#include "hermes_adapters/mapper/mapper_factory.h"
+#include "hermes_adapters/stdio/stdio_fs_api.h"
 
 using hermes::adapter::BlobPlacements;
 using hermes::adapter::MapperFactory;
@@ -53,7 +53,7 @@ hermes::adapter::stdio::test::Info info;
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
 
diff --git a/adapter/test/stdio/stdio_adapter_mode_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_mode_test.cpp
similarity index 90%
rename from adapter/test/stdio/stdio_adapter_mode_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_mode_test.cpp
index e6d81d5c6..78926c123 100644
--- a/adapter/test/stdio/stdio_adapter_mode_test.cpp
+++ b/test/unit/hermes_adapters/stdio/stdio_adapter_mode_test.cpp
@@ -19,12 +19,12 @@
 #include <iostream>
 
 #if HERMES_INTERCEPT == 1
-#include "adapter/stdio/stdio_api.h"
+#include "hermes_adapters/stdio/stdio_api.h"
 #endif
 
 #include "adapter_test_utils.h"
-#include "adapter_types.h"
-#include "hermes.h"
+#include "hermes_adapters/adapter_types.h"
+#include "hermes/hermes.h"
 
 namespace stdfs = std::filesystem;
 using hermes::adapter::AdapterMode;
@@ -62,7 +62,7 @@ hermes::adapter::stdio::test::Info info;
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   stdfs::path fullpath = args.directory;
   fullpath /= args.filename;
@@ -73,8 +73,8 @@ int init(int* argc, char*** argv) {
       fullpath.string() + "_ext_cmp" + std::to_string(getpid());
   char* set_path = getenv("SET_PATH");
   if (set_path && strcmp(set_path, "1") == 0) {
-    HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-    HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+    HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
   }
   MPI_Init(argc, argv);
   info.write_data = GenRandom(args.request_size);
@@ -88,17 +88,17 @@ int finalize() {
 
 void IgnoreAllFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
 #endif
 }
 
 void TrackFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
 #endif
 }
 
@@ -286,8 +286,8 @@ TEST_CASE("BatchedWriteSequentialPersistent",
               std::to_string(info.num_iterations) +
               "]"
               "[pattern=sequential][file=1]") {
-  HERMES->client_config_.SetBaseAdapterMode(AdapterMode::kDefault);
-  REQUIRE(HERMES->client_config_.GetBaseAdapterMode() == AdapterMode::kDefault);
+  HERMES_CLIENT_CONF.SetBaseAdapterMode(AdapterMode::kDefault);
+  REQUIRE(HERMES_CLIENT_CONF.GetBaseAdapterMode() == AdapterMode::kDefault);
   pretest();
   SECTION("write to new file always at end") {
     test::test_fopen(info.new_file.c_str(), "w+");
@@ -314,8 +314,8 @@ TEST_CASE("BatchedWriteSequentialBypass",
               std::to_string(info.num_iterations) +
               "]"
               "[pattern=sequential][file=1]") {
-  HERMES->client_config_.SetBaseAdapterMode(AdapterMode::kBypass);
-  REQUIRE(HERMES->client_config_.GetBaseAdapterMode() == AdapterMode::kBypass);
+  HERMES_CLIENT_CONF.SetBaseAdapterMode(AdapterMode::kBypass);
+  REQUIRE(HERMES_CLIENT_CONF.GetBaseAdapterMode() == AdapterMode::kBypass);
   pretest();
   SECTION("write to new file always at end") {
     test::test_fopen(info.new_file.c_str(), "w+");
@@ -342,8 +342,8 @@ TEST_CASE("BatchedWriteSequentialScratch",
               std::to_string(info.num_iterations) +
               "]"
               "[pattern=sequential][file=1]") {
-  HERMES->client_config_.SetBaseAdapterMode(AdapterMode::kScratch);
-  REQUIRE(HERMES->client_config_.GetBaseAdapterMode() == AdapterMode::kScratch);
+  HERMES_CLIENT_CONF.SetBaseAdapterMode(AdapterMode::kScratch);
+  REQUIRE(HERMES_CLIENT_CONF.GetBaseAdapterMode() == AdapterMode::kScratch);
   pretest();
   SECTION("write to new file always at end") {
     test::test_fopen(info.new_file.c_str(), "w+");
diff --git a/adapter/test/stdio/stdio_adapter_mpi_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_mpi_test.cpp
similarity index 93%
rename from adapter/test/stdio/stdio_adapter_mpi_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_mpi_test.cpp
index 3cb86dde7..0a4970665 100644
--- a/adapter/test/stdio/stdio_adapter_mpi_test.cpp
+++ b/test/unit/hermes_adapters/stdio/stdio_adapter_mpi_test.cpp
@@ -19,8 +19,8 @@
 #include <filesystem>
 #include <iostream>
 #if HERMES_INTERCEPT == 1
-#include "adapter/stdio/stdio_api.h"
-#include "adapter/stdio/stdio_fs_api.h"
+#include "hermes_adapters/stdio/stdio_api.h"
+#include "hermes_adapters/stdio/stdio_fs_api.h"
 #endif
 
 namespace stdfs = std::filesystem;
@@ -62,7 +62,7 @@ hermes::adapter::stdio::test::Info info;
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
   info.write_data = GenRandom(args.request_size);
@@ -211,9 +211,9 @@ int pretest() {
   REQUIRE(info.total_size > 0);
   MPI_Barrier(MPI_COMM_WORLD);
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.existing_shared_file_cmp, false);
 #endif
   return 0;
@@ -227,9 +227,9 @@ void Clear() {
 
 int posttest(bool compare_data = true) {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.existing_shared_file, false);
 #endif
   if (compare_data && stdfs::exists(info.new_file) &&
@@ -335,13 +335,13 @@ int posttest(bool compare_data = true) {
   Clear();
 
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.existing_shared_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(
       info.existing_shared_file_cmp, true);
 #endif
   return 0;
diff --git a/adapter/test/stdio/stdio_adapter_rs_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_rs_test.cpp
similarity index 100%
rename from adapter/test/stdio/stdio_adapter_rs_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_rs_test.cpp
diff --git a/adapter/test/stdio/stdio_adapter_shared_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_shared_test.cpp
similarity index 100%
rename from adapter/test/stdio/stdio_adapter_shared_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_shared_test.cpp
diff --git a/adapter/test/stdio/stdio_adapter_test.cpp b/test/unit/hermes_adapters/stdio/stdio_adapter_test.cpp
similarity index 93%
rename from adapter/test/stdio/stdio_adapter_test.cpp
rename to test/unit/hermes_adapters/stdio/stdio_adapter_test.cpp
index e43d951af..92c690771 100644
--- a/adapter/test/stdio/stdio_adapter_test.cpp
+++ b/test/unit/hermes_adapters/stdio/stdio_adapter_test.cpp
@@ -19,9 +19,9 @@
 
 #include "adapter_test_utils.h"
 #include "catch_config.h"
-#include "adapter/stdio/stdio_api.h"
+#include "hermes_adapters/stdio/stdio_api.h"
 #if HERMES_INTERCEPT == 1
-#include "adapter/stdio/stdio_fs_api.h"
+#include "hermes_adapters/stdio/stdio_fs_api.h"
 #endif
 
 #include "hermes_shm/util/logging.h"
@@ -63,7 +63,7 @@ hermes::adapter::stdio::test::Info info;
 int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
   info.write_data = GenRandom(args.request_size);
@@ -78,17 +78,17 @@ int finalize() {
 
 void IgnoreAllFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
 #endif
 }
 
 void TrackFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
 #endif
 }
 
diff --git a/adapter/test/stdio/tests.py b/test/unit/hermes_adapters/stdio/tests.py
similarity index 100%
rename from adapter/test/stdio/tests.py
rename to test/unit/hermes_adapters/stdio/tests.py
diff --git a/adapter/test/vfd/CMakeLists.txt b/test/unit/hermes_adapters/vfd/CMakeLists.txt
similarity index 100%
rename from adapter/test/vfd/CMakeLists.txt
rename to test/unit/hermes_adapters/vfd/CMakeLists.txt
diff --git a/adapter/test/vfd/hermes_vfd_basic_test.cc b/test/unit/hermes_adapters/vfd/hermes_vfd_basic_test.cc
similarity index 99%
rename from adapter/test/vfd/hermes_vfd_basic_test.cc
rename to test/unit/hermes_adapters/vfd/hermes_vfd_basic_test.cc
index 216d20e6f..f0c2eca7f 100644
--- a/adapter/test/vfd/hermes_vfd_basic_test.cc
+++ b/test/unit/hermes_adapters/vfd/hermes_vfd_basic_test.cc
@@ -709,7 +709,7 @@ TEST_CASE("ScratchMode", "[scratch]") {
     test::TestClose();
     REQUIRE(test::hermes_herr >= 0);
 
-    if (HERMES->client_config_.GetBaseAdapterMode()
+    if (HERMES_CLIENT_CONF.GetBaseAdapterMode()
         == hermes::adapter::AdapterMode::kScratch) {
       REQUIRE(!stdfs::exists(info.new_file));
     }
diff --git a/adapter/test/vfd/hermes_vfd_test.cc b/test/unit/hermes_adapters/vfd/hermes_vfd_test.cc
similarity index 96%
rename from adapter/test/vfd/hermes_vfd_test.cc
rename to test/unit/hermes_adapters/vfd/hermes_vfd_test.cc
index 25a45da61..ce2711315 100644
--- a/adapter/test/vfd/hermes_vfd_test.cc
+++ b/test/unit/hermes_adapters/vfd/hermes_vfd_test.cc
@@ -22,7 +22,7 @@
 #include <mpi.h>
 #include <hdf5.h>
 
-#include "hermes.h"
+#include "hermes/hermes.h"
 #include "hermes_types.h"
 #include "adapter_test_utils.h"
 #include "catch_config.h"
@@ -364,17 +364,17 @@ using hermes::adapter::vfd::test::GenRandom0to1;
 
 void IgnoreAllFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file_cmp, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, false);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file_cmp, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, false);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, false);
 #endif
 }
 
 void TrackFiles() {
 #if HERMES_INTERCEPT == 1
-  HERMES->client_config_.SetAdapterPathTracking(info.new_file, true);
-  HERMES->client_config_.SetAdapterPathTracking(info.existing_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.new_file, true);
+  HERMES_CLIENT_CONF.SetAdapterPathTracking(info.existing_file, true);
 #endif
 }
 
@@ -400,7 +400,7 @@ int init(int* argc, char*** argv) {
 #if HERMES_INTERCEPT == 1
   setenv("HERMES_FLUSH_MODE", "kSync", 1);
   TRANSPARENT_HERMES
-  HERMES->client_config_.flushing_mode_ = hermes::FlushingMode::kSync;
+  HERMES_CLIENT_CONF.flushing_mode_ = hermes::FlushingMode::kSync;
 #endif
   MPI_Init(argc, argv);
 
@@ -477,7 +477,7 @@ void CheckResults(const std::string &file1, const std::string &file2) {
  * Called after each individual test.
  */
 int Posttest() {
-  if (HERMES->client_config_.GetBaseAdapterMode()
+  if (HERMES_CLIENT_CONF.GetBaseAdapterMode()
       != hermes::adapter::AdapterMode::kScratch) {
     // NOTE(chogan): This is necessary so that h5diff doesn't use the Hermes VFD
     // in CheckResults. We don't need to reset LD_PRELOAD because it only has an
diff --git a/adapter/test/vfd/tests.py b/test/unit/hermes_adapters/vfd/tests.py
similarity index 100%
rename from adapter/test/vfd/tests.py
rename to test/unit/hermes_adapters/vfd/tests.py
diff --git a/hermes_shm/test/unit/data_structures/serialize/thallium/CMakeLists.txt b/test/unit/ipc/CMakeLists.txt
similarity index 54%
rename from hermes_shm/test/unit/data_structures/serialize/thallium/CMakeLists.txt
rename to test/unit/ipc/CMakeLists.txt
index 50cd19fee..d6eff102a 100644
--- a/hermes_shm/test/unit/data_structures/serialize/thallium/CMakeLists.txt
+++ b/test/unit/ipc/CMakeLists.txt
@@ -1,46 +1,46 @@
 cmake_minimum_required(VERSION 3.10)
-project(hermes_shm)
+project(hermes)
 
 set(CMAKE_CXX_STANDARD 17)
 
 #------------------------------------------------------------------------------
 # Build Tests
 #------------------------------------------------------------------------------
-set (LIBS
-        hermes_shm_data_structures
-        Catch2::Catch2
-        MPI::MPI_CXX
-        OpenMP::OpenMP_CXX
-        thallium)
-
-add_executable(test_thallium_server server.cc)
-add_dependencies(test_thallium_server
-        hermes_shm_data_structures)
-target_link_libraries(test_thallium_server ${LIBS})
+
+add_executable(test_ipc_exec
+        ${TEST_MAIN}/main_mpi.cc
+        test_init.cc
+        test_finalize.cc
+        test_ipc.cc
+        test_serialize.cc
+)
+
+add_dependencies(test_ipc_exec ${Hermes_CLIENT_DEPS})
+target_link_libraries(test_ipc_exec
+        ${Hermes_CLIENT_LIBRARIES} Catch2::Catch2 MPI::MPI_CXX OpenMP::OpenMP_CXX)
 
 #------------------------------------------------------------------------------
 # Test Cases
 #------------------------------------------------------------------------------
-add_executable(test_thallium_exec
-        ${TEST_MAIN}/main.cc
-        test_init.cc
-        test_thallium.cc)
-add_dependencies(test_thallium_exec
-        hermes_shm_data_structures)
-target_link_libraries(test_thallium_exec ${LIBS})
 
-add_test(NAME test_thallium COMMAND
-        bash ${CMAKE_CURRENT_SOURCE_DIR}/test_thallium.sh
-        "${CMAKE_BINARY_DIR}")
+# STRING TESTS
+#add_test(NAME test_ipc COMMAND
+#        ${CMAKE_BINARY_DIR}/bin/test_messages "TestIpc")
 
 #------------------------------------------------------------------------------
 # Install Targets
 #------------------------------------------------------------------------------
 install(TARGETS
-        test_thallium_server
-        test_thallium_exec
+        test_ipc_exec
         EXPORT
         ${HERMES_EXPORTED_TARGETS}
         LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
         ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR})
+
+#-----------------------------------------------------------------------------
+# Coverage
+#-----------------------------------------------------------------------------
+if(HERMES_ENABLE_COVERAGE)
+    set_coverage_flags(test_messages)
+endif()
diff --git a/test/unit/ipc/test_finalize.cc b/test/unit/ipc/test_finalize.cc
new file mode 100644
index 000000000..4e3ece644
--- /dev/null
+++ b/test/unit/ipc/test_finalize.cc
@@ -0,0 +1,19 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "basic_test.h"
+#include "hrun/api/hrun_client.h"
+#include "hrun_admin/hrun_admin.h"
+
+TEST_CASE("TestFinalize") {
+  HRUN_ADMIN->AsyncStopRuntimeRoot(hrun::DomainId::GetGlobal());
+}
diff --git a/test/unit/ipc/test_init.cc b/test/unit/ipc/test_init.cc
new file mode 100644
index 000000000..91734b043
--- /dev/null
+++ b/test/unit/ipc/test_init.cc
@@ -0,0 +1,23 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+#include "hrun/api/hrun_client.h"
+#include "basic_test.h"
+#include "test_init.h"
+
+void MainPretest() {
+  TRANSPARENT_HRUN();
+}
+
+void MainPosttest() {
+}
diff --git a/test/unit/ipc/test_init.h b/test/unit/ipc/test_init.h
new file mode 100644
index 000000000..cb3b36df7
--- /dev/null
+++ b/test/unit/ipc/test_init.h
@@ -0,0 +1,19 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+#ifndef HRUN_TEST_UNIT_IPC_TEST_INIT_H_
+#define HRUN_TEST_UNIT_IPC_TEST_INIT_H_
+
+#include "hrun/hrun_types.h"
+
+#endif  // HRUN_TEST_UNIT_IPC_TEST_INIT_H_
diff --git a/test/unit/ipc/test_ipc.cc b/test/unit/ipc/test_ipc.cc
new file mode 100644
index 000000000..f4518757f
--- /dev/null
+++ b/test/unit/ipc/test_ipc.cc
@@ -0,0 +1,150 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "basic_test.h"
+#include <mpi.h>
+#include "hrun/api/hrun_client.h"
+#include "hrun_admin/hrun_admin.h"
+
+#include "small_message/small_message.h"
+#include "hermes_shm/util/timer.h"
+#include "hrun/work_orchestrator/affinity.h"
+#include "omp.h"
+
+TEST_CASE("TestIpc") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+  hrun::small_message::Client client;
+  HRUN_ADMIN->RegisterTaskLibRoot(hrun::DomainId::GetGlobal(), "small_message");
+  client.CreateRoot(hrun::DomainId::GetGlobal(), "ipc_test");
+  MPI_Barrier(MPI_COMM_WORLD);
+  hshm::Timer t;
+
+  int pid = getpid();
+  ProcessAffiner::SetCpuAffinity(pid, 8);
+
+  t.Resume();
+  size_t ops = 256;
+  for (size_t i = 0; i < ops; ++i) {
+    int ret;
+    HILOG(kInfo, "Sending message {}", i);
+    int node_id = 1 + ((rank + 1) % nprocs);
+    ret = client.MdRoot(hrun::DomainId::GetNode(node_id));
+    REQUIRE(ret == 1);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+TEST_CASE("TestFlush") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+  hrun::small_message::Client client;
+  HRUN_ADMIN->RegisterTaskLibRoot(hrun::DomainId::GetGlobal(), "small_message");
+  client.CreateRoot(hrun::DomainId::GetGlobal(), "ipc_test");
+  MPI_Barrier(MPI_COMM_WORLD);
+  hshm::Timer t;
+
+  int pid = getpid();
+  ProcessAffiner::SetCpuAffinity(pid, 8);
+
+  t.Resume();
+  size_t ops = 256;
+  for (size_t i = 0; i < ops; ++i) {
+    int ret;
+    HILOG(kInfo, "Sending message {}", i);
+    int node_id = 1 + ((rank + 1) % nprocs);
+    LPointer<hrun::small_message::MdTask> task =
+        client.AsyncMdRoot(hrun::DomainId::GetNode(node_id));
+  }
+  HRUN_ADMIN->FlushRoot(DomainId::GetGlobal());
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+void TestIpcMultithread(int nprocs) {
+  hrun::small_message::Client client;
+  HRUN_ADMIN->RegisterTaskLibRoot(hrun::DomainId::GetGlobal(), "small_message");
+  client.CreateRoot(hrun::DomainId::GetGlobal(), "ipc_test");
+
+#pragma omp parallel shared(client, nprocs) num_threads(nprocs)
+  {
+    int rank = omp_get_thread_num();
+    size_t ops = 256;
+    for (size_t i = 0; i < ops; ++i) {
+      int ret;
+      HILOG(kInfo, "Sending message {}", i);
+      int node_id = 1 + ((rank + 1) % nprocs);
+      ret = client.MdRoot(hrun::DomainId::GetNode(node_id));
+      REQUIRE(ret == 1);
+    }
+  }
+}
+
+TEST_CASE("TestIpcMultithread4") {
+  TestIpcMultithread(4);
+}
+
+TEST_CASE("TestIpcMultithread8") {
+  TestIpcMultithread(8);
+}
+
+TEST_CASE("TestIpcMultithread16") {
+  TestIpcMultithread(16);
+}
+
+TEST_CASE("TestIpcMultithread32") {
+  TestIpcMultithread(32);
+}
+
+TEST_CASE("TestIO") {
+  int rank, nprocs;
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+  MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
+  hrun::small_message::Client client;
+  HRUN_ADMIN->RegisterTaskLibRoot(hrun::DomainId::GetGlobal(), "small_message");
+  client.CreateRoot(hrun::DomainId::GetGlobal(), "ipc_test");
+  hshm::Timer t;
+
+  int pid = getpid();
+  ProcessAffiner::SetCpuAffinity(pid, 8);
+
+  HILOG(kInfo, "Starting IO test: {}", nprocs);
+
+  t.Resume();
+  size_t ops = 16;
+  for (size_t i = 0; i < ops; ++i) {
+    int ret;
+    HILOG(kInfo, "Sending message {}", i);
+    int node_id = 1 + ((rank + 1) % nprocs);
+    ret = client.IoRoot(hrun::DomainId::GetNode(node_id));
+    REQUIRE(ret == 1);
+  }
+  t.Pause();
+
+  HILOG(kInfo, "Latency: {} MOps", ops / t.GetUsec());
+}
+
+// TEST_CASE("TestHostfile") {
+//  for (u32 node_id = 1; node_id <
+//  HRUN_THALLIUM->rpc_->hosts_.size() + 1; ++node_id) {
+//    HILOG(kInfo, "Node {}: {}", node_id,
+//    HRUN_THALLIUM->GetServerName(node_id));
+//  }
+// }
diff --git a/test/unit/ipc/test_serialize.cc b/test/unit/ipc/test_serialize.cc
new file mode 100644
index 000000000..607df85bd
--- /dev/null
+++ b/test/unit/ipc/test_serialize.cc
@@ -0,0 +1,70 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "basic_test.h"
+#include "hrun/network/serialize.h"
+#include "hrun/task_registry/task.h"
+
+using hrun::DomainId;
+using hrun::BinaryOutputArchive;
+using hrun::BinaryInputArchive;
+using hrun::DataTransfer;
+using hrun::Task;
+using hrun::TaskFlags;
+
+struct TestObj : public Task, TaskFlags<TF_SRL_SYM> {
+  std::vector <char> data_;
+  DataTransfer xfer1_;
+  DataTransfer xfer2_;
+  int a_, b_, c_;
+
+  TestObj(int a, int b, int c, const std::vector<char> &data)
+  : a_(a), b_(b), c_(c), data_(data),
+    xfer1_(DT_RECEIVER_READ, data_.data(), data_.size()),
+    xfer2_(DT_RECEIVER_WRITE, data_.data(), data_.size()),
+    Task(nullptr)  {}
+
+  template<typename Ar>
+  void serialize(Ar &ar) {
+  }
+
+  /** (De)serialize message call */
+  template<typename Ar>
+  void SerializeStart(Ar &ar) {
+    task_serialize<Ar>(ar);
+    ar(a_, b_, xfer1_, c_, xfer2_);
+  }
+
+  /** (De)serialize message return */
+  template<typename Ar>
+  void SerializeEnd(u32 replica, Ar &ar) {
+  }
+
+  bool operator==(const TestObj &other) const {
+    return a_ == other.a_ && b_ == other.b_ && c_ == other.c_ &&
+           xfer1_ == other.xfer1_ && xfer2_ == other.xfer2_;
+  }
+};
+
+TEST_CASE("TestSerialize") {
+  std::vector<char> data(256);
+  BinaryOutputArchive<true> out(DomainId::GetLocal());
+  TestObj obj(25, 30, 35, std::vector<char>(256, 10));
+  out << obj;
+  std::vector<DataTransfer> xfer = out.Get();
+
+  BinaryInputArchive<true> in(xfer);
+  TestObj obj2(40, 50, 60, std::vector<char>(256, 0));
+  in >> obj2;
+
+  REQUIRE(obj == obj2);
+}
diff --git a/test/main.cc b/test/unit/main.cc
similarity index 98%
rename from test/main.cc
rename to test/unit/main.cc
index da1e76728..982afa67a 100644
--- a/test/main.cc
+++ b/test/unit/main.cc
@@ -10,8 +10,8 @@
  * have access to the file, you may request a copy from help@hdfgroup.org.   *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+
 #include "basic_test.h"
-#include <mpi.h>
 
 int main(int argc, char **argv) {
   int rc;
diff --git a/test/main_mpi.cc b/test/unit/main_mpi.cc
similarity index 100%
rename from test/main_mpi.cc
rename to test/unit/main_mpi.cc
diff --git a/traits/CMakeLists.txt b/traits/CMakeLists.txt
deleted file mode 100644
index 070331d27..000000000
--- a/traits/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-set(HERMES_IO_CLIENT_DIR ${CMAKE_SOURCE_DIR}/io_client)
-set(HERMES_SRC_DIR ${CMAKE_SOURCE_DIR}/src)
-set(HERMES_API_DIR ${CMAKE_SOURCE_DIR}/src/api)
-
-include_directories(
-        ${CMAKE_SOURCE_DIR}
-        ${HERMES_SRC_DIR}
-        ${HERMES_API_DIR}
-        ${HERMES_IO_CLIENT_DIR})
-
-add_subdirectory(example)
-add_subdirectory(prefetcher)
-
-#-----------------------------------------------------------------------------
-# Add file(s) to CMake Install
-#-----------------------------------------------------------------------------
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${HERMES_INSTALL_INCLUDE_DIR}
-        FILES_MATCHING PATTERN "*.h")
diff --git a/traits/example/example_trait.cc b/traits/example/example_trait.cc
deleted file mode 100644
index 120e0ba69..000000000
--- a/traits/example/example_trait.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "example_trait.h"
-
-namespace hermes::api {
-
-void ExampleTrait::Run(int method, void *params) {
-  (void) method;
-  auto cast = reinterpret_cast<ExampleTraitParams*>(params);
-  cast->hello_ = GetHeader<ExampleTraitHeader>()->hello_;
-}
-
-}  // namespace hermes::api
-
-HERMES_TRAIT_CC(hermes::api::ExampleTrait)
\ No newline at end of file
diff --git a/traits/example/example_trait.h b/traits/example/example_trait.h
deleted file mode 100644
index 22699c21f..000000000
--- a/traits/example/example_trait.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TRAITS_EXAMPLE_EXAMPLE_TRAIT_H_
-#define HERMES_TRAITS_EXAMPLE_EXAMPLE_TRAIT_H_
-
-#include "hermes.h"
-
-namespace hermes::api {
-
-struct ExampleTraitHeader : public TraitHeader {
-  int hello_;
-  explicit ExampleTraitHeader(const std::string &trait_uuid,
-                              const std::string &trait_name,
-                              int hello)
-      : TraitHeader(trait_uuid, trait_name, HERMES_TRAIT_PUT_GET),
-        hello_(hello) {}
-};
-
-struct ExampleTraitParams {
-  int hello_;
-};
-
-class ExampleTrait : public Trait {
- public:
-  HERMES_TRAIT_H(ExampleTrait, "ExampleTrait");
-
- public:
-  explicit ExampleTrait(hshm::charbuf &data) : Trait(data) {}
-
-  explicit ExampleTrait(const std::string &trait_uuid, int hello) {
-    auto hdr = CreateHeader<ExampleTraitHeader>(trait_uuid, trait_name_, hello);
-    hdr->hello_ = hello;
-  }
-
-  void Run(int method, void *params) override;
-};
-
-}  // namespace hermes::api
-
-#endif  // HERMES_TRAITS_EXAMPLE_EXAMPLE_TRAIT_H_
diff --git a/traits/prefetcher/prefetcher_header.h b/traits/prefetcher/prefetcher_header.h
deleted file mode 100644
index 6499ffd2a..000000000
--- a/traits/prefetcher/prefetcher_header.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TRAITS_PREFETCHER_PREFETCHER_HEADER_H_
-#define HERMES_TRAITS_PREFETCHER_PREFETCHER_HEADER_H_
-
-#include "trait_manager.h"
-
-namespace hermes {
-
-/** Types of prefetchers available */
-enum class PrefetcherType {
-  kApriori
-};
-
-/** Header for prefetcher trait */
-struct PrefetcherTraitHeader : public TraitHeader {
-  hermes::PrefetcherType type_;
-  explicit PrefetcherTraitHeader(const std::string &trait_uuid,
-                                 const std::string &trait_name,
-                                 hermes::PrefetcherType type)
-    : TraitHeader(trait_uuid, trait_name, HERMES_TRAIT_PREFETCHER),
-      type_(type) {}
-};
-
-}  // namespace hermes::api
-
-#endif  // HERMES_TRAITS_PREFETCHER_PREFETCHER_HEADER_H_
diff --git a/traits/prefetcher/prefetcher_trait.cc b/traits/prefetcher/prefetcher_trait.cc
deleted file mode 100644
index 6150363a5..000000000
--- a/traits/prefetcher/prefetcher_trait.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "prefetcher_trait.h"
-
-namespace hermes {
-
-void PrefetcherTrait::Run(int method, void *params) {
-  (void) method;
-  (void) params;
-}
-
-}  // namespace hermes::api
-
-HERMES_TRAIT_CC(hermes::PrefetcherTrait)
\ No newline at end of file
diff --git a/traits/prefetcher/prefetcher_trait.h b/traits/prefetcher/prefetcher_trait.h
deleted file mode 100644
index 2599ad674..000000000
--- a/traits/prefetcher/prefetcher_trait.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_TRAITS_EXAMPLE_EXAMPLE_TRAIT_H_
-#define HERMES_TRAITS_EXAMPLE_EXAMPLE_TRAIT_H_
-
-#include "hermes.h"
-#include "prefetcher_header.h"
-
-namespace hermes {
-
-/** Prefetcher trait */
-class PrefetcherTrait : public Trait {
- public:
-  HERMES_TRAIT_H(PrefetcherTrait, "PrefetcherTrait");
-
- public:
-  explicit PrefetcherTrait(hshm::charbuf &data) : Trait(data) {}
-
-  explicit PrefetcherTrait(const std::string &trait_uuid,
-                           hermes::PrefetcherType prefetch_type) {
-    CreateHeader<PrefetcherTraitHeader>(trait_uuid,
-                                        trait_name_,
-                                        prefetch_type);
-  }
-
-  void Run(int method, void *params) override;
-};
-
-}  // namespace hermes
-
-#endif  // HERMES_TRAITS_EXAMPLE_EXAMPLE_TRAIT_H_
diff --git a/wrapper/CMakeLists.txt b/wrapper/CMakeLists.txt
index 10b7e232d..082f8c4d6 100644
--- a/wrapper/CMakeLists.txt
+++ b/wrapper/CMakeLists.txt
@@ -1,26 +1,7 @@
+cmake_minimum_required(VERSION 3.10)
+project(hermes)
 
-set(HERMES_IO_CLIENT_DIR ${CMAKE_SOURCE_DIR}/io_client)
-set(HERMES_SRC_DIR ${CMAKE_SOURCE_DIR}/src)
-set(HERMES_API_DIR ${CMAKE_SOURCE_DIR}/src/api)
-set(HERMES_WRAPPER_DIR ${CMAKE_SOURCE_DIR}/wrapper)
-
-include_directories(
-        ${CMAKE_SOURCE_DIR}
-        ${HERMES_SRC_DIR}
-        ${HERMES_API_DIR}
-        ${HERMES_WRAPPER_DIR}
-        ${HERMES_IO_CLIENT_DIR})
-
-if (HERMES_ENABLE_C_BINDINGS OR
-        HERMES_ENABLE_JAVA_BINDINGS OR
-        HERMES_ENABLE_PYTHON_BINDINGS)
-    add_subdirectory(c)
-endif()
-
-if (HERMES_ENABLE_JAVA_BINDINGS)
-    add_subdirectory(java)
-endif()
-
-if (HERMES_ENABLE_PYTHON_BINDINGS)
+if (HERMES_ENABLE_PYTHON)
+    message("Python bindings enabled")
     add_subdirectory(python)
 endif()
diff --git a/wrapper/c/c_wrapper.cc b/wrapper/c/c_wrapper.cc
deleted file mode 100644
index 39821cb6c..000000000
--- a/wrapper/c/c_wrapper.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes.h"
-#include "c_wrapper.h"
-
-extern "C" {
-
-/** Get the Hermes instance */
-hapi::Hermes* HERMES_Get() {
-  return HERMES;
-}
-
-/** Initialize a Hermes instance */
-void HERMES_Create(hermes::HermesType mode,
-                   std::string server_config_path,
-                   std::string client_config_path) {
-  HERMES->Create(mode, server_config_path, client_config_path);
-}
-
-/** Bucket create */
-hapi::Bucket HERMES_Bucket_get(const std::string &name) {
-  hapi::Context ctx;
-  return HERMES->GetBucket(name, ctx, 0);
-}
-
-/** Bucket delete */
-void HERMES_Bucket_destroy(hapi::Bucket &bucket) {
-  bucket.Destroy();
-}
-
-/** Blob put */
-hermes::BlobId HERMES_Bucket_put_blob(hapi::Bucket &bucket,
-                                      const char *blob_name,
-                                      const char *blob,
-                                      size_t blob_size) {
-  hermes::Blob blob_wrap(blob, blob_size);
-  hermes::BlobId blob_id;
-  bucket.Put(blob_name, blob_wrap, blob_id, bucket.GetContext());
-  return blob_id;
-}
-
-/** Get blob ID */
-hermes::BlobId HERMES_Bucket_get_blob_id(hapi::Bucket &bucket,
-                                         const char *blob_name) {
-  hermes::BlobId blob_id;
-  bucket.GetBlobId(blob_name, blob_id);
-  return blob_id;
-}
-
-/** Blob get */
-void HERMES_Bucket_get_blob(hapi::Bucket &bucket,
-                            hermes::BlobId &blob_id,
-                            char* &blob,
-                            size_t &blob_size) {
-  hermes::Blob blob_h;
-  bucket.Get(blob_id, blob_h, bucket.GetContext());
-  blob = blob_h.data();
-  blob_size = blob_h.size();
-  std::move(blob_h);  // Don't allow blob to be destroyed
-}
-
-/** Blob delete */
-void HERMES_Bucket_destroy_blob(hapi::Bucket &bucket,
-                                hermes::BlobId &blob_id) {
-  bucket.DestroyBlob(blob_id, bucket.GetContext());
-}
-
-}  // extern C
\ No newline at end of file
diff --git a/wrapper/c/c_wrapper.h b/wrapper/c/c_wrapper.h
deleted file mode 100644
index 9e70a8d4f..000000000
--- a/wrapper/c/c_wrapper.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef HERMES_WRAPPER_C_C_WRAPPER_H_
-#define HERMES_WRAPPER_C_C_WRAPPER_H_
-
-#include "hermes.h"
-
-extern "C" {
-
-hapi::Hermes* HERMES_Get();
-void HERMES_Create(hermes::HermesType mode,
-                   std::string server_config_path,
-                   std::string client_config_path);
-hapi::Bucket HERMES_Bucket_get(const std::string &name);
-void HERMES_Bucket_destroy(hapi::Bucket &bucket);
-hermes::BlobId HERMES_Bucket_put_blob(hapi::Bucket &bucket,
-                                      const char *blob_name,
-                                      const char *blob,
-                                      size_t blob_size);
-hermes::BlobId HERMES_Bucket_get_blob_id(hapi::Bucket &bucket,
-                                         const char *blob_name);
-void HERMES_Bucket_get_blob(hapi::Bucket &bucket,
-                            hermes::BlobId &blob_id,
-                            char* &blob,
-                            size_t &blob_size);
-void HERMES_Bucket_destroy_blob(hapi::Bucket &bucket,
-                                hermes::BlobId &blob_id);
-
-}  // extern C
-
-#endif  // HERMES_WRAPPER_C_C_WRAPPER_H_
diff --git a/wrapper/java/CMakeLists.txt b/wrapper/java/CMakeLists.txt
deleted file mode 100644
index 03a03c75e..000000000
--- a/wrapper/java/CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#-----------------------------------------------------------------------------
-# Find Java JNI
-#-----------------------------------------------------------------------------
-find_package(JNI REQUIRED)
-find_package(Java REQUIRED)
-include(UseJava)
-message("Found JNI at ${JNI_INCLUDE_DIRS} and ${JNI_LIBRARIES}")
-
-#-----------------------------------------------------------------------------
-# Build C++ Java wrapper
-#-----------------------------------------------------------------------------
-function(java_wrapper name path)
-    include_directories(${JNI_INCLUDE_DIRS})
-    add_library(${name} SHARED ${path})
-    add_dependencies(${name} hermes)
-    target_link_libraries(${name}
-            hermes
-            MPI::MPI_CXX stdc++fs dl ${JNI_LIBRARIES})
-endfunction()
-java_wrapper(hermes_java_Blob src/hermes/cpp/src_main_Blob.cc)
-java_wrapper(hermes_java_Bucket src/hermes/cpp/src_main_Bucket.cc)
-java_wrapper(hermes_java_Hermes src/hermes/cpp/src_main_Hermes.cc)
-
-#-----------------------------------------------------------------------------
-# Build Java API
-#-----------------------------------------------------------------------------
-add_custom_command(TARGET hermes_java_Blob POST_BUILD
-        COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} &&
-                ${CMAKE_CURRENT_SOURCE_DIR}/gradlew build -x test)
-add_custom_target(build_hermes_java
-        COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} &&
-                ${CMAKE_CURRENT_SOURCE_DIR}/gradlew build -x test)
-pytest(java_wrapper test_hermes_java)
-
-#-----------------------------------------------------------------------------
-# Add Target(s) to CMake Install
-#-----------------------------------------------------------------------------
-install(
-        TARGETS
-        hermes_java_Blob
-        hermes_java_Bucket
-        hermes_java_Hermes
-        EXPORT
-        ${HERMES_EXPORTED_TARGETS}
-        LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
-        RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
-)
-#-----------------------------------------------------------------------------
-# Export all exported targets to the build tree for use by parent project
-#-----------------------------------------------------------------------------
-set(HERMES_EXPORTED_LIBS
-        hermes_java_Blob
-        hermes_java_Bucket
-        hermes_java_Hermes
-        ${HERMES_EXPORTED_LIBS})
-if(NOT HERMES_EXTERNALLY_CONFIGURED)
-    EXPORT (
-            TARGETS
-            ${HERMES_EXPORTED_LIBS}
-            FILE
-            ${HERMES_EXPORTED_TARGETS}.cmake
-    )
-endif()
-#-----------------------------------------------------------------------------
-# Add Target(s) to Coverage
-#-----------------------------------------------------------------------------
-if(HERMES_ENABLE_COVERAGE)
-#    set_coverage_flags(hermes_src_main_Blob)
-#    set_coverage_flags(hermes_src_main_Bucket)
-#    set_coverage_flags(hermes_src_main_Hermes)
-endif()
diff --git a/wrapper/java/build.gradle b/wrapper/java/build.gradle
deleted file mode 100644
index e4ed3c207..000000000
--- a/wrapper/java/build.gradle
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This build file was generated by the Gradle 'init' task.
- *
- * This generated file contains a commented-out sample Java project to get you started.
- * For more details take a look at the Java Quickstart chapter in the Gradle
- * user guide available at https://docs.gradle.org/4.4.1/userguide/tutorial_java_projects.html
- */
-
-// Apply the java plugin to add support for Java
-apply plugin: 'java'
-
-// In this section you declare where to find the dependencies of your project
-repositories {
-    // Use 'jcenter' for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    jcenter()
-}
-
-// In this section you declare the dependencies for your production and test code
-dependencies {
-    // The production code uses the SLF4J logging API at compile time
-    compile 'org.slf4j:slf4j-api:1.7.25'
-
-    // Declare the dependency for your favourite test framework you want to use in your tests.
-    // TestNG is also supported by the Gradle Test task. Just change the
-    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
-    // 'test.useTestNG()' to your build script.
-    testCompile 'junit:junit:4.12'
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir 'src/hermes/java'
-        }
-    }
-
-    test {
-        java {
-            srcDir 'src/test/java'
-        }
-    }
-}
-
-test {
-    useJUnit()
-}
\ No newline at end of file
diff --git a/wrapper/java/gradle/wrapper/gradle-wrapper.jar b/wrapper/java/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index d9b7505b1..000000000
Binary files a/wrapper/java/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/wrapper/java/gradle/wrapper/gradle-wrapper.properties b/wrapper/java/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 2c2bbe5f9..000000000
--- a/wrapper/java/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
diff --git a/wrapper/java/gradlew b/wrapper/java/gradlew
deleted file mode 100755
index cccdd3d51..000000000
--- a/wrapper/java/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/wrapper/java/gradlew.bat b/wrapper/java/gradlew.bat
deleted file mode 100644
index e95643d6a..000000000
--- a/wrapper/java/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/wrapper/java/settings.gradle b/wrapper/java/settings.gradle
deleted file mode 100644
index 4444894ae..000000000
--- a/wrapper/java/settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This settings file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/4.4.1/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
-rootProject.name = 'hermes-1.0.0'
diff --git a/wrapper/java/src/hermes/cpp/hermes_java_wrapper.h b/wrapper/java/src/hermes/cpp/hermes_java_wrapper.h
deleted file mode 100644
index 22a59f57f..000000000
--- a/wrapper/java/src/hermes/cpp/hermes_java_wrapper.h
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Created by lukemartinlogan on 4/28/23.
-//
-
-#ifndef HERMES_WRAPPER_Java_src_hermes_CPP_HERMES_JAVA_WRAPPER_H_
-#define HERMES_WRAPPER_Java_src_hermes_CPP_HERMES_JAVA_WRAPPER_H_
-
-#include <jni.h>
-#include "hermes.h"
-
-struct JavaStringWrap {
-  const char *data_;
-  JNIEnv *&env_;
-  jstring &string_java_;
-
-  JavaStringWrap(JNIEnv *&env, jstring &string_java)
-  : env_(env), string_java_(string_java) {
-    data_ = env_->GetStringUTFChars(string_java, nullptr);
-  }
-
-  ~JavaStringWrap() {
-    env_->ReleaseStringUTFChars(string_java_, data_);
-  }
-};
-
-class HermesJavaWrapper {
- public:
-  JNIEnv *env_;
-  /** UniqueId Java class */
-  jclass id_class;
-  jmethodID id_cstor;
-  jfieldID unique_fid;
-  jfieldID node_id_fid;
-
-  /** Bucket Java class */
-  jclass bkt_class;
-  jmethodID bkt_constructor;
-  jfieldID bkt_id_fid;
-
-  /** Blob java class */
-  jclass blob_class;
-  jmethodID blob_cstor;
-  jfieldID blob_data_fid;
-  jfieldID blob_size_fid;
-  jfieldID blob_alloc_fid;
-  jfieldID is_native_fid;
-
-  /** Blob ID vector methods */
-  jclass vector_class;
-  jmethodID vector_cstor;
-  jmethodID vector_add;
-
- public:
-  HermesJavaWrapper(JNIEnv *env) : env_(env) {
-    /* UniqueId methods */
-    id_class = FindClass("hermes/java/UniqueId");
-    id_cstor = env->GetMethodID(id_class, "<init>", "(JI)V");
-    unique_fid = env->GetFieldID(id_class, "unique_", "J");
-    node_id_fid = env->GetFieldID(id_class, "node_id_", "I");
-
-    /* Bucket methods */
-    bkt_class = FindClass("hermes/java/Bucket");
-    bkt_id_fid = env->GetFieldID(bkt_class, "bkt_id_",
-                                 "Lhermes/java/UniqueId;");
-    bkt_constructor = env->GetMethodID(
-        bkt_class,
-        "<init>",
-        "(Lhermes/java/UniqueId;)V");
-
-    /* Blob methods */
-    blob_class = FindClass("hermes/java/Blob");
-    blob_cstor = env->GetMethodID(
-        blob_class,
-        "<init>",
-        "(Ljava/nio/ByteBuffer;IJ)V");
-    blob_data_fid = env->GetFieldID(blob_class, "data_", "Ljava/nio/ByteBuffer;");
-    blob_size_fid = env->GetFieldID(blob_class, "size_", "I");
-    blob_alloc_fid = env->GetFieldID(blob_class, "alloc_", "J");
-    is_native_fid = env->GetFieldID(blob_class, "is_native_", "Z");
-
-    /* Blob vector methods */
-    vector_class = FindClass("java/util/Vector");
-    vector_cstor = env->
-        GetMethodID(vector_class, "<init>", "(I)V");
-    vector_add = env->GetMethodID(
-        vector_class, "add", "(Ljava/lang/Object;)Z");
-  }
-
-  HSHM_ALWAYS_INLINE jclass FindClass(const std::string &java_class) {
-    return (jclass)env_->NewGlobalRef(env_->FindClass(java_class.c_str()));
-  }
-
-  /** Convert a C++ UniqueId to Java UniqueId */
-  template<typename IdT>
-  jobject ConvertUniqueIdToJava(JNIEnv *env,
-                                const IdT &id) {
-    jobject id_java = env->NewObject(id_class, id_cstor,
-                                     id.unique_, id.node_id_);
-    return id_java;
-  }
-
-  /** Get a C++ UniqueId from Java UniqueId */
-  template<typename IdT>
-  IdT GetUniqueIdFromJava(JNIEnv *env,
-                          jobject bkt_id_java) {
-    IdT tag_id;
-    tag_id.unique_ = env->GetLongField(bkt_id_java, unique_fid);
-    tag_id.node_id_ = env->GetIntField(bkt_id_java, node_id_fid);
-    return tag_id;
-  }
-
-  /** Convert a C++ BUCKET to Java Bucket */
-  jobject ConvertBucketToJava(JNIEnv *env,
-                              hapi::Bucket &bkt) {
-    auto bkt_id_java = ConvertUniqueIdToJava<hermes::TagId>(env, bkt.GetId());
-    jobject bkt_java = env->NewObject(bkt_class, bkt_constructor, bkt_id_java);
-    return bkt_java;
-  }
-
-  /** Get a C++ BUCKET from Java Bucket */
-  hapi::Bucket GetBucketFromJava(JNIEnv *env,
-                                 jobject bkt_java) {
-    jobject bkt_id_java = env->GetObjectField(bkt_java, bkt_id_fid);
-    auto tag_id = GetUniqueIdFromJava<hermes::TagId>(env, bkt_id_java);
-    return hapi::Bucket(tag_id);
-  }
-
-  /** Convert a C++ BLOB to Java Blob */
-  jobject ConvertBlobToJava(JNIEnv *env,
-                            hapi::Blob &blob) {
-    // Prepare data to place into Java Blob
-    blob.destructable_ = false;
-    jobject data_java = env->NewDirectByteBuffer(blob.data(), blob.size());
-    hipc::Allocator *alloc = blob.GetAllocator();
-
-    // Allocate new Blob java
-    jobject blob_java = env->NewObject(blob_class, blob_cstor,
-                                       data_java,
-                                       (jint)blob.size(),
-                                       (jlong)alloc);
-    return blob_java;
-  }
-
-  /** Get a C++ BLOB from Java Blob */
-  hapi::Blob GetBlobFromJava(JNIEnv *env,
-                             jobject blob_java) {
-    hapi::Blob blob;
-    bool is_native = env->GetBooleanField(blob_java, is_native_fid);
-    jobject data = env->GetObjectField(blob_java, blob_data_fid);
-    blob.data_ = reinterpret_cast<char*>(
-        env->GetDirectBufferAddress(data));
-    blob.size_ = env->GetIntField(blob_java, blob_size_fid);
-    if (is_native) {
-      blob.alloc_ = reinterpret_cast<hipc::Allocator *>(
-          env->GetLongField(blob_java, blob_alloc_fid));
-    }
-    return blob;
-  }
-
-  /** Convert a blob ID vector to a Java vector */
-  jobject ConvertBlobIdVectorToJava(JNIEnv *env,
-                                    std::vector<hermes::BlobId> &blob_ids) {
-    // Allocate new Blob java
-    jobject blob_ids_java = env->NewObject(vector_class, vector_cstor,
-                                           (jint)blob_ids.size());
-    for (hermes::BlobId &blob_id : blob_ids) {
-      jobject blob_id_java = ConvertUniqueIdToJava(env, blob_id);
-      env->CallBooleanMethod(blob_ids_java, vector_add, blob_id_java);
-    }
-    return blob_ids_java;
-  }
-};
-
-#define HERMES_JAVA_WRAPPER \
-  hshm::EasySingleton<HermesJavaWrapper>::GetInstance(env)
-
-#endif //HERMES_WRAPPER_Java_src_hermes_CPP_HERMES_JAVA_WRAPPER_H_
diff --git a/wrapper/java/src/hermes/cpp/src_main_Blob.cc b/wrapper/java/src/hermes/cpp/src_main_Blob.cc
deleted file mode 100644
index 1264cfa9d..000000000
--- a/wrapper/java/src/hermes/cpp/src_main_Blob.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-#include "hermes_java_wrapper.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     hermes_java_Blob
- * Method:    freeNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Blob_freeNative(JNIEnv *env,
-                                                         jobject blob_java) {
-  hapi::Blob blob = HERMES_JAVA_WRAPPER->GetBlobFromJava(env, blob_java);
-  blob.destructable_ = true;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/wrapper/java/src/hermes/cpp/src_main_Blob.h b/wrapper/java/src/hermes/cpp/src_main_Blob.h
deleted file mode 100644
index 47214c0bc..000000000
--- a/wrapper/java/src/hermes/cpp/src_main_Blob.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class hermes_java_Blob */
-
-#ifndef _Included_hermes_java_Blob
-#define _Included_hermes_java_Blob
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     hermes_java_Blob
- * Method:    freeNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Blob_freeNative
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/wrapper/java/src/hermes/cpp/src_main_Bucket.cc b/wrapper/java/src/hermes/cpp/src_main_Bucket.cc
deleted file mode 100644
index 90a94d231..000000000
--- a/wrapper/java/src/hermes/cpp/src_main_Bucket.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-#include "src_main_Bucket.h"
-#include "hermes_java_wrapper.h"
-#include "src/api/hermes.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**====================================
- * BUCKET operations
- * ===================================*/
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    lock
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_lock(JNIEnv *env,
-                                                      jobject bkt_java,
-                                                      jint lock_type_java) {
-  auto bkt = HERMES_JAVA_WRAPPER->
-      GetBucketFromJava(env, bkt_java);
-  auto lock_type = static_cast<hermes::MdLockType>(lock_type_java);
-  bkt.LockBucket(lock_type);
-}
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    unlock
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_unlock(JNIEnv *env,
-                                                        jobject bkt_java,
-                                                        jint lock_type_java) {
-  auto bkt = HERMES_JAVA_WRAPPER->
-      GetBucketFromJava(env, bkt_java);
-  auto lock_type = static_cast<hermes::MdLockType>(lock_type_java);
-  bkt.UnlockBucket(lock_type);
-}
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    getContainedBlobIds
- * Signature: ()Ljava/util/List;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_getContainedBlobIds(
-    JNIEnv *env, jobject bkt_java) {
-  auto bkt = HERMES_JAVA_WRAPPER->
-      GetBucketFromJava(env, bkt_java);
-  std::vector<hermes::BlobId> blob_ids = bkt.GetContainedBlobIds();
-  return HERMES_JAVA_WRAPPER->ConvertBlobIdVectorToJava(env, blob_ids);
-}
-
-/*
- * Class:     src_main_Bucket
- * Method:    Destroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_destroy(JNIEnv *env,
-                                                         jobject bkt_java) {
-  hapi::Bucket bkt = HERMES_JAVA_WRAPPER->GetBucketFromJava(env, bkt_java);
-  bkt.Destroy();
-}
-
-/**====================================
- * BLOB operations
- * ===================================*/
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    getBlobId
- * Signature: (Ljava/lang/String;)Lsrc/main/java/UniqueId;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_getBlobId(
-    JNIEnv *env, jobject bkt_java, jstring blob_name_java) {
-  JavaStringWrap blob_name(env, blob_name_java);
-  auto bkt = HERMES_JAVA_WRAPPER->GetBucketFromJava(env, bkt_java);
-  hermes::BlobId blob_id;
-  bkt.GetBlobId(blob_name.data_, blob_id);
-  return HERMES_JAVA_WRAPPER->ConvertUniqueIdToJava(env, blob_id);
-}
-
-/*
- * Class:     src_main_Bucket
- * Method:    get
- * Signature: (Lsrc/main/UniqueId;)Ljava/lang/String;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_get(JNIEnv *env,
-                                                        jobject bkt_java,
-                                                        jobject blob_id_java) {
-  hapi::Bucket bkt = HERMES_JAVA_WRAPPER->GetBucketFromJava(env, bkt_java);
-  auto blob_id = HERMES_JAVA_WRAPPER->GetUniqueIdFromJava<hermes::BlobId>(
-      env, blob_id_java);
-  hapi::Blob blob;
-  hapi::Context ctx;
-  bkt.Get(blob_id, blob, ctx);
-  jobject blob_java = HERMES_JAVA_WRAPPER->ConvertBlobToJava(env, blob);
-  return blob_java;
-}
-
-/*
- * Class:     src_main_Bucket
- * Method:    put
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Lsrc/main/UniqueId;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_put(JNIEnv *env,
-                                                        jobject bkt_java,
-                                                        jstring blob_name_java,
-                                                        jobject blob_java) {
-  hapi::Context ctx;
-  hermes::BlobId blob_id;
-  hapi::Blob blob = HERMES_JAVA_WRAPPER->GetBlobFromJava(env, blob_java);
-  hapi::Bucket bkt = HERMES_JAVA_WRAPPER->GetBucketFromJava(env, bkt_java);
-  JavaStringWrap blob_name(env, blob_name_java);
-  bkt.Put(blob_name.data_, blob, blob_id, ctx);
-  return HERMES_JAVA_WRAPPER->ConvertUniqueIdToJava(env, blob_id);
-}
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    lockBlob
- * Signature: (Lsrc/main/java/UniqueId;)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_lockBlob
-  (JNIEnv *env, jobject bkt_java, jobject blob_id_java, jint lock_type_java) {
-  auto blob_id = HERMES_JAVA_WRAPPER->
-      GetUniqueIdFromJava<hermes::BlobId>(env, blob_id_java);
-  auto bkt = HERMES_JAVA_WRAPPER->
-      GetBucketFromJava(env, bkt_java);
-  auto lock_type = static_cast<hermes::MdLockType>(lock_type_java);
-  bkt.LockBlob(blob_id, lock_type);
-}
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    unlockBlob
- * Signature: (Lsrc/main/java/UniqueId;)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_unlockBlob
-  (JNIEnv *env, jobject bkt_java, jobject blob_id_java, jint lock_type_java) {
-  auto blob_id = HERMES_JAVA_WRAPPER->
-      GetUniqueIdFromJava<hermes::BlobId>(env, blob_id_java);
-  auto bkt = HERMES_JAVA_WRAPPER->
-      GetBucketFromJava(env, bkt_java);
-  auto lock_type = static_cast<hermes::MdLockType>(lock_type_java);
-  bkt.UnlockBlob(blob_id, lock_type);
-}
-
-/*
- * Class:     src_main_Bucket
- * Method:    DestroyBlob
- * Signature: (Lsrc/main/UniqueId;)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_destroyBlob(
-    JNIEnv *env, jobject bkt_java, jobject blob_id_java) {
-  hapi::Context ctx;
-  auto blob_id = HERMES_JAVA_WRAPPER->GetUniqueIdFromJava<hermes::BlobId>(
-      env, blob_id_java);
-  hapi::Bucket bkt = HERMES_JAVA_WRAPPER->GetBucketFromJava(env, bkt_java);
-  bkt.DestroyBlob(blob_id, ctx);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/wrapper/java/src/hermes/cpp/src_main_Bucket.h b/wrapper/java/src/hermes/cpp/src_main_Bucket.h
deleted file mode 100644
index 9f9feda7d..000000000
--- a/wrapper/java/src/hermes/cpp/src_main_Bucket.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class src_main_java_Bucket */
-
-#ifndef _Included_src_main_java_Bucket
-#define _Included_src_main_java_Bucket
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     src_main_java_Bucket
- * Method:    lock
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_lock
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    unlock
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_unlock
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    getContainedBlobIds
- * Signature: ()Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_getContainedBlobIds
-  (JNIEnv *, jobject);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    destroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_destroy
-  (JNIEnv *, jobject);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    getBlobId
- * Signature: (Ljava/lang/String;)Lsrc/main/java/UniqueId;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_getBlobId
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    get
- * Signature: (Lsrc/main/java/UniqueId;)Lsrc/main/java/Blob;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_get
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    put
- * Signature: (Ljava/lang/String;Lsrc/main/java/Blob;)Lsrc/main/java/UniqueId;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Bucket_put
-  (JNIEnv *, jobject, jstring, jobject);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    lockBlob
- * Signature: (Lsrc/main/java/UniqueId;I)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_lockBlob
-  (JNIEnv *, jobject, jobject, jint);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    unlockBlob
- * Signature: (Lsrc/main/java/UniqueId;I)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_unlockBlob
-  (JNIEnv *, jobject, jobject, jint);
-
-/*
- * Class:     src_main_java_Bucket
- * Method:    destroyBlob
- * Signature: (Lsrc/main/java/UniqueId;)V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Bucket_destroyBlob
-  (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/wrapper/java/src/hermes/cpp/src_main_Hermes.cc b/wrapper/java/src/hermes/cpp/src_main_Hermes.cc
deleted file mode 100644
index fc48f1003..000000000
--- a/wrapper/java/src/hermes/cpp/src_main_Hermes.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Distributed under BSD 3-Clause license.                                   *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Illinois Institute of Technology.                        *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of Hermes. The full Hermes copyright notice, including  *
-* terms governing use, modification, and redistribution, is contained in    *
-* the COPYING file, which can be found at the top directory. If you do not  *
-* have access to the file, you may request a copy from help@hdfgroup.org.   *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "hermes_java_wrapper.h"
-#include "src_main_Hermes.h"
-#include "src_main_Bucket.h"
-#include "src/api/hermes.h"
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     src_main_Hermes
- * Method:    create
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Hermes_create(
-    JNIEnv *env, jobject obj) {
-  (void) env; (void) obj;
-  HERMES->Create(hermes::HermesType::kClient);
-}
-
-/*
- * Class:     src_main_Hermes
- * Method:    getBucket
- * Signature: (Ljava/lang/String;)Lsrc/main/Bucket;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Hermes_getBucket(
-    JNIEnv *env, jobject obj, jstring bkt_name_java) {
-  (void) obj;
-  JavaStringWrap bkt_name(env, bkt_name_java);
-  hapi::Bucket bkt = HERMES->GetBucket(bkt_name.data_);
-  auto bkt_java = HERMES_JAVA_WRAPPER->ConvertBucketToJava(env, bkt);
-  return bkt_java;
-}
-
-#ifdef __cplusplus
-}
-#endif
\ No newline at end of file
diff --git a/wrapper/java/src/hermes/cpp/src_main_Hermes.h b/wrapper/java/src/hermes/cpp/src_main_Hermes.h
deleted file mode 100644
index 59a868764..000000000
--- a/wrapper/java/src/hermes/cpp/src_main_Hermes.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class src_main_Hermes */
-
-#ifndef _Included_src_main_Hermes
-#define _Included_src_main_Hermes
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     src_main_Hermes
- * Method:    create
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_hermes_java_Hermes_create
-  (JNIEnv *, jobject);
-
-/*
- * Class:     src_main_Hermes
- * Method:    getBucket
- * Signature: (Ljava/lang/String;)Lsrc/main/Bucket;
- */
-JNIEXPORT jobject JNICALL Java_hermes_java_Hermes_getBucket
-  (JNIEnv *, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/wrapper/java/src/hermes/java/Blob.java b/wrapper/java/src/hermes/java/Blob.java
deleted file mode 100644
index 293b79423..000000000
--- a/wrapper/java/src/hermes/java/Blob.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package hermes.java;
-import java.nio.ByteBuffer;
-
-public class Blob {
-    public ByteBuffer data_;
-    int size_;
-    long alloc_;
-    boolean is_native_;
-
-    /** Create a blob from JNI */
-    private Blob(ByteBuffer data, int size, long alloc) {
-        data_ = data;
-        size_ = size;
-        alloc_ = alloc;
-        is_native_ = true;
-        data_.position(0);
-    }
-
-    /** Create a blob within Java */
-    public Blob(ByteBuffer data) {
-        data_ = ByteBuffer.allocateDirect(data.capacity());
-        data_.put(data);
-        size_ = data.capacity();
-        alloc_ = 0;
-        is_native_ = false;
-        data_.position(0);
-    }
-
-    /** Convert a string to a Blob */
-    public static Blob fromString(String data) {
-        return new Blob(ByteBuffer.wrap(data.getBytes()));
-    }
-
-    /** Call ByteBuffer array method */
-    public byte[] array() {
-        byte[] bytes = new byte[size_];
-        data_.get(bytes);
-        return bytes;
-    }
-
-    /** Free data allocated by JNI */
-    private native void freeNative();
-
-    /** Release this blob */
-    public void close() {
-        if (is_native_) {
-            freeNative();
-        }
-    }
-
-    public boolean equals(Blob other) {
-        return data_.equals(other.data_);
-    }
-
-    static {
-        System.loadLibrary("hermes_java_Blob");
-    }
-}
diff --git a/wrapper/java/src/hermes/java/Bucket.java b/wrapper/java/src/hermes/java/Bucket.java
deleted file mode 100644
index ca7f00e97..000000000
--- a/wrapper/java/src/hermes/java/Bucket.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package hermes.java;
-import java.util.Vector;
-import hermes.java.UniqueId;
-import hermes.java.MdLockType;
-import hermes.java.Blob;
-
-public class Bucket {
-    public UniqueId bkt_id_;
-
-    /**====================================
-     * BUCKET operatoins
-     * ===================================*/
-
-    /** Used to construct bucket in JNI */
-    private Bucket(UniqueId bkt_id) {
-        bkt_id_ = bkt_id;
-    }
-
-    /** Lock this bucket */
-    public native void lock(int lock_type);
-    public void lock(MdLockType lock_type) {
-        lock(lock_type.ordinal());
-    }
-
-    /** Unlock this bucket */
-    public native void unlock(int lock_type);
-    public void unlock(MdLockType lock_type) {
-        unlock(lock_type.ordinal());
-    }
-
-    /** Get all blob IDs contained in this bucket */
-    public native Vector<UniqueId> getContainedBlobIds();
-
-    /** Destroy this bucket */
-    public native void destroy();
-
-    /**====================================
-     * BLOB operations
-     * ===================================*/
-
-    /** Get the ID of a blob from a bucket */
-    public native UniqueId getBlobId(String name);
-
-    /** Get a blob from the bucket */
-    public native Blob get(UniqueId blob_id);
-
-    /** Put a blob into the bucket */
-    public native UniqueId put(String blob_name, Blob data);
-
-    /** Lock a blob */
-    public native void lockBlob(UniqueId blob_id, int lock_type);
-    public void lockBlob(UniqueId blob_id, MdLockType lock_type) {
-        unlockBlob(blob_id, lock_type.ordinal());
-    }
-
-    /** Unlock a blob */
-    public native void unlockBlob(UniqueId blob_id, int lock_type);
-    public void unlockBlob(UniqueId blob_id, MdLockType lock_type) {
-        unlockBlob(blob_id, lock_type.ordinal());
-    }
-
-    /** Destroy a blob */
-    public native void destroyBlob(UniqueId blob_id);
-
-    static {
-        System.loadLibrary("hermes_java_Bucket");
-    }
-}
diff --git a/wrapper/java/src/hermes/java/Hermes.java b/wrapper/java/src/hermes/java/Hermes.java
deleted file mode 100644
index 6dfd745e9..000000000
--- a/wrapper/java/src/hermes/java/Hermes.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package hermes.java;
-import hermes.java.Bucket;
-
-public class Hermes {
-    private static Hermes instance_ = null;
-
-    static public Hermes getInstance() {
-        if (instance_ == null) {
-            instance_ = new Hermes();
-        }
-        return instance_;
-    }
-
-    public native void create();
-    public native Bucket getBucket(String bkt_name);
-
-    static {
-        System.loadLibrary("hermes_java_Hermes");
-    }
-}
diff --git a/wrapper/java/src/hermes/java/MdLockType.java b/wrapper/java/src/hermes/java/MdLockType.java
deleted file mode 100644
index 5d0f6f7d1..000000000
--- a/wrapper/java/src/hermes/java/MdLockType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package hermes.java;
-public enum MdLockType {
-    kInternalRead,    /**< Internal read lock used by Hermes */
-    kInternalWrite,   /**< Internal write lock by Hermes */
-    kExternalRead,    /**< External is used by programs */
-    kExternalWrite,   /**< External is used by programs */
-}
diff --git a/wrapper/java/src/hermes/java/UniqueId.java b/wrapper/java/src/hermes/java/UniqueId.java
deleted file mode 100644
index 9473bee13..000000000
--- a/wrapper/java/src/hermes/java/UniqueId.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package hermes.java;
-
-public class UniqueId {
-    public long unique_;
-    public int node_id_;
-
-    UniqueId(long unique, int node_id) {
-        unique_ = unique;
-        node_id_ = node_id;
-    }
-
-    public boolean equals(UniqueId other) {
-        return unique_ == other.unique_ && node_id_ == other.node_id_;
-    }
-
-    public boolean isNull() { return unique_ == 0; }
-}
diff --git a/wrapper/java/src/test/java/HermesJniTest.java b/wrapper/java/src/test/java/HermesJniTest.java
deleted file mode 100644
index 6244cd8cf..000000000
--- a/wrapper/java/src/test/java/HermesJniTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.util.Vector;
-import hermes.java.Blob;
-import hermes.java.Bucket;
-import hermes.java.Hermes;
-import hermes.java.UniqueId;
-import hermes.java.MdLockType;
-
-import java.lang.management.ManagementFactory;
-
-public class HermesJniTest {
-    @Test
-    public void testBucketPutGet() {
-        String pid = ManagementFactory.getRuntimeMXBean().getName();
-        System.out.println(pid);
-        Hermes hermes = Hermes.getInstance();
-        hermes.create();
-        Bucket bkt = hermes.getBucket("hello");
-        Blob old_data = Blob.fromString("this is my DATA!");
-
-        bkt.lock(MdLockType.kExternalWrite);
-        UniqueId blob_id = bkt.put("0", old_data);
-        bkt.unlock(MdLockType.kExternalWrite);
-
-        bkt.lockBlob(blob_id, MdLockType.kExternalRead);
-        Blob new_data = bkt.get(blob_id);
-        bkt.unlockBlob(blob_id, MdLockType.kExternalRead);
-
-        Vector<UniqueId> blob_ids = bkt.getContainedBlobIds();
-        assertEquals(blob_ids.size(), 1);
-        assertTrue(blob_ids.get(0).equals(blob_id));
-
-        bkt.destroy();
-        assertTrue(new_data.equals(old_data));
-        new_data.close();
-        old_data.close();
-    }
-}
diff --git a/wrapper/java/tests.py b/wrapper/java/tests.py
deleted file mode 100644
index b9fae8a53..000000000
--- a/wrapper/java/tests.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from py_hermes_ci.test_manager import TestManager
-from jarvis_util import *
-
-
-class JavaWrapperTestManager(TestManager):
-    def spawn_all_nodes(self):
-        return self.spawn_info()
-
-    def set_paths(self):
-        self.KVSTORE_CMD = f"./gradlew test"
-        self.disable_testing = False
-
-    def test_hermes_java(self):
-        return
-        spawn_info = self.spawn_info(nprocs=1,
-                                     hermes_conf='hermes_server',
-                                     cwd=f"{self.MY_DIR}/java")
-        self.start_daemon(spawn_info)
-        node = Exec(self.KVSTORE_CMD, spawn_info)
-        self.stop_daemon(spawn_info)
-        return node.exit_code
diff --git a/wrapper/python/CMakeLists.txt b/wrapper/python/CMakeLists.txt
new file mode 100644
index 000000000..44fdf033a
--- /dev/null
+++ b/wrapper/python/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(cpp)
\ No newline at end of file
diff --git a/wrapper/python/cpp/CMakeLists.txt b/wrapper/python/cpp/CMakeLists.txt
new file mode 100644
index 000000000..103c27142
--- /dev/null
+++ b/wrapper/python/cpp/CMakeLists.txt
@@ -0,0 +1,21 @@
+#------------------------------------------------------------------------------
+# Find Packages
+#------------------------------------------------------------------------------
+# find_package(pybind11 CONFIG REQUIRED)
+# message(STATUS "Found pybind11 v${pybind11_VERSION}: ${pybind11_INCLUDE_DIRS}")
+
+#------------------------------------------------------------------------------
+# Compile Python Hermes
+#------------------------------------------------------------------------------
+pybind11_add_module(py_hermes MODULE py_hermes.cpp)
+add_dependencies(py_hermes ${Hermes_CLIENT_DEPS} hermes)
+target_link_libraries(py_hermes PUBLIC
+        ${Hermes_CLIENT_LIBRARIES} hermes pybind11::module)
+
+#------------------------------------------------------------------------------
+# Install Targets
+#------------------------------------------------------------------------------
+install(TARGETS
+        py_hermes
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
\ No newline at end of file
diff --git a/wrapper/python/cpp/py_hermes.cpp b/wrapper/python/cpp/py_hermes.cpp
new file mode 100644
index 000000000..86059d8d9
--- /dev/null
+++ b/wrapper/python/cpp/py_hermes.cpp
@@ -0,0 +1,127 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Distributed under BSD 3-Clause license.                                   *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Illinois Institute of Technology.                        *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of Hermes. The full Hermes copyright notice, including  *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the top directory. If you do not  *
+ * have access to the file, you may request a copy from help@hdfgroup.org.   *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+#include <hrun/hrun_types.h>
+#include "hermes/hermes.h"
+#include "hermes/bucket.h"
+
+namespace py = pybind11;
+
+using hermes::BlobId;
+using hermes::BucketId;
+using hermes::TagId;
+using hermes::TargetId;
+using hermes::BlobInfo;
+using hermes::TargetStats;
+using hermes::TagInfo;
+using hermes::MetadataTable;
+using hermes::Hermes;
+using hrun::UniqueId;
+
+bool TRANSPARENT_HERMES_FUN() {
+  if (TRANSPARENT_HRUN()) {
+    HERMES_CONF->ClientInit();
+    return true;
+  }
+  return false;
+}
+
+template<typename UniqueT>
+void BindUniqueId(py::module &m, const std::string &name) {
+  py::class_<UniqueT>(m, name.c_str())
+      .def(py::init<>())
+      .def(py::init<u32, u64>(), py::arg("node_id"), py::arg("unique"))
+      .def(py::init<u32, u32, u64>(), py::arg("node_id"), py::arg("hash"), py::arg("unique"))
+      .def("IsNull", &UniqueT::IsNull)
+      .def("GetNull", &UniqueT::GetNull)
+      .def("SetNull", &UniqueT::SetNull)
+      .def("GetNodeId", &UniqueT::GetNodeId)
+      .def("__eq__", &UniqueT::operator==)
+      .def("__ne__", &UniqueT::operator!=)
+      .def_readonly("node_id", &UniqueT::node_id_)
+      .def_readonly("hash", &UniqueT::hash_)
+      .def_readonly("unique", &UniqueT::unique_);
+}
+
+void BindBlobInfo(py::module &m) {
+  py::class_<BlobInfo>(m, "BlobInfo")
+      .def(py::init<>())
+      .def("UpdateWriteStats", &BlobInfo::UpdateWriteStats)
+      .def("UpdateReadStats", &BlobInfo::UpdateReadStats)
+      .def_readonly("tag_id", &BlobInfo::tag_id_)
+      .def_readonly("blob_id", &BlobInfo::blob_id_)
+      .def_readonly("name", &BlobInfo::name_)
+      .def_readonly("buffers", &BlobInfo::buffers_)
+      .def_readonly("tags", &BlobInfo::tags_)
+      .def_readonly("blob_size", &BlobInfo::blob_size_)
+      .def_readonly("max_blob_size", &BlobInfo::max_blob_size_)
+      .def_readonly("score", &BlobInfo::score_)
+      .def_readonly("access_freq", &BlobInfo::access_freq_)
+      .def_readonly("last_access", &BlobInfo::last_access_)
+      .def_readonly("mod_count", &BlobInfo::mod_count_)
+      .def_readonly("last_flush", &BlobInfo::last_flush_)
+      .def_static("GetTimeFromStartNs", &BlobInfo::GetTimeFromStartNs);
+}
+
+void BindTargetStats(py::module &m) {
+  py::class_<TargetStats>(m, "TargetStats")
+      .def(py::init<>())
+      .def_readonly("tgt_id", &TargetStats::tgt_id_)
+      .def_readonly("rem_cap", &TargetStats::rem_cap_)
+      .def_readonly("max_cap", &TargetStats::max_cap_)
+      .def_readonly("bandwidth", &TargetStats::bandwidth_)
+      .def_readonly("latency", &TargetStats::latency_)
+      .def_readonly("score", &TargetStats::score_);
+}
+
+void BindTagInfo(py::module &m) {
+  py::class_<TagInfo>(m, "TagInfo")
+      .def(py::init<>())
+      .def_readonly("tag_id", &TagInfo::tag_id_)
+      .def_readonly("name", &TagInfo::name_)
+      .def_readonly("blobs", &TagInfo::blobs_)
+      .def_readonly("traits", &TagInfo::traits_)
+      .def_readonly("internal_size", &TagInfo::internal_size_)
+      .def_readonly("page_size", &TagInfo::page_size_)
+      .def_readonly("owner", &TagInfo::owner_);
+}
+
+void BindMetadataTable(py::module &m) {
+  py::class_<MetadataTable>(m, "MetadataTable")
+      .def(py::init<>())
+      .def_readonly("blob_info", &MetadataTable::blob_info_)
+      .def_readonly("target_info", &MetadataTable::target_info_)
+      .def_readonly("bkt_info", &MetadataTable::bkt_info_);
+}
+
+void BindHermes(py::module &m) {
+  py::class_<Hermes>(m, "Hermes")
+      .def(py::init<>())
+      .def("ClientInit", &Hermes::ClientInit)
+      .def("IsInitialized", &Hermes::IsInitialized)
+      .def("GetTagId", &Hermes::GetTagId)
+      .def("CollectMetadataSnapshot", &Hermes::CollectMetadataSnapshot);
+  m.def("TRANSPARENT_HERMES", &TRANSPARENT_HERMES_FUN);
+}
+
+PYBIND11_MODULE(py_hermes, m) {
+  BindUniqueId<BlobId>(m, "BlobId");
+  BindUniqueId<BucketId>(m, "BucketId");
+  BindUniqueId<TagId>(m, "TagId");
+  BindUniqueId<TargetId>(m, "TargetId");
+  BindBlobInfo(m);
+  BindTargetStats(m);
+  BindMetadataTable(m);
+  BindHermes(m);
+}
diff --git a/wrapper/python/requirements.txt b/wrapper/python/requirements.txt
new file mode 100644
index 000000000..852bb4206
--- /dev/null
+++ b/wrapper/python/requirements.txt
@@ -0,0 +1,2 @@
+pybind11
+pytest
\ No newline at end of file
diff --git a/ci/jarvis-util/setup.py b/wrapper/python/setup.py
similarity index 58%
rename from ci/jarvis-util/setup.py
rename to wrapper/python/setup.py
index a1bdd4e91..9ed6bbd05 100644
--- a/ci/jarvis-util/setup.py
+++ b/wrapper/python/setup.py
@@ -1,23 +1,23 @@
 import setuptools
 
 setuptools.setup(
-    name="jarvis_util",
+    name="hermes",
     packages=setuptools.find_packages(),
     version="0.0.1",
     author="Luke Logan",
-    author_email="llogan@hawk.iit.edu",
-    description="Various wrappers around shell utilities",
-    url="https://github.com/scs-lab/jarvis-util",
+    author_email="lukemartinlogan@gmail.com",
+    description="An I/O buffering library",
+    url="https://github.com/HDFGroup/hermes.git",
     classifiers = [
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Development Status :: 0 - Pre-Alpha",
+        "Development Status :: 1.1",
         "Environment :: Other Environment",
         "Intended Audience :: Developers",
         "License :: None",
-        "Operating System :: OS Independent",
+        "Operating System :: Linux",
         "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Application Configuration",
+        "Topic :: I/O",
     ],
     long_description=""
-)
+)
\ No newline at end of file
diff --git a/wrapper/python/test/unit/test_hermes.py b/wrapper/python/test/unit/test_hermes.py
new file mode 100644
index 000000000..7f3a3e7a8
--- /dev/null
+++ b/wrapper/python/test/unit/test_hermes.py
@@ -0,0 +1,12 @@
+from unittest import TestCase
+from py_hermes import Hermes, TRANSPARENT_HERMES
+import pathlib
+import os
+
+class TestHermes(TestCase):
+    def test_metadata_query(self):
+        TRANSPARENT_HERMES()
+        hermes = Hermes()
+        mdm = hermes.CollectMetadataSnapshot()
+        print(mdm.blob_info)
+        print("Done")