diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..089d44d1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+*.stl filter=lfs diff=lfs merge=lfs -text
+*.data.gz filter=lfs diff=lfs merge=lfs -text
+*.inst.gz filter=lfs diff=lfs merge=lfs -text
+*.tdb filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index 61e23e3d..c2403c1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 /dram/build
 *.user
 *.tdb
-!/DRAMSys/tests/*/expected/*.tdb
+!tests/tests_regression/*/expected/*.tdb
 *.tdb-journal
 *.out
 /build-simulation
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdca1806..39238ae7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,10 +7,7 @@ before_script:
 
 stages:
     - build
-    - test_DDR3
-    - test_DDR4
-    - test_HBM2
-    - test_LPDDR4
+    - test
     - coverage
 
 build:
@@ -22,31 +19,36 @@ build:
         - mkdir -p coverage
         - mkdir -p build
         - cd build
-        - cmake -DDRAMSYS_COVERAGE_CHECK=ON ../DRAMSys
+        - cmake -DDRAMSYS_COVERAGE_CHECK=ON -DDRAMSYS_ENABLE_EXTENSIONS=ON -DDRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE=ON -DDRAMSYS_WITH_DRAMPOWER=ON ..
         - make -j 10
         - find . -name "*.o" -type f -delete
 
     artifacts:
         paths:
             - build/
-            - DRAMSys/tests/
+            - tests/
             - coverage/
         expire_in: 2 days
         
 coverage:
     stage: coverage
+    needs:
+        - test_DDR3
+        - test_DDR4
+        - test_HBM2
+        - test_LPDDR4
     coverage: '/Total:\|(\d+\.?\d+\%)/'
     script:
         # delete all empty files since they produce errors 
         - find coverage -size 0 -type f -delete
         - ls coverage/ -lah
         - lcov `find coverage -type f -exec echo "-a {}" \;` -o coverage/final.out        
-        - lcov --remove coverage/final.out '*/systemc*/include/*' '*/traceAnalyzer/*' '*/gcc*/include/*' '/usr/include/*' '*/third_party/*' -o coverage/final_dramsys.out
+        - lcov --remove coverage/final.out '/build/_deps/*' '/lib/*' '/usr/*' -o coverage/final_dramsys.out
         - lcov --list coverage/final_dramsys.out
 
 include:
-    - '/DRAMSys/tests/DDR3/ci.yml'
-    - '/DRAMSys/tests/DDR4/ci.yml'
-    - '/DRAMSys/tests/HBM2/ci.yml'
-    - '/DRAMSys/tests/LPDDR4/ci.yml'
+    - 'tests/tests_regression/DDR3/ci.yml'
+    - 'tests/tests_regression/DDR4/ci.yml'
+    - 'tests/tests_regression/HBM2/ci.yml'
+    - 'tests/tests_regression/LPDDR4/ci.yml'
    #- '/DRAMSys/tests/dramsys-gem5/ci.yml' # Should be activated again when a new gitlab runner with right dependencies is used
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 8456cd1e..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,16 +0,0 @@
-[submodule "DRAMSys/library/src/common/third_party/DRAMPower"]
-	path = DRAMSys/library/src/common/third_party/DRAMPower
-	url = https://github.com/tukl-msd/DRAMPower.git
-	branch = rgr
-[submodule "DRAMSys/unitTests/googletest"]
-	path = DRAMSys/unitTests/googletest
-	url = https://github.com/google/googletest.git
-[submodule "DRAMSys/library/src/common/third_party/systemc"]
-	path = DRAMSys/library/src/common/third_party/systemc
-	url = https://github.com/accellera-official/systemc.git
-[submodule "DRAMSys/library/src/common/third_party/sqlite-amalgamation"]
-	path = DRAMSys/library/src/common/third_party/sqlite-amalgamation
-	url = https://github.com/azadkuh/sqlite-amalgamation.git
-[submodule "DRAMSys/library/src/common/third_party/nlohmann"]
-	path = DRAMSys/library/src/common/third_party/nlohmann
-	url = https://github.com/nlohmann/json
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..e8679d5c
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,191 @@
+# Copyright (c) 2020, Technische Universität Kaiserslautern
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. 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.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# 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.
+#
+# Authors: 
+#    Thomas Psota
+
+###############################################
+###                 DRAMSys                 ###
+###############################################
+cmake_minimum_required(VERSION 3.13.0)
+
+set(PROJECT_NAME "DRAMSys 5.0")
+set(PROJECT_SHORTNAME "DRAMSys")
+
+project(${PROJECT_NAME} VERSION "5.0")
+
+### CMake settings ###
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+include(build_source_group)
+include(diagnostics_print)
+include(enable_extensions)
+include(FetchContent)
+
+if(POLICY CMP0135)
+    cmake_policy(SET CMP0135 NEW)
+endif()
+
+# Check if standalone build or being included as submodule
+get_directory_property(DRAMSYS_IS_SUBMODULE PARENT_DIRECTORY)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+### Project settings ###
+message(STATUS "CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}")
+message(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
+message(STATUS "" )
+
+if(NOT DRAMSYS_IS_SUBMODULE)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+endif()
+
+### DRAMSys directories ###
+set(DRAMSYS_SOURCE_DIR    "${CMAKE_CURRENT_SOURCE_DIR}/src")
+set(DRAMSYS_LIBRARY_DIR   "${CMAKE_CURRENT_SOURCE_DIR}/lib")
+set(DRAMSYS_TESTS_DIR     "${CMAKE_CURRENT_SOURCE_DIR}/tests")
+set(DRAMSYS_RESOURCE_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/resources")
+set(DRAMSYS_EXTENSIONS_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/extensions")
+
+### Build options ###
+option(DRAMSYS_BUILD_TESTS "Build DRAMSys unit tests" OFF)
+option(DRAMSYS_VERBOSE_CMAKE_OUTPUT "Show detailed CMake output" OFF)
+option(DRAMSYS_BUILD_CLI "Build DRAMSys Command Line Tool" ON)
+option(DRAMSYS_COVERAGE_CHECK "Coverage check of DRAMSys" OFF)
+option(DRAMSYS_WITH_GEM5 "Build DRAMSys with gem5 coupling" OFF)
+option(DRAMSYS_WITH_DRAMPOWER "Build with DRAMPower support enabled." OFF)
+option(DRAMSYS_ENABLE_EXTENSIONS "Enable proprietary DRAMSys extensions." OFF)
+
+### Compiler settings ###
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Standard")
+
+if(DRAMSYS_COVERAGE_CHECK)
+    message("== Coverage check enabled")
+    set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
+    set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
+endif()
+
+
+###############################################
+###           Library Settings              ###
+###############################################
+
+### Detect OS threading library ###
+find_package(Threads)
+
+### nlohmann_json ###
+add_subdirectory(${DRAMSYS_LIBRARY_DIR}/nlohmann_json)
+
+### sqlite3 ###
+add_subdirectory(${DRAMSYS_LIBRARY_DIR}/sqlite3)
+
+### GoogleTest ###
+if(DRAMSYS_BUILD_TESTS)
+    FetchContent_Declare(
+	    googletest
+	    GIT_REPOSITORY https://github.com/google/googletest
+		GIT_TAG release-1.12.1)
+
+    # For Windows: Prevent overriding the parent project's compiler/linker settings
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    FetchContent_MakeAvailable(googletest)
+    set_target_properties(gmock PROPERTIES FOLDER lib/gtest)
+    set_target_properties(gmock_main PROPERTIES FOLDER lib/gtest)
+    set_target_properties(gtest PROPERTIES FOLDER lib/gtest)
+    set_target_properties(gtest_main PROPERTIES FOLDER lib/gtest)
+endif()
+
+### sqlite-amalgamation ###
+#  FetchContent_Declare(
+#  	sqlite-amalgamation
+#  	GIT_REPOSITORY https://github.com/azadkuh/sqlite-amalgamation.git
+#  	GIT_TAG 3.38.2)
+#  
+#  set(SQLITE_ENABLE_RTREE ON CACHE BOOL "Enable R-Tree Feature")
+#  FetchContent_MakeAvailable(sqlite-amalgamation)
+#  set_target_properties(SQLite3 PROPERTIES FOLDER lib)
+#  add_library(sqlite::sqlite3 ALIAS SQLite3)
+
+### SystemC ###
+FetchContent_Declare(
+	systemc
+	GIT_REPOSITORY https://github.com/accellera-official/systemc.git
+	GIT_TAG 2.3.4)
+
+FetchContent_MakeAvailable(systemc)
+set_target_properties(systemc PROPERTIES FOLDER lib)
+
+### DRAMPower ###
+if (DRAMSYS_WITH_DRAMPOWER)
+    FetchContent_Declare(
+        DRAMPower
+        GIT_REPOSITORY https://github.com/tukl-msd/DRAMPower
+        GIT_TAG 9e64a1b)
+
+    FetchContent_MakeAvailable(DRAMPower)
+    set_target_properties(DRAMPower PROPERTIES FOLDER lib)
+endif ()
+
+###############################################
+###           Source Directory              ###
+###############################################
+
+add_subdirectory(src/util)
+add_subdirectory(src/configuration)
+add_subdirectory(src/libdramsys)
+
+if(DRAMSYS_BUILD_CLI)
+	add_subdirectory(src/simulator)
+endif()
+
+if(DRAMSYS_ENABLE_EXTENSIONS)
+    dramsys_enable_extensions()
+endif()
+
+###############################################
+###           Test Directory                ###
+###############################################
+
+if(DRAMSYS_BUILD_TESTS)
+    include( GoogleTest )
+    include( CTest )
+    add_subdirectory(tests)
+endif()
+
+# Add DRAMSysgem5
+#if(DEFINED ENV{GEM5} AND DRAMSYS_WITH_GEM5)
+#    message("== gem5 coupling included")
+#    add_subdirectory(gem5)
+#endif()
+
diff --git a/DRAMSys/DRAMSys.astylerc b/DRAMSys.astylerc
similarity index 100%
rename from DRAMSys/DRAMSys.astylerc
rename to DRAMSys.astylerc
diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt
deleted file mode 100644
index adcb857b..00000000
--- a/DRAMSys/library/CMakeLists.txt
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright (c) 2020, Technische Universität Kaiserslautern
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# 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.
-#
-# Authors: 
-#   Matthias Jung
-#   Lukas Steiner
-#   Derek Christ
-
-cmake_minimum_required(VERSION 3.10)
-
-# Project Name
-project(DRAMSysLibrary)
-
-# Configuration:
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Version")
-set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
-
-option(DRAMSYS_WITH_DRAMPOWER "Build with DRAMPower support enabled." ON)
-
-# Add DRAMPower:
-if (DRAMSYS_WITH_DRAMPOWER)
-add_subdirectory(src/common/third_party/DRAMPower)
-endif()
-
-# Add Configuration
-add_subdirectory(src/common/configuration)
-
-# Add SystemC:
-if(DEFINED ENV{SYSTEMC_HOME})
-    find_library(SYSTEMC_LIBRARY 
-        NAMES systemc SnpsVP 
-	PATHS $ENV{SYSTEMC_HOME}/lib-$ENV{SYSTEMC_TARGET_ARCH}/ $ENV{SYSTEMC_HOME}/lib-linux64/ $ENV{SYSTEMC_HOME}/lib64 $ENV{SYSTEMC_HOME}/libso-$ENV{COWARE_CXX_COMPILER}/
-    )
-    message("== Building with external SystemC located in $ENV{SYSTEMC_HOME}")
-else()
-    set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libs")
-    add_subdirectory(src/common/third_party/systemc)
-    set(SYSTEMC_LIBRARY systemc)
-    message("== Building with SystemC submodule")
-endif()
-
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/common/third_party/sqlite-amalgamation)
-    message("== Database recording included")
-    # Add sqlite3 Dependency:
-    set(BUILD_ENABLE_RTREE ON CACHE BOOL "Enable R-Tree Feature")
-    set(BUILD_ENABLE_RTREE ON)
-    add_subdirectory(src/common/third_party/sqlite-amalgamation)
-
-    set(RECORDING_SOURCES
-        src/common/TlmRecorder.cpp
-        src/controller/ControllerRecordable.cpp
-        src/simulation/DRAMSysRecordable.cpp
-        src/simulation/dram/DramRecordable.cpp
-    )
-endif()
-
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/controller/checker/CheckerDDR5.cpp)
-    message("== DDR5 included")
-    set(DDR5_SOURCES
-        src/configuration/memspec/MemSpecDDR5.cpp
-        src/controller/checker/CheckerDDR5.cpp
-        src/simulation/dram/DramDDR5.cpp
-    )
-endif()
-
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/controller/checker/CheckerLPDDR5.cpp)
-    message("== LPDDR5 included")
-    set(LPDDR5_SOURCES
-        src/configuration/memspec/MemSpecLPDDR5.cpp
-        src/controller/checker/CheckerLPDDR5.cpp
-        src/simulation/dram/DramLPDDR5.cpp
-    )
-endif()
-
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/controller/checker/CheckerHBM3.cpp)
-    message("== HBM3 included")
-    set(HBM3_SOURCES
-        src/configuration/memspec/MemSpecHBM3.cpp
-        src/controller/checker/CheckerHBM3.cpp
-        src/simulation/dram/DramHBM3.cpp
-    )
-endif()
-
-add_library(DRAMSysLibrary
-    src/common/DebugManager.cpp
-    src/common/dramExtensions.cpp
-    src/common/tlm2_base_protocol_checker.h
-    src/common/utils.cpp
-    
-    src/configuration/Configuration.cpp 
-    src/configuration/TemperatureSimConfig.h
-    
-    src/configuration/memspec/MemSpec.cpp
-    src/configuration/memspec/MemSpecDDR3.cpp
-    src/configuration/memspec/MemSpecDDR4.cpp
-    src/configuration/memspec/MemSpecLPDDR4.cpp
-    src/configuration/memspec/MemSpecWideIO.cpp
-    src/configuration/memspec/MemSpecWideIO2.cpp
-    src/configuration/memspec/MemSpecGDDR5.cpp
-    src/configuration/memspec/MemSpecGDDR5X.cpp
-    src/configuration/memspec/MemSpecGDDR6.cpp
-    src/configuration/memspec/MemSpecHBM2.cpp
-    src/configuration/memspec/MemSpecSTTMRAM.cpp
-    
-    src/controller/BankMachine.cpp
-    src/controller/Command.cpp
-    src/controller/ControllerIF.h
-    src/controller/Controller.cpp
-    
-    src/controller/checker/CheckerIF.h
-    src/controller/checker/CheckerDDR3.cpp
-    src/controller/checker/CheckerDDR4.cpp
-    src/controller/checker/CheckerLPDDR4.cpp
-    src/controller/checker/CheckerWideIO.cpp
-    src/controller/checker/CheckerWideIO2.cpp
-    src/controller/checker/CheckerGDDR5.cpp
-    src/controller/checker/CheckerGDDR5X.cpp
-    src/controller/checker/CheckerGDDR6.cpp
-    src/controller/checker/CheckerHBM2.cpp
-    src/controller/checker/CheckerSTTMRAM.cpp
-    
-    src/controller/cmdmux/CmdMuxIF.h
-    src/controller/cmdmux/CmdMuxOldest.cpp
-    src/controller/cmdmux/CmdMuxStrict.cpp
-    
-    src/controller/powerdown/PowerDownManagerIF.h
-    src/controller/powerdown/PowerDownManagerDummy.cpp
-    src/controller/powerdown/PowerDownManagerStaggered.cpp
-    
-    src/controller/refresh/RefreshManagerIF.h
-    src/controller/refresh/RefreshManagerDummy.cpp
-    src/controller/refresh/RefreshManagerAllBank.cpp
-    src/controller/refresh/RefreshManagerPerBank.cpp
-    src/controller/refresh/RefreshManagerPer2Bank.cpp
-    src/controller/refresh/RefreshManagerSameBank.cpp
-    
-    src/controller/respqueue/RespQueueIF.h
-    src/controller/respqueue/RespQueueFifo.cpp
-    src/controller/respqueue/RespQueueReorder.cpp
-    
-    src/controller/scheduler/SchedulerIF.h
-    src/controller/scheduler/SchedulerFifo.cpp
-    src/controller/scheduler/SchedulerFrFcfs.cpp
-    src/controller/scheduler/SchedulerFrFcfsGrp.cpp
-    src/controller/scheduler/SchedulerGrpFrFcfs.cpp
-    src/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
-
-    src/controller/scheduler/BufferCounterIF.h
-    src/controller/scheduler/BufferCounterBankwise.cpp
-    src/controller/scheduler/BufferCounterReadWrite.cpp
-    src/controller/scheduler/BufferCounterShared.cpp
-    
-    src/error/eccbaseclass.cpp
-    src/error/ecchamming.cpp
-    src/error/errormodel.cpp
-    
-    src/error/ECC/Bit.cpp
-    src/error/ECC/ECC.cpp
-    src/error/ECC/Word.cpp
-    
-    src/simulation/Arbiter.cpp
-    src/simulation/AddressDecoder.cpp
-    src/simulation/DRAMSys.cpp
-    src/simulation/ReorderBuffer.h
-    src/simulation/TemperatureController.cpp
-    
-    src/simulation/dram/Dram.cpp
-    src/simulation/dram/DramDDR3.cpp 
-    src/simulation/dram/DramDDR4.cpp
-    src/simulation/dram/DramLPDDR4.cpp
-    src/simulation/dram/DramWideIO.cpp
-    src/simulation/dram/DramWideIO2.cpp
-    src/simulation/dram/DramGDDR5.cpp
-    src/simulation/dram/DramGDDR5X.cpp
-    src/simulation/dram/DramGDDR6.cpp
-    src/simulation/dram/DramHBM2.cpp
-    src/simulation/dram/DramSTTMRAM.cpp
-
-    ${RECORDING_SOURCES}
-    ${DDR5_SOURCES}
-    ${LPDDR5_SOURCES}
-    ${HBM3_SOURCES}
-)
-
-if(DEFINED DDR5_SOURCES)
-    target_compile_definitions(DRAMSysLibrary PRIVATE DDR5_SIM)
-endif()
-
-if(DEFINED LPDDR5_SOURCES)
-    target_compile_definitions(DRAMSysLibrary PRIVATE LPDDR5_SIM)
-endif()
-
-if(DEFINED HBM3_SOURCES)
-    target_compile_definitions(DRAMSysLibrary PRIVATE HBM3_SIM)
-endif()
-
-if(DEFINED ENV{LIBTHREED_ICE_HOME})
-    message("== Thermal simulation available")
-    target_compile_definitions(DRAMSysLibrary PRIVATE THERMALSIM)
-    target_include_directories(DRAMSysLibrary
-        PRIVATE $ENV{LIBTHREED_ICE_HOME}/include/
-    )
-    find_library(3DICE_LIBRARY NAMES threed-ice-2.2.4 PATHS $ENV{LIBTHREED_ICE_HOME}/lib/)
-    target_link_libraries(DRAMSysLibrary
-        PRIVATE ${3DICE_LIBRARY}
-    )
-endif()
-
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/common/third_party/sqlite-amalgamation)
-    target_include_directories(DRAMSysLibrary
-        PUBLIC src/common/third_party/sqlite-amalgamation/
-    )
-    target_link_libraries(DRAMSysLibrary
-        PRIVATE sqlite3::sqlite3
-    )
-endif()
-
-# Build:
-target_include_directories(DRAMSysLibrary
-    PRIVATE src/common/third_party/DRAMPower/src/
-    PUBLIC $ENV{SYSTEMC_HOME}/include/
-)
-
-if(EXISTS $ENV{SYSTEMC_HOME}/include/tlm/)
-    target_include_directories(DRAMSysLibrary
-        PUBLIC $ENV{SYSTEMC_HOME}/include/tlm/
-    )
-endif()
-
-target_link_libraries(DRAMSysLibrary
-    PUBLIC ${SYSTEMC_LIBRARY}
-    PUBLIC DRAMSysConfiguration
-)
-
-if (DRAMSYS_WITH_DRAMPOWER)
-target_compile_definitions(DRAMSysLibrary PRIVATE DRAMPOWER)
-
-target_link_libraries(DRAMSysLibrary
-    PRIVATE DRAMPower
-)
-endif()
diff --git a/DRAMSys/library/resources/.gitignore b/DRAMSys/library/resources/.gitignore
deleted file mode 100644
index 0d20b648..00000000
--- a/DRAMSys/library/resources/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/DRAMSys/library/resources/configs/simulator/ddr3.json b/DRAMSys/library/resources/configs/simulator/ddr3.json
deleted file mode 100644
index 99ccdb45..00000000
--- a/DRAMSys/library/resources/configs/simulator/ddr3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "ddr3",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/ddr3_ecc.json b/DRAMSys/library/resources/configs/simulator/ddr3_ecc.json
deleted file mode 100644
index e148c3aa..00000000
--- a/DRAMSys/library/resources/configs/simulator/ddr3_ecc.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Hamming",
-        "EnableWindowing": true,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": true,
-        "SimulationName": "ddr3",
-        "SimulationProgressBar": true,
-        "StoreMode": "ErrorModel",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/ddr4.json b/DRAMSys/library/resources/configs/simulator/ddr4.json
deleted file mode 100644
index 05cd86e2..00000000
--- a/DRAMSys/library/resources/configs/simulator/ddr4.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "ddr4",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/ddr5.json b/DRAMSys/library/resources/configs/simulator/ddr5.json
deleted file mode 100644
index d3987d37..00000000
--- a/DRAMSys/library/resources/configs/simulator/ddr5.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "ddr5",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/hbm2.json b/DRAMSys/library/resources/configs/simulator/hbm2.json
deleted file mode 100644
index 608aec41..00000000
--- a/DRAMSys/library/resources/configs/simulator/hbm2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "hbm2",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/hbm3.json b/DRAMSys/library/resources/configs/simulator/hbm3.json
deleted file mode 100644
index 901dc498..00000000
--- a/DRAMSys/library/resources/configs/simulator/hbm3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "hbm3",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/lpddr4.json b/DRAMSys/library/resources/configs/simulator/lpddr4.json
deleted file mode 100644
index 6ea5b1bd..00000000
--- a/DRAMSys/library/resources/configs/simulator/lpddr4.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "lpddr4",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/stt-mram.json b/DRAMSys/library/resources/configs/simulator/stt-mram.json
deleted file mode 100644
index 3248e9f0..00000000
--- a/DRAMSys/library/resources/configs/simulator/stt-mram.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "stt-mram",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/wideio.json b/DRAMSys/library/resources/configs/simulator/wideio.json
deleted file mode 100644
index 0c285f79..00000000
--- a/DRAMSys/library/resources/configs/simulator/wideio.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "simconfig": {
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": true,
-        "ErrorCSVFile": "../../DRAMSys/library/resources/error/wideio.csv",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": true,
-        "SimulationName": "wideio",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/wideio_ecc.json b/DRAMSys/library/resources/configs/simulator/wideio_ecc.json
deleted file mode 100644
index 80acc3be..00000000
--- a/DRAMSys/library/resources/configs/simulator/wideio_ecc.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "simconfig": {
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Hamming",
-        "EnableWindowing": true,
-        "ErrorCSVFile": "../../DRAMSys/library/resources/error/wideio.csv",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": true,
-        "SimulationName": "wideio_ecc",
-        "SimulationProgressBar": true,
-        "StoreMode": "ErrorModel",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/simulator/wideio_thermal.json b/DRAMSys/library/resources/configs/simulator/wideio_thermal.json
deleted file mode 100644
index 6ce8c0a4..00000000
--- a/DRAMSys/library/resources/configs/simulator/wideio_thermal.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "simconfig": {
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": true,
-        "ErrorCSVFile": "../../DRAMSys/library/resources/error/wideio.csv",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": true,
-        "SimulationName": "wideio",
-        "SimulationProgressBar": true,
-        "StoreMode": "Store",
-        "ThermalSimulation": true,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/library/resources/configs/thermalsim/config.json b/DRAMSys/library/resources/configs/thermalsim/config.json
deleted file mode 100644
index b88ed84c..00000000
--- a/DRAMSys/library/resources/configs/thermalsim/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"thermalsimconfig": {
-		"TemperatureScale": "Celsius",
-		"StaticTemperatureDefaultValue": 89,
-		"ThermalSimPeriod":100,
-		"ThermalSimUnit":"us",
-		"PowerInfoFile": "powerInfo.json",
-		"IceServerIp": "127.0.0.1",
-		"IceServerPort": 11880,
-		"SimPeriodAdjustFactor" : 10,
-		"NPowStableCyclesToIncreasePeriod": 5,
-		"GenerateTemperatureMap": true,
-		"GeneratePowerMap": true
-	}
-}
diff --git a/DRAMSys/library/resources/configs/thermalsim/core.flp b/DRAMSys/library/resources/configs/thermalsim/core.flp
deleted file mode 100755
index e85e6801..00000000
--- a/DRAMSys/library/resources/configs/thermalsim/core.flp
+++ /dev/null
@@ -1,45 +0,0 @@
-CPUs :
-
-  position        0,    0 ;
-  dimension    2750, 4300 ;
-
-GPU :
-
-  position     3350,    0 ;
-  dimension    2750, 4000 ;
-
-BASEBAND1 :
-
-  position     4250, 4000 ;
-  dimension    1850, 3300 ;
-
-BASEBAND2 :
-
-  position     3350, 7300 ;
-  dimension    2750, 3300 ;
-
-LLCACHE :
-
-  position        0, 4300 ;
-  dimension    1900, 3000 ;
-
-DRAMCTRL1 :
-
-  position     1900, 4300 ;
-  dimension     850, 3000 ;
-
-DRAMCTRL2 :
-
-  position     3350, 4000 ;
-  dimension     900, 3300 ;
-
-TSVS :
-
-  position     2750, 2300 ;
-  dimension     600, 6000 ;
-
-ACELLERATORS :
-
-  position        0, 7300 ;
-  dimension    2750, 3300 ;
-
diff --git a/DRAMSys/library/resources/configs/thermalsim/mem.flp b/DRAMSys/library/resources/configs/thermalsim/mem.flp
deleted file mode 100755
index 29d02254..00000000
--- a/DRAMSys/library/resources/configs/thermalsim/mem.flp
+++ /dev/null
@@ -1,16 +0,0 @@
-channel0 :
-    position   150,  100 ;
-    dimension  2600, 5200 ;
-
-channel1 :
-    position   3350,  100 ;
-    dimension  2600, 5200 ;
-
-channel2 :
-    position   150, 5300 ;
-    dimension  2600, 5200 ;
-
-channel3 :
-    position   3350, 5300 ;
-    dimension  2600, 5200 ;
-
diff --git a/DRAMSys/library/resources/configs/thermalsim/powerInfo.json b/DRAMSys/library/resources/configs/thermalsim/powerInfo.json
deleted file mode 100644
index 524f690f..00000000
--- a/DRAMSys/library/resources/configs/thermalsim/powerInfo.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"powerInfo": {
-		"dram_die_channel0": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel1": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel2": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel3": {
-			"init_pow": 0,
-			"threshold": 1.0
-		}
-	}
-}
diff --git a/DRAMSys/library/resources/configs/thermalsim/stack.stk b/DRAMSys/library/resources/configs/thermalsim/stack.stk
deleted file mode 100755
index ec74f020..00000000
--- a/DRAMSys/library/resources/configs/thermalsim/stack.stk
+++ /dev/null
@@ -1,49 +0,0 @@
-material SILICON :
-    thermal conductivity 1.30e-4 ;
-    volumetric heat capacity 1.628e-12 ;
-
-material BEOL :
-    thermal conductivity 2.25e-6 ;
-    volumetric heat capacity 2.175e-12 ;
-
-material COPPER :
-    thermal conductivity 4.01e-04 ;
-    volumetric heat capacity 3.37e-12 ;
-
-top heat sink :
-    //sink height 1e03, area 100e06, material COPPER ;
-    //spreader height 0.5e03, area 70e06, material SILICON ;
-    heat transfer coefficient 1.3e-09 ;
-    temperature 318.15 ;
-dimensions :
-   chip length 6100, width 10600 ;
-   cell length  100, width   100 ;
-
-
-layer PCB :
-    height 10 ;
-    material BEOL ;
-
-die DRAM :
-    layer 58.5 SILICON ;
-    source 2 SILICON ;
-    layer 1.5 BEOL ;
-    layer 58.5 SILICON ;
-
-
-stack:
-    die DRAM_DIE DRAM floorplan "./mem.flp" ;
-    layer CONN_TO_PCB PCB ;
-
-solver:
-   transient step 0.01, slot 0.05 ;
-   initial temperature 300.0 ;
-
-output:
-   Tflpel(DRAM_DIE.channel0 , "temp_flp_element_ch0.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel1 , "temp_flp_element_ch1.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel2 , "temp_flp_element_ch2.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel3 , "temp_flp_element_ch3.txt" , average  , slot );
-   Tmap  (DRAM_DIE, "output1.txt", slot) ;
-   Pmap  (DRAM_DIE, "output2.txt", slot) ;
-
diff --git a/DRAMSys/library/resources/error/wideio.csv b/DRAMSys/library/resources/error/wideio.csv
deleted file mode 100644
index 22e0d502..00000000
--- a/DRAMSys/library/resources/error/wideio.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-75	 64	0	0	0	0
-80	 64	0	0	0	0
-85	 64	0	0	0	0
-89	 64	0	0	0	0
-75	127	0	0	0	0
-80	127	0	0	0	0
-85	127	0	0	0	0
-89	127	2	0.03	2	0.06
-75	145	0	0	0	0
-80	145	0	0	0	0
-85	145	0	0	1	0.03
-89	145	13	0.195	3	0.09
-75	164	0	0	0	0
-80	164	0	0	0	0
-85	164	8	0.12	2	0.06
-89	164	24	0.36	4	0.12
-75	182	0	0	0	0
-80	182	0	0	1	0.03
-85	182	16	0.24	2	0.06
-89	182	41	0.615	8	0.24
-75	200	0	0	0	0
-80	200	5	0.075	3	0.09
-85	200	24	0.36	4	0.12
-89	200	67	1.005	15	0.45
diff --git a/DRAMSys/library/resources/scripts/address_scrambler.pl b/DRAMSys/library/resources/scripts/address_scrambler.pl
deleted file mode 100644
index 65396cb8..00000000
--- a/DRAMSys/library/resources/scripts/address_scrambler.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-
-my $filename = shift || die;
-
-open(FH, "$filename");
-
-while(<FH>)
-{
-	# Get all the data adress:
-	$_ =~ /(\d+):\s+(\w+)\s+0x([\w\d]+)/;
-	my $time = $1;
-	my $command = $2;
-	my $address = $3;
-	my $new_address; 
-
-	# Convert to binary:
-	$address = sprintf( "%032b", hex( $address ) );
-	
-	# example:
-	# 31                             0
-	# 00000000000000000000000000000001
-	# 00000000000000000000010000000000
-
-	# Swap adresses:
-	$new_address = 	substr($address,31 - 31,1). # R  31
-			substr($address,31 - 30,1). # R  30
-			substr($address,31 - 29,1). # R  29
-			substr($address,31 - 28,1). # R  28
-			substr($address,31 - 27,1). # R  27
-			substr($address,31 - 26,1). # R  26
-			substr($address,31 - 25,1). # R  25
-			substr($address,31 - 24,1). # R  24
-			substr($address,31 - 23,1). # R  23
-			substr($address,31 - 22,1). # R  22
-			substr($address,31 - 21,1). # R  21
-			substr($address,31 - 20,1). # R  20
-			substr($address,31 - 19,1). # R  19
-			substr($address,31 - 18,1). # R  18
-			substr($address,31 - 17,1). # R  17
-			substr($address,31 - 16,1). # R  16
-			substr($address,31 -  8,1). # R  15
-			substr($address,31 -  7,1). # R  14
-			substr($address,31 -  6,1). # R  13
-			substr($address,31 - 11,1). # B  12
-			substr($address,31 -  9,1). # B  11
-			substr($address,31 -  0,1). # B  10
-			substr($address,31 - 15,1). # C   9
-			substr($address,31 - 14,1). # C   8 
-			substr($address,31 - 13,1). # C   7
-			substr($address,31 - 12,1). # C   6
-			substr($address,31 - 10,1). # C   5
-			substr($address,31 -  5,1). # C   4 
-			substr($address,31 -  4,1). # C   3
-			substr($address,31 -  3,1). # C   2
-			substr($address,31 -  2,1). # C   1
-			substr($address,31 -  1,1); # C   0
-			
-	$new_address = sprintf("%X", oct( "0b$new_address" ) );
-
-	print $time.":\t".$command."\t0x".$new_address."\n";
-}
-
diff --git a/DRAMSys/library/resources/scripts/analyse_trace.pl b/DRAMSys/library/resources/scripts/analyse_trace.pl
deleted file mode 100644
index 671179c2..00000000
--- a/DRAMSys/library/resources/scripts/analyse_trace.pl
+++ /dev/null
@@ -1,378 +0,0 @@
-#!/usr/bin/perl
-use List::Util 'max';
-use warnings;
-use strict;
-
-my $filename = shift || die("Please provide a input STL file");
-
-my $numberOfRows    = 16384;
-my $numberOfBanks   = 8;
-my $numberOfColumns = 1024;
-my $numberOfBytes   = 8; # Byte Offset from e.g. DIMM
-
-my $numberOfBits    = 32;
-my $burstLength     = 8;
-
-my $addressCorrection = 1;
-
-my $numberOfRowBits    = log($numberOfRows)/log(2);
-my $numberOfBankBits   = log($numberOfBanks)/log(2);
-my $numberOfColumnBits = log($numberOfColumns)/log(2);
-my $numberOfByteBits   = log($numberOfBytes)/log(2);
-my $numberOfBurstBits  = log($burstLength)/log(2);
-
-print "Number of Address Bits:\t".$numberOfBits."\n\n";
-print "Number of Row Bits:\t".$numberOfRowBits."\n";
-print "Number of Bank Bits:\t".$numberOfBankBits."\n";
-print "Number of Col Bits:\t".$numberOfColumnBits."\n";
-print ">Burst Bits in Col:\t".$numberOfBurstBits."\n";
-print "Number of Byte Bits:\t".$numberOfByteBits."\n";
-
-my $numberOfXBits = $numberOfBits - $numberOfRowBits - $numberOfBankBits - $numberOfColumnBits - $numberOfByteBits;
-
-print "Number of Unused Bits:\t".$numberOfXBits."\n";
-print "\n";
-print "\n";
-
-open(FH, "$filename");
-
-my @activityCounter;
-my @mapping;
-
-# Initialize:
-for(my $i = 0; $i < $numberOfBits; $i++)
-{
-	$activityCounter[$i] = 0;
-}
-
-for(my $i = $numberOfXBits-1; $i >= 0; $i--)
-{
-        $mapping[$numberOfBits-($numberOfXBits-$i)] = "X".$i;
-}
-
-my $old_address = "00000000000000000000000000000000";
-
-while(<FH>)
-{
-	# Get the adress:
-	$_ =~ /\d+:\s+\w+\s+0x([\w\d]+)\s*[\d\w]*/;
-	my $address = $1;
-        $address = sprintf( "%0".$numberOfBits."b", hex( $address ) * $addressCorrection );
-
-	# $i = 0 :: most significant bit
-        for(my $i = 0; $i < $numberOfBits; $i++)
-	{
-		my $new = substr($address, $i, 1);
-		my $old = substr($old_address, $i, 1);
-
-		if($new ne $old)
-		{
-                        $activityCounter[$numberOfBits-1-$i]++;
-		}
-	}
-
-	$old_address = $address;
-}
-
-close(FH);
-
-# Make Consistency Check:
-for(my $i = 0; $i < ($numberOfByteBits+$numberOfBankBits); $i++)
-{
-    if($activityCounter[$i] != 0)
-    {
-        print "Bits of lower C part or Y have toggled, this should not happen\n";
-        exit -1;
-    }
-}
-
-# Print bit numbers:
-print "Bits\t\t";
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-	print $i."\t";
-}
-
-#Print Activity
-print "\nActivity\t";
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-	print $activityCounter[$i]."\t";
-}
-
-#Print relative Activity
-print "\nPercent\t\t";
-my $sum = 0;
-my @percent;
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-	$sum = $sum + $activityCounter[$i];
-}
-
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-        my $string = $activityCounter[$i]/$sum*100;
-        $string = sprintf("%.2f", $string);
-	$string =~ s/\./,/g;
-        $percent[$i] = $string."%";
-        $string .= "%\t";
-        print $string;
-}
-
-#Fix Byte Offset:
-for(my $i = 0; $i < $numberOfByteBits; $i++)
-{
-    $activityCounter[$i] = -1;
-    $mapping[$i] = "Y$i";
-}
-
-#Fix Constant 0 Bits in Column due to Burstlength:
-for(my $i=0; $i < $numberOfBurstBits; $i++)
-{
-    $activityCounter[$numberOfByteBits + $i] = -1;
-    $mapping[$numberOfByteBits + $i] = "C$i";
-}
-
-#Search Column Locations
-for(my $i = $numberOfBurstBits; $i < $numberOfColumnBits; $i++)
-{
-        my $maximum = max(@activityCounter);
-        my ($index) = grep $activityCounter[$_] == $maximum , 0.. $#activityCounter;
-        $mapping[$index] = "C$i";
-        $activityCounter[$index] = -1;
-}
-
-#Search Bank Locations
-for(my $i = 0; $i < $numberOfBankBits; $i++)
-{
-	my $maximum = max(@activityCounter);
-	my ($index) = grep $activityCounter[$_] == $maximum , 0.. $#activityCounter;
-	$mapping[$index] = "B$i";
-	$activityCounter[$index] = -1;
-}
-
-#Search Row Locations
-for(my $i = 0; $i < $numberOfRowBits; $i++)
-{
-	my $maximum = max(@activityCounter);
-	my ($index) = grep $activityCounter[$_] == $maximum , 0.. $#activityCounter;
-	$mapping[$index] = "R$i";
-	$activityCounter[$index] = -1;
-}
-
-#Print final mapping
-my $header = '
-strict graph G
-{
-    forcelabels=true;
-    rankdir=LR;
-    {
-        graph [fontname = "courier"];
-        node [shape=square, fontname="courier", fixedsize=true, width=0.85, height=0.85]
-        edge [fontname = "courier"];
-';
-
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-        $header .= "        $i [pos=\"".($numberOfBits-1-$i).",0!\", xlp=\"-5,0\", label=\"$i\n".$percent[$i]."\" ]\n";
-}
-
-my $pos = 0;
-for(my $i = $numberOfXBits-1; $i >= 0; $i--)
-{
-        my $pos2 = $numberOfBits-$pos-1;
-        $header .= "        X$i [ label=\"$pos2\nX$i\" pos=\"$pos,-5!\"]\n";
-        $pos++;
-}
-for(my $i = $numberOfBankBits-1; $i >= 0; $i--)
-{
-        my $pos2 = $numberOfBits-$pos-1;
-        $header .= "        B$i [ label=\"$pos2\nB$i\" pos=\"$pos,-5!\"]\n";
-        $pos++;
-}
-for(my $i = $numberOfRowBits-1; $i >= 0; $i--)
-{
-        my $pos2 = $numberOfBits-$pos-1;
-        $header .= "        R$i [ label=\"$pos2\nR$i\" pos=\"$pos,-5!\"]\n";
-        $pos++;
-}
-for(my $i = $numberOfColumnBits-1; $i >= 0; $i--)
-{
-        my $pos2 = $numberOfBits-$pos-1;
-        $header .= "        C$i [ label=\"$pos2\nC$i\" pos=\"$pos,-5!\"]\n";
-        $pos++;
-}
-for(my $i = $numberOfByteBits-1; $i >= 0; $i--)
-{
-        my $pos2 = $numberOfBits-$pos-1;
-        $header .= "        Y$i [ label=\"$pos2\nY$i\" pos=\"$pos,-5!\"]\n";
-        $pos++;
-}
-$header .= "    }\n";
-
-print "\nMapping\t\t";
-my $maximum = max(@activityCounter);
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-    if($mapping[$i] =~ /X\d/)
-    {
-        $header .= "$i -- ".$mapping[$i]." [ color=\"grey\"];\n";
-    }
-    elsif($mapping[$i] =~ /B\d/)
-    {
-        $header .= "$i -- ".$mapping[$i]." [ color=\"green\"];\n";
-    }
-    elsif($mapping[$i] =~ /R\d/)
-    {
-        $header .= "$i -- ".$mapping[$i]." [ color=\"blue\"];\n";
-    }
-    elsif($mapping[$i] =~ /C\d/)
-    {
-        $header .= "$i -- ".$mapping[$i]." [ color=\"red\"];\n";
-    }
-    elsif($mapping[$i] =~ /Y\d/)
-    {
-        $header .= "$i -- ".$mapping[$i]." [ color=\"grey\"];\n";
-    }
-        print $mapping[$i]."\t";
-}
-$header .= "}";
-print "\n";
-
-#Generate Scrambled Trace:
-
-#Generate Configuration for 32x32 MUX:
-# Assumption e.g. 32 bit:
-#   B R C
-#  X X   B B B  R R R R R R R R R R R R R R  C C C C C C C C C C Y Y Y
-# 31 30  29 27  26                       13  12                3 2   0
-# A      B      C                            D                   E   F
-#
-#print "A:".($numberOfBits-1)."\n";
-#print "B:".($numberOfBits-$numberOfXBits-1)."\n";
-#print "C:".($numberOfBits-$numberOfXBits-$numberOfBankBits-1)."\n";
-#print "D:".($numberOfBits-$numberOfXBits-$numberOfBankBits-$numberOfRowBits-1)."\n";
-#print "E:".($numberOfBits-$numberOfXBits-$numberOfBankBits-$numberOfRowBits-$numberOfColumnBits-1)."\n";
-#print "F:".($numberOfBits-$numberOfXBits-$numberOfBankBits-$numberOfRowBits-$numberOfColumnBits-$numberOfByteBits)."\n";
-
-my @confVectorDecimal;
-my @checkVector;
-my $XCounter = 0;
-my $rowCounter = 0;
-my $bankCounter = 0;
-my $columnCounter = 0;
-my $byteCounter = 0;
-
-for(my $i = $numberOfBits-1; $i >= 0; $i--)
-{
-    if($mapping[$i] =~ /X(\d+)/)
-    {
-        my $idx = $numberOfBits-$numberOfXBits+$1;
-        #print "\$1=".$1." i=".$i." idx=".$idx." mapping=".$mapping[$i]."\n";
-        $confVectorDecimal[$idx] = $i;
-        $checkVector[$idx] = "X";
-    }
-    elsif($mapping[$i] =~ /B(\d+)/)
-    {
-        my $idx = $numberOfBits-$numberOfXBits-$numberOfBankBits+$1;
-        #print "\$1=".$1." i=".$i." idx=".$idx." mapping=".$mapping[$i]."\n";
-        $confVectorDecimal[$idx] = $i;
-        $checkVector[$idx] = "B";
-    }
-    elsif($mapping[$i] =~ /R(\d+)/)
-    {
-        my $idx = $numberOfBits-$numberOfXBits-$numberOfBankBits-$numberOfRowBits+$1;
-        #print "\$1=".$1." i=".$i." idx=".$idx." mapping=".$mapping[$i]."\n";
-        $confVectorDecimal[$idx] = $i;
-        $checkVector[$idx] = "R";
-    }
-    elsif($mapping[$i] =~ /C(\d+)/)
-    {
-        my $idx = $numberOfBits-$numberOfXBits-$numberOfBankBits-$numberOfRowBits-$numberOfColumnBits+$1;
-        #print "\$1=".$1." i=".$i." idx=".$idx." mapping=".$mapping[$i]."\n";
-        $confVectorDecimal[$idx] = $i;
-        $checkVector[$idx] = "C";
-    }
-    elsif($mapping[$i] =~ /Y(\d+)/)
-    {
-        my $idx = $numberOfBits-$numberOfXBits-$numberOfBankBits-$numberOfRowBits-$numberOfColumnBits-$numberOfByteBits+$1;
-        #print "\$1=".$1." i=".$i." idx=".$idx." mapping=".$mapping[$i]."\n";
-        $confVectorDecimal[$idx] = $i;
-        $checkVector[$idx] = "Y";
-    }
-}
-
-print "\n";
-print "\n";
-print "Configuration Vector for the mapping ";
-for(my $m = $numberOfBits-1; $m >= 0; $m--)
-{
-    print $checkVector[$m];
-}
-print ":\n\n";
-
-for(my $m = $numberOfBits-1; $m >= 0; $m--)
-{
-    #Debug:
-    print "mux: $m\t-->\t".$confVectorDecimal[$m]."\n";
-}
-
-print "\n";
-print "\n";
-
-for(my $m = $numberOfBits-1; $m >= 0; $m--)
-{
-    print sprintf( "%05b", $confVectorDecimal[$m] );
-}
-print "\n";
-print "\n";
-
-# Generate Graph
-my $dotname;
-my $pdfname;
-my $stlname;
-
-if($filename =~ /(.+)\.stl/)
-{
-    $dotname = $1.".dot";
-    $pdfname = $1.".pdf";
-    $stlname = $1."_scram.stl";
-
-    open(FH,">$dotname");
-    print FH $header;
-    close(FH);
-    system("neato -o $pdfname -Tpdf $dotname");
-}
-
-
-open(FH, "$filename");
-open(SH, ">$stlname");
-
-while(<FH>)
-{
-        # Get all the data adress:
-        $_ =~ /(\d+):\s+(\w+)\s+0x([\w\d]+)/; # XXX
-        my $time = $1;
-        my $command = $2;
-        my $address = $3;
-        my $new_address;
-
-        # Convert to binary:
-        $address = sprintf( "%032b", hex( $address ) );
-
-        # Swap adresses:
-        $new_address = "";
-        for(my $m = $numberOfBits-1; $m >= 0; $m--)
-        {
-            #print $confVectorDecimal[$m]."\n";
-            $new_address .= substr($address,$numberOfBits-1-$confVectorDecimal[$m],1);
-        }
-
-        # Convert to Hex:
-        $new_address = sprintf("%X", oct( "0b$new_address" ) );
-
-        print SH $time.":\t".$command."\t0x".$new_address."\n";
-}
-
-close(FH);
-close(SH);
diff --git a/DRAMSys/library/resources/scripts/generateTrace.py b/DRAMSys/library/resources/scripts/generateTrace.py
deleted file mode 100644
index ba22f861..00000000
--- a/DRAMSys/library/resources/scripts/generateTrace.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-# This script generates an example trace for DDR3
-#
-#<addressmapping>
-#    <channel from="128"  to="128"  /> <!-- only one channel -->
-#    <bank    from="27"   to="29"   />
-#    <row     from="13"   to="26"   /> 26 downto 13 --> 2^14 = 16384
-#    <column  from="3"    to="12"   /> Burstlength = 8 --> 8 down bits always zero --> 12 downto 3 --> 7 --> 2^7 = 128
-#    <bytes   from="0"    to="2"    /> 2^3 = 8
-#</addressmapping>
-
-numberOfRows = 16384
-numberOfColumns = 128
-byteOffset = 64
-bankOffset = numberOfRows * numberOfColumns
-
-# Write to Bank 0
-for x in range(0, bankOffset):
-    print "{0:d}:\tread\t0x{1:X}".format(x,(x*byteOffset))
-
-# Write to Bank 1
-for x in range(bankOffset, 2*bankOffset):
-    print "{0:d}:\tread\t0x{1:X}".format(x,(x*byteOffset))
diff --git a/DRAMSys/library/resources/scripts/memoryHog.pl b/DRAMSys/library/resources/scripts/memoryHog.pl
deleted file mode 100644
index 0d2cf321..00000000
--- a/DRAMSys/library/resources/scripts/memoryHog.pl
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/perl -w
-use warnings;
-use strict;
-
-open(LINEAR, "> ../traces/linear.stl");
-open(RANDOM, "> ../traces/random.stl");
-
-my $length = shift || die ("please give length of traces");
-my $size = 0x40;
-
-for(my $i=0; $i < $length; $i++)
-{
-    my $r = int(rand($length));
-    #print $r." ".($size*$r)."\n";
-    
-    print LINEAR "$i: read ".sprintf("0x%x",($size*$i))."\n";
-    print RANDOM "$i: read ".sprintf("0x%x",($size*$r))."\n";
-
-    #my $rw = int(rand(2))%2;
-    #if($rw == 0)
-    #{
-    #    print LINEAR "$i: read ".sprintf("0x%x",($size*$i))."\n";
-    #    print RANDOM "$i: read ".sprintf("0x%x",($size*$r))."\n";
-    #}
-    #else
-    #{
-    #    print LINEAR "$i: write ".sprintf("0x%x",($size*$i))."\n";
-    #    print RANDOM "$i: write ".sprintf("0x%x",($size*$r))."\n";
-    #}
-}
-
-
-close(LINEAR);
-close(RANDOM);
diff --git a/DRAMSys/library/resources/scripts/stride_detection.pl b/DRAMSys/library/resources/scripts/stride_detection.pl
deleted file mode 100644
index c15b2c28..00000000
--- a/DRAMSys/library/resources/scripts/stride_detection.pl
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/perl
-use List::Util 'max';
-use warnings;
-use strict;
-
-my $filename = shift || die("Please provide a input STL file");
-my $command = shift || die ("Pleas provide read/write");
-
-open(FH, "$filename");
-
-my $old_address = 0;
-my %histogram;
-my $command_occurance = 0;
-
-while(<FH>)
-{
-	# Get the adress:
-	$_ =~ /\d+:\s+(\w+)\s+0x([\w\d]+)\s*[\d\w]*/;
-	if($command eq $1)
-	{
-		my $address = hex($2);
-		my $distance = $address - $old_address;
-		$histogram{$distance} ++;
-		$old_address = $address;
-		$command_occurance++;
-	}
-}
-
-foreach my $key ( keys %histogram)
-{
-	my $percent = $histogram{$key}/$command_occurance;
-	my $hexkey = sprintf( "%032b", abs($key) );
-	print "0x".$hexkey." ".abs($key)." = ".$histogram{$key}." (".$percent.")\n";
-}
diff --git a/DRAMSys/library/resources/scripts/traceGenerationForNNTraining.pl b/DRAMSys/library/resources/scripts/traceGenerationForNNTraining.pl
deleted file mode 100644
index 58a534bc..00000000
--- a/DRAMSys/library/resources/scripts/traceGenerationForNNTraining.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-
-my $phaseLength = 100;
-my $phaseStatus = 0;
-my $max = 100000;
-my $base = 0;
-my $maxAddressExp = 26;
-my $maxAddress = 2**$maxAddressExp;
-
-for(my $i = 0; $i < $max; $i++)
-{
-    if($phaseStatus == 0) # Linear
-    {
-        my $addr = (($base << 6) + (($i % $phaseLength) << 6)) % $maxAddress;
-        print "$i: read 0x".sprintf("%x", $addr)."\n";
-    }
-    else # Random
-    {
-        my $addr = (rand(2**($maxAddressExp-6))) << 6;
-        print "$i: read 0x".sprintf("%x", $addr)."\n";
-    }
-
-    if($i % 100 == 0 && $i != 0)
-    {
-        $phaseStatus = ($phaseStatus == 0) ? 1 : 0;
-        $base = rand(2**($maxAddressExp-6));
-    }
-}
-
diff --git a/DRAMSys/library/resources/scripts/trace_gen.py b/DRAMSys/library/resources/scripts/trace_gen.py
deleted file mode 100755
index a2b42f42..00000000
--- a/DRAMSys/library/resources/scripts/trace_gen.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#! /usr/bin/env python3
-# vim: set fileencoding=utf-8
-
-# Copyright (c) 2018, Technische Universität Kaiserslautern
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# 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.
-#
-# Author: Éder F. Zulian
-
-import ctypes
-
-# A trace file is a pre-recorded file containing memory transactions. Each
-# memory transaction has a timestamp that tells the simulator when it shall
-# happen, a transaction type (read or write) and a memory address given in
-# hexadecimal.
-#
-# Here is an example syntax:
-#
-# ```
-# # Comment lines begin with #
-# # [clock-cyle]: [write|read] [hex-address]
-# 31:	read	0x400140
-# 33:	read	0x400160
-# 56:	write	0x7fff8000
-# 81:	read	0x400180
-# ```
-#
-# The timestamp corresponds to the time the request is to be issued and it is
-# given in cycles of the bus master device. Example: the device is a FPGA with
-# frequency 200 MHz (clock period of 5 ns). If the timestamp is 10 it means
-# that the request is to be issued when time is 50 ns.
-#
-
-# The default values given as example assume the following address mapping:
-#
-# DIMM Characteristics:
-# Byte Offset (Y): 8    [0:2]   (8-byte-wide memory module, i.e., 64-bit-wide data bus) -> 3 bit
-# Cols        (C): 1K   [3:12]  (A0 - A9)   -> 10 bit
-# Rows        (R): 128K [13:29] (A0 - A16)  -> 17 bit
-# Bank        (B): 8    [30:32] (BA0 - BA2) -> 3  bit
-#
-# 3 3 3 | 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 | 1 1 1
-# 2 1 0 | 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 | 2 1 0 9 8 7 6 5 4 3 | 2 1 0
-# B B B | R R R R R R R R R R R R R R R R R | C C C C C C C C C C | Y Y Y
-#
-
-# Transaction type (read or write)
-transaction = 'read'
-
-# Channel information. If your address mapping does not have channel bits keep
-# it equal to 1 and set the shift to the extreme left of the address.
-num_ch = 1              # Number of channels
-ch_shift = 34           # Shift to reach the frist bit reserved for channels in the address
-ch_mask = 0x1           # Mask for all channel bits in the address
-
-# Bank group information. If your address mapping does not have bank groups
-# keep it equal to 1 and set the shift to the extreme left of the address.
-num_bank_groups = 1     # Number of bank groups
-bgroup_shift = 33   	# Shift to reach the frist bit reserved for bank groups in the address
-bgroup_mask = 0x1   	# Mask for all bits in the address related to bank groups
-
-# Bank information
-num_banks = 8           # Number of banks
-bank_shift = 30         # Shift to reach the frist bit reserved for banks in the address
-bank_mask = 0x7         # Mask for all bank bits in the address
-
-# Row information
-num_rows = 128 * 1024   # Number of rows
-row_shift = 13          # Shift to reach the frist bit reserved for rows in the address
-row_mask = 0x1ffff      # Mask for all row bits in the address
-
-# Column information
-num_col = 1 * 1024      # Number of columns
-col_shift = 3           # Shift to reach the frist bit reserved for columns in the address
-col_mask = 0x3ff        # Mask for all column bits in the address
-
-# Burst length of 8 columns. 8 columns written/read per access (in 4 full
-# clock cycles of the memory bus).
-burst_len = 8
-
-# Initial clock cycle
-clock_cycle = 0
-
-# Clock cycle increment between two accesses
-clock_increment = 10
-
-
-def clear_bits(mask, shift, val):
-    m = ctypes.c_uint64(~(mask << shift)).value
-    return ctypes.c_uint64(val & m).value
-
-
-def set_bits(mask, shift, val, v):
-    val = clear_bits(mask, shift, val)
-    return ctypes.c_uint64(val | (v << shift)).value
-
-
-address = 0
-for ch in range(0, num_ch):
-    address = set_bits(ch_mask, ch_shift, address, ch)
-    for bg in range(0, num_bank_groups):
-        address = set_bits(bgroup_mask, bgroup_shift, address, bg)
-        for b in range(0, num_banks):
-            address = set_bits(bank_mask, bank_shift, address, b)
-            for row in range(0, num_rows):
-                address = set_bits(row_mask, row_shift, address, row)
-                for col in range(0, num_col, burst_len):
-                    address = set_bits(col_mask, col_shift, address, col)
-                    print('# clock cycle: {0:d} | {1} | address: 0x{2:010X} | channel: {3} | bank group: {4} | bank: {5} | row: {6} | column: {7}'.format(clock_cycle, transaction, address, ch, bg, b, row, col))
-                    print('{0:d}:\t{1}\t0x{2:010X}'.format(clock_cycle, transaction, address))
-                    clock_cycle = clock_cycle + clock_increment
diff --git a/DRAMSys/library/resources/scripts/video_rendering/Makefile b/DRAMSys/library/resources/scripts/video_rendering/Makefile
deleted file mode 100644
index 51190ca8..00000000
--- a/DRAMSys/library/resources/scripts/video_rendering/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all:
-	modulecmd bash load gnuplot/latest
-	modulecmd bash load image-magick/latest
-	./temperatur.pl
-movie:
-	ffmpeg -start_number 00000000 -i ../out/%08d.jpg -vcodec mpeg4 ../out.avi
-
-clean:
-	rm *.out *.err
diff --git a/DRAMSys/library/resources/scripts/video_rendering/temperatur.job.pl b/DRAMSys/library/resources/scripts/video_rendering/temperatur.job.pl
deleted file mode 100644
index 5c05db4c..00000000
--- a/DRAMSys/library/resources/scripts/video_rendering/temperatur.job.pl
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/perl -w
-use warnings;
-use strict;
-use File::Copy;
-
-my $file = shift;
-my $id = shift;
-my $samples = shift;
-my $inputPath   = "/gu2/jungma/thermal/in/out-backup";
-my $extractPath = "/gu2/jungma/thermal/tmp/$id";
-
-print "Create TMP path... ";
-system("mkdir $extractPath");
-print " done\n";
-
-print "Extract... ";
-system("tar -xf $inputPath/$file -C $extractPath");
-print " done\n";
-
-print "Preprocessing... ";
-system("sed '1d' $extractPath/out/output_core_die_full.txt  > $extractPath/die0.txt");
-system("sed '1d' $extractPath/out/output_mem_die_1_full.txt > $extractPath/die1.txt");
-system("sed '1d' $extractPath/out/output_mem_die_2_full.txt > $extractPath/die2.txt");
-system("sed '1d' $extractPath/out/output_mem_die_3_full.txt > $extractPath/die3.txt");
-system("sed '1d' $extractPath/out/output_mem_die_4_full.txt > $extractPath/die4.txt");
-print " done\n";
-
-print "Gnuplot...";
-open( my $GP, '|-', 'gnuplot' );
-print $GP "
-	reset
-	set terminal pngcairo size 500,500 enhanced font 'Verdana,10'
-	
-	set border linewidth 0
-	unset key
-	unset colorbox
-	unset tics
-	set lmargin screen 0.0
-	set rmargin screen 1.0
-	set tmargin screen 1.0
-	set bmargin screen 0.0
-	
-	set pm3d map
-	set pm3d interpolate 2,2
-	set cbrange [318.0:388.0]
-
-	#set palette rgbformulae  22,13,-31
-	set palette defined ( 0 \"blue\", 3 \"green\", 4 \"yellow\", 5 \"red\", 6 \"black\" )
-	
-	set output '$extractPath/die0.png'
-	splot '$extractPath/die0.txt' matrix every ::1
-	
-	set output '$extractPath/die1.png'
-	splot '$extractPath/die1.txt' matrix every ::1
-	
-	set output '$extractPath/die2.png'
-	splot '$extractPath/die2.txt' matrix every ::1
-	
-	set output '$extractPath/die3.png'
-	splot '$extractPath/die3.txt' matrix every ::1
-	
-	set output '$extractPath/die4.png'
-	splot '$extractPath/die4.txt' matrix every ::1";
-close($GP);
-print " done\n";
-
-print "Wait for files... ";
-while (1) { last if -e "$extractPath/die0.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die1.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die2.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die3.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die4.png";  print "."; sleep 1;}
-print " done\n";
-
-print "Composite ...";
-system("composite -gravity center constants/thermal_model_core.png $extractPath/die0.png $extractPath/die0b.png");
-system("composite -gravity center constants/thermal_model_dram_0_1.png $extractPath/die1.png $extractPath/die1b.png");
-system("composite -gravity center constants/thermal_model_dram_2_3.png $extractPath/die2.png $extractPath/die2b.png");
-system("composite -gravity center constants/thermal_model_dram_4_5.png $extractPath/die3.png $extractPath/die3b.png");
-system("composite -gravity center constants/thermal_model_dram_6_7.png $extractPath/die4.png $extractPath/die4b.png");
-print " done\n";
-
-print "Wait for files... ";
-while (1) { last if -e "$extractPath/die0b.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die1b.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die2b.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die3b.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die4b.png";  print "."; sleep 1;}
-print " done\n";
-
-print "Convert ...";
-system("convert $extractPath/die0b.png -alpha set -background none -shear 0x-40 -rotate 60  +repage -crop 1048x485+0+205 $extractPath/die0c.png");
-system("convert $extractPath/die1b.png -alpha set -background none -shear 0x-40 -rotate 60  +repage -crop 1048x485+0+205 $extractPath/die1c.png");
-system("convert $extractPath/die2b.png -alpha set -background none -shear 0x-40 -rotate 60  +repage -crop 1048x485+0+205 $extractPath/die2c.png");
-system("convert $extractPath/die3b.png -alpha set -background none -shear 0x-40 -rotate 60  +repage -crop 1048x485+0+205 $extractPath/die3c.png");
-system("convert $extractPath/die4b.png -alpha set -background none -shear 0x-40 -rotate 60  +repage -crop 1048x485+0+205 $extractPath/die4c.png");
-print " done\n";
-
-print "Wait for files... ";
-while (1) { last if -e "$extractPath/die0c.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die1c.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die2c.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die3c.png";  print "."; sleep 1;}
-while (1) { last if -e "$extractPath/die4c.png";  print "."; sleep 1;}
-print " done\n";
-
-my $outFileName = sprintf("%08d", $id);
-
-print "Produce Output ...";
-system("convert -size 1048x1680 xc:black $extractPath/die0c.png -geometry +0+1200 -composite $extractPath/die1c.png -geometry +0+900 -composite $extractPath/die2c.png -geometry +0+600 -composite $extractPath/die3c.png -geometry +0+300 -composite $extractPath/die4c.png -composite $extractPath/a$outFileName.jpg");
-
-while (1) { last if -e "$extractPath/a$outFileName.jpg"; print "."; sleep 1;}
-system("convert $extractPath/a$outFileName.jpg -pointsize 80 -fill white -gravity northeast -draw \"text 20,20 '".$samples."ms'\" $extractPath/b$outFileName.jpg");
-
-while (1) { last if -e "$extractPath/b$outFileName.jpg"; print "."; sleep 1;}
-system("convert $extractPath/b$outFileName.jpg constants/legend/legend4.png +append ../out/$outFileName.jpg");
-
-print " done\n";
-
-print "Produce Samples ...";
-for(my $i = 0; $i < $samples-1; $i++)
-{
-	$id++;
-	my $outFileNameCopy = sprintf("%08d", $id);
-	copy("../out/$outFileName.jpg","../out/$outFileNameCopy.jpg");
-}
-print " done\n";
-
-# cleanup
-print "Cleanup ... ";
-while (1) { last if -e "/gu2/jungma/thermal/out/$outFileName.jpg"; print "."; sleep 1;}
-system("rm -rf $extractPath");
-print " done\n";
-
-##ffmpeg -start_number 00000000 -i %08d.jpg -vcodec mpeg4 test.avi
diff --git a/DRAMSys/library/resources/scripts/video_rendering/temperatur.pl b/DRAMSys/library/resources/scripts/video_rendering/temperatur.pl
deleted file mode 100644
index 11279c14..00000000
--- a/DRAMSys/library/resources/scripts/video_rendering/temperatur.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/perl -w
-use warnings;
-use strict;
-use List::Util qw( min max );
-
-#/Volumes/Etana_tmp2/tmp_sadri/backup/sep_16/log_smartbench_traces_50_cpu_1650_mhz_100_mhz_dram_100_mhz_sampling8X_bankwise_on_test/out-backup
-my $inputPath    = "../in/out-backup";
-my $extractPath  = "../tmp";
-my $samplingFile = "../in/sampling";
-
-# Read the input file names and store it in an array
-opendir (DIR, $inputPath) or die $!;
-
-my @files;
-my @sortetFiles;
-
-while (my $file = readdir(DIR))
-{
-	push(@files, $file);
-}
-
-@sortetFiles = sort @files;
-
-
-print "Cleanup\n";
-system("rm -rf *.err *.out");
-system("rm -rf ../tmp/*");
-print "Load modules\n";
-
-
-# Estimate sampeling numbers
-
-open(SF,$samplingFile);
-
-my @refreshRates;
-
-while(<SF>)
-{
-	$_ =~ /(\d+)\.0/;
-	my $rate = $1;
-	push(@refreshRates, $rate);
-}
-
-print "Max. Rate:".max(@refreshRates)."\n";
-print "Min. Rate:".min(@refreshRates)."\n";
-
-my $counter = 0;
-my $i       = 0;
-# For each data package start one job!
-foreach(@sortetFiles)
-{
-	my $file = $_;
-
-	if($file =~ /(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)\.tgz/)
-	{
-		my $samples = $refreshRates[$i];
-		system("bsub -W 00:05 ./temperatur.job.pl $file $counter $samples");
-		$counter+=$samples;
-		$i++;
-		#if($i == 100)
-		#{
-		#	last;
-		#}
-	}
-}
-
-##ffmpeg -start_number 00000000 -i %08d.jpg -vcodec mpeg4 test.avi
diff --git a/DRAMSys/library/resources/simulations/ddr3-example2.json b/DRAMSys/library/resources/simulations/ddr3-example2.json
deleted file mode 100644
index 99e1821a..00000000
--- a/DRAMSys/library/resources/simulations/ddr3-example2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
-        "mcconfig": "fr_fcfs.json",
-        "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3.json",
-        "simulationid": "ddr3-example2",
-        "thermalconfig": "config.json",
-        "tracesetup": [
-            {
-                "clkMhz": 300,
-                "name": "ddr3_example.stl"
-            },
-            {
-                "clkMhz": 400,
-                "name": "ddr3_example.stl"
-            }
-        ]
-    }
-}
diff --git a/DRAMSys/library/resources/simulations/wideio-example.json b/DRAMSys/library/resources/simulations/wideio-example.json
deleted file mode 100644
index 4bfd6979..00000000
--- a/DRAMSys/library/resources/simulations/wideio-example.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "simulation": {
-        "addressmapping": "am_wideio_4x256Mb_rbc.json",
-        "mcconfig": "fr_fcfs.json",
-        "memspec": "JEDEC_256Mb_WIDEIO-200_128bit.json",
-        "simconfig": "wideio.json",
-        "simulationid": "wideio-example",
-        "thermalconfig": "config.json",
-        "tracesetup": [
-            {
-                "clkMhz": 1000,
-                "name": "chstone-adpcm_32.stl"
-            }
-        ]
-    }
-}
diff --git a/DRAMSys/library/resources/traces/generateErrorTest.pl b/DRAMSys/library/resources/traces/generateErrorTest.pl
deleted file mode 100644
index 39589e25..00000000
--- a/DRAMSys/library/resources/traces/generateErrorTest.pl
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright (c) 2015, Technische Universität Kaiserslautern
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# 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.
-#
-# Authors: 
-#    Matthias Jung
-#    Eder F. Zulian
-#    Lukas Steiner
-
-use warnings;
-use strict;
-
-# Assuming this address mapping:
-# {
-#     "CONGEN": {
-#         "BYTE_BIT": [
-#             0,
-#             1,
-#             2,
-#             3
-#         ],
-#         "BANK_BIT": [
-#             4,
-#             5
-#         ],
-#         "COLUMN_BIT": [
-#             6,
-#             7,
-#             8,
-#             9,
-#             10,
-#             11,
-#             12
-#         ],
-#         "ROW_BIT": [
-#             13,
-#             14,
-#             15,
-#             16,
-#             17,
-#             18,
-#             19,
-#             20,
-#             21,
-#             22,
-#             23,
-#             24
-#         ],
-#         "CHANNEL_BIT": [
-#             25,
-#             26
-#         ]
-#     }
-# }
-
-# This is how it should look like later:
-# 31:     write   0x0     0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-
-my $numberOfChannels = 4;
-my $numberOfRows = 4096;
-my $numberOfColumns = 128;
-my $bytesPerColumn = 16;
-my $burstLength = 4; # burst length of 4 columns --> 4 columns written or read per access
-my $dataLength = $bytesPerColumn * $burstLength;
-
-my $channelOffset = 0x2000000;
-my $rowOffset = 0x2000;
-my $columnOffset = 0x40;
-
-# Generate Data Pattern:
-my $dataPatternByte = "ff";
-
-my $dataPattern = "0x";
-for(my $i = 0; $i < $dataLength; $i++)
-{
-    $dataPattern .= $dataPatternByte;
-}
-
-my $clkCounter = 0;
-my $addr = 0;
-
-# Generate Trace file (writes):
-for(my $cha = 0; $cha < ($numberOfChannels * $channelOffset); $cha = $cha + $channelOffset)
-{
-    for(my $row = 0; $row < ($numberOfRows * $rowOffset); $row = $row + $rowOffset)
-    {
-        for(my $col = 0; $col < ($numberOfColumns * $columnOffset); $col = $col + ($columnOffset * $burstLength))
-        {
-            my $addrHex = sprintf("0x%x", $addr);
-            print "$clkCounter:\twrite\t$addrHex\t$dataPattern\n";
-            $clkCounter++;
-            $addr += $columnOffset * $burstLength;
-        }
-    }
-}
-
-$clkCounter = 50000000;
-$addr = 0;
-
-# Generate Trace file (reads):
-for(my $cha = 0; $cha < ($numberOfChannels * $channelOffset); $cha = $cha + $channelOffset)
-{
-    for(my $row = 0; $row < ($numberOfRows * $rowOffset); $row = $row + $rowOffset)
-    {
-        for(my $col = 0; $col < ($numberOfColumns * $columnOffset); $col = $col + ($columnOffset * $burstLength))
-        {
-            my $addrHex = sprintf("0x%x", $addr);
-            print "$clkCounter:\tread\t$addrHex\n";
-            $clkCounter++;
-            $addr += $columnOffset * $burstLength;
-        }
-    }
-}
\ No newline at end of file
diff --git a/DRAMSys/library/src/common/configuration/ThermalConfig.cpp b/DRAMSys/library/src/common/configuration/ThermalConfig.cpp
deleted file mode 100644
index f3bed414..00000000
--- a/DRAMSys/library/src/common/configuration/ThermalConfig.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2021, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Derek Christ
- */
-
-#include "ThermalConfig.h"
-#include "util.h"
-
-namespace DRAMSysConfiguration
-{
-
-void to_json(json &j, const ThermalConfig &c)
-{
-    j = json{{"TemperatureScale", c.temperatureScale},
-             {"StaticTemperatureDefaultValue", c.staticTemperatureDefaultValue},
-             {"ThermalSimPeriod", c.thermalSimPeriod},
-             {"ThermalSimUnit", c.thermalSimUnit},
-             {"PowerInfoFile", c.powerInfo},
-             {"IceServerIp", c.iceServerIp},
-             {"IceServerPort", c.iceServerPort},
-             {"SimPeriodAdjustFactor", c.simPeriodAdjustFactor},
-             {"NPowStableCyclesToIncreasePeriod", c.nPowStableCyclesToIncreasePeriod},
-             {"GenerateTemperatureMap", c.generateTemperatureMap},
-             {"GeneratePowerMap", c.generatePowerMap}};
-}
-
-void from_json(const json &j, ThermalConfig &c)
-{
-    json j_thermalsim = get_config_json(j, thermalConfigPath, "thermalsimconfig");
-
-    j_thermalsim.at("TemperatureScale").get_to(c.temperatureScale);
-    j_thermalsim.at("StaticTemperatureDefaultValue").get_to(c.staticTemperatureDefaultValue);
-    j_thermalsim.at("ThermalSimPeriod").get_to(c.thermalSimPeriod);
-    j_thermalsim.at("ThermalSimUnit").get_to(c.thermalSimUnit);
-    j_thermalsim.at("PowerInfoFile").get_to(c.powerInfo);
-    j_thermalsim.at("IceServerIp").get_to(c.iceServerIp);
-    j_thermalsim.at("IceServerPort").get_to(c.iceServerPort);
-    j_thermalsim.at("SimPeriodAdjustFactor").get_to(c.simPeriodAdjustFactor);
-    j_thermalsim.at("NPowStableCyclesToIncreasePeriod").get_to(c.nPowStableCyclesToIncreasePeriod);
-    j_thermalsim.at("GenerateTemperatureMap").get_to(c.generateTemperatureMap);
-    j_thermalsim.at("GeneratePowerMap").get_to(c.generatePowerMap);
-}
-
-void to_json(json &j, const DramDieChannel &c)
-{
-    j = json{{"init_pow", c.init_pow}, {"threshold", c.threshold}};
-}
-
-void from_json(const json &j, DramDieChannel &c)
-{
-    j.at("init_pow").get_to(c.init_pow);
-    j.at("threshold").get_to(c.threshold);
-}
-
-void to_json(json &j, const PowerInfo &c)
-{
-    j = json{};
-
-    for (const auto &channel : c.channels)
-    {
-        j.emplace(channel.identifier, channel);
-    }
-}
-
-void from_json(const json &j, PowerInfo &c)
-{
-    json j_powerinfo = get_config_json(j, thermalConfigPath, "powerInfo");
-
-    for (const auto &entry : j_powerinfo.items())
-    {
-        DramDieChannel channel;
-        j_powerinfo.at(entry.key()).get_to(channel);
-        channel.identifier = entry.key();
-
-        c.channels.push_back(channel);
-    }
-}
-
-void from_dump(const std::string &dump, ThermalConfig &c)
-{
-    json json_thermalconfig = json::parse(dump).at("thermalconfig");
-    json_thermalconfig.get_to(c);
-}
-
-std::string dump(const ThermalConfig &c, unsigned int indentation)
-{
-    json json_thermalconfig;
-    json_thermalconfig["thermalconfig"] = c;
-    return json_thermalconfig.dump(indentation);
-}
-
-} // namespace DRAMSysConfiguration
diff --git a/DRAMSys/library/src/common/configuration/ThermalConfig.h b/DRAMSys/library/src/common/configuration/ThermalConfig.h
deleted file mode 100644
index 61592197..00000000
--- a/DRAMSys/library/src/common/configuration/ThermalConfig.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2021, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Derek Christ
- */
-
-#ifndef DRAMSYSCONFIGURATION_THERMALCONFIG_H
-#define DRAMSYSCONFIGURATION_THERMALCONFIG_H
-
-#include <nlohmann/json.hpp>
-
-namespace DRAMSysConfiguration
-{
-using json = nlohmann::json;
-
-const std::string thermalConfigPath = "configs/thermalsim";
-
-enum class TemperatureScale
-{
-    Celsius,
-    Fahrenheit,
-    Kelvin,
-    Invalid = -1,
-};
-
-NLOHMANN_JSON_SERIALIZE_ENUM(TemperatureScale, {{TemperatureScale::Invalid, nullptr},
-                                                {TemperatureScale::Celsius, "Celsius"},
-                                                {TemperatureScale::Fahrenheit, "Fahrenheit"},
-                                                {TemperatureScale::Kelvin, "Kelvin"}})
-
-enum class ThermalSimUnit
-{
-    Seconds,
-    Milliseconds,
-    Microseconds,
-    Nanoseconds,
-    Picoseconds,
-    Femtoseconds,
-    Invalid = -1,
-};
-
-NLOHMANN_JSON_SERIALIZE_ENUM(ThermalSimUnit, {{ThermalSimUnit::Invalid, nullptr},
-                                              {ThermalSimUnit::Seconds, "s"},
-                                              {ThermalSimUnit::Milliseconds, "ms"},
-                                              {ThermalSimUnit::Microseconds, "us"},
-                                              {ThermalSimUnit::Nanoseconds, "ns"},
-                                              {ThermalSimUnit::Picoseconds, "ps"},
-                                              {ThermalSimUnit::Femtoseconds, "fs"}})
-
-struct DramDieChannel
-{
-    std::string identifier;
-    double init_pow;
-    double threshold;
-};
-
-void to_json(json &j, const DramDieChannel &c);
-void from_json(const json &j, DramDieChannel &c);
-
-struct PowerInfo
-{
-    std::vector<DramDieChannel> channels;
-};
-
-void to_json(json &j, const PowerInfo &c);
-void from_json(const json &j, PowerInfo &c);
-
-struct ThermalConfig
-{
-    TemperatureScale temperatureScale;
-    int staticTemperatureDefaultValue;
-    double thermalSimPeriod;
-    ThermalSimUnit thermalSimUnit;
-    PowerInfo powerInfo;
-    std::string iceServerIp;
-    unsigned int iceServerPort;
-    unsigned int simPeriodAdjustFactor;
-    unsigned int nPowStableCyclesToIncreasePeriod;
-    bool generateTemperatureMap;
-    bool generatePowerMap;
-};
-
-void to_json(json &j, const ThermalConfig &c);
-void from_json(const json &j, ThermalConfig &c);
-
-void from_dump(const std::string &dump, ThermalConfig &c);
-std::string dump(const ThermalConfig &c, unsigned int indentation = -1);
-
-} // namespace Configuration
-
-#endif // DRAMSYSCONFIGURATION_THERMALCONFIG_H
diff --git a/DRAMSys/library/src/common/configuration/tests/CMakeLists.txt b/DRAMSys/library/src/common/configuration/tests/CMakeLists.txt
deleted file mode 100644
index 621a7230..00000000
--- a/DRAMSys/library/src/common/configuration/tests/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_executable(simpletest simpletest.cpp)
-target_link_libraries(simpletest PRIVATE DRAMSysConfiguration nlohmann_json::nlohmann_json)
-
-add_executable(converter converter.cpp)
-target_link_libraries(converter PRIVATE DRAMSysConfiguration nlohmann_json::nlohmann_json)
diff --git a/DRAMSys/library/src/common/configuration/tests/simpletest.cpp b/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
deleted file mode 100644
index 8bac3858..00000000
--- a/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2021, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Derek Christ
- */
-
-#include <DRAMSysConfiguration.h>
-#include <fstream>
-#include <iostream>
-
-using json = nlohmann::json;
-
-DRAMSysConfiguration::AddressMapping getAddressMapping()
-{
-    return DRAMSysConfiguration::AddressMapping{{{0, 1}},
-                                                {{2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}},
-                                                {{16}},
-                                                {{13, 14, 15}},
-                                                {{17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}},
-                                                {{33}},
-                                                {{}},
-                                                {{}}};
-}
-
-DRAMSysConfiguration::McConfig getMcConfig()
-{
-    return DRAMSysConfiguration::McConfig{DRAMSysConfiguration::PagePolicy::Open,
-                                          DRAMSysConfiguration::Scheduler::FrFcfs,
-                                          DRAMSysConfiguration::SchedulerBuffer::Bankwise,
-                                          8,
-                                          DRAMSysConfiguration::CmdMux::Oldest,
-                                          DRAMSysConfiguration::RespQueue::Fifo,
-                                          DRAMSysConfiguration::RefreshPolicy::AllBank,
-                                          0,
-                                          0,
-                                          DRAMSysConfiguration::PowerDownPolicy::NoPowerDown,
-                                          DRAMSysConfiguration::Arbiter::Simple,
-                                          128,
-                                          {}};
-}
-
-DRAMSysConfiguration::SimConfig getSimConfig()
-{
-    return DRAMSysConfiguration::SimConfig{
-        0,   false, true,     false, false, {"error.csv"},
-        42,  false, {"ddr5"}, true,  DRAMSysConfiguration::StoreMode::NoStorage,        false, false,
-        1000};
-}
-
-DRAMSysConfiguration::ThermalConfig getThermalConfig()
-{
-    std::vector<DRAMSysConfiguration::DramDieChannel> channels {{"dram_die_channel0", 0.0, 1.0}, {"dram_die_channel1", 0.0, 1.0}, {"dram_die_channel2", 0.0, 1.0}, {"dram_die_channel3", 0.0, 1.0}};
-
-    return DRAMSysConfiguration::ThermalConfig{
-        DRAMSysConfiguration::TemperatureScale::Celsius,
-        89,
-        100,
-        DRAMSysConfiguration::ThermalSimUnit::Microseconds,
-        DRAMSysConfiguration::PowerInfo{channels},
-        "127.0.0.1",
-        118800,
-        10,
-        5,
-        true,
-        true};
-}
-
-DRAMSysConfiguration::TracePlayer getTracePlayer()
-{
-    DRAMSysConfiguration::TracePlayer player;
-    player.clkMhz = 100;
-    player.name = "mytrace.stl";
-
-    return player;
-}
-
-DRAMSysConfiguration::TraceGenerator getTraceGeneratorOneState()
-{
-    DRAMSysConfiguration::TraceGenerator gen;
-    gen.clkMhz = 100;
-    gen.name = "MyTestGen";
-
-    DRAMSysConfiguration::TraceGeneratorTrafficState state0;
-    state0.numRequests = 1000;
-    state0.rwRatio = 0.5;
-    state0.addressDistribution = DRAMSysConfiguration::AddressDistribution::Random;
-    state0.addressIncrement = {};
-    state0.minAddress = {};
-    state0.maxAddress = {};
-    state0.clksPerRequest = {};
-
-    gen.states.emplace(0, state0);
-
-    return gen;
-}
-
-DRAMSysConfiguration::TraceGenerator getTraceGeneratorMultipleStates()
-{
-    DRAMSysConfiguration::TraceGenerator gen;
-
-    gen.clkMhz = 100;
-    gen.name = "MyTestGen";
-    gen.maxPendingReadRequests = 8;
-
-    DRAMSysConfiguration::TraceGeneratorTrafficState state0;
-    state0.numRequests = 1000;
-    state0.rwRatio = 0.5;
-    state0.addressDistribution = DRAMSysConfiguration::AddressDistribution::Sequential;
-    state0.addressIncrement = 256;
-    state0.minAddress = {};
-    state0.maxAddress = 1024;
-    state0.clksPerRequest = {};
-
-    DRAMSysConfiguration::TraceGeneratorTrafficState state1;
-    state1.numRequests = 100;
-    state1.rwRatio = 0.75;
-    state1.addressDistribution = DRAMSysConfiguration::AddressDistribution::Sequential;
-    state1.addressIncrement = 512;
-    state1.minAddress = 1024;
-    state1.maxAddress = 2048;
-    state1.clksPerRequest = {};
-
-    gen.states.emplace(0, state0);
-    gen.states.emplace(1, state1);
-
-    DRAMSysConfiguration::TraceGeneratorStateTransition transistion0{1, 1.0};
-
-    gen.transitions.emplace(0, transistion0);
-
-    return gen;
-}
-
-DRAMSysConfiguration::TraceHammer getTraceHammer()
-{
-    DRAMSysConfiguration::TraceHammer hammer;
-
-    hammer.clkMhz = 100;
-    hammer.name = "MyTestHammer";
-    hammer.numRequests = 4000;
-    hammer.rowIncrement = 2097152;
-
-    return hammer;
-}
-
-DRAMSysConfiguration::TraceSetup getTraceSetup()
-{
-    using namespace DRAMSysConfiguration;
-
-    std::vector<std::variant<TracePlayer, TraceGenerator, TraceHammer>> initiators;
-    initiators.emplace_back(getTracePlayer());
-    initiators.emplace_back(getTraceGeneratorOneState());
-    initiators.emplace_back(getTraceGeneratorMultipleStates());
-    initiators.emplace_back(getTraceHammer());
-
-    return DRAMSysConfiguration::TraceSetup{initiators};
-}
-
-DRAMSysConfiguration::Configuration getConfig(const DRAMSysConfiguration::MemSpec &memSpec)
-{
-    return DRAMSysConfiguration::Configuration{
-        getAddressMapping(),
-        getMcConfig(),
-        memSpec,
-        getSimConfig(),
-        "std::string_simulationId",
-        getThermalConfig(),
-        // {{}, false}, works too
-        getTraceSetup(),
-    };
-}
-
-int main()
-{
-    DRAMSysConfiguration::Configuration conf = DRAMSysConfiguration::from_path("ddr5.json");
-    std::ofstream fileout("myjson.json");
-    json j_my;
-    j_my["simulation"] = getConfig(conf.memSpec); // just copy memspec over
-    fileout << j_my.dump(4);
-
-    std::ifstream file2("hbm2.json");
-    json hbm2_j = json::parse(file2, nullptr, false);
-    json hbm2_config = hbm2_j.at("simulation");
-    DRAMSysConfiguration::Configuration hbm2conf = hbm2_config.get<DRAMSysConfiguration::Configuration>();
-    std::ofstream filehbm2("myhbm2.json");
-    json j_myhbm2;
-    j_myhbm2["simulation"] = hbm2conf;
-    filehbm2 << j_myhbm2.dump(4);
-
-    std::ifstream file3("myjson.json");
-    json ddr5_old = json::parse(file3, nullptr, false);
-    json ddr5_old_conf = ddr5_old.at("simulation");
-    DRAMSysConfiguration::Configuration ddr5_old_config = ddr5_old_conf.get<DRAMSysConfiguration::Configuration>();
-    std::ofstream fileoldout("myjson2.json");
-    json j_oldconfconv;
-    j_oldconfconv["simulation"] = ddr5_old_config;
-    fileoldout << j_oldconfconv.dump(4);
-}
diff --git a/DRAMSys/library/src/common/configuration/util.h b/DRAMSys/library/src/common/configuration/util.h
deleted file mode 100644
index 1a6ac463..00000000
--- a/DRAMSys/library/src/common/configuration/util.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2021, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Derek Christ
- */
-
-#ifndef DRAMSYSCONFIGURATION_UTIL_H
-#define DRAMSYSCONFIGURATION_UTIL_H
-
-#include <nlohmann/json.hpp>
-#include <optional>
-#include <utility>
-
-namespace DRAMSysConfiguration
-{
-using json = nlohmann::json;
-
-// template <typename T>
-// class Optional : public std::pair<T, bool>
-// {
-// public:
-//     Optional() : std::pair<T, bool>{{}, false}
-//     {
-//     }
-//     Optional(const T &v) : std::pair<T, bool>{v, true}
-//     {
-//     }
-
-//     bool isValid() const
-//     {
-//         return this->second;
-//     }
-
-//     const T &getValue() const
-//     {
-//         assert(this->second == true);
-//         return this->first;
-//     }
-
-//     void setValue(const T &v)
-//     {
-//         this->first = v;
-//         this->second = true;
-//     }
-
-//     void invalidate()
-//     {
-//         this->second = false;
-//     }
-
-//     /**
-//      * This methods only purpose is to make a optional type
-//      * valid so that it can be written to by reference.
-//      */
-//     T &setByReference()
-//     {
-//         this->second = true;
-//         return this->first;
-//     }
-// };
-
-template <typename T>
-void invalidateEnum(T &value)
-{
-    if (value.has_value() && value.value() == T::value_type::Invalid)
-        value.reset();
-}
-
-json get_config_json(const json &j, const std::string &configPath, const std::string &objectName);
-
-inline void remove_null_values(json &j)
-{
-    std::vector<std::string> keysToRemove;
-
-    for (const auto &element : j.items())
-    {
-        if (element.value() == nullptr)
-            keysToRemove.emplace_back(element.key());
-    }
-
-    std::for_each(keysToRemove.begin(), keysToRemove.end(), [&](const std::string &key) { j.erase(key); });
-}
-
-} // namespace DRAMSysConfiguration
-
-/**
- * Inspired from
- * https://json.nlohmann.me/features/arbitrary_types/#how-can-i-use-get-for-non-default-constructiblenon-copyable-types
- */
-namespace nlohmann
-{
-
-template <typename T>
-void to_json(nlohmann::json &j, const std::optional<T> &v)
-{
-    if (v.has_value())
-        j = v.value();
-    else
-        j = nullptr;
-}
-
-template <typename T>
-void from_json(const nlohmann::json &j, std::optional<T> &v)
-{
-    if (j.is_null())
-        v = std::nullopt;
-    else
-    {
-        v = j.get<T>();
-    }
-}
-
-} // namespace nlohmann
-
-#endif // DRAMSYSCONFIGURATION_UTIL_H
diff --git a/DRAMSys/library/src/common/third_party/DRAMPower b/DRAMSys/library/src/common/third_party/DRAMPower
deleted file mode 160000
index 1ddc48a3..00000000
--- a/DRAMSys/library/src/common/third_party/DRAMPower
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1ddc48a3872d93e2a60fc8c53348e0c2ed95fae1
diff --git a/DRAMSys/library/src/common/third_party/nlohmann b/DRAMSys/library/src/common/third_party/nlohmann
deleted file mode 160000
index b7be613b..00000000
--- a/DRAMSys/library/src/common/third_party/nlohmann
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b7be613b6ec6269c829144ff1cc8a633876d3092
diff --git a/DRAMSys/library/src/common/third_party/sqlite-amalgamation b/DRAMSys/library/src/common/third_party/sqlite-amalgamation
deleted file mode 160000
index 9be05e13..00000000
--- a/DRAMSys/library/src/common/third_party/sqlite-amalgamation
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9be05e13408dd8cf8dafe8f11b1700a28194e07e
diff --git a/DRAMSys/library/src/common/third_party/systemc b/DRAMSys/library/src/common/third_party/systemc
deleted file mode 160000
index 60418250..00000000
--- a/DRAMSys/library/src/common/third_party/systemc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 604182509559ae42c34e878f508bae7c18abbbd6
diff --git a/DRAMSys/library/src/configuration/TemperatureSimConfig.h b/DRAMSys/library/src/configuration/TemperatureSimConfig.h
deleted file mode 100644
index ac090b02..00000000
--- a/DRAMSys/library/src/configuration/TemperatureSimConfig.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Eder F. Zulian
- *    Matthias Jung
- *    Luiza Correa
- *    Derek Christ
- */
-
-#ifndef TEMPERATURESIMCONFIG_H
-#define TEMPERATURESIMCONFIG_H
-
-#include <string>
-#include <vector>
-#include <DRAMSysConfiguration.h>
-#include <systemc>
-#include <utility>
-#include "../common/DebugManager.h"
-
-struct TemperatureSimConfig
-{
-    // Temperature Scale
-    enum class TemperatureScale {Celsius, Fahrenheit, Kelvin} temperatureScale;
-
-    // Static Temperature Simulation parameters
-    int staticTemperatureDefaultValue;
-
-    // Thermal Simulation parameters
-    double thermalSimPeriod;
-    enum sc_core::sc_time_unit thermalSimUnit;
-    std::string iceServerIp;
-    unsigned int iceServerPort;
-    unsigned int simPeriodAdjustFactor;
-    unsigned int nPowStableCyclesToIncreasePeriod;
-    bool generateTemperatureMap;
-    bool generatePowerMap;
-
-    // Power related information
-    std::vector<float> powerInitialValues;
-    std::vector<float> powerThresholds;
-
-    void showTemperatureSimConfig()
-    {
-        NDEBUG_UNUSED(int i) = 0;
-        for (NDEBUG_UNUSED(auto e) : powerInitialValues)
-        {
-            PRINTDEBUGMESSAGE("TemperatureSimConfig", "powerInitialValues["
-                              + std::to_string(i++) + "]: " + std::to_string(e));
-        }
-        i = 0;
-        for (NDEBUG_UNUSED(auto e) : powerThresholds)
-        {
-            PRINTDEBUGMESSAGE("TemperatureSimConfig", "powerThreshold["
-                              + std::to_string(i++) + "]: " + std::to_string(e));
-        }
-    }
-};
-
-#endif // TEMPERATURESIMCONFIG_H
-
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpec.cpp b/DRAMSys/library/src/configuration/memspec/MemSpec.cpp
deleted file mode 100644
index f675a806..00000000
--- a/DRAMSys/library/src/configuration/memspec/MemSpec.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Lukas Steiner
- *    Derek Christ
- */
-
-#include "MemSpec.h"
-
-using namespace sc_core;
-using namespace tlm;
-
-MemSpec::MemSpec(const DRAMSysConfiguration::MemSpec &memSpec,
-                 MemoryType memoryType,
-                 unsigned numberOfChannels, unsigned pseudoChannelsPerChannel,
-                 unsigned ranksPerChannel, unsigned banksPerRank,
-                 unsigned groupsPerRank, unsigned banksPerGroup,
-                 unsigned banksPerChannel, unsigned bankGroupsPerChannel,
-                 unsigned devicesPerRank)
-    : numberOfChannels(numberOfChannels),
-      pseudoChannelsPerChannel(pseudoChannelsPerChannel),
-      ranksPerChannel(ranksPerChannel),
-      banksPerRank(banksPerRank),
-      groupsPerRank(groupsPerRank),
-      banksPerGroup(banksPerGroup),
-      banksPerChannel(banksPerChannel),
-      bankGroupsPerChannel(bankGroupsPerChannel),
-      devicesPerRank(devicesPerRank),
-      rowsPerBank(memSpec.memArchitectureSpec.entries.at("nbrOfRows")),
-      columnsPerRow(memSpec.memArchitectureSpec.entries.at("nbrOfColumns")),
-      defaultBurstLength(memSpec.memArchitectureSpec.entries.at("burstLength")),
-      maxBurstLength(memSpec.memArchitectureSpec.entries.find("maxBurstLength") !=
-                             memSpec.memArchitectureSpec.entries.end()
-                        ? memSpec.memArchitectureSpec.entries.at("maxBurstLength")
-                        : defaultBurstLength),
-      dataRate(memSpec.memArchitectureSpec.entries.at("dataRate")),
-      bitWidth(memSpec.memArchitectureSpec.entries.at("width")),
-      dataBusWidth(bitWidth * devicesPerRank),
-      bytesPerBeat(dataBusWidth / 8),
-      defaultBytesPerBurst((defaultBurstLength * dataBusWidth) / 8),
-      maxBytesPerBurst((maxBurstLength * dataBusWidth) / 8),
-      fCKMHz(memSpec.memTimingSpec.entries.at("clkMhz")),
-      tCK(sc_time(1.0 / fCKMHz, SC_US)),
-      memoryId(memSpec.memoryId),
-      memoryType(memoryType),
-      burstDuration(tCK * (static_cast<double>(defaultBurstLength) / dataRate)),
-      memorySizeBytes(0)
-{
-    commandLengthInCycles = std::vector<double>(Command::numberOfCommands(), 1);
-}
-
-sc_time MemSpec::getCommandLength(Command command) const
-{
-    return tCK * commandLengthInCycles[command];
-}
-
-double MemSpec::getCommandLengthInCycles(Command command) const
-{
-    return commandLengthInCycles[command];
-}
-
-uint64_t MemSpec::getSimMemSizeInBytes() const
-{
-    return memorySizeBytes;
-}
-
-sc_time MemSpec::getRefreshIntervalAB() const
-{
-    SC_REPORT_FATAL("MemSpec", "All-bank refresh not supported");
-    return SC_ZERO_TIME;
-}
-
-sc_time MemSpec::getRefreshIntervalPB() const
-{
-    SC_REPORT_FATAL("MemSpec", "Per-bank refresh not supported");
-    return SC_ZERO_TIME;
-}
-
-sc_time MemSpec::getRefreshIntervalP2B() const
-{
-    SC_REPORT_FATAL("MemSpec", "Per-2-bank refresh not supported");
-    return SC_ZERO_TIME;
-}
-
-sc_time MemSpec::getRefreshIntervalSB() const
-{
-    SC_REPORT_FATAL("MemSpec", "Same-bank refresh not supported");
-    return SC_ZERO_TIME;
-}
-
-unsigned MemSpec::getPer2BankOffset() const
-{
-    return 0;
-}
-
-unsigned MemSpec::getRAACDR() const
-{
-    SC_REPORT_FATAL("MemSpec", "Refresh Management not supported");
-    return 0;
-}
-
-unsigned MemSpec::getRAAIMT() const
-{
-    SC_REPORT_FATAL("MemSpec", "Refresh Management not supported");
-    return 0;
-}
-
-unsigned MemSpec::getRAAMMT() const
-{
-    SC_REPORT_FATAL("MemSpec", "Refresh Management not supported");
-    return 0;
-}
-
-bool MemSpec::hasRasAndCasBus() const
-{
-    return false;
-}
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpec.h b/DRAMSys/library/src/configuration/memspec/MemSpec.h
deleted file mode 100644
index 0a1d0894..00000000
--- a/DRAMSys/library/src/configuration/memspec/MemSpec.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Janik Schlemminger
- *    Matthias Jung
- *    Lukas Steiner
- *    Derek Christ
- */
-
-#ifndef MEMSPEC_H
-#define MEMSPEC_H
-
-#include <vector>
-#include <string>
-#include <DRAMSysConfiguration.h>
-#include <systemc>
-#include <tlm>
-#include "../../common/utils.h"
-#include "../../controller/Command.h"
-
-class MemSpec
-{
-public:
-    const unsigned numberOfChannels;
-    const unsigned pseudoChannelsPerChannel;
-    const unsigned ranksPerChannel;
-    const unsigned banksPerRank;
-    const unsigned groupsPerRank;
-    const unsigned banksPerGroup;
-    const unsigned banksPerChannel;
-    const unsigned bankGroupsPerChannel;
-    const unsigned devicesPerRank;
-    const unsigned rowsPerBank;
-    const unsigned columnsPerRow;
-    const unsigned defaultBurstLength;
-    const unsigned maxBurstLength;
-    const unsigned dataRate;
-    const unsigned bitWidth;
-    const unsigned dataBusWidth;
-    const unsigned bytesPerBeat;
-    const unsigned defaultBytesPerBurst;
-    const unsigned maxBytesPerBurst;
-
-    // Clock
-    const double fCKMHz;
-    const sc_core::sc_time tCK;
-
-    const std::string memoryId;
-    const enum class MemoryType {DDR3, DDR4, DDR5, LPDDR4, LPDDR5, WideIO,
-            WideIO2, GDDR5, GDDR5X, GDDR6, HBM2, HBM3, STTMRAM} memoryType;
-
-    virtual ~MemSpec() = default;
-
-    virtual sc_core::sc_time getRefreshIntervalAB() const;
-    virtual sc_core::sc_time getRefreshIntervalPB() const;
-    virtual sc_core::sc_time getRefreshIntervalP2B() const;
-    virtual sc_core::sc_time getRefreshIntervalSB() const;
-
-    virtual unsigned getPer2BankOffset() const;
-
-    virtual unsigned getRAAIMT() const;
-    virtual unsigned getRAAMMT() const;
-    virtual unsigned getRAACDR() const;
-
-    virtual bool hasRasAndCasBus() const;
-
-    virtual sc_core::sc_time getExecutionTime(Command command, const tlm::tlm_generic_payload &payload) const = 0;
-    virtual TimeInterval getIntervalOnDataStrobe(Command command, const tlm::tlm_generic_payload &payload) const = 0;
-
-    sc_core::sc_time getCommandLength(Command) const;
-    double getCommandLengthInCycles(Command) const;
-    uint64_t getSimMemSizeInBytes() const;
-
-protected:
-    MemSpec(const DRAMSysConfiguration::MemSpec &memSpec,
-            MemoryType memoryType,
-            unsigned numberOfChannels, unsigned pseudoChannelsPerChannel,
-            unsigned ranksPerChannel, unsigned banksPerRank,
-            unsigned groupsPerRank, unsigned banksPerGroup,
-            unsigned banksPerChannel, unsigned bankGroupsPerChannel,
-            unsigned devicesPerRank);
-
-    // Command lengths in cycles on bus, usually one clock cycle
-    std::vector<double> commandLengthInCycles;
-    sc_core::sc_time burstDuration;
-    uint64_t memorySizeBytes;
-};
-
-#endif // MEMSPEC_H
-
diff --git a/DRAMSys/library/src/error/ECC/Bit.h b/DRAMSys/library/src/error/ECC/Bit.h
deleted file mode 100644
index 5e4b6779..00000000
--- a/DRAMSys/library/src/error/ECC/Bit.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#pragma once
-class CBit
-{
-public:
-    enum VALUE {
-        ZERO = 0,
-        ONE = 1
-    };
-
-protected:
-    VALUE m_nValue;
-
-public:
-    CBit(VALUE nVal = ZERO);
-    virtual ~CBit();
-
-    inline void Set()
-    {
-        m_nValue = ONE;
-    };
-    inline void Clear()
-    {
-        m_nValue = ZERO;
-    };
-    inline unsigned Get()
-    {
-        if (m_nValue == ONE)
-            return 1;
-        else
-            return 0;
-    };
-
-    void Print();
-
-    CBit &operator=(unsigned d)
-    {
-        if (d == 0 ) {
-            m_nValue = ZERO;
-        } else {
-            m_nValue = ONE;
-        }
-        return *this;
-    }
-
-    friend CBit operator^(CBit l, const CBit &r)
-    {
-        if (l.m_nValue == r.m_nValue) {
-            return CBit(ZERO);
-        } else {
-            return CBit(ONE);
-        }
-    }
-
-    CBit &operator^=(const CBit &r)
-    {
-        if (m_nValue == r.m_nValue) {
-            m_nValue = ZERO;
-        } else {
-            m_nValue = ONE;
-        }
-        return *this;
-    }
-
-    inline bool operator==(const CBit::VALUE &r)
-    {
-        return m_nValue == r;
-    }
-};
-
diff --git a/DRAMSys/library/src/error/ECC/ECC.cpp b/DRAMSys/library/src/error/ECC/ECC.cpp
deleted file mode 100644
index fba2c953..00000000
--- a/DRAMSys/library/src/error/ECC/ECC.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#include "ECC.h"
-
-// ************************************************************************************************
-// Function which calculates the number of additional bits needed for a given number of data bits
-// to store the hamming code and parity bit for a SECDED implementation
-unsigned ECC::GetNumParityBits(unsigned nDataBits)
-{
-    unsigned nParityBits = 0;
-
-    // Function to calculate the nube of bits: n = 2^k - k - 1
-    // ( Source: Hacker's Delight; p. 310; math. function 1 )
-    while (nDataBits > ((1 << nParityBits) - nParityBits - 1)) {
-        ++nParityBits;
-    }
-
-    return nParityBits + 1; // +1 for the parity bit
-}
-
-
-// ************************************************************************************************
-// Function which extends a given data word to the needed length for a SECDED code
-void ECC::ExtendWord(CWord &v)
-{
-    unsigned end = v.GetLength() + ECC::GetNumParityBits(v.GetLength());
-
-    // Insert x bits for the hamming code at positions where pos = 2^a; a = [0..N]
-    // In "Hacker's Delight" the smallest index is 1 - But in this beautiful C-Code it's 0 as it
-    // should be. That's why there is a '-1' in the call of v.Insert.
-    unsigned i = 1;
-    while (i < end) {
-        v.Insert(i - 1, CBit());
-        i <<= 1;
-    }
-
-    // Append one bit for the parity
-    v.Append(CBit());
-}
-
-// ************************************************************************************************
-// Function which calculates the Hamming Code bits of an extended Data word.
-// Function ExtendWord must be called before calling this function
-// The calculated bits are stored in p, so the length of p should be at least
-// 'GetNumParityBits(#data bits)-1'
-void ECC::CalculateCheckbits(CWord &v, CWord &p)
-{
-    unsigned i = 1, l = 0;
-
-    // Last bit is the parity bit - don't use this in the algorithm for hamming code
-    unsigned len = v.GetLength() - 1;
-
-    // Following Graph should show you the behaviour of this algorithm
-    // #Data bits: 11 #Hamming bits: 4 -> SECDED bits: 16 (incl. parity bit)
-    // Hamming Code Bit: | Bits used -> data(X)/Hamming Code(H) // Bit unused -
-    //                 0 | H-X-X-X-X-X-X-X
-    //                 1 | -HX--XX--XX--XX
-    //                 2 | ---HXXX----XXXX
-    //                 3 | -------HXXXXXXX
-    // For further information read "Hacker's delight" chapter 15
-    // ATTENTION: The order of indices is different from the one in the book,
-    //            but it doesn't matter in which order your data or check bits are.
-    //            But it should be the same for encoding and decoding
-    while (i < len) {
-        for (unsigned j = (i - 1); j < len; j += (i << 1)) {
-            for (unsigned k = 0; k < (i); k++) {
-                if (j + k >= len)
-                    break;
-                p[l] ^= v[j + k];
-            }
-        }
-        l++;
-        i <<= 1;
-    }
-}
-
-// ************************************************************************************************
-// Function which inserts the checkbits which were calculated with 'CalculateCheckbits' in the
-// extended data word. This is needed to calculate a proper parity of ALL bits to achive a SECDED
-// behaviour.
-void ECC::InsertCheckbits(CWord &v, CWord p)
-{
-    unsigned i = 1, j = 0;
-    while (i <= v.GetLength() - 1) {
-        v[i - 1] = p[j++];
-        i <<= 1;
-    }
-}
-
-
-// ************************************************************************************************
-// Function which extracts the checkbits out of an extended data word. This is needed to check for
-// bit error in the data word.
-void ECC::ExtractCheckbits(CWord v, CWord &p)
-{
-    unsigned i = 1, j = 0;
-    while (i <= v.GetLength() - 1) {
-        p[j++] = v[i - 1];
-        i <<= 1;
-    }
-}
-
-// ************************************************************************************************
-// Function which calculates the overal parity
-// Simply XOR all bits
-void ECC::CalculateParityBit(CWord v, CBit &p)
-{
-    // Paritybit
-    p = CBit::ZERO;
-    for (unsigned i = 0; i < v.GetLength(); i++) {
-        p ^= v[i];
-    }
-}
-
-// ************************************************************************************************
-// Function to insert the parity bit into the extended data word
-void ECC::InsertParityBit(CWord &v, CBit p)
-{
-    v[v.GetLength() - 1] = p;
-}
-
-// ************************************************************************************************
-// Function to extract the parity bit out of an extended data word.
-void ECC::ExtractParityBit(CWord v, CBit &p)
-{
-    p = v[v.GetLength() - 1];
-}
diff --git a/DRAMSys/library/src/error/ECC/ECC.h b/DRAMSys/library/src/error/ECC/ECC.h
deleted file mode 100644
index db2ed2ce..00000000
--- a/DRAMSys/library/src/error/ECC/ECC.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#pragma once
-
-#include "Word.h"
-#include "Bit.h"
-
-// ************************************************************************************************
-//
-// | __/ __/ __| | __|  _ _ _  __| |_(_)___ _ _  ___
-// | _| (_| (__  | _| || | ' \/ _|  _| / _ \ ' \(_-<
-// |___\___\___| |_| \_,_|_||_\__|\__|_\___/_||_/__/
-//
-// ------------------------------------------------------------------------------------------------
-// ECC Implementation as described in "Hacker's Delight - second Edition" by Henry S. Warren, Jr.
-// ------------------------------------------------------------------------------------------------
-// This namespace gives you some handy functions to get a SEC-DED implementation.
-//
-// SEC-DED: Single Error Correction - Double Error Detection
-// This is the most common error correction code (ECC).
-// It consists of two different correction codes: Haming code + parity code.
-//
-// For further details read chapter 15 of "Hacker's Delight - second Edition"
-// ************************************************************************************************
-
-namespace ECC {
-unsigned GetNumParityBits(unsigned nDataBits);
-
-// Extends the data word that it can be used with hamming code
-// Several bits will be included at specific places
-void ExtendWord(CWord &v);
-
-void CalculateCheckbits(CWord &v, CWord &p);
-void InsertCheckbits(CWord &v, CWord p);
-void ExtractCheckbits(CWord v, CWord &p);
-
-void CalculateParityBit(CWord v, CBit &p);
-void InsertParityBit(CWord &v, CBit p);
-void ExtractParityBit(CWord v, CBit &p);
-}
diff --git a/DRAMSys/library/src/error/ECC/ECC_Test.cpp b/DRAMSys/library/src/error/ECC/ECC_Test.cpp
deleted file mode 100644
index 42a6a3f0..00000000
--- a/DRAMSys/library/src/error/ECC/ECC_Test.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-// ECC_Test.cpp : Entry point for the console application.
-//
-
-#include "stdafx.h"
-#include <time.h>
-#include "ECC.h"
-
-int main()
-{
-    // Random number init
-    srand(time(NULL));
-
-    // Erstellen
-    unsigned size = 4;
-    CWord p(ECC::GetNumParityBits(size)), v(size);
-
-    // Daten eingeben
-    for (unsigned a = 0; a < 16; a++) {
-        v = a;
-        v.Rotate();
-
-        ECC::ExtendWord(v);
-        printf("%d:\t", a);
-
-        p = 0;
-        ECC::CalculateCheckbits(v, p);
-        ECC::InsertCheckbits(v, p);
-        ECC::CalculateParityBit(v, p[3]);
-        ECC::InsertParityBit(v, p[3]);
-
-        v.Print();
-
-        v.Resize(size);
-    }
-
-    printf("\r\n");
-
-    for (unsigned x = 0; x < 100; x++) {
-        //Get random number
-        unsigned a = rand() % 16;
-
-        v.Resize(size);
-        v = a;
-        v.Rotate();
-
-        ECC::ExtendWord(v);
-
-        p = 0;
-        ECC::CalculateCheckbits(v, p);
-        ECC::InsertCheckbits(v, p);
-        ECC::CalculateParityBit(v, p[3]);
-        ECC::InsertParityBit(v, p[3]);
-        v.Print();
-
-        // Insert error
-        unsigned pos = rand() % 8;
-        v[pos] ^= CBit(CBit::ONE);
-
-        printf("Data: %d, Error at pos %d: ", a, pos + 1);
-        v[pos].Print();
-        printf("\r\n");
-        v.Print();
-
-        p = 0;
-        ECC::CalculateCheckbits(v, p);
-        ECC::CalculateParityBit(v, p[3]);
-
-        printf("%d:\t", a);
-
-        p.Print();
-
-        // Interpreting Data
-
-        unsigned syndrome = 0;
-        for (unsigned i = 0; i < p.GetLength() - 1; i++) {
-            if (p[i] == CBit::ONE)
-                syndrome += (1 << i);
-        }
-
-        if (p[3] == CBit::ZERO) {
-            // Parity even
-
-            if (syndrome) {
-                // Double error
-                printf("Double error detected.\r\n");
-                break;
-            } else {
-                // No Error
-                printf("No error detected.\r\n");
-                break;
-            }
-        } else {
-            // Parity odd
-
-            if (syndrome) {
-                // Bit error
-                printf("Error detected in Bit %d.\r\n", syndrome);
-                if (syndrome == pos + 1)
-                    continue;
-                else
-                    break;
-            } else {
-                // Overall parity Error
-                printf("Overall parity error detected.\r\n");
-                if (pos == 7 || pos == 3 || pos == 1 || pos == 0)
-                    continue;
-                else
-                    break;
-            }
-        }
-    }
-    system("pause");
-
-    return 0;
-}
-
diff --git a/DRAMSys/library/src/error/ECC/Word.cpp b/DRAMSys/library/src/error/ECC/Word.cpp
deleted file mode 100644
index 928af5ce..00000000
--- a/DRAMSys/library/src/error/ECC/Word.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#include "Word.h"
-
-#include <math.h>
-#include <iostream>
-#include <string.h>
-
-using std::cout;
-using std::deque;
-
-CWord::CWord(unsigned nBitLength)
-    : m_nBitLength(nBitLength)
-{
-    m_word.resize(nBitLength);
-}
-
-
-CWord::~CWord()
-{
-}
-
-CBit *CWord::GetAt(unsigned nBitPos)
-{
-    if (nBitPos < m_nBitLength) {
-        return &m_word.at(nBitPos);
-    }
-
-    return nullptr;
-}
-
-void CWord::Set(unsigned data)
-{
-    deque<CBit>::iterator it;
-    if (m_nBitLength < sizeof(data)) {
-        it = m_word.begin();
-        for (unsigned i = 0; i < m_nBitLength; i++) {
-            (*it++) = data & 1;
-            data >>= 1;
-        }
-    } else {
-        for (it = m_word.begin(); it != m_word.end(); it++) {
-            (*it) = data & 1;
-            data >>= 1;
-        }
-    }
-}
-
-void CWord::Set(const unsigned char *data, unsigned lengthInBits)
-{
-    deque<CBit>::iterator it;
-    if (m_nBitLength < lengthInBits) {
-        it = m_word.begin();
-        for (unsigned pos = 0; pos < m_nBitLength; pos++) {
-            (*it) = data[pos >> 3] & (1 << (7 - (pos & 7)));
-            it++;
-        }
-    } else {
-        unsigned pos = 0;
-        for (it = m_word.begin(); it != m_word.end(); it++) {
-            (*it) = data[pos >> 3] & (1 << (7 - (pos & 7)));
-            ++pos;
-        }
-    }
-}
-
-void CWord::Rotate()
-{
-    deque<CBit> buffer = m_word;
-    for (unsigned i = 0; i < m_nBitLength; i++) {
-        m_word.at(m_nBitLength - i - 1) = buffer.at(i);
-    }
-}
-
-bool CWord::Insert(unsigned npos, CBit b)
-{
-    if (npos >= m_nBitLength)
-        return false;
-
-    deque<CBit>::iterator it = m_word.begin() + npos;
-    m_word.insert(it, b);
-
-    m_nBitLength++;
-
-    return true;
-}
-
-bool CWord::Delete(unsigned npos)
-{
-    if (npos >= m_nBitLength)
-        return false;
-
-    deque<CBit>::iterator it = m_word.begin() + npos;
-    m_word.erase(it);
-
-    m_nBitLength++;
-
-    return true;
-}
-
-void CWord::Append(CBit b)
-{
-    m_word.push_back(b);
-
-    m_nBitLength++;
-}
-
-void CWord::Resize(unsigned nsize)
-{
-    m_word.resize(nsize);
-    m_nBitLength = nsize;
-}
-
-bool CWord::PartShiftRight(unsigned nPos, unsigned /*nShift*/)
-{
-    if (nPos >= m_nBitLength)
-        return false;
-
-    /*for (unsigned i = 0; i < nShift; i++)
-    {
-        m_word.insert()
-    }*/
-
-    return true;
-}
-
-void CWord::Print()
-{
-    deque<CBit>::iterator it;
-    for (it = m_word.begin(); it != m_word.end(); it++) {
-        (*it).Print();
-    }
-    cout << "\r\n";
-}
-
-void CWord::Copy(unsigned char *ptr)
-{
-    unsigned len = ceil(m_word.size() / 8);
-    memset(ptr, 0, len);
-
-    unsigned pos = 0;
-    for (auto it = m_word.begin(); it != m_word.end(); it++) {
-        ptr[pos >> 3] |= (*it).Get() << (7 - (pos & 7));
-        ++pos;
-    }
-}
diff --git a/DRAMSys/library/src/error/ECC/Word.h b/DRAMSys/library/src/error/ECC/Word.h
deleted file mode 100644
index dec8606b..00000000
--- a/DRAMSys/library/src/error/ECC/Word.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#pragma once
-
-#include <deque>
-#include "Bit.h"
-
-class CWord
-{
-protected:
-
-    unsigned m_nBitLength;
-    std::deque<CBit> m_word;
-
-
-public:
-    CWord(unsigned nBitLength);
-    virtual ~CWord();
-
-    CBit *GetAt(unsigned nBitPos);
-
-    void Set(unsigned data);
-    void Set(const unsigned char *data, unsigned lengthInBits);
-    void Rotate();
-
-    bool Insert(unsigned npos, CBit b);
-    bool Delete(unsigned npos);
-
-    void Copy(unsigned char *ptr);
-
-    void Append(CBit b);
-
-    void Resize(unsigned nsize);
-
-    bool PartShiftRight(unsigned nPos, unsigned nShift);
-
-    inline unsigned GetLength() const
-    {
-        return m_nBitLength;
-    };
-
-    void Print();
-
-    CWord &operator=(unsigned d)
-    {
-        Set(d);
-        return *this;
-    }
-
-    CBit &operator[](unsigned nPos)
-    {
-        return m_word.at(nPos);
-    }
-
-    friend CWord operator >> (CWord l, const unsigned &r)
-    {
-        for (unsigned i = 0; i < r; i++) {
-            l.m_word.pop_front();
-            l.m_word.push_back(CBit(CBit::VALUE::ZERO));
-        }
-        return l;
-    }
-};
-
diff --git a/DRAMSys/library/src/error/eccbaseclass.cpp b/DRAMSys/library/src/error/eccbaseclass.cpp
deleted file mode 100644
index 3f266077..00000000
--- a/DRAMSys/library/src/error/eccbaseclass.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#include "eccbaseclass.h"
-
-using namespace sc_core;
-using namespace tlm;
-
-tlm::tlm_sync_enum ECCBaseClass::nb_transport_fw( int id,
-                                                  tlm::tlm_generic_payload &trans, tlm::tlm_phase &phase, sc_time &delay )
-{
-    if (trans.get_command() == TLM_WRITE_COMMAND && phase == BEGIN_REQ) {
-        // Allocate memory for encoded data using the size provided by AllocationEncode
-        unsigned nEncodedDataSize = AllocationSize(trans.get_data_length());
-        assert(nEncodedDataSize != 0);
-        unsigned char *pEncodedData = new unsigned char[nEncodedDataSize];
-
-        // Save memory pointer and size
-        m_mDataPointer[pEncodedData].pData = trans.get_data_ptr();
-        m_mDataPointer[pEncodedData].nDataSize = trans.get_data_length();
-
-        // Data Encoding
-        Encode(trans.get_data_ptr(), trans.get_data_length(), pEncodedData,
-               nEncodedDataSize);
-
-        // Change transport data length and pointer
-        trans.set_data_length(nEncodedDataSize);
-        trans.set_data_ptr(pEncodedData);
-    } else if (trans.get_command() == TLM_READ_COMMAND && phase == BEGIN_REQ) {
-        // Allocate memory for reading data using the size provided by AllocationEncode
-        unsigned nReadDataSize = AllocationSize(trans.get_data_length());
-        assert(nReadDataSize != 0);
-        unsigned char *pReadData = new unsigned char[nReadDataSize];
-
-        // Save memory pointer and size
-        m_mDataPointer[pReadData].pData = trans.get_data_ptr();
-        m_mDataPointer[pReadData].nDataSize = trans.get_data_length();
-
-        // Change transport data length and pointer
-        trans.set_data_length(nReadDataSize);
-        trans.set_data_ptr(pReadData);
-    }
-
-    return i_socket[id]->nb_transport_fw( trans, phase, delay );
-}
-
-
-// Backward interface
-tlm::tlm_sync_enum ECCBaseClass::nb_transport_bw( int id,
-                                                  tlm::tlm_generic_payload &trans, tlm::tlm_phase &phase, sc_time &delay )
-{
-    if (trans.get_command() == TLM_READ_COMMAND && phase == BEGIN_RESP) {
-        //Look for the corresponding data pointer for decoding
-        auto it = m_mDataPointer.find(trans.get_data_ptr());
-        assert(it != m_mDataPointer.end());
-
-        // Data Decoding
-        Decode(trans.get_data_ptr(), trans.get_data_length(), it->second.pData,
-               it->second.nDataSize);
-
-        // delete data pointer from map
-        m_mDataPointer.erase(it);
-
-        // Delete data pointer used for encoded data
-        delete[] trans.get_data_ptr();
-
-        // Set data pointer and size for decoded data
-        trans.set_data_ptr(it->second.pData);
-        trans.set_data_length(it->second.nDataSize);
-    } else if (trans.get_command() == TLM_WRITE_COMMAND && phase == BEGIN_RESP) {
-        //Look for the corresponding data pointer for decoding
-        auto it = m_mDataPointer.find(trans.get_data_ptr());
-        assert(it != m_mDataPointer.end());
-
-        // delete data pointer from map
-        m_mDataPointer.erase(it);
-
-        // Delete data pointer used for encoded data
-        delete[] trans.get_data_ptr();
-
-        // Set data pointer and size for decoded data
-        trans.set_data_ptr(it->second.pData);
-        trans.set_data_length(it->second.nDataSize);
-    }
-
-    return t_socket[id]->nb_transport_bw( trans, phase, delay );
-}
diff --git a/DRAMSys/library/src/error/eccbaseclass.h b/DRAMSys/library/src/error/eccbaseclass.h
deleted file mode 100644
index 9a9d52bb..00000000
--- a/DRAMSys/library/src/error/eccbaseclass.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#ifndef ECCBASECLASS_H
-#define ECCBASECLASS_H
-
-#include <systemc>
-#include <tlm>
-#include <tlm_utils/multi_passthrough_initiator_socket.h>
-#include <tlm_utils/multi_passthrough_target_socket.h>
-
-#include "ECC/ECC.h"
-
-#include "../common/DebugManager.h"
-
-class ECCBaseClass : sc_core::sc_module
-{
-public:
-    struct DataStruct {
-        unsigned char *pData;
-        unsigned int nDataSize;
-    };
-
-private:
-    std::map<unsigned char *, DataStruct> m_mDataPointer;
-
-public:
-    // Function prototype for calculated the size of memory needed for saving the encoded data
-    // Input nBytes: Number of bytes which have to be encoded
-    // Return value: Number of bytes which have to be allocated for storing the encoded data
-    virtual unsigned AllocationSize(unsigned nBytes) = 0;
-
-protected:
-    // Function prototype for encoding data.
-    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
-    // Result should be written in pDataOut, which has a size of nDataOut.
-    // pDataOut is already allocated with a size given by function AllocationEncode
-    virtual void Encode(const unsigned char *pDataIn, unsigned nDataIn,
-                        unsigned char *pDataOut, unsigned nDataOut) = 0;
-
-
-    // Function prototype for decoding data.
-    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
-    // Result should be written in pDataOut, which has a size of nDataOut.
-    // pDataOut is already allocated with a size given by function AllocationDecode
-    virtual void Decode(const unsigned char *pDataIn, unsigned nDataIn,
-                        unsigned char *pDataOut, unsigned nDataOut) = 0;
-
-public:
-    tlm_utils::multi_passthrough_target_socket<ECCBaseClass>    t_socket;
-    tlm_utils::multi_passthrough_initiator_socket<ECCBaseClass> i_socket;
-
-    SC_CTOR(ECCBaseClass)
-        : t_socket("t_socket")
-        , i_socket("i_socket")
-    {
-        t_socket.register_nb_transport_fw(this, &ECCBaseClass::nb_transport_fw);
-        i_socket.register_nb_transport_bw(this, &ECCBaseClass::nb_transport_bw);
-    }
-    // Forward interface
-    tlm::tlm_sync_enum nb_transport_fw( int id, tlm::tlm_generic_payload &trans,
-                                        tlm::tlm_phase &phase, sc_core::sc_time &delay );
-
-    // Backward interface
-    tlm::tlm_sync_enum nb_transport_bw( int id, tlm::tlm_generic_payload &trans,
-                                        tlm::tlm_phase &phase, sc_core::sc_time &delay );
-};
-
-#endif // ECCBASECLASS_H
diff --git a/DRAMSys/library/src/error/ecchamming.cpp b/DRAMSys/library/src/error/ecchamming.cpp
deleted file mode 100644
index 65255532..00000000
--- a/DRAMSys/library/src/error/ecchamming.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#include "ecchamming.h"
-
-#include "ECC/ECC.h"
-
-unsigned ECCHamming::AllocationSize(unsigned nBytes)
-{
-    // For this hamming for 8 bytes one extra byte is needed:l
-    return nBytes + ceil(nBytes / m_nDatawordSize) * m_nCodewordSize;
-}
-
-void ECCHamming::Encode(const unsigned char *pDataIn, const unsigned nDataIn,
-                        unsigned char *pDataOut, const unsigned nDataOut)
-{
-    // Calculate how many 8 byte blocks are there
-    unsigned nBlocks = nDataIn / m_nDatawordSize;
-
-    // No partly filled blocks are supported
-    assert(nDataIn % m_nDatawordSize == 0);
-
-    // Create ECC data for every block
-    for (unsigned i = 0; i < nBlocks; i++) {
-        // Create all variables needed for calulation
-        CWord dataword(InBits(m_nDatawordSize));    // Size in bits
-        CWord codeword(InBits(m_nCodewordSize));   // Size in bits
-
-        // Fill in current data block
-        dataword.Set(&pDataIn[i * m_nDatawordSize], InBits(m_nDatawordSize));
-
-        // Extend data word. It grows from m_nDatawordSize to m_nDatawordSize + m_nCodewordSize
-        ECC::ExtendWord(dataword);
-
-        // Initialize the codeword with zeros
-        codeword = 0;
-
-        // Calculate Checkbits
-        ECC::CalculateCheckbits(dataword, codeword);
-        ECC::InsertCheckbits(dataword, codeword);
-
-        // Calculate Parity
-        ECC::CalculateParityBit(dataword, codeword[7]);
-
-        // Check if there is enough space in the output array (should always be)
-        assert((i + 1) * (m_nDatawordSize + m_nCodewordSize) <= nDataOut);
-
-        // Copy old data
-        memcpy(&pDataOut[i * (m_nDatawordSize + m_nCodewordSize)],
-               &pDataIn[i * m_nDatawordSize], m_nDatawordSize);
-
-        // Save hamming code + parity bit in the last byte
-        codeword.Copy(&pDataOut[i * (m_nDatawordSize + m_nCodewordSize) +
-                                m_nDatawordSize]);
-    }
-}
-
-void ECCHamming::Decode(const unsigned char *pDataIn, const unsigned nDataIn,
-                        unsigned char *pDataOut, const unsigned nDataOut)
-{
-    // Calculate how many 9 byte blocks are there
-    unsigned nBlocks = nDataIn / (m_nDatawordSize + m_nCodewordSize);
-
-    // No partly filled blocks are supported
-    assert(nDataIn % (m_nDatawordSize + m_nCodewordSize) == 0);
-
-    // Verify ECC data for every block
-    for (unsigned i = 0; i < nBlocks; i++) {
-        // Create all variables needed for calulation
-        CWord dataword(InBits(m_nDatawordSize));    // Size in bits
-        CWord codeword(InBits(m_nCodewordSize));   // Size in bits
-
-        // Fill in current data block
-        dataword.Set(&pDataIn[i * (m_nDatawordSize + m_nCodewordSize)],
-                     InBits(m_nDatawordSize));
-        codeword.Set(&pDataIn[i * (m_nDatawordSize + m_nCodewordSize) +
-                              m_nDatawordSize], InBits(m_nCodewordSize));
-
-        // Extend data word. It grows from m_nDatawordSize to m_nDatawordSize + m_nCodewordSize
-        ECC::ExtendWord(dataword);
-
-        // Insert old codeword
-        ECC::InsertCheckbits(dataword, codeword);
-        ECC::InsertParityBit(dataword, codeword[7]);
-
-        // Reset codeword
-        codeword = 0;
-
-        // Calculate Checkbits again
-        ECC::CalculateCheckbits(dataword, codeword);
-
-        // Calculate Parity again
-        ECC::CalculateParityBit(dataword, codeword[7]);
-
-        // Translate codeword
-        bool bParity = codeword[7] == CBit::ONE;
-
-        // calculate syndrome
-        unsigned char c = 0;
-        codeword.Rotate();
-        codeword.Copy(&c);
-        c &= 0x7F;
-
-        // Parity Error?
-        if (bParity) {
-            // Parity Error
-
-            if (c == 0) {
-                // Only Parity Bit broken - continue
-                std::cout << "Parity Bit error" << std::endl;
-            } else {
-                // Data or Hamming Code Bit broken
-                std::cout << "Single Error Detected" << std::endl;
-            }
-        } else {
-            // No Parity Error
-
-            if (c == 0) {
-                // No error at all - continue
-            } else {
-                // Double error detected
-                std::cout << "Double Error Detected (Block " << i << ")." << std::endl;
-            }
-        }
-
-        // Check if there is enough space in the output array (should always be)
-        assert((i + 1) * (m_nDatawordSize) <= nDataOut);
-
-        // Copy data
-        memcpy(&pDataOut[i * m_nDatawordSize],
-               &pDataIn[i * (m_nDatawordSize + m_nCodewordSize)], m_nDatawordSize);
-    }
-}
diff --git a/DRAMSys/library/src/error/ecchamming.h b/DRAMSys/library/src/error/ecchamming.h
deleted file mode 100644
index 14986cd7..00000000
--- a/DRAMSys/library/src/error/ecchamming.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
- */
-
-#ifndef ECCHAMMIMG_H
-#define ECCHAMMIMG_H
-
-#include "eccbaseclass.h"
-
-
-class ECCHamming : public ECCBaseClass
-{
-private:
-    // Hamming constants for this special implementation
-    const unsigned m_nDatawordSize = 8;     // bytes
-    const unsigned m_nCodewordSize = 1;     // bytes
-
-    inline unsigned InBits(unsigned n)
-    {
-        return n << 3;
-    };    // use this if constants are needed in bits
-
-public:
-    // Function prototype for calculated the size of memory needed for saving the encoded data
-    // Input nBytes: Number of bytes which have to be encoded
-    // Return value: Number of bytes which have to be allocated for storing the encoded data
-    virtual unsigned AllocationSize(unsigned nBytes);
-
-protected:
-    // Function prototype for encoding data.
-    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
-    // Result should be written in pDataOut, which has a size of nDataOut.
-    // pDataOut is already allocated with a size given by function AllocationEncode
-    virtual void Encode(const unsigned char *pDataIn, unsigned nDataIn,
-                        unsigned char *pDataOut, unsigned nDataOut);
-
-
-    // Function prototype for decoding data.
-    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
-    // Result should be written in pDataOut, which has a size of nDataOut.
-    // pDataOut is already allocated with a size given by function AllocationDecode
-    virtual void Decode(const unsigned char *pDataIn, unsigned nDataIn,
-                        unsigned char *pDataOut, unsigned nDataOut);
-
-public:
-    ECCHamming(::sc_core::sc_module_name name) : ECCBaseClass(name)
-    {};
-};
-
-#endif // ECCHAMMIMG_H
diff --git a/DRAMSys/library/src/error/errormodel.cpp b/DRAMSys/library/src/error/errormodel.cpp
deleted file mode 100644
index 86e86a03..00000000
--- a/DRAMSys/library/src/error/errormodel.cpp
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Matthias Jung
- */
-
-#include "errormodel.h"
-#include "../common/DebugManager.h"
-#include "../simulation/TemperatureController.h"
-#include "../simulation/AddressDecoder.h"
-#include "../common/dramExtensions.h"
-
-#ifdef DRAMPOWER
-#include "../../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
-#endif
-
-#include <random>
-#include <chrono>
-#include <bitset>
-#include <cmath>
-#include <sstream>
-#include <fstream>
-
-using namespace sc_core;
-
-errorModel::errorModel(const sc_module_name& name, const Configuration& config,
-                       TemperatureController& temperatureController, libDRAMPower *dramPower)
-        : sc_module(name), memSpec(*config.memSpec), temperatureController(temperatureController)
-{
-    this->DRAMPower = dramPower;
-    init(config);
-}
-
-void errorModel::init(const Configuration& config)
-{
-    powerAnalysis = config.powerAnalysis;
-    thermalSim = config.thermalSimulation;
-    // Get Configuration parameters:
-    burstLenght = config.memSpec->defaultBurstLength;
-    numberOfColumns = config.memSpec->columnsPerRow;
-    bytesPerColumn = std::log2(config.memSpec->dataBusWidth);
-
-    // Adjust number of bytes per column dynamically to the selected ecc controller
-    //TODO: bytesPerColumn = Configuration::getInstance().adjustNumBytesAfterECC(bytesPerColumn);
-
-    numberOfRows = config.memSpec->rowsPerBank;
-    numberOfBitErrorEvents = 0;
-
-
-    // Initialize the lastRow Access array:
-    lastRowAccess = new sc_time[numberOfRows];
-    for (unsigned int i = 0; i < numberOfRows; i++)
-        lastRowAccess[i] = SC_ZERO_TIME;
-
-    // The name is set when the context is clear.
-    contextStr = "";
-
-    // Parse data input:
-    parseInputData(config);
-    prepareWeakCells();
-
-    // Initialize context variables:
-    myChannel = -1;
-    myRank = -1;
-    myBankgroup = -1;
-    myBank = -1;
-
-    // Test 1:
-    // If you want to test the function that get the number
-    // of bit errors for a given temperature and time
-    // uncomment the following lines:
-    //
-    //std::cout << "MAXTemp:" << maxTemperature << std::endl;
-    //std::cout << "MAXTime:" << maxTime << std::endl;
-    //getNumberOfFlips(45.0,sc_time(200.0,SC_MS));
-    //getNumberOfFlips(45.0,sc_time(190.0,SC_MS));
-    //getNumberOfFlips(45.0,sc_time(180.0,SC_MS));
-    //getNumberOfFlips(75.0,sc_time(200.0,SC_MS));
-    //getNumberOfFlips(75.0,sc_time(190.0,SC_MS));
-    //getNumberOfFlips(75.0,sc_time(180.0,SC_MS));
-    //getNumberOfFlips(85.0,sc_time(200.0,SC_MS));
-    //getNumberOfFlips(85.0,sc_time(190.0,SC_MS));
-    //getNumberOfFlips(85.0,sc_time(180.0,SC_MS));
-    //getNumberOfFlips(88.0,sc_time(200.0,SC_MS));
-    //getNumberOfFlips(88.0,sc_time(190.0,SC_MS));
-    //getNumberOfFlips(88.0,sc_time(180.0,SC_MS));
-    //getNumberOfFlips(89.0,sc_time(64.0,SC_MS));
-    //getNumberOfFlips(89.0,sc_time(64.0,SC_MS));
-    //getNumberOfFlips(89.0,sc_time(64.0,SC_MS));
-
-    // Test 2:
-    // X X X
-    // X 1 1
-    // X 1 1
-    //weakCells[0].bit = 0;
-    //weakCells[0].col = 0;
-    //weakCells[0].row = 0;
-    //weakCells[0].dependent = true;
-
-    markBitFlips();
-}
-
-errorModel::~errorModel()
-{
-    // Remove all data from the dataMap:
-    for (std::map<DecodedAddress, unsigned char *>::iterator it = dataMap.begin();
-            it != dataMap.end(); ++it ) {
-        delete it->second;
-    }
-    // Delete all elements from the dataMap:
-    dataMap.clear();
-
-    // Remove all data from the lastRowAccess
-    delete [] lastRowAccess;
-
-    // Clean errorMap
-    errorMap.clear();
-
-    // Clean list of weak cells:
-    delete [] weakCells;
-
-    // If an access happened to a bank the numner of error events should be shown:
-    if (myChannel != -1 && myBank != -1 && myBankgroup != -1 && myRank != -1 ) {
-        std::cout << contextStr
-                  << ": Number of Retention Error Events = " << numberOfBitErrorEvents
-                  << std::endl;
-    }
-}
-
-void errorModel::store(tlm::tlm_generic_payload &trans)
-{
-    // Check wich bits have flipped during the last access and mark them as flipped:
-    markBitFlips();
-
-    // Get the key for the dataMap from the transaction's dram extension:
-    // FIXME
-//    ControllerExtension &ext = ControllerExtension::getExtension(trans);
-//    DecodedAddress key = DecodedAddress(ext.getChannel().ID(), ext.getRank().ID(),
-//                                        ext.getBankGroup().ID(), ext.getBank().ID(),
-//                                        ext.getRow().ID(), ext.getColumn().ID(), 0);
-    DecodedAddress key;
-// Set context:
-    setContext(key);
-
-    std::stringstream msg;
-    msg << "bank: " << key.bank << " group: " << key.bankgroup << " bytes: " <<
-        key.byte << " channel: " << key.channel << " column: " << key.column <<
-        " rank: " << key.rank << " row: " << key.row;
-    PRINTDEBUGMESSAGE(name(), msg.str());
-
-    // Check if the provided data length is correct:
-    assert((bytesPerColumn * burstLenght) == trans.get_data_length());
-
-    PRINTDEBUGMESSAGE(name(), ("Data length: " + std::to_string(trans.get_data_length()) +
-                       " bytesPerColumn: " + std::to_string(bytesPerColumn)).c_str());
-
-    // Handle the DRAM burst,
-    for (unsigned int i = 0; i < trans.get_data_length(); i += bytesPerColumn) {
-        unsigned char *data;
-
-        // Check if address is not already stored:
-        if (dataMap.count(key) == 0) {
-            // Generate a new data entry
-            data = new unsigned char[bytesPerColumn];
-        } else { // In case the address was stored before:
-            data = dataMap[key];
-        }
-
-        // Copy the data from the transaction to the data pointer
-        memcpy(data, trans.get_data_ptr() + i, bytesPerColumn);
-
-        // Save part of the burst in the dataMap
-        // TODO: Check if we can have double entries, is key unique?
-        dataMap.insert(std::pair<DecodedAddress, unsigned char *>(key, data));
-
-        // Reset flipped weak cells in this area, since they are rewritten now
-        for (unsigned int j = 0; j < maxNumberOfWeakCells; j++) {
-            // If the current written column in a row has a week cell:
-            if (weakCells[j].row == key.row && weakCells[j].col == key.column) {
-                // If the bit was marked as flipped due to a retention error
-                // mark it as unflipped:
-                if (weakCells[j].flipped == true) {
-                    weakCells[j].flipped = false;
-                }
-            }
-        }
-
-        // The next burst element is handled, therfore the column address must be increased
-        key.column++;
-
-        // Check that there is no column overfow:
-        std::stringstream msg;
-        msg << "key.column is " << key.column << " columnsPerRow is " <<
-            numberOfColumns;
-        PRINTDEBUGMESSAGE(name(), msg.str());
-        assert(key.column <= numberOfColumns);
-    }
-}
-
-void errorModel::load(tlm::tlm_generic_payload &trans)
-{
-    // Check wich bits have flipped during the last access and mark them as flipped:
-    markBitFlips();
-
-    // Get the key for the dataMap from the transaction's dram extension:
-    // FIXME
-//    DramExtension &ext = DramExtension::getExtension(trans);
-//    DecodedAddress key = DecodedAddress(ext.getChannel().ID(), ext.getRank().ID(),
-//                                        ext.getBankGroup().ID(), ext.getBank().ID(),
-//                                        ext.getRow().ID(), ext.getColumn().ID(), 0);
-    DecodedAddress key;
-    // Set context:
-    setContext(key);
-
-    // Check if the provided data length is correct:
-    assert((bytesPerColumn * burstLenght) == trans.get_data_length());
-
-    // Handle the DRAM burst:
-    for (unsigned int i = 0; i < trans.get_data_length(); i += bytesPerColumn) {
-        // Check if address is not stored:
-        if (dataMap.count(key) == 0) {
-            SC_REPORT_FATAL("errormodel", "Reading from an empty memory location");
-        }
-
-        // Copy the dataMap to the transaction data pointer
-        memcpy(trans.get_data_ptr() + i, dataMap[key], bytesPerColumn);
-
-        // The next burst element is handled, therfore the column address must be increased
-        key.column++;
-
-        // Check that there is no column overfow:
-        assert(key.column <= numberOfColumns);
-    }
-}
-
-void errorModel::markBitFlips()
-{
-    double temp = getTemperature();
-    for (unsigned int row = 0;
-            row < memSpec.rowsPerBank; row++) {
-        // If the row has never been accessed ignore it and go to the next one
-        if (lastRowAccess[row] != SC_ZERO_TIME) {
-            // Get the time interval between now and the last acivate/refresh
-            sc_time interval = sc_time_stamp() - lastRowAccess[row];
-
-            // Obtain the number of bit flips for the current temperature and the time interval:
-            unsigned int n = getNumberOfFlips(temp, interval);
-
-            // Check if the current row is in the range of bit flips for this interval
-            // and temperature, if yes mark it as flipped:
-            for (unsigned int i = 0; i < n; i++) {
-                // Check if Bit has marked as flipped yet, if yes mark it as flipped
-                if (!weakCells[i].flipped && weakCells[i].row == row) {
-                    std::stringstream msg;
-                    msg << "Maked weakCell[" << i << "] as flipped" << std::endl;
-                    PRINTDEBUGMESSAGE(name(), msg.str());
-
-                    weakCells[i].flipped = true;
-                }
-            }
-        }
-    }
-}
-
-void errorModel::refresh(unsigned int row)
-{
-    // A refresh is internally composed of ACT and PRE that are executed
-    // on all banks, therefore we call the activate method:
-    activate(row);
-}
-
-void errorModel::activate(unsigned int row)
-{
-    // Check wich bits have flipped during the last access and mark them as flipped:
-    markBitFlips();
-
-    // The Activate command is responsible that an retention error is manifested.
-    // Therefore, Flip the bit in the data structure if it is marked as flipped
-    // and if it is a one. Transisitons from 0 to 1 are only happening
-    // in DRAM with anticells. This behavior is not implemented yet.
-    for (unsigned int i = 0; i < maxNumberOfWeakCells; i++) {
-        if (weakCells[i].flipped == true && weakCells[i].row == row) {
-            // Estimate key to access column data
-            DecodedAddress key;
-            key.bank = myBank;
-            key.bankgroup = myBankgroup;
-            key.channel = myChannel;
-            key.column = weakCells[i].col;
-            key.rank = myRank;
-            key.row = row;
-
-            // Byte position in column:
-            unsigned int byte = weakCells[i].bit / 8;
-
-            // Bit position in byte:
-            unsigned int bitInByte = weakCells[i].bit % 8;
-
-            // Check if the bit is 1 (only 1->0 transitions are supported)
-            // DRAMs based on anti cells are not supported yet by this model
-            if (getBit(key, byte, bitInByte) == 1) {
-                // Prepare bit mask: invert mask and AND it later
-                unsigned char mask = pow(2, bitInByte);
-                mask = ~mask;
-
-                // Temporal storage for modification:
-                unsigned char tempByte;
-
-                if (weakCells[i].dependent == false) {
-                    // Load the affected byte to tempByte
-                    memcpy(&tempByte, dataMap[key] + byte, 1);
-
-                    // Flip the bit:
-                    tempByte = (tempByte & mask);
-
-                    // Output on the Console:
-                    std::stringstream msg;
-                    msg << "Bit Flipped!"
-                        << " row: " << key.row
-                        << " col: " << key.column
-                        << " bit: " << weakCells[i].bit;
-                    PRINTDEBUGMESSAGE(name(), msg.str());
-
-                    numberOfBitErrorEvents++;
-
-                    // Copy the modified byte back to the dataMap:
-                    memcpy(dataMap[key] + byte, &tempByte, 1);
-                } else { // if(weakCells[i].dependent == true)
-                    // Get the neighbourhood of the bit and store it in the
-                    // grid variable:
-                    //        | 0 1 2 |
-                    // grid = | 3 4 5 |
-                    //        | 6 7 8 |
-
-                    unsigned int grid[9];
-
-                    grid[0] = getBit(key.row - 1, key.column, byte, bitInByte - 1);
-                    grid[1] = getBit(key.row - 1, key.column, byte, bitInByte  );
-                    grid[2] = getBit(key.row - 1, key.column, byte, bitInByte + 1);
-
-                    grid[3] = getBit(key.row  , key.column, byte, bitInByte - 1);
-                    grid[4] = getBit(key.row  , key.column, byte, bitInByte  );
-                    grid[5] = getBit(key.row  , key.column, byte, bitInByte + 1);
-
-                    grid[6] = getBit(key.row + 1, key.column, byte, bitInByte - 1);
-                    grid[7] = getBit(key.row + 1, key.column, byte, bitInByte  );
-                    grid[8] = getBit(key.row + 1, key.column, byte, bitInByte + 1);
-
-                    unsigned int sum = 0;
-                    for (int s = 0; s < 9; s++) {
-                        sum += grid[s];
-                    }
-
-                    if (sum <= 4) {
-                        // Load the affected byte to tempByte
-                        memcpy(&tempByte, dataMap[key] + byte, 1);
-
-                        // Flip the bit:
-                        tempByte = (tempByte & mask);
-                        numberOfBitErrorEvents++;
-
-                        // Copy the modified byte back to the dataMap:
-                        memcpy(dataMap[key] + byte, &tempByte, 1);
-
-                        // Output on the Console:
-                        std::stringstream msg;
-                        msg << "Dependent Bit Flipped!"
-                            << " row: " << key.row
-                            << " col: " << key.column
-                            << " bit: " << weakCells[i].bit
-                            << " sum: " << sum << std::endl
-                            << grid[0] << grid[1] << grid[2] << std::endl
-                            << grid[3] << grid[4] << grid[5] << std::endl
-                            << grid[6] << grid[7] << grid[8];
-                        PRINTDEBUGMESSAGE(name(), msg.str());
-                    } else {
-                        // Output on the Console:
-                        std::stringstream msg;
-                        msg << "Dependent Bit NOT Flipped!"
-                            << " row: " << key.row
-                            << " col: " << key.column
-                            << " bit: " << weakCells[i].bit
-                            << " sum: " << sum << std::endl
-                            << grid[0] << grid[1] << grid[2] << std::endl
-                            << grid[3] << grid[4] << grid[5] << std::endl
-                            << grid[6] << grid[7] << grid[8];
-                        PRINTDEBUGMESSAGE(name(), msg.str());
-                    }
-                }
-            }
-        }
-    }
-
-    lastRowAccess[row] = sc_time_stamp();
-}
-
-// This method is used to get a bit with a key, usually for independent case:
-unsigned int errorModel::getBit(DecodedAddress key, unsigned int byteInColumn,
-                                unsigned int bitInByte)
-{
-    // If the data was not writte by the produce yet it is zero:
-    if (dataMap.count(key) == 0) {
-        return 0;
-    } else { // Return the value of the bit
-        unsigned char tempByte;
-
-        // Copy affected byte to a temporal variable:
-        memcpy(&tempByte, dataMap[key] + byteInColumn, 1);
-        unsigned char mask = pow(2, bitInByte);
-        unsigned int result = (tempByte & mask) >> bitInByte;
-        std::bitset<8> x(mask);
-
-        std::stringstream msg;
-        msg << "mask = " << x
-            << " bitInByte = " << bitInByte
-            << " tempByte = " << (unsigned int)tempByte
-            << " result = " << result;
-
-        PRINTDEBUGMESSAGE(name(), msg.str());
-
-        return result;
-    }
-}
-
-// This method is used to get neighbourhoods, for the dependent case:
-unsigned int errorModel::getBit(int row, int column, int byteInColumn,
-                                int bitInByte)
-{
-    // Border-Exception handling:
-
-    // Switch the byte if bit under/overflow:
-    if (bitInByte < 0) {
-        byteInColumn--;
-        bitInByte = 7;
-    } else if (bitInByte >= 8) {
-        byteInColumn++;
-        bitInByte = 0;
-    }
-
-    // Switch the column if byte under/overflow
-    if (byteInColumn < 0) {
-        column--;
-        byteInColumn = bytesPerColumn;
-    } else if (byteInColumn >= int(byteInColumn)) {
-        column++;
-        byteInColumn = 0;
-    }
-
-    // If we switch the row we return 0 (culumn under/overflow)
-    if (column < 0) {
-        return 0;
-    } else if (column >= int(numberOfColumns)) {
-        return 0;
-    }
-
-    // Row over/underflow return 0
-    if (row < 0) {
-        return 0;
-    } else if (row >= int(numberOfRows)) {
-        return 0;
-    }
-
-    DecodedAddress key;
-    key.bank = myBank;
-    key.bankgroup = myBankgroup;
-    key.channel = myChannel;
-    key.rank = myRank;
-    key.column = column;
-    key.row = row;
-
-    return getBit(key, byteInColumn, bitInByte);
-}
-
-double errorModel::getTemperature()
-{
-    // FIXME
-    // make sure the context is set (myChannel has the proper value) before
-    // requesting the temperature.
-    double temperature = 89;
-
-    if (this->myChannel != -1)
-    {
-#ifdef DRAMPOWER
-        if (thermalSim && powerAnalysis)
-        {
-            // TODO
-            // check if this is best way to request information to DRAMPower.
-            unsigned long long clk_cycles = sc_time_stamp() / memSpec.tCK;
-            DRAMPower->calcWindowEnergy(clk_cycles);
-            float average_power = (float)DRAMPower->getPower().average_power;
-            temperature = temperatureController.getTemperature(this->myChannel, average_power);
-        } else {
-            temperature = temperatureController.getTemperature(this->myChannel, 0);
-        }
-#else
-        temperature = temperatureController.getTemperature(this->myChannel, 0);
-#endif
-    }
-
-    return temperature;
-}
-
-void errorModel::parseInputData(const Configuration& config)
-{
-    std::string fileName = config.errorCSVFile;
-    std::ifstream inputFile(fileName);
-
-    if (inputFile.is_open()) {
-        std::string line;
-        while (std::getline(inputFile, line)) {
-            std::istringstream iss(line);
-            std::string str_temperature;
-            std::string str_retentionTime;
-            std::string str_mu_independent;
-            std::string str_sigma_independent;
-            std::string str_mu_dependent;
-            std::string str_sigma_dependent;
-
-            // Parse file:
-            iss >> str_temperature
-                >> str_retentionTime
-                >> str_mu_independent
-                >> str_sigma_independent
-                >> str_mu_dependent
-                >> str_sigma_dependent;
-
-            double temp = std::stod(str_temperature.c_str(), 0);
-            sc_time retentionTime    = sc_time(std::stod(str_retentionTime.c_str(), 0),
-                                               SC_MS);
-
-            unsigned int mu_independent    = std::stod(str_mu_independent.c_str(), 0);
-            unsigned int sigma_independent = std::stod(str_sigma_independent.c_str(), 0);
-            unsigned int mu_dependent      = std::stod(str_mu_dependent.c_str(), 0);
-            unsigned int sigma_dependent   = std::stod(str_sigma_dependent.c_str(), 0);
-
-            errors e;
-
-            //calculate normal distribution of # of independent errors
-            unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
-            std::default_random_engine generator(seed);
-            std::normal_distribution<double> distribution(mu_independent,
-                                                          sigma_independent);
-            e.independent = ceil(distribution(generator));
-
-            // calculate normal distribution of # of dependent errors
-            unsigned seed2 = std::chrono::system_clock::now().time_since_epoch().count();
-            std::default_random_engine generator2(seed2);
-            std::normal_distribution<double> distribution2(mu_dependent, sigma_dependent);
-            e.dependent = ceil(distribution2(generator2));
-
-            // Store parsed data to the errorMap:
-            errorMap[temp][retentionTime] = e;
-
-            std::stringstream msg;
-            msg << "Temperature = " << temp
-                << " Time = " << retentionTime
-                << " independent = " << errorMap[temp][retentionTime].independent
-                << " dependent = " << errorMap[temp][retentionTime].dependent;
-
-            PRINTDEBUGMESSAGE(name(), msg.str());
-        }
-        inputFile.close();
-    } else {
-        SC_REPORT_FATAL("errormodel", "Cannot open ErrorCSVFile");
-    }
-}
-
-void errorModel::prepareWeakCells()
-{
-    // Get the Maxium number of weak cells by iterating over the errorMap:
-    maxNumberOfWeakCells = 0;
-    maxNumberOfDepWeakCells = 0;
-    for ( const auto &i : errorMap ) {
-        for ( const auto &j : i.second ) {
-            // Get number of dependent weak cells:
-            if ( j.second.dependent > maxNumberOfDepWeakCells) {
-                maxNumberOfDepWeakCells = j.second.dependent;
-            }
-
-            // Get the total number of weak cells (independet + dependent):
-            if ( j.second.independent + j.second.dependent > maxNumberOfWeakCells) {
-                maxNumberOfWeakCells = j.second.independent + j.second.dependent;
-            }
-        }
-    }
-
-    // Get the highest temperature in the error map:
-    maxTemperature = 0;
-    for ( const auto &i : errorMap ) {
-        if (i.first > maxTemperature) {
-            maxTemperature = i.first;
-        }
-    }
-
-    // Get the highest time in the error map:
-    maxTime = SC_ZERO_TIME;
-    for ( const auto &i : errorMap ) {
-        for ( const auto &j : i.second ) {
-            if (j.first > maxTime) {
-                maxTime = j.first;
-            }
-        }
-    }
-
-    // Generate weak cells:
-
-    weakCells = new weakCell[maxNumberOfWeakCells];
-
-    for (unsigned int i = 0; i < maxNumberOfWeakCells; i++) {
-        unsigned int row, col, bit;
-
-        // Select positions of weak cells randomly, uniformly distributed:
-        row = (unsigned int) (rand() % numberOfRows);
-        col = (unsigned int) (rand() % numberOfColumns);
-        bit = (unsigned int) (rand() % (bytesPerColumn * 8));
-
-        // Test if weak cell has been chosen already before:
-        bool found = false;
-        for (unsigned int k = 0; k < i; k++) {
-            if ((weakCells[k].row == row) && (weakCells[k].col == col)
-                    && (weakCells[k].bit == bit)) {
-                found = true;
-                break;
-            }
-        }
-        // If a cell was already choosen as weak we have to roll the dice again:
-        if (found) {
-            i--;
-        } else {
-            weakCells[i].row = row;         // Row in the bank
-            weakCells[i].col = col;         // Column in the row
-            weakCells[i].bit = bit;         // Bit position in column
-            weakCells[i].flipped =
-                false;    // Flag whether this position has already flipped
-            weakCells[i].dependent =
-                false; // init dependency flag with false, dependent cells will be estimated in the next step
-        }
-    }
-
-    // Generate dependent weak cells:
-    for (unsigned int i = 1; i <= maxNumberOfDepWeakCells; i++) {
-        unsigned int r = (rand() % maxNumberOfWeakCells);
-
-        // If the dependent weak cell was choosen before roll the dice again:
-        if (weakCells[r].dependent) {
-            i--;
-        } else {
-            weakCells[r].dependent = true;
-        }
-
-    }
-
-    // Debug output where the weak cells are located:
-    for (unsigned int i = 0; i < maxNumberOfWeakCells; i++) {
-        std::stringstream msg;
-        msg << "row="   << weakCells[i].row
-            << " col=" << weakCells[i].col
-            << " bit=" << weakCells[i].bit
-            << " flip=" << weakCells[i].flipped
-            << " dep=" << weakCells[i].dependent;
-        PRINTDEBUGMESSAGE(name(), msg.str());
-    }
-}
-
-// Retrieve number of flipping bits which fits best to temperature input and time since last refresh
-unsigned int errorModel::getNumberOfFlips(double temp, sc_time time)
-{
-    // Check if the provided temperature and retention time are in a valid
-    // range that is covered by the input data stored in the errorMap. In case
-    // of values out of the valid range the simulation will be aborted.
-    if (temp > maxTemperature) {
-        SC_REPORT_FATAL("errormodel", "temperature out of range");
-    }
-
-    if (time > maxTime) {
-        SC_REPORT_FATAL("errormodel", "time out of range");
-    }
-
-    // Find nearest temperature:
-    double nearestTemperature = 0;
-    for ( const auto &i : errorMap ) {
-        if (i.first >= temp) { // for worst case reasons we go to the next bin
-            nearestTemperature = i.first;
-            break;
-        }
-    }
-
-    // Find nearest time:
-    sc_time nearestTime;
-    for ( const auto &i : errorMap[nearestTemperature]) {
-        if (i.first >= time) { // for worst case reasons we go to the next bin
-            nearestTime = i.first;
-            break;
-        }
-    }
-
-    errors e = errorMap[nearestTemperature][nearestTime];
-
-    //std::stringstream msg;
-    //msg << "ACT/REF temp:" << temp
-    //    << " time:" << time
-    //    << " nearestTemp:" << nearestTemperature
-    //    << " nearestTime:" << nearestTime
-    //    << " ind:" << e.independent
-    //    << " dep:" << e.dependent;
-
-    //printDebugMessage(msg.str());
-
-    return e.independent + e.dependent;
-}
-
-void errorModel::setContext(DecodedAddress addr)
-{
-    // This function is called the first store ore load to get the context in
-    // which channel, rank or bank the error model is used.
-    if (myChannel == -1 && myBank == -1 && myBankgroup == -1 && myRank == -1 ) {
-        myChannel = addr.channel;
-        myBank = addr.bank;
-        myBankgroup = addr.bankgroup;
-        myRank = addr.rank;
-
-        contextStr = "Channel_" + std::to_string(myChannel) + "_Bank_" + std::to_string(
-                         myBank) + " ";
-    }
-}
diff --git a/DRAMSys/library/src/error/errormodel.h b/DRAMSys/library/src/error/errormodel.h
deleted file mode 100644
index 312bbdd6..00000000
--- a/DRAMSys/library/src/error/errormodel.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Matthias Jung
- */
-
-#ifndef ERRORMODEL_H
-#define ERRORMODEL_H
-
-#include <map>
-
-#include <systemc>
-#include "../configuration/Configuration.h"
-#include "../simulation/AddressDecoder.h"
-#include "../simulation/TemperatureController.h"
-
-class libDRAMPower;
-
-class errorModel : public sc_core::sc_module
-{
-public:
-    errorModel(const sc_core::sc_module_name& name, const Configuration& config,
-               TemperatureController& temperatureController, libDRAMPower* dramPower = nullptr);
-    ~errorModel() override;
-
-    // Access Methods:
-    void store(tlm::tlm_generic_payload &trans);
-    void load(tlm::tlm_generic_payload &trans);
-    void refresh(unsigned int row);
-    void activate(unsigned int row);
-    void setTemperature(double t);
-    double getTemperature();
-
-private:
-    void init(const Configuration& config);
-    bool powerAnalysis;
-    libDRAMPower *DRAMPower;
-    bool thermalSim;
-    TemperatureController& temperatureController;
-    const MemSpec& memSpec;
-    // Configuration Parameters:
-    unsigned int burstLenght;
-    unsigned int numberOfColumns;
-    unsigned int bytesPerColumn;
-    unsigned int numberOfRows;
-
-    // context:
-    std::string contextStr;
-
-    // Online Parameters:
-    unsigned int numberOfBitErrorEvents;
-
-    // Private Methods:
-    void parseInputData(const Configuration& config);
-    void prepareWeakCells();
-    void markBitFlips();
-    unsigned int getNumberOfFlips(double temp, sc_core::sc_time time);
-    void setContext(DecodedAddress addr);
-    unsigned int getBit(DecodedAddress key, unsigned int byte,
-                        unsigned int bitInByte);
-    unsigned int getBit(int row, int column, int byteInColumn, int bitInByte);
-
-    // Input related data structures:
-
-    struct errors {
-        double independent;
-        double dependent;
-    };
-
-    //    temperature          time     number of errors
-    //         |                 |        |
-    std::map<double, std::map<sc_core::sc_time, errors> > errorMap;
-
-    unsigned int maxNumberOfWeakCells;
-    unsigned int maxNumberOfDepWeakCells;
-    double maxTemperature;
-    sc_core::sc_time maxTime;
-
-    // Storage of weak cells:
-    struct weakCell {
-        unsigned int row;
-        unsigned int col;
-        unsigned int bit;
-        bool flipped;
-        bool dependent;
-    };
-
-    weakCell *weakCells;
-
-    // To use a map for storing the data a comparing function must be defined
-    struct DecodedAddressComparer
-    {
-        bool operator() (const DecodedAddress &first ,
-                         const DecodedAddress &second) const
-        {
-            if (first.row == second.row)
-                return first.column < second.column;
-            else
-                return first.row < second.row;
-        }
-    };
-
-    // The data structure stores complete column accesses
-    // A DRAM burst will be splitted up in several column accesses
-    // e.g. BL=4 means that 4 elements will be added to the dataMap!
-    std::map<DecodedAddress, unsigned char *, DecodedAddressComparer> dataMap;
-
-    // An array to save when the last ACT/REF to a row happened:
-    sc_core::sc_time *lastRowAccess;
-
-    // Context Variables (will be written by the first dram access)
-    int myChannel;
-    int myRank;
-    int myBankgroup;
-    int myBank;
-};
-
-#endif // ERRORMODEL_H
diff --git a/DRAMSys/library/src/simulation/TemperatureController.cpp b/DRAMSys/library/src/simulation/TemperatureController.cpp
deleted file mode 100644
index 4c0ddd0e..00000000
--- a/DRAMSys/library/src/simulation/TemperatureController.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Eder F. Zulian
- *    Matthias Jung
- *    Derek Christ
- */
-
-#include <cmath>
-
-#include "TemperatureController.h"
-#include "../configuration/Configuration.h"
-
-using namespace sc_core;
-
-double TemperatureController::temperatureConvert(double tKelvin)
-{
-    if (temperatureScale == TemperatureSimConfig::TemperatureScale::Celsius) {
-        return tKelvin - 273.15;
-    } else if (temperatureScale == TemperatureSimConfig::TemperatureScale::Fahrenheit) {
-        return (tKelvin - 273.15) * 1.8 + 32;
-    }
-
-    return tKelvin;
-}
-
-double TemperatureController::getTemperature(int deviceId, float currentPower)
-{
-    PRINTDEBUGMESSAGE(name(), "Temperature requested by device " + std::to_string(
-                          deviceId) + " current power is " + std::to_string(currentPower));
-
-    if (dynamicTempSimEnabled)
-    {
-        currentPowerValues.at(deviceId) = currentPower;
-        checkPowerThreshold(deviceId);
-
-        // FIXME: using the static temperature value until the vector of temperatures is filled
-        if (temperatureValues.empty())
-            return temperatureConvert(staticTemperature + 273.15);
-
-        return temperatureConvert(temperatureValues.at(deviceId));
-    }
-    else
-    {
-        PRINTDEBUGMESSAGE(name(), "Temperature is " + std::to_string(staticTemperature));
-        return staticTemperature;
-    }
-}
-
-void TemperatureController::updateTemperatures()
-{
-#ifdef THERMALSIM
-    thermalSimulation->sendPowerValues(&currentPowerValues);
-    thermalSimulation->simulate();
-    thermalSimulation->getTemperature(temperaturesBuffer, TDICE_OUTPUT_INSTANT_SLOT,
-                                      TDICE_OUTPUT_TYPE_TFLPEL, TDICE_OUTPUT_QUANTITY_AVERAGE);
-
-    std::string mapfile;
-    sc_time ts = sc_time_stamp();
-    if (genTempMap == true) {
-        mapfile = temperatureMapFile + "_" + std::to_string(ts.to_default_time_units())
-                  + ".txt";
-        thermalSimulation->getTemperatureMap(mapfile);
-    }
-    if (genPowerMap == true) {
-        mapfile = powerMapFile + "_" + std::to_string(ts.to_default_time_units()) +
-                  ".txt";
-        thermalSimulation->getPowerMap(mapfile);
-    }
-#endif
-    // Save values just obtained for posterior use
-    temperatureValues = temperaturesBuffer;
-    // Clear the buffer, otherwise it will grow every request
-    temperaturesBuffer.clear();
-}
-
-void TemperatureController::checkPowerThreshold(int deviceId)
-{
-    if (std::abs(lastPowerValues.at(deviceId) - currentPowerValues.at(
-                     deviceId)) > powerThresholds.at(deviceId)) {
-        decreaseSimPeriod = true;
-    }
-    lastPowerValues.at(deviceId) = currentPowerValues.at(deviceId);
-}
-
-double TemperatureController::adjustThermalSimPeriod()
-{
-    // Temperature Simulation Period Dynamic Adjustment
-    //
-    // 1. Adjustment is requierd when:
-    //
-    // 1.1. The power dissipation of one or more devices change considerably
-    // (exceeds the configured threshold for that device in any direction,
-    // i.e. increases or decreases substantially) during the current
-    // simulaiton period.
-    //
-    // 1.1.1. The simulation period will be reduced by a factor of 'n' so the
-    // simulation occurs 'n' times more often.
-    //
-    // 1.1.2. The step 1.1.1 will be repeated until the point that there are
-    // no sustantial changes in power dissipation between two consecutive
-    // executions of the thermal simulation, i.e. all changes for all devices
-    // are less than the configured threshold.
-    //
-    // 1.2. The current simulation period differs from the target period
-    // defined in the configuration by the user.
-    //
-    // 1.2.1 Provided a scenario in which power dissipation changes do not
-    // exceed the thresholds, the situation period will be kept for a number
-    // of simulation cycles 'nc' and after 'nc' the period will be increased
-    // again in steps of 'n/2' until it achieves the desired value given by
-    // configuration or the described in 1.1 occurs.
-
-    if (decreaseSimPeriod)
-    {
-        period = period / periodAdjustFactor;
-        cyclesSinceLastPeriodAdjust = 0;
-        decreaseSimPeriod = false;
-        PRINTDEBUGMESSAGE(name(), "Thermal Simulation period reduced to " + std::to_string(
-                              period) + ". Target is " + std::to_string(targetPeriod));
-    }
-    else
-    {
-        if (period != targetPeriod) {
-            cyclesSinceLastPeriodAdjust++;
-            if (cyclesSinceLastPeriodAdjust >= nPowStableCyclesToIncreasePeriod) {
-                cyclesSinceLastPeriodAdjust = 0;
-                period = period * ((double)periodAdjustFactor / 2);
-                if (period > targetPeriod)
-                    period = targetPeriod;
-                PRINTDEBUGMESSAGE(name(), "Thermal Simulation period increased to "
-                                  + std::to_string(period) + ". Target is " + std::to_string(targetPeriod));
-            }
-        }
-    }
-
-    return period;
-}
-
-void TemperatureController::temperatureThread()
-{
-    while (true)
-    {
-        updateTemperatures();
-        double p = adjustThermalSimPeriod();
-
-        NDEBUG_UNUSED(int i) = 0;
-        for (NDEBUG_UNUSED(auto t) : temperatureValues) {
-            PRINTDEBUGMESSAGE(name(), "Temperature[" + std::to_string(i++)
-                              + "] is " + std::to_string(t));
-        }
-        PRINTDEBUGMESSAGE(name(), "Thermal simulation period is " + std::to_string(p));
-
-        wait(sc_time(p, t_unit));
-    }
-}
diff --git a/DRAMSys/library/src/simulation/TemperatureController.h b/DRAMSys/library/src/simulation/TemperatureController.h
deleted file mode 100644
index cf9f4fa2..00000000
--- a/DRAMSys/library/src/simulation/TemperatureController.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Eder F. Zulian
- *    Matthias Jung
- *    Derek Christ
- */
-
-#ifndef TEMPERATURECONTROLLER_H
-#define TEMPERATURECONTROLLER_H
-
-#include <string>
-
-#include <systemc>
-#include "../common/DebugManager.h"
-#include "../common/utils.h"
-#include "../configuration/Configuration.h"
-
-#ifdef THERMALSIM
-#include "IceWrapper.h"
-#endif
-
-class TemperatureController : sc_core::sc_module
-{
-public:
-    TemperatureController(const TemperatureController&) = delete;
-    TemperatureController& operator=(const TemperatureController&) = delete;
-
-    SC_HAS_PROCESS(TemperatureController);
-    TemperatureController() = default;
-    TemperatureController(const sc_core::sc_module_name& name, const Configuration& config) : sc_core::sc_module(name)
-    {
-        temperatureScale = config.temperatureSim.temperatureScale;
-        dynamicTempSimEnabled = config.thermalSimulation;
-        staticTemperature = config.temperatureSim.staticTemperatureDefaultValue;
-
-        if (dynamicTempSimEnabled)
-        {
-#ifdef THERMALSIM
-            // Connect to the server
-            std::string ip = config.temperatureSim.iceServerIp;
-            unsigned int port = config.temperatureSim.iceServerPort;
-            thermalSimulation = new IceWrapper(ip, port);
-            PRINTDEBUGMESSAGE(name(), "Dynamic temperature simulation. Server @ "
-                              + ip + ":" + std::to_string(port));
-#else
-            SC_REPORT_FATAL(sc_module::name(),
-                            "DRAMSys was build without support to dynamic temperature simulation. Check the README file for further details.");
-#endif
-            // Initial power dissipation values (got from config)
-            currentPowerValues = config.temperatureSim.powerInitialValues;
-            lastPowerValues = currentPowerValues;
-
-            // Substantial changes in power will trigger adjustments in the simulaiton period. Get the thresholds from config.
-            powerThresholds = config.temperatureSim.powerThresholds;
-            decreaseSimPeriod = false;
-            periodAdjustFactor = config.temperatureSim.simPeriodAdjustFactor;
-            nPowStableCyclesToIncreasePeriod = config.temperatureSim.nPowStableCyclesToIncreasePeriod;
-            cyclesSinceLastPeriodAdjust = 0;
-
-            // Get the target period for the thermal simulation from config.
-            targetPeriod = config.temperatureSim.thermalSimPeriod;
-            period = targetPeriod;
-            t_unit = config.temperatureSim.thermalSimUnit;
-
-            genTempMap = config.temperatureSim.generateTemperatureMap;
-            temperatureMapFile = "temperature_map";
-            std::system("rm -f temperature_map*");
-
-            genPowerMap = config.temperatureSim.generatePowerMap;
-            powerMapFile = "power_map";
-            std::system("rm -f power_map*");
-
-            SC_THREAD(temperatureThread);
-        }
-        else
-        {
-            PRINTDEBUGMESSAGE(sc_module::name(), "Static temperature simulation. Temperature set to " +
-                              std::to_string(staticTemperature));
-        }
-    }
-
-    double getTemperature(int deviceId, float currentPower);
-
-private:
-    TemperatureSimConfig::TemperatureScale temperatureScale;
-    double temperatureConvert(double tKelvin);
-
-    double staticTemperature;
-
-    bool dynamicTempSimEnabled;
-
-#ifdef THERMALSIM
-    IceWrapper *thermalSimulation;
-#endif
-    std::vector<float> temperaturesBuffer;
-    std::vector<float> temperatureValues;
-
-    std::vector<float> currentPowerValues;
-    std::vector<float> lastPowerValues;
-    std::vector<float> powerThresholds;
-
-    double targetPeriod;
-    double period;
-    enum sc_core::sc_time_unit t_unit;
-    void temperatureThread();
-    void updateTemperatures();
-    double adjustThermalSimPeriod();
-    void checkPowerThreshold(int deviceId);
-    bool decreaseSimPeriod;
-    unsigned int periodAdjustFactor;
-    unsigned int cyclesSinceLastPeriodAdjust;
-    unsigned int nPowStableCyclesToIncreasePeriod;
-
-    bool genTempMap;
-    std::string temperatureMapFile;
-    bool genPowerMap;
-    std::string powerMapFile;
-};
-
-#endif // TEMPERATURECONTROLLER_H
-
diff --git a/DRAMSys/simulator/ExampleInitiator.h b/DRAMSys/simulator/ExampleInitiator.h
deleted file mode 100644
index 8325f3ed..00000000
--- a/DRAMSys/simulator/ExampleInitiator.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2016, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Eder F. Zulian
- */
-
-#ifndef EXAMPLEINITIATOR_H
-#define EXAMPLEINITIATOR_H
-
-#include <cstdlib>
-#include <iostream>
-
-#include <systemc>
-#include "MemoryManager.h"
-#include "common/dramExtensions.h"
-#include "TracePlayer.h"
-
-struct ExampleInitiator : sc_core::sc_module
-{
-    // TLM-2 socket, defaults to 32-bits wide, base protocol
-    tlm_utils::simple_initiator_socket<ExampleInitiator> socket;
-
-    SC_CTOR(ExampleInitiator)
-        : socket("socket"),
-          request_in_progress(nullptr),
-          m_peq(this, &ExampleInitiator::peq_cb)
-    {
-        socket.register_nb_transport_bw(this, &ExampleInitiator::nb_transport_bw);
-        SC_THREAD(thread_process);
-    }
-
-    void thread_process()
-    {
-        tlm::tlm_generic_payload *trans;
-        tlm::tlm_phase phase;
-        sc_core::sc_time delay;
-
-        dump_mem();
-        init_mem();
-        dump_mem();
-
-        for (unsigned char &i : data)
-            i = 0x55;
-
-        // Generate 2 write transactions
-        for (int i = 0; i < 2; i++) {
-            int adr = i * 64;
-
-            tlm::tlm_command cmd = tlm::TLM_WRITE_COMMAND;
-
-            // Grab a new transaction from the memory manager
-            trans = m_mm.allocate();
-            trans->acquire();
-
-            trans->set_command(cmd);
-            trans->set_address(adr);
-            trans->set_data_ptr(reinterpret_cast<unsigned char *>(&data[0]));
-            trans->set_data_length(64);
-            trans->set_streaming_width(4);
-            trans->set_byte_enable_ptr(nullptr);
-            trans->set_dmi_allowed(false);
-            trans->set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
-
-            // ExampleInitiator must honor BEGIN_REQ/END_REQ exclusion rule
-            if (request_in_progress)
-                wait(end_request_event);
-            request_in_progress = trans;
-            phase = tlm::BEGIN_REQ;
-
-            // Timing annotation models processing time of initiator prior to call
-            delay = sc_core::sc_time(100000, sc_core::SC_PS);
-
-            std::cout << "Address " << std::hex << adr << " new, cmd=" << (cmd ? "write" : "read")
-                 << ", data=" << std::hex << data[0] << " at time " << sc_core::sc_time_stamp()
-                 << " in " << name() << std::endl;
-
-            GenerationExtension *genExtension = new GenerationExtension(sc_core::sc_time_stamp());
-            trans->set_auto_extension(genExtension);
-
-
-            // Non-blocking transport call on the forward path
-            tlm::tlm_sync_enum status;
-            status = socket->nb_transport_fw( *trans, phase, delay );
-
-            // Check value returned from nb_transport_fw
-            if (status == tlm::TLM_UPDATED) {
-                // The timing annotation must be honored
-                m_peq.notify( *trans, phase, delay );
-            } else if (status == tlm::TLM_COMPLETED) {
-                // The completion of the transaction necessarily ends the BEGIN_REQ phase
-                request_in_progress = nullptr;
-
-                // The target has terminated the transaction
-                check_transaction( *trans );
-
-                // Allow the memory manager to free the transaction object
-                trans->release();
-            }
-
-            sc_core::wait(sc_core::sc_time(500, sc_core::SC_NS));
-
-            dump_mem();
-        }
-
-        sc_core::wait(sc_core::sc_time(500, sc_core::SC_NS));
-        sc_core::sc_stop();
-    }
-
-    static void init_mem()
-    {
-        unsigned char buffer[64];
-        for (unsigned char &i : buffer)
-            i = 0xff;
-
-        for (int addr = 0; addr < 128; addr += 64) {
-            tlm::tlm_generic_payload trans;
-            trans.set_command( tlm::TLM_WRITE_COMMAND );
-            trans.set_address( addr );
-            trans.set_data_ptr( buffer );
-            trans.set_data_length( 64 );
-
-            socket->transport_dbg( trans );
-        }
-    }
-
-    static void dump_mem()
-    {
-        for (int addr = 0; addr < 128; addr += 64) {
-            unsigned char buffer[64];
-            tlm::tlm_generic_payload trans;
-            trans.set_command( tlm::TLM_READ_COMMAND );
-            trans.set_address( addr );
-            trans.set_data_ptr( buffer );
-            trans.set_data_length( 64 );
-
-            socket->transport_dbg( trans );
-
-            std::cout << "\nMemory dump\n";
-            for (int i = 0; i < 64; i++)
-                std::cout << "mem[" << addr + i << "] = " << std::hex << (int)buffer[i] << std::endl;
-        }
-    }
-
-    // TLM-2 backward non-blocking transport method
-
-    virtual tlm::tlm_sync_enum nb_transport_bw( tlm::tlm_generic_payload &trans,
-                                                tlm::tlm_phase &phase, sc_core::sc_time &delay )
-    {
-        m_peq.notify( trans, phase, delay );
-        return tlm::TLM_ACCEPTED;
-    }
-
-    // Payload event queue callback to handle transactions from target
-    // Transaction could have arrived through return path or backward path
-
-    void peq_cb(tlm::tlm_generic_payload &trans, const tlm::tlm_phase &phase)
-    {
-        if (phase == tlm::END_REQ || (&trans == request_in_progress
-                                      && phase == tlm::BEGIN_RESP)) {
-            // The end of the BEGIN_REQ phase
-            request_in_progress = nullptr;
-            end_request_event.notify();
-        } else if (phase == tlm::BEGIN_REQ || phase == tlm::END_RESP)
-            SC_REPORT_FATAL("TLM-2", "Illegal transaction phase received by initiator");
-
-        if (phase == tlm::BEGIN_RESP) {
-            check_transaction( trans );
-
-            // Send final phase transition to target
-            tlm::tlm_phase fw_phase = tlm::END_RESP;
-            sc_core::sc_time delay = sc_core::sc_time(60000, sc_core::SC_PS);
-            socket->nb_transport_fw( trans, fw_phase, delay );
-            // Ignore return value
-
-            // Allow the memory manager to free the transaction object
-            trans.release();
-        }
-    }
-
-    // Called on receiving BEGIN_RESP or TLM_COMPLETED
-    void check_transaction(tlm::tlm_generic_payload &trans)
-    {
-        if ( trans.is_response_error() ) {
-            char txt[100];
-            sprintf(txt, "Transaction returned with error, response status = %s",
-                    trans.get_response_string().c_str());
-            SC_REPORT_ERROR("TLM-2", txt);
-        }
-
-        tlm::tlm_command cmd = trans.get_command();
-        uint64_t    adr = trans.get_address();
-        int             *ptr = reinterpret_cast<int *>( trans.get_data_ptr() );
-
-        std::cout << std::hex << adr << " check, cmd=" << (cmd ? "write" : "read")
-             << ", data=" << std::hex << *ptr << " at time " << sc_core::sc_time_stamp()
-             << " in " << sc_core::name() << std::endl;
-
-        if (cmd == tlm::TLM_READ_COMMAND)
-            assert( *ptr == -int(adr) );
-    }
-
-    MemoryManager m_mm;
-    unsigned char data[64];
-    tlm::tlm_generic_payload *request_in_progress;
-    sc_core::sc_event end_request_event;
-    tlm_utils::peq_with_cb_and_phase<ExampleInitiator> m_peq;
-};
-
-#endif // EXAMPLEINITIATOR_H
diff --git a/DRAMSys/simulator/LengthConverter.cpp b/DRAMSys/simulator/LengthConverter.cpp
deleted file mode 100644
index 288bf458..00000000
--- a/DRAMSys/simulator/LengthConverter.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2022, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Lukas Steiner
- */
-
-#include "LengthConverter.h"
-
-using namespace sc_core;
-using namespace tlm;
-
-// TODO: return status, TLM_INCOMPLETE_RESPONSE, acquire + release
-
-LengthConverter::LengthConverter(const sc_module_name &name, unsigned maxOutputLength, bool storageEnabled) :
-    sc_module(name), payloadEventQueue(this, &LengthConverter::peqCallback), storageEnabled(storageEnabled),
-    memoryManager(storageEnabled, maxOutputLength), maxOutputLength(maxOutputLength)
-{
-    iSocket.register_nb_transport_bw(this, &LengthConverter::nb_transport_bw);
-    tSocket.register_nb_transport_fw(this, &LengthConverter::nb_transport_fw);
-    tSocket.register_transport_dbg(this, &LengthConverter::transport_dbg);
-}
-
-tlm_sync_enum LengthConverter::nb_transport_fw(tlm_generic_payload& trans,
-                              tlm_phase& phase, sc_time& fwDelay)
-{
-    if (phase == BEGIN_REQ)
-        trans.acquire();
-
-    payloadEventQueue.notify(trans, phase, fwDelay);
-    return TLM_ACCEPTED;
-}
-
-tlm_sync_enum LengthConverter::nb_transport_bw(tlm_generic_payload &payload,
-                              tlm_phase &phase, sc_time &bwDelay)
-{
-    payloadEventQueue.notify(payload, phase, bwDelay);
-    return TLM_ACCEPTED;
-}
-
-unsigned int LengthConverter::transport_dbg(tlm_generic_payload &trans)
-{
-    return iSocket->transport_dbg(trans);
-}
-
-void LengthConverter::peqCallback(tlm_generic_payload &cbTrans, const tlm_phase &cbPhase)
-{
-    if (cbPhase == BEGIN_REQ) // from initiator
-    {
-        if (cbTrans.get_data_length() <= maxOutputLength)
-        {
-            // pipe transaction through
-            tlm_phase fwPhase = BEGIN_REQ;
-            sc_time fwDelay = SC_ZERO_TIME;
-            tlm_sync_enum returnStatus = iSocket->nb_transport_fw(cbTrans, fwPhase, fwDelay);
-            // TODO: END_REQ/BEGIN_RESP shortcut
-        }
-        else
-        {
-            // split transaction up into multiple sub-transactions
-            createChildTranses(&cbTrans);
-            tlm_generic_payload* firstChildTrans = cbTrans.get_extension<ParentExtension>()->getNextChildTrans();
-            tlm_phase fwPhase = BEGIN_REQ;
-            sc_time fwDelay = SC_ZERO_TIME;
-            tlm_sync_enum returnStatus = iSocket->nb_transport_fw(*firstChildTrans, fwPhase, fwDelay);
-        }
-    }
-    else if (cbPhase == END_REQ)
-    {
-        if (ChildExtension::isChildTrans(&cbTrans))
-        {
-            tlm_generic_payload* nextChildTrans = cbTrans.get_extension<ChildExtension>()->getNextChildTrans();
-            if (nextChildTrans != nullptr)
-            {
-                tlm_phase fwPhase = BEGIN_REQ;
-                //sc_time fwDelay = SC_ZERO_TIME;
-                sc_time fwDelay = sc_time(1, SC_NS);
-                tlm_sync_enum returnStatus = iSocket->nb_transport_fw(*nextChildTrans, fwPhase, fwDelay);
-            }
-            else
-            {
-                tlm_generic_payload* parentTrans = cbTrans.get_extension<ChildExtension>()->getParentTrans();
-                tlm_phase bwPhase = END_REQ;
-                sc_time bwDelay = SC_ZERO_TIME;
-                tlm_sync_enum returnStatus = tSocket->nb_transport_bw(*parentTrans, bwPhase, bwDelay);
-            }
-        }
-        else
-        {
-            tlm_phase bwPhase = END_REQ;
-            sc_time bwDelay = SC_ZERO_TIME;
-            tlm_sync_enum returnStatus = tSocket->nb_transport_bw(cbTrans, bwPhase, bwDelay);
-        }
-    }
-    else if (cbPhase == BEGIN_RESP)
-    {
-        if (ChildExtension::isChildTrans(&cbTrans))
-        {
-            {
-                tlm_phase fwPhase = END_RESP;
-                sc_time fwDelay = SC_ZERO_TIME;
-                tlm_sync_enum returnStatus = iSocket->nb_transport_fw(cbTrans, fwPhase, fwDelay);
-            }
-
-            if (storageEnabled && cbTrans.is_read())
-            {
-                tlm_generic_payload* parentTrans = cbTrans.get_extension<ChildExtension>()->getParentTrans();
-                std::copy(cbTrans.get_data_ptr(), cbTrans.get_data_ptr() + maxOutputLength,
-                        parentTrans->get_data_ptr() + (cbTrans.get_address() - parentTrans->get_address()));
-            }
-
-            if (cbTrans.get_extension<ChildExtension>()->notifyChildTransCompletion()) // all children finished
-            {
-                // BEGIN_RESP über tSocket
-                tlm_generic_payload* parentTrans = cbTrans.get_extension<ChildExtension>()->getParentTrans();
-                tlm_phase bwPhase = BEGIN_RESP;
-                sc_time bwDelay = SC_ZERO_TIME;
-                parentTrans->set_response_status(tlm::TLM_OK_RESPONSE);
-                tlm_sync_enum returnStatus = tSocket->nb_transport_bw(*parentTrans, bwPhase, bwDelay);
-            }
-        }
-        else
-        {
-            tlm_phase bwPhase = BEGIN_RESP;
-            sc_time bwDelay = SC_ZERO_TIME;
-            cbTrans.set_response_status(tlm::TLM_OK_RESPONSE);
-            tlm_sync_enum returnStatus = tSocket->nb_transport_bw(cbTrans, bwPhase, bwDelay);
-        }
-    }
-    else if (cbPhase == END_RESP)
-    {
-        if (ParentExtension::isParentTrans(&cbTrans))
-        {
-            cbTrans.get_extension<ParentExtension>()->releaseChildTranses();
-        }
-        else
-        {
-            tlm_phase fwPhase = END_RESP;
-            sc_time fwDelay = SC_ZERO_TIME;
-            tlm_sync_enum returnStatus = iSocket->nb_transport_fw(cbTrans, fwPhase, fwDelay);
-        }
-        cbTrans.release();
-    }
-    else
-        SC_REPORT_FATAL(0, "Payload event queue in LengthConverter was triggered with unknown phase");
-}
-
-void LengthConverter::createChildTranses(tlm_generic_payload* parentTrans)
-{
-    unsigned numChildTranses = parentTrans->get_data_length() / maxOutputLength;
-    std::vector<tlm_generic_payload*> childTranses;
-
-    for (unsigned childId = 0; childId < numChildTranses; childId++)
-    {
-        tlm_generic_payload* childTrans = memoryManager.allocate();
-        childTrans->acquire();
-        childTrans->set_command(parentTrans->get_command());
-        childTrans->set_address(parentTrans->get_address() + childId * maxOutputLength);
-        childTrans->set_data_length(maxOutputLength);
-        if (storageEnabled && parentTrans->is_write())
-            std::copy(parentTrans->get_data_ptr() + childId * maxOutputLength, parentTrans->get_data_ptr() +
-                    (childId + 1) * maxOutputLength, childTrans->get_data_ptr());
-        ChildExtension::setExtension(childTrans, parentTrans);
-        childTranses.push_back(childTrans);
-    }
-    ParentExtension::setExtension(parentTrans, std::move(childTranses));
-}
-
-LengthConverter::MemoryManager::MemoryManager(bool storageEnabled, unsigned maxDataLength)
-        : storageEnabled(storageEnabled), maxDataLength(maxDataLength)
-{}
-
-LengthConverter::MemoryManager::~MemoryManager()
-{
-    while (!freePayloads.empty())
-    {
-        tlm_generic_payload* payload = freePayloads.top();
-        if (storageEnabled)
-            delete[] payload->get_data_ptr();
-        payload->reset();
-        delete payload;
-        freePayloads.pop();
-    }
-}
-
-tlm_generic_payload* LengthConverter::MemoryManager::allocate()
-{
-    if (freePayloads.empty())
-    {
-        auto* payload = new tlm_generic_payload(this);
-
-        if (storageEnabled)
-        {
-            auto* data = new unsigned char[maxDataLength];
-            payload->set_data_ptr(data);
-        }
-        return payload;
-    }
-    else
-    {
-        tlm_generic_payload* result = freePayloads.top();
-        freePayloads.pop();
-        return result;
-    }
-}
-
-void LengthConverter::MemoryManager::free(tlm_generic_payload* payload)
-{
-    freePayloads.push(payload);
-}
\ No newline at end of file
diff --git a/DRAMSys/simulator/LengthConverter.h b/DRAMSys/simulator/LengthConverter.h
deleted file mode 100644
index bac9c29d..00000000
--- a/DRAMSys/simulator/LengthConverter.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 2022, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Lukas Steiner
- */
-
-#ifndef LENGTHCONVERTER_H
-#define LENGTHCONVERTER_H
-
-#include <iostream>
-#include <utility>
-#include <vector>
-#include <queue>
-#include <set>
-#include <unordered_map>
-#include <stack>
-
-#include <tlm>
-#include <systemc>
-#include <tlm_utils/simple_initiator_socket.h>
-#include <tlm_utils/simple_target_socket.h>
-#include <tlm_utils/peq_with_cb_and_phase.h>
-
-//TLM_DECLARE_EXTENDED_PHASE(REQ_ARBITRATION);
-//TLM_DECLARE_EXTENDED_PHASE(RESP_ARBITRATION);
-
-class LengthConverter : public sc_core::sc_module
-{
-public:
-    tlm_utils::simple_initiator_socket<LengthConverter> iSocket;
-    tlm_utils::simple_target_socket<LengthConverter> tSocket;
-
-    LengthConverter(const sc_core::sc_module_name& name, unsigned maxOutputLength, bool storageEnabled);
-    SC_HAS_PROCESS(LengthConverter);
-
-private:
-    tlm_utils::peq_with_cb_and_phase<LengthConverter> payloadEventQueue;
-    void peqCallback(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase);
-
-    //std::vector<bool> tSocketIsBusy;
-    //std::vector<bool> iSocketIsBusy;
-
-    const unsigned maxOutputLength;
-    const bool storageEnabled;
-
-    void createChildTranses(tlm::tlm_generic_payload* parentTrans);
-
-    //std::uint64_t getTargetAddress(std::uint64_t address) const;
-    //int getISocketId(std::uint64_t address) const;
-
-    //std::vector<std::queue<tlm::tlm_generic_payload *>> pendingRequests;
-
-    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &trans, tlm::tlm_phase &phase,
-                                       sc_core::sc_time &fwDelay);
-    tlm::tlm_sync_enum nb_transport_bw(tlm::tlm_generic_payload &payload, tlm::tlm_phase &phase,
-                                       sc_core::sc_time &bwDelay);
-    unsigned int transport_dbg(tlm::tlm_generic_payload &trans);
-
-    class MemoryManager : public tlm::tlm_mm_interface
-    {
-    public:
-        MemoryManager(bool storageEnabled, unsigned maxDataLength);
-        ~MemoryManager() override;
-        tlm::tlm_generic_payload* allocate();
-        void free(tlm::tlm_generic_payload* payload) override;
-
-    private:
-        std::stack<tlm::tlm_generic_payload*> freePayloads;
-        bool storageEnabled = false;
-        unsigned maxDataLength;
-    } memoryManager;
-
-    class ChildExtension : public tlm::tlm_extension<ChildExtension>
-    {
-    private:
-        tlm::tlm_generic_payload* parentTrans;
-        explicit ChildExtension(tlm::tlm_generic_payload* parentTrans) : parentTrans(parentTrans) {}
-
-    public:
-        //ChildExtension() = delete;
-
-        tlm_extension_base* clone() const override
-        {
-            return new ChildExtension(parentTrans);
-        }
-
-        void copy_from(tlm_extension_base const &ext) override
-        {
-            const auto& cpyFrom = dynamic_cast<const ChildExtension&>(ext);
-            parentTrans = cpyFrom.parentTrans;
-        }
-
-        tlm::tlm_generic_payload* getParentTrans()
-        {
-            return parentTrans;
-        }
-
-        static void setExtension(tlm::tlm_generic_payload* childTrans, tlm::tlm_generic_payload* parentTrans)
-        {
-            auto *extension = childTrans->get_extension<ChildExtension>();
-
-            if (extension != nullptr)
-            {
-                extension->parentTrans = parentTrans;
-            }
-            else
-            {
-                extension = new ChildExtension(parentTrans);
-                childTrans->set_auto_extension(extension);
-            }
-        }
-
-        static bool isChildTrans(const tlm::tlm_generic_payload* trans)
-        {
-            if (trans->get_extension<ChildExtension>() != nullptr)
-                return true;
-            else
-                return false;
-        }
-
-        tlm::tlm_generic_payload* getNextChildTrans()
-        {
-            return parentTrans->get_extension<ParentExtension>()->getNextChildTrans();
-        }
-
-        bool notifyChildTransCompletion()
-        {
-            return parentTrans->get_extension<ParentExtension>()->notifyChildTransCompletion();
-        }
-    };
-
-    class ParentExtension : public tlm::tlm_extension<ParentExtension>
-    {
-    private:
-        std::vector<tlm::tlm_generic_payload*> childTranses;
-        unsigned nextEndReqChildId = 0;
-        unsigned completedChildTranses = 0;
-        explicit ParentExtension(std::vector<tlm::tlm_generic_payload*> _childTranses)
-            : childTranses(std::move(_childTranses)) {}
-
-    public:
-        ParentExtension() = delete;
-
-        tlm_extension_base* clone() const override
-        {
-            return new ParentExtension(childTranses);
-        }
-
-        void copy_from(tlm_extension_base const &ext) override
-        {
-            const auto& cpyFrom = dynamic_cast<const ParentExtension&>(ext);
-            childTranses = cpyFrom.childTranses;
-        }
-
-        static bool isParentTrans(const tlm::tlm_generic_payload* trans)
-        {
-            auto* extension = trans->get_extension<ParentExtension>();
-            if (extension != nullptr)
-                return !extension->childTranses.empty();
-            else
-                return false;
-        }
-
-        static void setExtension(tlm::tlm_generic_payload* parentTrans, std::vector<tlm::tlm_generic_payload*> childTranses)
-        {
-            auto* extension = parentTrans->get_extension<ParentExtension>();
-
-            if (extension != nullptr)
-            {
-                extension->childTranses = std::move(childTranses);
-                extension->nextEndReqChildId = 0;
-                extension->completedChildTranses = 0;
-            }
-            else
-            {
-                extension = new ParentExtension(std::move(childTranses));
-                parentTrans->set_auto_extension(extension);
-            }
-        }
-
-        tlm::tlm_generic_payload* getNextChildTrans()
-        {
-            if (nextEndReqChildId < childTranses.size())
-                return childTranses[nextEndReqChildId++];
-            else
-                return nullptr;
-        }
-
-        bool notifyChildTransCompletion()
-        {
-            completedChildTranses++;
-            return completedChildTranses == childTranses.size();
-        }
-
-        void releaseChildTranses()
-        {
-            std::for_each(childTranses.begin(), childTranses.end(),
-                          [](tlm::tlm_generic_payload* childTrans){childTrans->release();});
-            childTranses.clear();
-        }
-    };
-};
-
-#endif // LENGTHCONVERTER_H
diff --git a/DRAMSys/tests/DDR3/ci.yml b/DRAMSys/tests/DDR3/ci.yml
deleted file mode 100644
index 3a2c1eb0..00000000
--- a/DRAMSys/tests/DDR3/ci.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp
-example_DDR3:
-    stage: test_DDR3
-    script:
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/simulator
-        - ./DRAMSys ../../DRAMSys/tests/DDR3/simulations/ddr3-example.json ../../DRAMSys/tests/DDR3/
-        - mv DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb
-        - ls -lah
-        - ls -lah ../../DRAMSys/tests/DDR3/expected/
-        - sqldiff ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        # Run Code Coverage
-        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
- 
-    cache:
-        key: build
-        paths:
-            - build/
-        policy: pull
-
-    artifacts:
-        paths:
-          - build/simulator/ddr3-dual-rank_ddr3_ch0.tdb
-          - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
diff --git a/DRAMSys/tests/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json b/DRAMSys/tests/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json
deleted file mode 100644
index c82926c9..00000000
--- a/DRAMSys/tests/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "CONGEN": {
-        "XOR":[
-	 {
-	    "FIRST":13,
-	    "SECOND":16
-	 }
-	],
-        "BANK_BIT": [
-            13,
-            14,
-            15
-        ],
-        "BYTE_BIT": [
-            0,
-            1,
-            2	
-        ],
-        "COLUMN_BIT": [
-            3,
-	    4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12
-        ],
-        "ROW_BIT": [
-	    16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-            25,
-            26,
-            27,
-            28,
-            29		
-        ],
-	"RANK_BIT": [
-            30
-        ]
-    }
-}
diff --git a/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs_grp.json b/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs_grp.json
deleted file mode 100644
index ec7ba66c..00000000
--- a/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs_grp.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "mcconfig": {
-        "PagePolicy": "Open", 
-        "Scheduler": "FrFcfsGrp", 
-        "RequestBufferSize": 8, 
-        "CmdMux":  "Oldest", 
-        "RespQueue": "Fifo", 
-        "RefreshPolicy": "Rankwise", 
-        "RefreshMaxPostponed": 0, 
-        "RefreshMaxPulledin": 0, 
-        "PowerDownPolicy": "Staggered", 
-        "PowerDownTimeout": 100
-    }
-}
\ No newline at end of file
diff --git a/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json b/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json
deleted file mode 100644
index e9dc9a59..00000000
--- a/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 8,
-            "dataRate": 2,
-            "nbrOfBanks": 8,
-            "nbrOfColumns": 1024,
-            "nbrOfRanks": 2,
-            "nbrOfChannels": 1,
-            "nbrOfRows": 16384,
-            "width": 64,
-            "nbrOfDevices": 1
-        },
-        "memoryId": "MICRON_2GB_DDR3-1066_64bit_D_SODIMM",
-        "memoryType": "DDR3",
-        "mempowerspec": {
-            "idd0": 720.0,
-            "idd2n": 400.0,
-            "idd2p0": 80.0,
-            "idd2p1": 200.0,
-            "idd3n": 440.0,
-            "idd3p0": 240.0,
-            "idd3p1": 240.0,
-            "idd4r": 1200.0,
-            "idd4w": 1200.0,
-            "idd5": 1760.0,
-            "idd6": 48.0,
-            "vdd": 1.5
-        },
-        "memtimingspec": {
-            "AL": 0,
-            "CCD": 4,
-            "CKE": 3,
-            "CKESR": 4,
-            "CL": 7,
-            "DQSCK": 0,
-            "FAW": 20,
-            "RAS": 20,
-            "RC": 27,
-            "RCD": 7,
-            "REFI": 4160,
-            "RFC": 59,
-            "RL": 7,
-            "RP": 7,
-            "RRD": 4,
-            "RTP": 4,
-            "WL": 6,
-            "WR": 8,
-            "WTR": 4,
-            "XP": 4,
-            "XPDLL": 13,
-            "XS": 64,
-            "XSDLL": 512,
-            "ACTPDEN": 1,
-            "PRPDEN": 1,
-            "REFPDEN": 1,
-            "RTRS": 1,
-            "clkMhz": 533
-        }
-    }
-}
diff --git a/DRAMSys/tests/DDR3/configs/simulator/ddr3.json b/DRAMSys/tests/DDR3/configs/simulator/ddr3.json
deleted file mode 100644
index 1ade5aea..00000000
--- a/DRAMSys/tests/DDR3/configs/simulator/ddr3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": true,
-        "SimulationName": "ddr3",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/tests/DDR3/configs/thermalsim/config.json b/DRAMSys/tests/DDR3/configs/thermalsim/config.json
deleted file mode 100644
index b88ed84c..00000000
--- a/DRAMSys/tests/DDR3/configs/thermalsim/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"thermalsimconfig": {
-		"TemperatureScale": "Celsius",
-		"StaticTemperatureDefaultValue": 89,
-		"ThermalSimPeriod":100,
-		"ThermalSimUnit":"us",
-		"PowerInfoFile": "powerInfo.json",
-		"IceServerIp": "127.0.0.1",
-		"IceServerPort": 11880,
-		"SimPeriodAdjustFactor" : 10,
-		"NPowStableCyclesToIncreasePeriod": 5,
-		"GenerateTemperatureMap": true,
-		"GeneratePowerMap": true
-	}
-}
diff --git a/DRAMSys/tests/DDR3/configs/thermalsim/core.flp b/DRAMSys/tests/DDR3/configs/thermalsim/core.flp
deleted file mode 100755
index e85e6801..00000000
--- a/DRAMSys/tests/DDR3/configs/thermalsim/core.flp
+++ /dev/null
@@ -1,45 +0,0 @@
-CPUs :
-
-  position        0,    0 ;
-  dimension    2750, 4300 ;
-
-GPU :
-
-  position     3350,    0 ;
-  dimension    2750, 4000 ;
-
-BASEBAND1 :
-
-  position     4250, 4000 ;
-  dimension    1850, 3300 ;
-
-BASEBAND2 :
-
-  position     3350, 7300 ;
-  dimension    2750, 3300 ;
-
-LLCACHE :
-
-  position        0, 4300 ;
-  dimension    1900, 3000 ;
-
-DRAMCTRL1 :
-
-  position     1900, 4300 ;
-  dimension     850, 3000 ;
-
-DRAMCTRL2 :
-
-  position     3350, 4000 ;
-  dimension     900, 3300 ;
-
-TSVS :
-
-  position     2750, 2300 ;
-  dimension     600, 6000 ;
-
-ACELLERATORS :
-
-  position        0, 7300 ;
-  dimension    2750, 3300 ;
-
diff --git a/DRAMSys/tests/DDR3/configs/thermalsim/mem.flp b/DRAMSys/tests/DDR3/configs/thermalsim/mem.flp
deleted file mode 100755
index 29d02254..00000000
--- a/DRAMSys/tests/DDR3/configs/thermalsim/mem.flp
+++ /dev/null
@@ -1,16 +0,0 @@
-channel0 :
-    position   150,  100 ;
-    dimension  2600, 5200 ;
-
-channel1 :
-    position   3350,  100 ;
-    dimension  2600, 5200 ;
-
-channel2 :
-    position   150, 5300 ;
-    dimension  2600, 5200 ;
-
-channel3 :
-    position   3350, 5300 ;
-    dimension  2600, 5200 ;
-
diff --git a/DRAMSys/tests/DDR3/configs/thermalsim/powerInfo.json b/DRAMSys/tests/DDR3/configs/thermalsim/powerInfo.json
deleted file mode 100644
index 524f690f..00000000
--- a/DRAMSys/tests/DDR3/configs/thermalsim/powerInfo.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"powerInfo": {
-		"dram_die_channel0": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel1": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel2": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel3": {
-			"init_pow": 0,
-			"threshold": 1.0
-		}
-	}
-}
diff --git a/DRAMSys/tests/DDR3/configs/thermalsim/stack.stk b/DRAMSys/tests/DDR3/configs/thermalsim/stack.stk
deleted file mode 100755
index ec74f020..00000000
--- a/DRAMSys/tests/DDR3/configs/thermalsim/stack.stk
+++ /dev/null
@@ -1,49 +0,0 @@
-material SILICON :
-    thermal conductivity 1.30e-4 ;
-    volumetric heat capacity 1.628e-12 ;
-
-material BEOL :
-    thermal conductivity 2.25e-6 ;
-    volumetric heat capacity 2.175e-12 ;
-
-material COPPER :
-    thermal conductivity 4.01e-04 ;
-    volumetric heat capacity 3.37e-12 ;
-
-top heat sink :
-    //sink height 1e03, area 100e06, material COPPER ;
-    //spreader height 0.5e03, area 70e06, material SILICON ;
-    heat transfer coefficient 1.3e-09 ;
-    temperature 318.15 ;
-dimensions :
-   chip length 6100, width 10600 ;
-   cell length  100, width   100 ;
-
-
-layer PCB :
-    height 10 ;
-    material BEOL ;
-
-die DRAM :
-    layer 58.5 SILICON ;
-    source 2 SILICON ;
-    layer 1.5 BEOL ;
-    layer 58.5 SILICON ;
-
-
-stack:
-    die DRAM_DIE DRAM floorplan "./mem.flp" ;
-    layer CONN_TO_PCB PCB ;
-
-solver:
-   transient step 0.01, slot 0.05 ;
-   initial temperature 300.0 ;
-
-output:
-   Tflpel(DRAM_DIE.channel0 , "temp_flp_element_ch0.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel1 , "temp_flp_element_ch1.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel2 , "temp_flp_element_ch2.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel3 , "temp_flp_element_ch3.txt" , average  , slot );
-   Tmap  (DRAM_DIE, "output1.txt", slot) ;
-   Pmap  (DRAM_DIE, "output2.txt", slot) ;
-
diff --git a/DRAMSys/tests/DDR3/simulations/ddr3-example.json b/DRAMSys/tests/DDR3/simulations/ddr3-example.json
deleted file mode 100644
index b924da62..00000000
--- a/DRAMSys/tests/DDR3/simulations/ddr3-example.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "simulation": {
-        "addressmapping": "am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json",
-        "mcconfig": "fr_fcfs_grp.json",
-        "memspec": "MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json",
-        "simconfig": "ddr3.json",
-        "simulationid": "ddr3-dual-rank",
-        "thermalconfig": "config.json",
-        "tracesetup": [
-            {
-                "clkMhz": 533,
-                "name": "trace_test2.stl"
-            }
-        ]
-    }
-}
diff --git a/DRAMSys/tests/DDR4/ci.yml b/DRAMSys/tests/DDR4/ci.yml
deleted file mode 100644
index 86bddbbb..00000000
--- a/DRAMSys/tests/DDR4/ci.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler:
-example_DDR4:
-    stage: test_DDR4
-    script:
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/simulator
-        - ./DRAMSys ../../DRAMSys/tests/DDR4/simulations/ddr4-example.json ../../DRAMSys/tests/DDR4/
-        - mv DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb
-        - ls -lah
-        - ls -lah ../../DRAMSys/tests/DDR4/expected/
-        - sqldiff ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        # Run Code Coverage
-        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
- 
-    cache:
-        key: build
-        paths:
-            - build/
-        policy: pull
-
-    artifacts:
-        paths:
-          - build/simulator/ddr4-bankgrp_ddr4_ch0.tdb
-          - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
diff --git a/DRAMSys/tests/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json b/DRAMSys/tests/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
deleted file mode 100644
index be30b98f..00000000
--- a/DRAMSys/tests/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "CONGEN": {
-	"BANKGROUP_BIT":[
-            30,
-	    31
-	],
-        "BANK_BIT": [
-            28,
-            29
-        ],
-        "BYTE_BIT": [
-            0,
-            1,
-            2
-        ],
-        "COLUMN_BIT": [
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12
-        ],
-        "ROW_BIT": [
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-            25,
-            26,
-            27
-        ]
-    }
-}
diff --git a/DRAMSys/tests/DDR4/configs/mcconfigs/fr_fcfs.json b/DRAMSys/tests/DDR4/configs/mcconfigs/fr_fcfs.json
deleted file mode 100644
index 787d87e2..00000000
--- a/DRAMSys/tests/DDR4/configs/mcconfigs/fr_fcfs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"mcconfig": {
-	"PagePolicy": "ClosedAdaptive",
-	"Scheduler": "FrFcfs",
-	"RequestBufferSize": 8,
-	"CmdMux": "Oldest",
-	"RespQueue": "Fifo",
-	"RefreshPolicy": "Rankwise",
-	"RefreshMaxPostponed": 8,
-	"RefreshMaxPulledin": 8,
-	"PowerDownPolicy": "NoPowerDown",
-	"PowerDownTimeout": 100}}
diff --git a/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json b/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json
deleted file mode 100644
index 95234154..00000000
--- a/DRAMSys/tests/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 8,
-            "dataRate": 2,
-            "nbrOfBankGroups": 4,
-            "nbrOfBanks": 16,
-            "nbrOfColumns": 1024,
-            "nbrOfRanks": 1,
-            "nbrOfChannels": 1,
-            "nbrOfRows": 32768,
-            "width": 8,
-            "nbrOfDevices": 8
-        },
-        "memoryId": "MICRON_4Gb_DDR4-1866_8bit_A",
-        "memoryType": "DDR4",
-        "mempowerspec": {
-            "idd0": 56.25,
-            "idd02": 4.05,
-            "idd2n": 33.75,
-            "idd2p0": 17.0,
-            "idd2p1": 17.0,
-            "idd3n": 39.5,
-            "idd3p0": 22.5,
-            "idd3p1": 22.5,
-            "idd4r": 157.5,
-            "idd4w": 135.0,
-            "idd5": 118.0,
-            "idd6": 20.25,
-            "idd62": 2.6,
-            "vdd": 1.2,
-            "vdd2": 2.5
-        },
-        "memtimingspec": {
-            "AL": 0,
-            "CCD_L": 5,
-            "CCD_S": 4,
-            "CKE": 6,
-            "CKESR": 7,
-            "CL": 13,
-            "DQSCK": 2,
-            "FAW": 22,
-            "RAS": 32,
-            "RC": 45,
-            "RCD": 13,
-            "REFM": 1,
-            "REFI": 3644,
-            "RFC": 243,
-            "RL": 13,
-            "RPRE": 1,
-            "RP": 13,
-            "RRD_L": 5,
-            "RRD_S": 4,
-            "RTP": 8,
-            "WL": 12,
-            "WPRE": 1,
-            "WR": 14,
-            "WTR_L": 7,
-            "WTR_S": 3,
-            "XP": 8,
-            "XPDLL": 255,
-            "XS": 252,
-            "XSDLL": 512,
-            "ACTPDEN": 1,
-            "PRPDEN": 1,
-            "REFPDEN": 1,
-            "RTRS": 1,
-            "clkMhz": 933
-        }
-    }
-}
diff --git a/DRAMSys/tests/DDR4/configs/simulator/ddr4.json b/DRAMSys/tests/DDR4/configs/simulator/ddr4.json
deleted file mode 100644
index c88964d3..00000000
--- a/DRAMSys/tests/DDR4/configs/simulator/ddr4.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": true,
-        "SimulationName": "ddr4",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/tests/DDR4/configs/thermalsim/config.json b/DRAMSys/tests/DDR4/configs/thermalsim/config.json
deleted file mode 100644
index b88ed84c..00000000
--- a/DRAMSys/tests/DDR4/configs/thermalsim/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"thermalsimconfig": {
-		"TemperatureScale": "Celsius",
-		"StaticTemperatureDefaultValue": 89,
-		"ThermalSimPeriod":100,
-		"ThermalSimUnit":"us",
-		"PowerInfoFile": "powerInfo.json",
-		"IceServerIp": "127.0.0.1",
-		"IceServerPort": 11880,
-		"SimPeriodAdjustFactor" : 10,
-		"NPowStableCyclesToIncreasePeriod": 5,
-		"GenerateTemperatureMap": true,
-		"GeneratePowerMap": true
-	}
-}
diff --git a/DRAMSys/tests/DDR4/configs/thermalsim/core.flp b/DRAMSys/tests/DDR4/configs/thermalsim/core.flp
deleted file mode 100755
index e85e6801..00000000
--- a/DRAMSys/tests/DDR4/configs/thermalsim/core.flp
+++ /dev/null
@@ -1,45 +0,0 @@
-CPUs :
-
-  position        0,    0 ;
-  dimension    2750, 4300 ;
-
-GPU :
-
-  position     3350,    0 ;
-  dimension    2750, 4000 ;
-
-BASEBAND1 :
-
-  position     4250, 4000 ;
-  dimension    1850, 3300 ;
-
-BASEBAND2 :
-
-  position     3350, 7300 ;
-  dimension    2750, 3300 ;
-
-LLCACHE :
-
-  position        0, 4300 ;
-  dimension    1900, 3000 ;
-
-DRAMCTRL1 :
-
-  position     1900, 4300 ;
-  dimension     850, 3000 ;
-
-DRAMCTRL2 :
-
-  position     3350, 4000 ;
-  dimension     900, 3300 ;
-
-TSVS :
-
-  position     2750, 2300 ;
-  dimension     600, 6000 ;
-
-ACELLERATORS :
-
-  position        0, 7300 ;
-  dimension    2750, 3300 ;
-
diff --git a/DRAMSys/tests/DDR4/configs/thermalsim/mem.flp b/DRAMSys/tests/DDR4/configs/thermalsim/mem.flp
deleted file mode 100755
index 29d02254..00000000
--- a/DRAMSys/tests/DDR4/configs/thermalsim/mem.flp
+++ /dev/null
@@ -1,16 +0,0 @@
-channel0 :
-    position   150,  100 ;
-    dimension  2600, 5200 ;
-
-channel1 :
-    position   3350,  100 ;
-    dimension  2600, 5200 ;
-
-channel2 :
-    position   150, 5300 ;
-    dimension  2600, 5200 ;
-
-channel3 :
-    position   3350, 5300 ;
-    dimension  2600, 5200 ;
-
diff --git a/DRAMSys/tests/DDR4/configs/thermalsim/powerInfo.json b/DRAMSys/tests/DDR4/configs/thermalsim/powerInfo.json
deleted file mode 100644
index 524f690f..00000000
--- a/DRAMSys/tests/DDR4/configs/thermalsim/powerInfo.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"powerInfo": {
-		"dram_die_channel0": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel1": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel2": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel3": {
-			"init_pow": 0,
-			"threshold": 1.0
-		}
-	}
-}
diff --git a/DRAMSys/tests/DDR4/configs/thermalsim/stack.stk b/DRAMSys/tests/DDR4/configs/thermalsim/stack.stk
deleted file mode 100755
index ec74f020..00000000
--- a/DRAMSys/tests/DDR4/configs/thermalsim/stack.stk
+++ /dev/null
@@ -1,49 +0,0 @@
-material SILICON :
-    thermal conductivity 1.30e-4 ;
-    volumetric heat capacity 1.628e-12 ;
-
-material BEOL :
-    thermal conductivity 2.25e-6 ;
-    volumetric heat capacity 2.175e-12 ;
-
-material COPPER :
-    thermal conductivity 4.01e-04 ;
-    volumetric heat capacity 3.37e-12 ;
-
-top heat sink :
-    //sink height 1e03, area 100e06, material COPPER ;
-    //spreader height 0.5e03, area 70e06, material SILICON ;
-    heat transfer coefficient 1.3e-09 ;
-    temperature 318.15 ;
-dimensions :
-   chip length 6100, width 10600 ;
-   cell length  100, width   100 ;
-
-
-layer PCB :
-    height 10 ;
-    material BEOL ;
-
-die DRAM :
-    layer 58.5 SILICON ;
-    source 2 SILICON ;
-    layer 1.5 BEOL ;
-    layer 58.5 SILICON ;
-
-
-stack:
-    die DRAM_DIE DRAM floorplan "./mem.flp" ;
-    layer CONN_TO_PCB PCB ;
-
-solver:
-   transient step 0.01, slot 0.05 ;
-   initial temperature 300.0 ;
-
-output:
-   Tflpel(DRAM_DIE.channel0 , "temp_flp_element_ch0.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel1 , "temp_flp_element_ch1.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel2 , "temp_flp_element_ch2.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel3 , "temp_flp_element_ch3.txt" , average  , slot );
-   Tmap  (DRAM_DIE, "output1.txt", slot) ;
-   Pmap  (DRAM_DIE, "output2.txt", slot) ;
-
diff --git a/DRAMSys/tests/DDR4/simulations/ddr4-example.json b/DRAMSys/tests/DDR4/simulations/ddr4-example.json
deleted file mode 100644
index d97481d9..00000000
--- a/DRAMSys/tests/DDR4/simulations/ddr4-example.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "simulation": {
-        "addressmapping": "am_ddr4_8x4Gbx8_dimm_p1KB_brc.json",
-        "mcconfig": "fr_fcfs.json",
-        "memspec": "MICRON_4Gb_DDR4-1866_8bit_A.json",
-        "simconfig": "ddr4.json",
-        "simulationid": "ddr4-bankgrp",
-        "thermalconfig": "config.json",
-        "tracesetup": [
-            {
-                "clkMhz": 933,
-                "name": "trace_test3.stl"
-            }
-        ]
-    }
-}
diff --git a/DRAMSys/tests/HBM2/ci.yml b/DRAMSys/tests/HBM2/ci.yml
deleted file mode 100644
index 91636d65..00000000
--- a/DRAMSys/tests/HBM2/ci.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-example_HBM2: 
-    stage: test_HBM2
-    script: 
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/simulator
-        - ./DRAMSys ../../DRAMSys/tests/HBM2/simulations/hbm2-example.json ../../DRAMSys/tests/HBM2/
-        - mv DRAMSys_hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb
-        - mv DRAMSys_hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb
-        - ls -lah
-        - ls -lah ../../DRAMSys/tests/HBM2/expected/
-        - sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
-    cache: 
-        key: build
-        paths: 
-            - build/
-        policy: pull
-  
-    artifacts: 
-        paths: 
-            - build/simulator/hbm2-example_hbm2_ch0.tdb
-            - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
diff --git a/DRAMSys/tests/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json b/DRAMSys/tests/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json
deleted file mode 100644
index c9362ea4..00000000
--- a/DRAMSys/tests/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "CONGEN": {
-	"CHANNEL_BIT":[
-	    30
-        ],
-	"BANKGROUP_BIT":[
-            28,
-	    29
-        ],
-        "BANK_BIT": [
-            26,
-            27
-        ],
-        "BYTE_BIT": [
-            0,
-            1,
-            2,
-	    3
-        ],
-        "COLUMN_BIT": [
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-	    10
-        ],
-        "ROW_BIT": [
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-	    25
-        ]
-    }
-}
diff --git a/DRAMSys/tests/HBM2/configs/mcconfigs/fifoStrict.json b/DRAMSys/tests/HBM2/configs/mcconfigs/fifoStrict.json
deleted file mode 100644
index a1b1bc77..00000000
--- a/DRAMSys/tests/HBM2/configs/mcconfigs/fifoStrict.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "mcconfig": {
-        "PagePolicy": "Closed", 
-        "Scheduler": "Fifo", 
-        "RequestBufferSize": 8, 
-        "CmdMux": "Strict", 
-        "RespQueue": "Fifo", 
-        "RefreshPolicy": "NoRefresh",  
-        "RefreshMaxPostponed": 0, 
-        "RefreshMaxPulledin": 0, 
-        "PowerDownPolicy": "NoPowerDown", 
-        "PowerDownTimeout": 100
-    }
-}
\ No newline at end of file
diff --git a/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json b/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json
deleted file mode 100644
index de681372..00000000
--- a/DRAMSys/tests/HBM2/configs/memspecs/HBM2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 4,
-            "dataRate": 2,
-            "nbrOfBankGroups": 4,
-            "nbrOfBanks": 16,
-            "nbrOfColumns": 128,
-            "nbrOfPseudoChannels": 1,
-            "nbrOfChannels": 2,
-            "nbrOfDevices": 1,
-            "nbrOfRows": 32768,
-            "width": 128
-        },
-        "memoryId": "https://www.computerbase.de/2019-05/amd-memory-tweak-vram-oc/#bilder",
-        "memoryType": "HBM2",
-        "memtimingspec": {
-            "CCDL": 3,
-            "CCDS": 2,
-            "CKE": 8,
-            "DQSCK": 1,
-            "FAW": 16,
-            "PL": 0,
-            "RAS": 28,
-            "RC": 42,
-            "RCDRD": 12,
-            "RCDWR": 6,
-            "REFI": 3900,
-            "REFISB": 244,
-            "RFC": 220,
-            "RFCSB": 96,
-            "RL": 17,
-            "RP": 14,
-            "RRDL": 6,
-            "RRDS": 4,
-            "RREFD": 8,
-            "RTP": 5,
-            "RTW": 18,
-            "WL": 7,
-            "WR": 14,
-            "WTRL": 9,
-            "WTRS": 4,
-            "XP": 8,
-            "XS": 216,
-            "clkMhz": 1000
-        }
-    }
-}
diff --git a/DRAMSys/tests/HBM2/configs/simulator/hbm2.json b/DRAMSys/tests/HBM2/configs/simulator/hbm2.json
deleted file mode 100644
index 608aec41..00000000
--- a/DRAMSys/tests/HBM2/configs/simulator/hbm2.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "hbm2",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/tests/HBM2/configs/thermalsim/config.json b/DRAMSys/tests/HBM2/configs/thermalsim/config.json
deleted file mode 100644
index b88ed84c..00000000
--- a/DRAMSys/tests/HBM2/configs/thermalsim/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"thermalsimconfig": {
-		"TemperatureScale": "Celsius",
-		"StaticTemperatureDefaultValue": 89,
-		"ThermalSimPeriod":100,
-		"ThermalSimUnit":"us",
-		"PowerInfoFile": "powerInfo.json",
-		"IceServerIp": "127.0.0.1",
-		"IceServerPort": 11880,
-		"SimPeriodAdjustFactor" : 10,
-		"NPowStableCyclesToIncreasePeriod": 5,
-		"GenerateTemperatureMap": true,
-		"GeneratePowerMap": true
-	}
-}
diff --git a/DRAMSys/tests/HBM2/configs/thermalsim/core.flp b/DRAMSys/tests/HBM2/configs/thermalsim/core.flp
deleted file mode 100755
index e85e6801..00000000
--- a/DRAMSys/tests/HBM2/configs/thermalsim/core.flp
+++ /dev/null
@@ -1,45 +0,0 @@
-CPUs :
-
-  position        0,    0 ;
-  dimension    2750, 4300 ;
-
-GPU :
-
-  position     3350,    0 ;
-  dimension    2750, 4000 ;
-
-BASEBAND1 :
-
-  position     4250, 4000 ;
-  dimension    1850, 3300 ;
-
-BASEBAND2 :
-
-  position     3350, 7300 ;
-  dimension    2750, 3300 ;
-
-LLCACHE :
-
-  position        0, 4300 ;
-  dimension    1900, 3000 ;
-
-DRAMCTRL1 :
-
-  position     1900, 4300 ;
-  dimension     850, 3000 ;
-
-DRAMCTRL2 :
-
-  position     3350, 4000 ;
-  dimension     900, 3300 ;
-
-TSVS :
-
-  position     2750, 2300 ;
-  dimension     600, 6000 ;
-
-ACELLERATORS :
-
-  position        0, 7300 ;
-  dimension    2750, 3300 ;
-
diff --git a/DRAMSys/tests/HBM2/configs/thermalsim/mem.flp b/DRAMSys/tests/HBM2/configs/thermalsim/mem.flp
deleted file mode 100755
index 29d02254..00000000
--- a/DRAMSys/tests/HBM2/configs/thermalsim/mem.flp
+++ /dev/null
@@ -1,16 +0,0 @@
-channel0 :
-    position   150,  100 ;
-    dimension  2600, 5200 ;
-
-channel1 :
-    position   3350,  100 ;
-    dimension  2600, 5200 ;
-
-channel2 :
-    position   150, 5300 ;
-    dimension  2600, 5200 ;
-
-channel3 :
-    position   3350, 5300 ;
-    dimension  2600, 5200 ;
-
diff --git a/DRAMSys/tests/HBM2/configs/thermalsim/powerInfo.json b/DRAMSys/tests/HBM2/configs/thermalsim/powerInfo.json
deleted file mode 100644
index 524f690f..00000000
--- a/DRAMSys/tests/HBM2/configs/thermalsim/powerInfo.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"powerInfo": {
-		"dram_die_channel0": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel1": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel2": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel3": {
-			"init_pow": 0,
-			"threshold": 1.0
-		}
-	}
-}
diff --git a/DRAMSys/tests/HBM2/configs/thermalsim/stack.stk b/DRAMSys/tests/HBM2/configs/thermalsim/stack.stk
deleted file mode 100755
index ec74f020..00000000
--- a/DRAMSys/tests/HBM2/configs/thermalsim/stack.stk
+++ /dev/null
@@ -1,49 +0,0 @@
-material SILICON :
-    thermal conductivity 1.30e-4 ;
-    volumetric heat capacity 1.628e-12 ;
-
-material BEOL :
-    thermal conductivity 2.25e-6 ;
-    volumetric heat capacity 2.175e-12 ;
-
-material COPPER :
-    thermal conductivity 4.01e-04 ;
-    volumetric heat capacity 3.37e-12 ;
-
-top heat sink :
-    //sink height 1e03, area 100e06, material COPPER ;
-    //spreader height 0.5e03, area 70e06, material SILICON ;
-    heat transfer coefficient 1.3e-09 ;
-    temperature 318.15 ;
-dimensions :
-   chip length 6100, width 10600 ;
-   cell length  100, width   100 ;
-
-
-layer PCB :
-    height 10 ;
-    material BEOL ;
-
-die DRAM :
-    layer 58.5 SILICON ;
-    source 2 SILICON ;
-    layer 1.5 BEOL ;
-    layer 58.5 SILICON ;
-
-
-stack:
-    die DRAM_DIE DRAM floorplan "./mem.flp" ;
-    layer CONN_TO_PCB PCB ;
-
-solver:
-   transient step 0.01, slot 0.05 ;
-   initial temperature 300.0 ;
-
-output:
-   Tflpel(DRAM_DIE.channel0 , "temp_flp_element_ch0.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel1 , "temp_flp_element_ch1.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel2 , "temp_flp_element_ch2.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel3 , "temp_flp_element_ch3.txt" , average  , slot );
-   Tmap  (DRAM_DIE, "output1.txt", slot) ;
-   Pmap  (DRAM_DIE, "output2.txt", slot) ;
-
diff --git a/DRAMSys/tests/HBM2/simulations/hbm2-example.json b/DRAMSys/tests/HBM2/simulations/hbm2-example.json
deleted file mode 100644
index 6fd5f064..00000000
--- a/DRAMSys/tests/HBM2/simulations/hbm2-example.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "simulation": {
-        "addressmapping": "am_hbm2_8Gb_pc_brc.json",
-        "mcconfig": "fifoStrict.json",
-        "memspec": "HBM2.json",
-        "simconfig": "hbm2.json",
-        "simulationid": "hbm2-example",
-        "thermalconfig": "config.json",
-        "tracesetup": [
-            {
-                "clkMhz": 1000,
-                "name": "trace1_test4.stl"
-            },
-	    {
-                "clkMhz": 1000,
-                "name": "trace2_test4.stl"
-            }
-        ]
-    }
-}
diff --git a/DRAMSys/tests/LPDDR4/ci.yml b/DRAMSys/tests/LPDDR4/ci.yml
deleted file mode 100644
index 8f3ab1fd..00000000
--- a/DRAMSys/tests/LPDDR4/ci.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler:
-example_LPDDR4:
-    stage: test_LPDDR4
-    script:
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/simulator
-        - ./DRAMSys ../../DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json ../../DRAMSys/tests/LPDDR4/
-        - mv DRAMSys_lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb
-        - ls -lah
-        - ls -lah ../../DRAMSys/tests/LPDDR4/expected/
-        - sqldiff ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        # Run Code Coverage
-        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
- 
-    cache:
-        key: build
-        paths:
-            - build/
-        policy: pull
-
-    artifacts:
-        paths:
-          - build/simulator/lpddr4-example_lpddr4_ch0.tdb
-          - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
diff --git a/DRAMSys/tests/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json b/DRAMSys/tests/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json
deleted file mode 100644
index e9b3ac9f..00000000
--- a/DRAMSys/tests/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "CONGEN": {
-        "BANK_BIT": [
-            27,
-            28,
-            29
-        ],
-        "BYTE_BIT": [
-            0
-        ],
-        "COLUMN_BIT": [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10
-        ],
-        "ROW_BIT": [
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-            25,
-            26
-        ]
-    }
-}
\ No newline at end of file
diff --git a/DRAMSys/tests/LPDDR4/configs/mcconfigs/fifo.json b/DRAMSys/tests/LPDDR4/configs/mcconfigs/fifo.json
deleted file mode 100644
index d1793358..00000000
--- a/DRAMSys/tests/LPDDR4/configs/mcconfigs/fifo.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "mcconfig": {
-        "PagePolicy": "OpenAdaptive", 
-        "Scheduler": "Fifo", 
-        "RequestBufferSize": 8, 
-        "CmdMux": "Oldest", 
-        "RespQueue": "Fifo", 
-        "RefreshPolicy": "Bankwise",  
-        "RefreshMaxPostponed": 8, 
-        "RefreshMaxPulledin": 8, 
-        "PowerDownPolicy": "NoPowerDown", 
-        "PowerDownTimeout": 100
-    }
-}
\ No newline at end of file
diff --git a/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json b/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json
deleted file mode 100644
index 34230486..00000000
--- a/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 16,
-            "dataRate": 2,
-            "nbrOfBanks": 8,
-            "nbrOfColumns": 1024,
-            "nbrOfRanks": 1,
-            "nbrOfChannels": 1,
-            "nbrOfDevices": 1,
-            "nbrOfRows": 65536,
-            "width": 16
-        },
-        "memoryId": "JEDEC_8Gb_LPDDR4-3200_16bit",
-        "memoryType": "LPDDR4",
-        "memtimingspec": {
-            "CCD": 8,
-            "CKE": 12,
-            "CMDCKE": 3,
-            "DQS2DQ": 2,
-            "DQSCK": 6,
-            "DQSS": 1,
-            "ESCKE": 3,
-            "FAW": 64,
-            "PPD": 4,
-            "RAS": 68,
-            "RCD": 29,
-            "REFI": 6246,
-            "REFIPB": 780,
-            "RFCAB": 448,
-            "RFCPB": 224,
-            "RL": 28,
-            "RPAB": 34,
-            "RPPB": 29,
-            "RCAB": 102,
-            "RCPB": 97,
-            "RPST": 0,
-            "RRD": 16,
-            "RTP": 12,
-            "SR": 24,
-            "WL": 14,
-            "WPRE": 2,
-            "WR": 29,
-            "WTR": 16,
-            "XP": 12,
-            "XSR": 460,
-            "RTRS": 1,
-            "clkMhz": 1600
-        }
-    }
-}
diff --git a/DRAMSys/tests/LPDDR4/configs/simulator/lpddr4.json b/DRAMSys/tests/LPDDR4/configs/simulator/lpddr4.json
deleted file mode 100644
index 6ea5b1bd..00000000
--- a/DRAMSys/tests/LPDDR4/configs/simulator/lpddr4.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "simconfig": {
-        "AddressOffset": 0,
-        "CheckTLM2Protocol": false,
-        "DatabaseRecording": true,
-        "Debug": false,
-        "ECCControllerMode": "Disabled",
-        "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
-        "PowerAnalysis": false,
-        "SimulationName": "lpddr4",
-        "SimulationProgressBar": true,
-        "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
-        "UseMalloc": false,
-        "WindowSize": 1000
-    }
-}
diff --git a/DRAMSys/tests/LPDDR4/configs/thermalsim/config.json b/DRAMSys/tests/LPDDR4/configs/thermalsim/config.json
deleted file mode 100644
index b88ed84c..00000000
--- a/DRAMSys/tests/LPDDR4/configs/thermalsim/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"thermalsimconfig": {
-		"TemperatureScale": "Celsius",
-		"StaticTemperatureDefaultValue": 89,
-		"ThermalSimPeriod":100,
-		"ThermalSimUnit":"us",
-		"PowerInfoFile": "powerInfo.json",
-		"IceServerIp": "127.0.0.1",
-		"IceServerPort": 11880,
-		"SimPeriodAdjustFactor" : 10,
-		"NPowStableCyclesToIncreasePeriod": 5,
-		"GenerateTemperatureMap": true,
-		"GeneratePowerMap": true
-	}
-}
diff --git a/DRAMSys/tests/LPDDR4/configs/thermalsim/core.flp b/DRAMSys/tests/LPDDR4/configs/thermalsim/core.flp
deleted file mode 100755
index e85e6801..00000000
--- a/DRAMSys/tests/LPDDR4/configs/thermalsim/core.flp
+++ /dev/null
@@ -1,45 +0,0 @@
-CPUs :
-
-  position        0,    0 ;
-  dimension    2750, 4300 ;
-
-GPU :
-
-  position     3350,    0 ;
-  dimension    2750, 4000 ;
-
-BASEBAND1 :
-
-  position     4250, 4000 ;
-  dimension    1850, 3300 ;
-
-BASEBAND2 :
-
-  position     3350, 7300 ;
-  dimension    2750, 3300 ;
-
-LLCACHE :
-
-  position        0, 4300 ;
-  dimension    1900, 3000 ;
-
-DRAMCTRL1 :
-
-  position     1900, 4300 ;
-  dimension     850, 3000 ;
-
-DRAMCTRL2 :
-
-  position     3350, 4000 ;
-  dimension     900, 3300 ;
-
-TSVS :
-
-  position     2750, 2300 ;
-  dimension     600, 6000 ;
-
-ACELLERATORS :
-
-  position        0, 7300 ;
-  dimension    2750, 3300 ;
-
diff --git a/DRAMSys/tests/LPDDR4/configs/thermalsim/mem.flp b/DRAMSys/tests/LPDDR4/configs/thermalsim/mem.flp
deleted file mode 100755
index 29d02254..00000000
--- a/DRAMSys/tests/LPDDR4/configs/thermalsim/mem.flp
+++ /dev/null
@@ -1,16 +0,0 @@
-channel0 :
-    position   150,  100 ;
-    dimension  2600, 5200 ;
-
-channel1 :
-    position   3350,  100 ;
-    dimension  2600, 5200 ;
-
-channel2 :
-    position   150, 5300 ;
-    dimension  2600, 5200 ;
-
-channel3 :
-    position   3350, 5300 ;
-    dimension  2600, 5200 ;
-
diff --git a/DRAMSys/tests/LPDDR4/configs/thermalsim/powerInfo.json b/DRAMSys/tests/LPDDR4/configs/thermalsim/powerInfo.json
deleted file mode 100644
index 524f690f..00000000
--- a/DRAMSys/tests/LPDDR4/configs/thermalsim/powerInfo.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"powerInfo": {
-		"dram_die_channel0": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel1": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel2": {
-			"init_pow": 0,
-			"threshold": 1.0
-		},
-		"dram_die_channel3": {
-			"init_pow": 0,
-			"threshold": 1.0
-		}
-	}
-}
diff --git a/DRAMSys/tests/LPDDR4/configs/thermalsim/stack.stk b/DRAMSys/tests/LPDDR4/configs/thermalsim/stack.stk
deleted file mode 100755
index ec74f020..00000000
--- a/DRAMSys/tests/LPDDR4/configs/thermalsim/stack.stk
+++ /dev/null
@@ -1,49 +0,0 @@
-material SILICON :
-    thermal conductivity 1.30e-4 ;
-    volumetric heat capacity 1.628e-12 ;
-
-material BEOL :
-    thermal conductivity 2.25e-6 ;
-    volumetric heat capacity 2.175e-12 ;
-
-material COPPER :
-    thermal conductivity 4.01e-04 ;
-    volumetric heat capacity 3.37e-12 ;
-
-top heat sink :
-    //sink height 1e03, area 100e06, material COPPER ;
-    //spreader height 0.5e03, area 70e06, material SILICON ;
-    heat transfer coefficient 1.3e-09 ;
-    temperature 318.15 ;
-dimensions :
-   chip length 6100, width 10600 ;
-   cell length  100, width   100 ;
-
-
-layer PCB :
-    height 10 ;
-    material BEOL ;
-
-die DRAM :
-    layer 58.5 SILICON ;
-    source 2 SILICON ;
-    layer 1.5 BEOL ;
-    layer 58.5 SILICON ;
-
-
-stack:
-    die DRAM_DIE DRAM floorplan "./mem.flp" ;
-    layer CONN_TO_PCB PCB ;
-
-solver:
-   transient step 0.01, slot 0.05 ;
-   initial temperature 300.0 ;
-
-output:
-   Tflpel(DRAM_DIE.channel0 , "temp_flp_element_ch0.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel1 , "temp_flp_element_ch1.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel2 , "temp_flp_element_ch2.txt" , average  , slot );
-   Tflpel(DRAM_DIE.channel3 , "temp_flp_element_ch3.txt" , average  , slot );
-   Tmap  (DRAM_DIE, "output1.txt", slot) ;
-   Pmap  (DRAM_DIE, "output2.txt", slot) ;
-
diff --git a/DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json b/DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json
deleted file mode 100644
index 30211e69..00000000
--- a/DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "simulation": {
-        "addressmapping": "am_lpddr4_8Gbx16_brc.json",
-        "mcconfig": "fifo.json",
-        "memspec": "JEDEC_8Gb_LPDDR4-3200_16bit.json",
-        "simconfig": "lpddr4.json",
-        "simulationid": "lpddr4-example",
-        "thermalconfig": "config.json",
-        "tracesetup": [
-            {
-                "clkMhz": 1600,
-                "name": "trace_lpddr4.stl"
-            }
-        ]
-    }
-}
diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt
deleted file mode 100644
index bcc2b512..00000000
--- a/DRAMSys/traceAnalyzer/CMakeLists.txt
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright (c) 2020, Technische Universität Kaiserslautern
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# 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.
-#
-# Authors: 
-#    Matthias Jung
-#    Lukas Steiner
-#    Derek Christ
-#    Iron Prando da Silva
-
-cmake_minimum_required(VERSION 3.12)
-
-# Project Name:
-project(TraceAnalyzer)
-
-# Add Python3 Dependency:
-find_package(Python3 COMPONENTS Development)
-
-# Add QWT Dependency:
-find_library(QWT_LIBRARY NAMES "qwt-qt5" "qwt" PATHS
-    "$ENV{QWT_HOME}/lib"
-    "/opt/homebrew/opt/qwt-qt5/lib"
-)
-find_path(QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS
-    "/usr/include/qwt-qt5"
-    "/usr/include/qwt"
-    "$ENV{QWT_HOME}/include"
-    "/opt/homebrew/opt/qwt-qt5/include"
-    "/opt/homebrew/opt/qwt-qt5/lib/qwt.framework/Headers"
-)
-
-# Add QT Library:
-if (APPLE)
-    set(Qt5_DIR "/opt/homebrew/opt/qt@5/lib/cmake/Qt5")
-endif(APPLE)
-find_package(Qt5 COMPONENTS Core Gui Widgets Sql REQUIRED)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-# Configure:
-set(CMAKE_CXX_STANDARD 17)
-set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
-
-add_executable(TraceAnalyzer
-    main.cpp
-    businessObjects/transaction.cpp
-    businessObjects/timespan.cpp
-    data/tracedb.cpp
-    presentation/tracenavigator.cpp
-    presentation/util/colorgenerator.cpp
-    presentation/util/colorobject.cpp
-    presentation/tracedrawing.cpp
-    presentation/traceplotitem.cpp
-    gototimedialog.cpp
-    presentation/traceplot.cpp
-    tracefiletab.cpp
-    presentation/tracescroller.cpp
-    traceanalyzer.cpp
-    presentation/transactiontreewidget.cpp
-    presentation/util/clkgrid.cpp
-    queryeditor.cpp
-    presentation/selectedtransactiontreewidget.cpp
-    businessObjects/phases/phasefactory.cpp
-    presentation/debugmessagetreewidget.cpp
-    presentation/tracePlotMouseLabel.cpp
-    evaluationtool.cpp
-    selectmetrics.cpp
-    presentation/util/testlight.cpp
-    presentation/util/togglecollapsedaction.cpp
-    businessObjects/pythoncaller.cpp
-    presentation/tracemetrictreewidget.cpp
-    businessObjects/phases/phase.cpp
-    businessObjects/phases/phasedependency.cpp
-    businessObjects/phases/dependencyinfos.cpp
-    presentation/tracedrawingproperties.cpp
-    presentation/util/customlabelscaledraw.cpp
-    businessObjects/configmodels.cpp
-    businessObjects/commentmodel.cpp
-    businessObjects/traceplotlinemodel.cpp
-    simulationdialog.cpp
-    businessObjects/dependencymodels.cpp
-
-    businessObjects/dramTimeDependencies/common/QStringComparator.cpp
-    businessObjects/dramTimeDependencies/common/StringMapper.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp
-    businessObjects/dramTimeDependencies/configurations/configurationBase.cpp
-    
-    businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
-    # businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp
-    businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
-    
-    businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp
-    businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp
-
-    businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp
-    businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp
-
-    businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp
-    businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp
-
-    businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp
-    businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp
-
-    businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.cpp
-    businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.cpp
-    businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
-
-    businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp
-    businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
-
-    selectmetrics.ui
-    preferences.ui
-    evaluationtool.ui
-    gototimedialog.ui
-    tracefiletab.ui
-    queryeditor.ui
-    traceanalyzer.ui
-    simulationdialog.ui
-
-    scripts/memUtil.py
-    scripts/metrics.py
-    scripts/tests.py
-    scripts/plots.py
-    scripts/vcdExport.py
-    scripts/sonification.pl
-    scripts/dataExtractForNN.pl
-
-    resources.qrc
-)
-
-target_include_directories(TraceAnalyzer
-    PRIVATE ${QWT_INCLUDE_DIRS}
-    PRIVATE ${Python3_INCLUDE_DIRS}
-)
-
-# Build:
-target_link_libraries(TraceAnalyzer
-    PRIVATE ${Python3_LIBRARIES}
-    PRIVATE ${QWT_LIBRARY}
-    PRIVATE Qt5::Widgets
-    PRIVATE Qt5::Sql
-    PRIVATE DRAMSysConfiguration
-)
diff --git a/DRAMSys/traceAnalyzer/mainwindow.cpp b/DRAMSys/traceAnalyzer/mainwindow.cpp
deleted file mode 100644
index 2b0ba7bd..00000000
--- a/DRAMSys/traceAnalyzer/mainwindow.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Janik Schlemminger
- *    Robert Gernhardt
- *    Matthias Jung
- */
-
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include "traceDB.h"
-#include "xmldeserializer.h"
-#include <qwt_plot.h>
-
-MainWindow::MainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow)
-{
-    ui->setupUi(this);
-    // xmlDeserializer des("config.xml");
-    // des.xmlToTraceDB("tpr.xml")
-
-    db = new TraceDB("tpr.tdb", true);
-    traceNavigator = new TraceNavigator(db->getGeneralInfo(), this);
-    ui->tracePlot->init(traceNavigator, db);
-    ui->traceScroller->init(traceNavigator, db, ui->tracePlot);
-    phases = db->getPhasesInTimespan(
-                 traceNavigator->GeneralTraceInfo().TraceSpan());
-    transactions = db->getTransactionsInTimespan(
-                       traceNavigator->GeneralTraceInfo().TraceSpan());
-
-    ui->qwtPlot->setAxisScale(QwtPlot::xBottom,
-                              traceNavigator->GeneralTraceInfo().TraceSpan().Begin(),
-                              traceNavigator->GeneralTraceInfo().TraceSpan().End());
-    unsigned int banksize = traceNavigator->GeneralTraceInfo().NumberOfBanks();
-    ui->qwtPlot->setAxisScale(QwtPlot::yLeft, 0.0, banksize + 3, 1.0);
-
-    PhaseCollectionDrawingProperties *drawingProperties = new
-    PhaseCollectionDrawingProperties(banksize, this);
-    drawingProperties->setDrawText(false);
-    drawingProperties->setDrawBorder(false);
-    drawingProperties->setDrawPowerDownStates(false);
-    phaseCollectionPlotItem *phaseCollectionPlot = new phaseCollectionPlotItem(
-        phases, transactions, drawingProperties);
-    phaseCollectionPlot->attach(ui->qwtPlot);
-
-    traceNavigator->navigateToTime(0);
-}
-
-MainWindow::~MainWindow()
-{
-    delete ui;
-}
diff --git a/DRAMSys/traceAnalyzer/mainwindow.h b/DRAMSys/traceAnalyzer/mainwindow.h
deleted file mode 100644
index 794d7f22..00000000
--- a/DRAMSys/traceAnalyzer/mainwindow.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Janik Schlemminger
- *    Robert Gernhardt
- *    Matthias Jung
- */
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QHash>
-
-#include "tracenavigator.h"
-
-class TraceDB;
-
-namespace Ui {
-class MainWindow;
-}
-
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    explicit MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-
-//private slots:
-//     void on_horizontalScrollBar_valueChanged(int value);
-
-private:
-    Ui::MainWindow *ui;
-    TraceNavigator *traceNavigator;
-    TraceDB *db;
-    QHash<ID, Phase> phases;
-    QHash<ID, Transaction> transactions;
-
-};
-
-#endif // MAINWINDOW_H
diff --git a/DRAMSys/traceAnalyzer/markerplotitem.cpp b/DRAMSys/traceAnalyzer/markerplotitem.cpp
deleted file mode 100644
index 9945814a..00000000
--- a/DRAMSys/traceAnalyzer/markerplotitem.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Janik Schlemminger
- *    Robert Gernhardt
- *    Matthias Jung
- */
-
-#include "markerplotitem.h"
-#include "tracedrawing.h"
-#include <qwt_scale_map.h>
-
-int MarkerPlotItem::rtti() const
-{
-    return QwtPlotItem::Rtti_PlotUserItem;
-}
-
-void MarkerPlotItem::draw(QPainter *painter, const QwtScaleMap &xMap,
-                          const QwtScaleMap &yMap, const QRectF &canvasRect) const
-{
-    drawVerticalLine(painter, xMap.transform(time), canvasRect, color, width);
-}
diff --git a/DRAMSys/traceAnalyzer/schedulerwrapper.h b/DRAMSys/traceAnalyzer/schedulerwrapper.h
deleted file mode 100644
index a36fbd03..00000000
--- a/DRAMSys/traceAnalyzer/schedulerwrapper.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2015, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Janik Schlemminger
- *    Robert Gernhardt
- *    Matthias Jung
- */
-
-#ifndef SCHEDULERWRAPPER_H
-#define SCHEDULERWRAPPER_H
-
-#include <tlm.h>
-#include <systemc.h>
-#include <tlm_utils/simple_target_socket.h>
-#include <tlm_utils/simple_initiator_socket.h>
-#include <tlm_utils/peq_with_cb_and_phase.h>
-
-struct SchedulerWrapper : public sc_module {
-    tlm_utils::simple_initiator_socket<SchedulerWrapper> iSocket;
-    tlm_utils::simple_target_socket<SchedulerWrapper> tSocket;
-
-    SC_HAS_PROCESS(SchedulerWrapper);
-
-    SchedulerWrapper(sc_module_name name);
-
-private:
-    tlm_utils::peq_with_cb_and_phase<SchedulerWrapper> payloadEventQueue;
-
-    tlm::tlm_sync_enum nb_transport_bw(tlm::tlm_generic_payload &payload,
-                                       tlm::tlm_phase &phase, sc_time &bwDelay);
-    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &payload,
-                                       tlm::tlm_phase &phase, sc_time &fwDelay);
-
-    void peqCallback(tlm::tlm_generic_payload &payload,
-                     const tlm::tlm_phase &phase);
-    void sendToTarget(tlm::tlm_generic_payload &payload,
-                      const tlm::tlm_phase &phase, const sc_time &delay);
-    void sendToInitiator(tlm::tlm_generic_payload &payload,
-                         const tlm::tlm_phase &phase, const sc_time &delay);
-
-};
-
-#endif // SCHEDULERWRAPPER_H
-
-
diff --git a/DRAMSys/unitTests/CommandMuxTests.cpp b/DRAMSys/unitTests/CommandMuxTests.cpp
deleted file mode 100644
index 15cb40f3..00000000
--- a/DRAMSys/unitTests/CommandMuxTests.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2019, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Lukas Steiner
- */
-
-#include <gtest/gtest.h>
-#include <tlm.h>
-#include <utility>
-#include <vector>
-#include "../library/src/controller/CommandMux.h"
-#include "../library/src/controller/Command.h"
-
-class CommandMuxState
-{
-public:
-    Command firstCommand;
-    Command secondCommand;
-    Command resultCommand;
-};
-
-class CommandMuxTestBase : public testing::Test
-{
-public:
-    CommandMux *commandMux;
-
-    tlm_generic_payload *firstPayload;
-    tlm_generic_payload *secondPayload;
-
-    std::pair<Command, tlm_generic_payload *> firstPair;
-    std::pair<Command, tlm_generic_payload *> secondPair;
-
-    std::vector<std::pair<Command, tlm_generic_payload *>> readyCommands;
-
-    std::pair<Command, tlm_generic_payload *> result;
-
-    CommandMuxTestBase()
-    {
-        commandMux = new CommandMux();
-        firstPayload = new tlm_generic_payload();
-        secondPayload = new tlm_generic_payload();
-    }
-
-    ~CommandMuxTestBase()
-    {
-        delete commandMux;
-        delete firstPayload;
-        delete secondPayload;
-    }
-};
-
-class CommandMuxTestParam : public CommandMuxTestBase, public testing::WithParamInterface<CommandMuxState>
-{
-public:
-    CommandMuxTestParam()
-    {
-        commandMux->insertPayload(firstPayload);
-        commandMux->insertPayload(secondPayload);
-
-        firstPair.first = GetParam().firstCommand;
-        firstPair.second = firstPayload;
-        secondPair.first = GetParam().secondCommand;
-        secondPair.second = secondPayload;
-
-        readyCommands.push_back(secondPair);
-        readyCommands.push_back(firstPair);
-        result = commandMux->selectCommand(readyCommands);
-    }
-};
-
-TEST_P(CommandMuxTestParam, satisfiesCommandOrder)
-{
-    EXPECT_EQ(result.first, GetParam().resultCommand);
-}
-
-INSTANTIATE_TEST_CASE_P(Default, CommandMuxTestParam, testing::Values(
-                            CommandMuxState{Command::RD, Command::WR, Command::RD},
-                            CommandMuxState{Command::RD, Command::ACT, Command::ACT}));
diff --git a/DRAMSys/unitTests/googletest b/DRAMSys/unitTests/googletest
deleted file mode 160000
index b77e5c76..00000000
--- a/DRAMSys/unitTests/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b77e5c76252bac322bb82c5b444f050bd0d92451
diff --git a/README.md b/README.md
index 2b81e63a..1fcd24b0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-<img src="DRAMSys/docs/images/dramsys4_0.png" width="350" style="float: left;"/>  
+<img src="docs/images/dramsys_logo.png" width="350" style="float: left;" alt="DRAMSys Logo"/>  
 
-**DRAMSys4.0** is a flexible DRAM subsystem design space exploration framework based on SystemC TLM-2.0. It was developed at the [Microelectronic Systems Design Research Group](https://ems.eit.uni-kl.de/en/start/) and [Fraunhofer IESE](https://www.iese.fraunhofer.de/en.html).
+**DRAMSys** is a flexible DRAM subsystem design space exploration framework based on SystemC TLM-2.0. It was developed at the [Microelectronic Systems Design Research Group](https://ems.eit.uni-kl.de/en/start/) and [Fraunhofer IESE](https://www.iese.fraunhofer.de/en.html).
 
 \>> [Official Website](https://www.iese.fraunhofer.de/en/innovation_trends/autonomous-systems/memtonomy/DRAMSys.html) <<
 
@@ -17,28 +17,22 @@ If you decide to use DRAMSys in your research please cite the papers [2] [3]. To
 
 ## Key Features
 
-- **standalone** simulator with trace players, **gem5**-coupled simulator and **TLM-AT-compliant library**
-- support for **DDR3/4**, **LPDDR4**, **Wide I/O 1/2**, **GDDR5/5X/6** and **HBM1/2**
-- support for **DDR5**, **LPDDR5** and **HBM3** under development (contact [Matthias Jung](mailto:matthias.jung@iese.fraunhofer.de) for more information) 
-- automatic source code generation for new JEDEC standards [3] [9] from the domain-specific language DRAMml
-- FIFO, FR-FCFS and FR-FCFS with read/write grouping scheduling policies
-- open, closed, open adaptive and closed adaptive page policy [8]
-- all-bank refresh, same-bank refresh and per-bank refresh with pulled-in and postponed refresh commands
-- staggered power down [5]
-- coupling to **DRAMPower** [4] and **3D-ICE** [8] for power and thermal simulation
+- **Standalone** simulator with trace players and traffic generators, **gem5**-coupled simulator and **TLM-AT-compliant library**
+- Support for **DDR3/4**, **LPDDR4**, **Wide I/O 1/2**, **GDDR5/5X/6** and **HBM1/2**
+- Support for **DDR5**, **LPDDR5** and **HBM3** (please contact [Matthias Jung](mailto:matthias.jung@iese.fraunhofer.de) for more information) 
+- Automatic source code generation for new JEDEC standards [3] [9] from DRAMml DSL
+- Various scheduling policies
+- Open, closed and adaptive page policies [8]
+- All-bank, same-bank, per-bank and per-2-bank refresh
+- Staggered power down [5]
+- Coupling to **DRAMPower** [4] and for power simulation
 - **Trace Analyzer** for visual and metric-based result analysis
 
 ## Video
-The linked video shows the background of DRAMSys and some examples how simulations can be performed.
+The linked video shows the background of DRAMSys and some examples of how simulations can be performed.
 
 [![DRAMSys Video](https://img.youtube.com/vi/xdfaGv7MPVo/0.jpg)](https://www.youtube.com/watch?v=xdfaGv7MPVo)
 
-## Architecture and Functionality
-
-A UML diagram of the software architecture is presented below; different component implementations are left out for simplicity. More information about the architecture and functionality can be found in the papers [1] [2] [3] and in the introduction video on [Youtube](https://www.youtube.com/watch?v=8EkC3mYWpQY).
-
-<img src="DRAMSys/docs/images/dramsys_uml.png" alt="UML"  />
-
 ## Trace Analyzer Consulting and Custom-Tailored Modifications
 
 To provide better analysis capabilities for DRAM subsystem design space exploration than the usual performance-related outputs to the console, DRAMSys offers the Trace Analyzer. 
@@ -49,16 +43,15 @@ The Trace Analyzer's main window is shown below.
 
 If you are interested in the Trace Analyzer, if you need support with the setup of DRAMSys in a virtual platform of your company, or if you require custom modifications of the simulator please contact [Matthias Jung](mailto:matthias.jung@iese.fraunhofer.de).
 
-![Trace Analyzer Main Window](DRAMSys/docs/images/traceanalyzer.png) 
+![Trace Analyzer Main Window](docs/images/traceanalyzer.png) 
 
 ## Basic Setup
 
 Start using DRAMSys by cloning the repository.
-Use the `--recursive` flag to initialize all submodules within the repository, namely **DRAMPower**, **SystemC**, **nlohmann JSON** and **SQLite Amalgamation**.
 
 ### Dependencies
 
-DRAMSys requires a **C++17** compiler. The build process is based on **CMake** (minimum version **3.10**). Furthermore, the simulator is based on **SystemC**. SystemC is included as a submodule and will be build automatically with the project. If you want to use an external SystemC version, export the environment variables `SYSTEMC_HOME` (SystemC root directory) and `SYSTEMC_TARGET_ARCH` (e.g., linux64).
+DRAMSys requires a **C++17** compiler. The build process is based on **CMake** (minimum version **3.13**). Furthermore, the simulator is based on **SystemC**. SystemC is included as a submodule and will be build automatically with the project. If you want to use an external SystemC version, export the environment variables `SYSTEMC_HOME` (SystemC root directory) and `SYSTEMC_TARGET_ARCH` (e.g., linux64).
 
 ### Building DRAMSys
 
@@ -68,19 +61,11 @@ To build the standalone simulator for running memory trace files or a traffic ge
 $ cd DRAMSys
 $ mkdir build
 $ cd build
-$ cmake ../DRAMSys/
+$ cmake ..
 $ make
 ```
 
-If you plan to integrate DRAMSys into your own SystemC TLM-2.0 project you can build the DRAMSys library only:
-
-```bash
-$ cd DRAMSys
-$ mkdir build
-$ cd build
-$ cmake ../DRAMSys/library/
-$ make
-```
+To include **DRAMPower** in your build enable the CMake option `DRAMSYS_WITH_DRAMPOWER`. If you plan to integrate DRAMSys into your own SystemC TLM-2.0 project you can build the DRAMSys library only by disabling the CMake option `DRAMSYS_BUILD_CLI`.
 
 To build DRAMSys on Windows 10 we recommend to use the **Windows Subsystem for Linux (WSL)**.
 
@@ -91,478 +76,26 @@ Information on how to couple DRAMSys with **gem5** can be found [here](DRAMSys/g
 From the build directory use the commands below to execute the DRAMSys standalone.
 
 ```bash
-$ cd simulator
+$ cd bin
 $ ./DRAMSys
 ```
 
-The default base config file is *ddr3-example.json* located in *DRAMSys/library/resources/simulations*, the default resource folder for all nested config files is *DRAMSys/library/resources*.
+The default configuration file is *ddr4-example.json* located in *configs/*, the default folder for all nested configuration files is *configs/*.
 
-To run DRAMSys with a specific base config file:
+To run DRAMSys with a specific configuration file:
 
 ```bash
-$ ./DRAMSys ../../DRAMSys/library/resources/simulations/ddr3-example.json
+$ ./DRAMSys ../../configs/lpddr4-example.json
 ```
 
-To run DRAMSys with a specific base config file and a resource folder somewhere else to the standard:
+To run DRAMSys with a specific configuration file and configuration folder:
 
 ```bash
-$ ./DRAMSys ../../DRAMSys/tests/example_ddr3/simulations/ddr3-example.json ../../DRAMSys/tests/example_ddr3/
+$ ./DRAMSys ../../tests/tests_regression/DDR3/ddr3-example.json ../../tests/tests_regression/DDR3/
 ```
 
-### DRAMSys Configuration
+More information on the configuration can be found [here](configs/README.md).
 
-The DRAMSys executable supports one argument, which is a JSON file that contains certain arguments and the name of nested configuration files for the desired simulation. Alternatively, the contents of nested configuration files can also be added directly to the top configuration file instead of the file name.
-
-The JSON code below shows an example configuration:
-
-```json
-{
-    "simulation": {
-        "simulationid": "ddr3-example",
-        "simconfig": "ddr3.json",
-        "thermalconfig": "config.json",
-        "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
-        "mcconfig":"fifoStrict.json",
-        "tracesetup": [
-            {
-                "clkMhz": 300,
-                "name": "ddr3_example.stl"
-            },
-            {
-                "clkMhz": 2000,
-                "type": "generator",
-                "name": "gen0",
-                "numRequests": 2000,
-                "rwRatio": 0.85,
-                "addressDistribution": "random",
-                "seed": 123456,
-                "maxPendingReadRequests": 8,
-                "maxPendingWriteRequests": 8,
-                "minAddress": 16384,
-                "maxAddress": 32767
-            },
-            {
-                "clkMhz": 1000,
-                "type": "hammer",
-                "name": "ham0",
-                "numRequests": 4000,
-                "rowIncrement": 2097152
-            }
-        ]	
-    }
-}
-```
-Field Descriptions:
-- "simulationid": simulation file identifier
-- "simconfig": configuration file for the DRAMSys simulator
-- "thermalconfig": thermal simulation configuration file
-- "memspec": memory device configuration file
-- "addressmapping": address mapping configuration file
-- "mcconfig": memory controller configuration file
-- "tracesetup": The trace setup is only used in standalone mode. In library mode or gem5 mode the trace setup is ignored. Each device should be added as a json object inside the "tracesetup" array. 
-
-Each **trace setup** device configuration can be a **trace player** ("type": "player"), a **traffic generator** ("type": "generator") or a **row hammer generator** ("type": "hammer"). By not specifing the **type** parameter, the device will act as a **trace player**.
-All device configurations must define a **clkMhz** (operation frequency of the **traffic initiator**) and a **name** (in case of a trace player this specifies the **trace file** to play; in case of a generator this field is only for identification purposes).
-The **maxPendingReadRequests** and **maxPendingWriteRequests** parameters define the maximum number of outstanding read/write requests. The current implementation delays all memory accesses if one limit is reached. The default value (0) disables the limit.
-
-A **traffic generator** can be configured to generate **numRequests** requests in total, of which the **rwRatio** field defines the probability of one request being a read request. The length of a request (in bytes) can be specified with the **dataLength** parameter. The **seed** parameter can be used to produce identical results for all simulations. **minAddress** and **maxAddress** specify the address range, by default the whole address range is used. The parameter **addressDistribution** can either be set to **random** or **sequential**. In case of **sequential** the additional **addressIncrement** field must be specified, defining the address increment after each request.
-
-The **row hammer generator** is a special traffic generator that mimics a row hammer attack. It generates **numRequests** alternating read requests to two different addresses. The first address is 0x0, the second address is specified by the **rowIncrement** parameter and should decode to a different row in the same bank. Since only one outstanding request is allowed, the controller cannot perform any reordering, forcing a row switch (precharge and activate) for each access. That way the number of activations on the target rows are maximized.
-
-Most configuration fields reference other JSON files which contain more specialized chunks of the configuration like a memory specification, an address mapping and a memory controller configuration.
-
-
-#### Trace Files
-
-A **trace file** is a prerecorded file containing memory transactions. Each memory transaction has a time stamp that tells the simulator when it shall happen, a transaction type (*read* or *write*) and a hexadecimal memory address. The optional length parameter (in bytes) allows sending transactions with a custom length that does not match the length of a single DRAM burst access. In this case a length converter has to be added. Write transactions also have to specify a data field when storage is enabled in DRAMSys.
-
-There are two different kinds of trace files. They differ in their timing behavior and are distinguished by their file extension.
-
-##### STL Traces (.stl)
-
-The time stamp corresponds to the time the request is to be issued and it is given in cycles of the bus master device. Example: The device is an FPGA with a frequency of 200 MHz (clock period of 5 ns). If the time stamp is 10 the request is to be issued when time is 50 ns.
-
-Syntax example:
-
-```
-# Comment lines begin with #
-# cycle: [(length)] command hex-address [hex-data]
-31: read 0x400140
-33: read 0x400160
-56: write 0x7fff8000 0x123456789abcdef...
-81: (128) read 0x400180
-```
-
-##### Relative STL Traces (.rstl)
-
-The time stamp corresponds to the time the request is to be issued relative to the end of the previous transaction. This results in a simulation in which the trace player is able to react to possible delays due to DRAM bottlenecks.
-
-Syntax example:
-
-```
-# Comment lines begin with #
-# cycle: [(length)] command hex-address [hex-data]
-31: read 0x400140
-2: (512) read 0x400160
-23: write 0x7fff8000 0x123456789abcdef...
-10: read 0x400180
-```
-
-##### Elastic Traces
-
-More information about elastic traces can be found in the [gem5 readme](DRAMSys/gem5/README.md).
-
-#### Trace Player
-
-A trace player is equivalent to a bus master device (processor, FPGA, etc.). It reads an input trace file and translates each line into a new memory request. By adding a new device element into the trace setup section one can specify a new trace player, its operating frequency and its trace file.
-
-#### Configuration File Sections
-
-The main configuration file is divided into self-contained sections. Each of these sections refers to sub-configuration files. Below, the sub-configurations are listed and explained.
-
-##### Simulator Configuration
-
-The content of [ddr3.json](DRAMSys/library/resources/configs/simulator/ddr3.json) is presented below as an example.
-
-```json
-{
-    "simconfig": {
-        "SimulationName": "ddr3",
-        "Debug": false,
-        "DatabaseRecording": true,
-        "PowerAnalysis": false,
-        "EnableWindowing": false,
-        "WindowSize": 1000,
-        "ThermalSimulation": false,
-        "SimulationProgressBar": true,
-        "CheckTLM2Protocol": false,
-        "ECCControllerMode": "Disabled",
-        "UseMalloc": false,
-        "AddressOffset": 0,
-        "ErrorChipSeed": 42,
-        "ErrorCSVFile": "",
-        "StoreMode": "NoStorage"
-    }
-}
-```
-
-  - *SimulationName* (string)
-    - Give the name of the simulation for distinguishing from other simulations.
-  - *Debug* (boolean)
-    - true: enables debug output on console (only supported by a debug build)
-    - false: disables debug output
-  - *DatabaseRecording* (boolean)
-    - true: enables output database recording for the Trace Analyzer tool
-    - false: disables output database recording
-  - *PowerAnalysis* (boolean)
-    - true: enables live power analysis with DRAMPower
-    - false: disables power analysis
-  - *EnableWindowing* (boolean)
-    - true: enables temporal windowing
-    - false: disables temporal windowing
-  - *WindowSize* (unsigned int)
-    - Size of the window in clock cycles used to evaluate average bandwidth and average power consumption
-  - *ThermalSimulation* (boolean)
-    - true: enables thermal simulation ([more information](#dramsys-with-thermal-simulation))
-    - false: static temperature during simulation
-  - *SimulationProgressBar* (boolean)
-    - true: enables the simulation progress bar
-    - false: disables the simulation progress bar
-  - *CheckTLM2Protocol* (boolean)
-    - true: enables the TLM-2.0 Protocol Checking
-    - false: disables the TLM-2.0 Protocol Checking
-  - *ECCControllerMode* (string)
-    - "Disabled": No ECC controller is used
-    - "Hamming": Enables an ECC Controller with classic SECDED implementation using Hamming Code
-  - *UseMalloc* (boolean)
-    - false: model storage using mmap() (DEFAULT)
-    - true: allocate memory for modeling storage using malloc()
-  - *AddressOffset* (unsigned int)
-    - Address offset of the DRAM subsystem (required for the gem5 coupling).
-  - *ErrorChipSeed* (unsigned int)
-    - Seed to initialize the random error generator.
-  - *ErrorCSVFile* (string)
-    - CSV file with error injection information.
-  - *StoreMode* (string)
-    - "NoStorage": no storage
-    - "Store": store data without error model
-    - "ErrorModel": store data with error model [6]
-
-##### Thermal Simulation
-
-The thermal simulation configuration can be found [here](#thermal-simulation-configuration).
-
-
-##### Memory Specification
-
-A file with memory specifications. Timings and currents come from data sheets and measurements and usually do not change.  
-The fields inside "mempowerspec" can be written directly as a **double** type, "memoryId" and "memoryType" are **string**, all other fields are **unsigned int**.
-
-##### Address Mapping
-
-DRAMSys uses the **ConGen** [7] format for address mappings. It provides bit-wise granularity. It also provides the possibility to XOR address bits in order to map page misses to different banks and reduce latencies. 
-
-Used fields:  
-- "XOR": Defines an XOR connection of a "FIRST" and a "SECOND" bit
-- "BYTE_BIT": Address bits that are connected to the byte bits in ascending order
-- "COLUMN_BIT": Address bits that are connected to the column bits in ascending order
-- "ROW_BIT": Address bits that are connected to the row bits in ascending order
-- "BANK_BIT": Address bits that are connected to the bank bits in ascending order
-- "BANKGROUP_BIT": Address bits that are connected to the bank group bits in ascending order
-- "RANK_BIT": Address bits that are connected to the rank bits in ascending order
-- "CHANNEL_BIT": Address bits that are connected to the channel bits in ascending order
-
-```json
-{
-    "CONGEN": {
-        "XOR": [
-            {
-                "FIRST": 13,
-                "SECOND": 16
-            }
-        ],
-        "BYTE_BIT": [0,1,2],
-        "COLUMN_BIT": [3,4,5,6,7,8,9,10,11,12],
-        "BANK_BIT": [13,14,15],
-        "ROW_BIT": [16,17,18,19,20,21,22,23,24,25,26,27,28,29]
-    }	
-}
-
-```
-
-##### Memory Controller
-
-An example follows.
-
-```json
-{
-    "mcconfig": {
-        "PagePolicy": "Open", 
-        "Scheduler": "Fifo", 
-        "SchedulerBuffer": "ReadWrite",
-        "RequestBufferSize": 8, 
-        "CmdMux": "Oldest", 
-        "RespQueue": "Fifo", 
-        "RefreshPolicy": "AllBank", 
-        "RefreshMaxPostponed": 8, 
-        "RefreshMaxPulledin": 8, 
-        "PowerDownPolicy": "NoPowerDown", 
-        "Arbiter": "Fifo",
-        "MaxActiveTransactions": 128,
-        "RefreshManagement": true
-    }
-}
-```
-
-  - *PagePolicy* (string)
-    - "Open": no auto-precharge is performed after read or write commands
-    - "OpenAdaptive": auto-precharge after read or write commands is only performed if further requests for the targeted bank are stored in the scheduler and all the requests are row misses
-    - "Closed": auto-precharge is performed after each read or write command
-    - "ClosedAdaptive": auto-precharge after read or write commands is performed if all further requests for the targeted bank stored in the scheduler are row misses or if there are no further requests stored 
-  - *Scheduler* (string)
-    - all policies are applied locally to one bank, not globally to the whole channel
-    - "Fifo": first in, first out policy
-    - "FrFcfs": first-ready - first-come, first-served policy (row hits are preferred to row misses)
-    - "FrFcfsGrp": first-ready - first-come, first-served policy with additional grouping of read and write requests
-  - *SchedulerBuffer* (string)
-    - "Bankwise": requests are stored in bankwise buffers
-    - "ReadWrite": read and write requests are stored in different buffers
-    - "Shared": all requests are stored in one shared buffer
-  - *RequestBufferSize* (unsigned int)
-    - depth of a single scheduler buffer entity, total buffer depth depends on the selected scheduler buffer policy
-  - *CmdMux* (string)
-    - "Oldest": from all commands that are ready to be issued in the current clock cycle the one that belongs to the oldest transaction has the highest priority; commands from refresh managers have a higher priority than all other commands, commands from power down managers have a lower priority than all other commands
-    - "Strict": based on "Oldest", in addition, read and write commands are strictly issued in the order their corresponding requests arrived at the channel controller (can only be used in combination with the "Fifo" scheduler) 
-  - *RespQueue* (string)
-    - "Fifo": the original request order is not restored for outgoing responses 
-    - "Reorder": the original request order is restored for outgoing responses (only within the channel)
-  - *RefreshPolicy* (string)
-    - "NoRefresh": refresh is disabled
-    - "AllBank": all-bank refresh commands are issued (per rank)
-    - "PerBank": per-bank refresh commands are issued (only available in combination with LPDDR4, Wide I/O 2, GDDR5/5X/6 or HBM2)
-    - "SameBank": same-bank refresh commands are issued (only available in combination with DDR5)
-  - *RefreshMaxPostponed* (unsigned int)
-    - maximum number of refresh commands that can be postponed (with per-bank refresh the number is internally multiplied with the number of banks, with same-bank refresh the number is internally multiplied with the number of banks per bank group)
-  - *RefreshMaxPulledin* (unsigned int)
-    - maximum number of refresh commands that can be pulled in (with per-bank refresh the number is internally multiplied with the number of banks, with same-bank refresh the number is internally multiplied with the number of banks per bank group)
-  - *PowerDownPolicy* (string)
-    - "NoPowerDown": power down disabled
-    - "Staggered": staggered power down policy [5]
-  - *Arbiter* (string)
-    - "Simple": simple forwarding of transactions to the right channel or initiator
-    - "Fifo": transactions can be buffered internally to achieve a higher throughput especially in multi-initiator-multi-channel configurations
-    - "Reorder": based on "Fifo", in addition, the original request order is restored for outgoing responses (separately for each initiator and globally to all channels)
-  - *MaxActiveTransactions* (unsigned int)
-    - maximum number of active transactions per initiator (only applies to "Fifo" and "Reorder" arbiter policy)
-- *RefreshManagement* (boolean)
-  - enable the sending of refresh management commands when the number of activates to one bank exceeds a certain management threshold (only supported in DDR5 and LPDDR5)
-
-## DRAMSys with Thermal Simulation
-
-The thermal simulation is performed by a **3D-ICE** [8] server accessed through the network. Therefore users interested in thermal simulation during their DRAMSys simulations need to make sure they have a 3D-ICE server up and running before starting. For more information about 3D-ICE visit the [official website](https://www.epfl.ch/labs/esl/open-source-software-projects/3d-ice/). An example video that visualizes the results of a thermal simulation is provided on [Youtube](https://www.youtube.com/watch?v=Eacsq71hHtY).
-
-#### Installing 3D-ICE
-
-Install SuperLU dependencies:
-
-```bash
-$ sudo apt-get install build-essential git bison flex libblas-dev
-```
-
-Download and install SuperLU:
-
-```bash
-$ wget http://crd.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz
-$ tar xvfz superlu_4.3.tar.gz
-$ cd SuperLU_4.3/
-$ cp MAKE_INC/make.linux make.inc
-```
-
-Make sure the *SuperLUroot* variable in *make.inc* is properly set. For example, if you downloaded it to your home folder set as follows:
-
-```bash
-SuperLUroot = $(HOME)/SuperLU_4.3
-```
-
-Compile the library:
-
-```bash
-$ make superlulib
-```
-
-Download and install bison-2.4.1:
-
-```bash
-$ wget http://ftp.gnu.org/gnu/bison/bison-2.4.1.tar.gz
-$ tar xvzf bison-2.4.1.tar.gz
-$ cd bison-2.4.1
-$ ./configure --program-suffix=-2.4.1
-$ make
-$ sudo make install
-```
-
-[Download](https://www.epfl.ch/labs/esl/open-source-software-projects/3d-ice/3d-ice-download/) the lastest version of 3D-ICE. Make sure you got version 2.2.6 or greater.
-
-Unzip the archive and go to the 3D-ICE directory:
-
-```bash
-$ unzip 3d-ice-latest.zip
-$ cd 3d-ice-latest/3d-ice-2.2.6
-```
-
-Open the makefile.def and set the following variables properly, e.g.: 
-
-```bash
-SLU_MAIN = $(HOME)/SuperLU_$(SLU_VERSION)
-YACC = bison-2.4.1
-
-SYSTEMC_VERSION = 2.3.4
-SYSTEMC_ARCH    = linux64
-SYSTEMC_MAIN    = $(HOME)/systemc-$(SYSTEMC_VERSION)
-SYSTEMC_INCLUDE = $(SYSTEMC_MAIN)/include
-SYSTEMC_LIB     = $(SYSTEMC_MAIN)/lib-$(SYSTEMC_ARCH)
-```
-
-In case you are using the SystemC submodule and DRAMSys is located in your home directory the variables should be set as follows:
-
-```bash
-SYSTEMC_INCLUDE = $(HOME)/DRAMSys/DRAMSys/library/src/common/third_party/systemc/src
-SYSTEMC_LIB     = $(HOME)/DRAMSys/build/library/src/common/third_party/systemc/src
-```
-
-Compile 3D-ICE with SystemC TLM-2.0 support:
-
-```bash
-$ make SYSTEMC_WRAPPER=y
-```
-
-Export the environment variable `LIBTHREED_ICE_HOME`:
-
-```bash
-$ export LIBTHREED_ICE_HOME=${HOME}/3d-ice-latest/3d-ice-2.2.6
-```
-
-#### Running DRAMSys with Thermal Simulation
-
-In order to run DRAMSys with thermal simulation you have to rerun CMake and rebuild the project. The example input trace file can be generated with a Perl script:
-
- ```bash
-$ cd DRAMSys/DRAMSys/library/resources/traces
-$ ./generateErrorTest.pl > test_error.stl
- ```
-
-Before starting DRAMSys it is necessary to run the 3D-ICE server passing to it two arguments: a suitable configuration file and a socket port number. And then wait until the server is ready to receive requests.
-
-```bash
-$ cd DRAMSys/DRAMSys/library/resources/configs/thermalsim
-$ ~/3d-ice-latest/3d-ice-2.2.6/bin/3D-ICE-Server stack.stk 11880
-Preparing stk data ... done !
-Preparing thermal data ... done !
-Creating socket ... done !
-Waiting for client ...
-```
-
-In another terminal or terminal tab start DRAMSys with the special thermal simulation config:
-
-```bash
-$ cd DRAMSys/build/simulator/
-$ ./DRAMSys ../../DRAMSys/library/resources/simulations/wideio-thermal.json
-```
-
-#### Thermal Simulation Configuration
-
-The content of [config.json](DRAMSys/library/resources/configs/thermalsim/config.json) is presented below as an example.
-
-```json
-{
-    "thermalsimconfig": {
-        "TemperatureScale": "Celsius",
-        "StaticTemperatureDefaultValue": 89,
-        "ThermalSimPeriod": 100,
-        "ThermalSimUnit": "us",
-        "PowerInfoFile": "powerInfo.json",
-        "IceServerIp": "127.0.0.1",
-        "IceServerPort": 11880,
-        "SimPeriodAdjustFactor": 10,
-        "NPowStableCyclesToIncreasePeriod": 5,
-        "GenerateTemperatureMap": true,
-        "GeneratePowerMap": true
-    }
-}
-```
-
-  - *TemperatureScale* (string)
-    - "Celsius"
-    - "Fahrenheit"
-    - "Kelvin"
-  - *StaticTemperatureDefaultValue* (int)    
-    - Temperature value for simulations with static temperature
-  - *ThermalSimPeriod* (double)   
-    - Period of the thermal simulation
-  - *ThermalSimUnit* (string)
-    - "s": seconds
-    - "ms": millisecond
-    - "us": microseconds
-    - "ns": nanoseconds
-    - "ps": picoseconds
-    - "fs": femtoseconds
-  - *PowerInfoFile* (string)    
-    - File containing power related information: devices identifiers, initial power values and power thresholds.
-  - *IceServerIp* (string)    
-    - 3D-ICE server IP address
-  - *IceServerPort* (unsigned int)    
-    - 3D-ICE server port
-  - *SimPeriodAdjustFactor* (unsigned int)    
-    - When substantial changes in power occur (i.e., changes that exceed the thresholds), then the simulation period will be divided by this number causing the thermal simulation to be executed more often.
-  - *NPowStableCyclesToIncreasePeriod* (unsigned int)    
-    - Wait this number of thermal simulation cycles with power stability (i.e., changes that do not exceed the thresholds) to start increasing the simulation period back to its configured value.
-  - *GenerateTemperatureMap* (boolean)
-    - true: generate temperature map files during thermal simulation
-    - false: do not generate temperature map files during thermal simulation
-  - *GeneratePowerMap* (boolean)
-    - true: generate power map files during thermal simulation
-    - false: do not generate power map files during thermal simulation
 
 ## Acknowledgements
 
diff --git a/cmake/build_source_group.cmake b/cmake/build_source_group.cmake
new file mode 100644
index 00000000..563638bf
--- /dev/null
+++ b/cmake/build_source_group.cmake
@@ -0,0 +1,13 @@
+###############################################
+###          build_source_group             ###
+###############################################
+###
+### Builds a source group from a set of files
+### for nicer display in IDEs
+###
+
+function( build_source_group )
+	file(GLOB_RECURSE files ${CMAKE_CURRENT_SOURCE_DIR}/*.* )
+	list(REMOVE_ITEM files "CMakeLists.txt")
+	source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "[src]" FILES ${files})
+endfunction()
\ No newline at end of file
diff --git a/cmake/diagnostics_print.cmake b/cmake/diagnostics_print.cmake
new file mode 100644
index 00000000..a07ec142
--- /dev/null
+++ b/cmake/diagnostics_print.cmake
@@ -0,0 +1,32 @@
+###############################################
+###          diagnostics_print              ###
+###############################################
+###
+### Prints different diagnostics and infos
+### about the specified target
+###
+
+function( diagnostics_print target_name )	
+	message(STATUS "${target_name} settings:")
+	message(STATUS "==============\n")
+
+	message(STATUS "Source Files:")
+	get_target_property(SOURCE_FILES ${target_name} SOURCES)
+	if(SOURCE_FILES)
+		message(STATUS "${SOURCE_FILES}")
+	endif()
+	
+	message(STATUS "\nInclude Directories:")
+	get_target_property(HEADER_DIR ${target_name} INCLUDE_DIRECTORIES)
+	if(HEADER_DIR)
+		message(STATUS "${HEADER_DIR}")
+	endif()
+	
+	message(STATUS "\nLink Libraries:")
+	get_target_property(LINKED_LIBS ${target_name} LINK_LIBRARIES)
+	if(LINKED_LIBS)
+		message(STATUS "${LINKED_LIBS}")
+	endif()
+		
+	message(STATUS "\n")
+endfunction()
\ No newline at end of file
diff --git a/cmake/enable_extensions.cmake b/cmake/enable_extensions.cmake
new file mode 100644
index 00000000..07f90cca
--- /dev/null
+++ b/cmake/enable_extensions.cmake
@@ -0,0 +1,23 @@
+###############################################
+###          enable_extensions              ###
+###############################################
+###
+### Enable proprietary DRAMSys extensions
+### during build generation
+###
+
+function( dramsys_enable_extensions )
+	file(GLOB sub_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${DRAMSYS_EXTENSIONS_DIR}/*)
+
+	message(STATUS "Enabling DRAMSys extensions:")
+	message(STATUS "============================")
+
+	FOREACH(sub_dir ${sub_dirs})
+		IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${sub_dir}")
+			add_subdirectory(${sub_dir})
+		ENDIF()
+	ENDFOREACH()
+	
+	message(STATUS "")
+	message(STATUS "")
+endfunction()
\ No newline at end of file
diff --git a/configs/README.md b/configs/README.md
new file mode 100644
index 00000000..6ed1fbef
--- /dev/null
+++ b/configs/README.md
@@ -0,0 +1,266 @@
+# Configuration
+
+The DRAMSys executable supports one argument, which is a JSON file that contains certain arguments and the name of nested configuration files for the desired simulation. Alternatively, the contents of nested configuration files can also be added directly to the top configuration file instead of the file name.
+
+The JSON code below shows an example configuration:
+
+```json
+{
+    "simulation": {
+        "simulationid": "ddr3-example",
+        "simconfig": "example.json",
+        "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
+        "mcconfig":"fifoStrict.json",
+        "tracesetup": [
+            {
+                "clkMhz": 300,
+                "name": "example.stl"
+            },
+            {
+                "clkMhz": 2000,
+                "type": "generator",
+                "name": "gen0",
+                "numRequests": 2000,
+                "rwRatio": 0.85,
+                "addressDistribution": "random",
+                "seed": 123456,
+                "maxPendingReadRequests": 8,
+                "maxPendingWriteRequests": 8,
+                "minAddress": 16384,
+                "maxAddress": 32767
+            },
+            {
+                "clkMhz": 1000,
+                "type": "hammer",
+                "name": "ham0",
+                "numRequests": 4000,
+                "rowIncrement": 2097152
+            }
+        ]	
+    }
+}
+```
+Field Descriptions:
+- "simulationid": simulation file identifier
+- "simconfig": configuration file for the DRAMSys simulator
+- "memspec": memory device configuration file
+- "addressmapping": address mapping configuration file
+- "mcconfig": memory controller configuration file
+- "tracesetup": The trace setup is only used in standalone mode. In library mode or gem5 mode the trace setup is ignored. Each device should be added as a json object inside the "tracesetup" array.
+
+Each **trace setup** device configuration can be a **trace player** ("type": "player"), a **traffic generator** ("type": "generator") or a **row hammer generator** ("type": "hammer"). By not specifing the **type** parameter, the device will act as a **trace player**.
+All device configurations must define a **clkMhz** (operation frequency of the **traffic initiator**) and a **name** (in case of a trace player this specifies the **trace file** to play; in case of a generator this field is only for identification purposes).
+The **maxPendingReadRequests** and **maxPendingWriteRequests** parameters define the maximum number of outstanding read/write requests. The current implementation delays all memory accesses if one limit is reached. The default value (0) disables the limit.
+
+A **traffic generator** can be configured to generate **numRequests** requests in total, of which the **rwRatio** field defines the probability of one request being a read request. The length of a request (in bytes) can be specified with the **dataLength** parameter. The **seed** parameter can be used to produce identical results for all simulations. **minAddress** and **maxAddress** specify the address range, by default the whole address range is used. The parameter **addressDistribution** can either be set to **random** or **sequential**. In case of **sequential** the additional **addressIncrement** field must be specified, defining the address increment after each request.
+
+The **row hammer generator** is a special traffic generator that mimics a row hammer attack. It generates **numRequests** alternating read requests to two different addresses. The first address is 0x0, the second address is specified by the **rowIncrement** parameter and should decode to a different row in the same bank. Since only one outstanding request is allowed, the controller cannot perform any reordering, forcing a row switch (precharge and activate) for each access. That way the number of activations on the target rows are maximized.
+
+Most configuration fields reference other JSON files which contain more specialized chunks of the configuration like a memory specification, an address mapping and a memory controller configuration.
+
+
+## Trace Files
+
+A **trace file** is a prerecorded file containing memory transactions. Each memory transaction has a time stamp that tells the simulator when it shall happen, a transaction type (*read* or *write*) and a hexadecimal memory address. The optional length parameter (in bytes) allows sending transactions with a custom length that does not match the length of a single DRAM burst access. In this case a length converter has to be added. Write transactions also have to specify a data field when storage is enabled in DRAMSys.
+
+There are two different kinds of trace files. They differ in their timing behavior and are distinguished by their file extension.
+
+### STL Traces (.stl)
+
+The time stamp corresponds to the time the request is to be issued and it is given in cycles of the bus master device. Example: The device is an FPGA with a frequency of 200 MHz (clock period of 5 ns). If the time stamp is 10 the request is to be issued when time is 50 ns.
+
+Syntax example:
+
+```
+# Comment lines begin with #
+# cycle: [(length)] command hex-address [hex-data]
+31: read 0x400140
+33: read 0x400160
+56: write 0x7fff8000 0x123456789abcdef...
+81: (128) read 0x400180
+```
+
+### Relative STL Traces (.rstl)
+
+The time stamp corresponds to the time the request is to be issued relative to the end of the previous transaction. This results in a simulation in which the trace player is able to react to possible delays due to DRAM bottlenecks.
+
+Syntax example:
+
+```
+# Comment lines begin with #
+# cycle: [(length)] command hex-address [hex-data]
+31: read 0x400140
+2: (512) read 0x400160
+23: write 0x7fff8000 0x123456789abcdef...
+10: read 0x400180
+```
+
+### Elastic Traces
+
+More information about elastic traces can be found in the [gem5 readme](../src/gem5/README.md).
+
+## Trace Player
+
+A trace player is equivalent to a bus master device (processor, FPGA, etc.). It reads an input trace file and translates each line into a new memory request. By adding a new device element into the trace setup section one can specify a new trace player, its operating frequency and its trace file.
+
+## Configuration File Sections
+
+The main configuration file is divided into self-contained sections. Each of these sections refers to sub-configuration files. Below, the sub-configurations are listed and explained.
+
+### Simulator Configuration
+
+The content of [ddr3.json](simconfig/example.json) is presented below as an example.
+
+```json
+{
+    "simconfig": {
+        "SimulationName": "example",
+        "Debug": false,
+        "DatabaseRecording": true,
+        "PowerAnalysis": false,
+        "EnableWindowing": false,
+        "WindowSize": 1000,
+        "SimulationProgressBar": true,
+        "CheckTLM2Protocol": false,
+        "UseMalloc": false,
+        "AddressOffset": 0,
+        "StoreMode": "NoStorage"
+    }
+}
+```
+
+- *SimulationName* (string)
+    - Give the name of the simulation for distinguishing from other simulations.
+- *Debug* (boolean)
+    - true: enables debug output on console (only supported by a debug build)
+    - false: disables debug output
+- *DatabaseRecording* (boolean)
+    - true: enables output database recording for the Trace Analyzer tool
+    - false: disables output database recording
+- *PowerAnalysis* (boolean)
+    - true: enables live power analysis with DRAMPower
+    - false: disables power analysis
+- *EnableWindowing* (boolean)
+    - true: enables temporal windowing
+    - false: disables temporal windowing
+- *WindowSize* (unsigned int)
+    - Size of the window in clock cycles used to evaluate average bandwidth and average power consumption
+- *SimulationProgressBar* (boolean)
+    - true: enables the simulation progress bar
+    - false: disables the simulation progress bar
+- *CheckTLM2Protocol* (boolean)
+    - true: enables the TLM-2.0 Protocol Checking
+    - false: disables the TLM-2.0 Protocol Checking
+- *UseMalloc* (boolean)
+    - false: model storage using mmap() (DEFAULT)
+    - true: allocate memory for modeling storage using malloc()
+- *AddressOffset* (unsigned int)
+    - Address offset of the DRAM subsystem (required for the gem5 coupling).
+- *StoreMode* (string)
+    - "NoStorage": no storage
+    - "Store": store data without error model
+
+### Memory Specification
+
+A file with memory specifications. Timings and currents come from data sheets and measurements and usually do not change.  
+The fields inside "mempowerspec" can be written directly as a **double** type, "memoryId" and "memoryType" are **string**, all other fields are **unsigned int**.
+
+### Address Mapping
+
+DRAMSys uses the **ConGen** [7] format for address mappings. It provides bit-wise granularity. It also provides the possibility to XOR address bits in order to map page misses to different banks and reduce latencies.
+
+Used fields:
+- "XOR": Defines an XOR connection of a "FIRST" and a "SECOND" bit
+- "BYTE_BIT": Address bits that are connected to the byte bits in ascending order
+- "COLUMN_BIT": Address bits that are connected to the column bits in ascending order
+- "ROW_BIT": Address bits that are connected to the row bits in ascending order
+- "BANK_BIT": Address bits that are connected to the bank bits in ascending order
+- "BANKGROUP_BIT": Address bits that are connected to the bank group bits in ascending order
+- "RANK_BIT": Address bits that are connected to the rank bits in ascending order
+- "CHANNEL_BIT": Address bits that are connected to the channel bits in ascending order
+
+```json
+{
+    "CONGEN": {
+        "XOR": [
+            {
+                "FIRST": 13,
+                "SECOND": 16
+            }
+        ],
+        "BYTE_BIT": [0,1,2],
+        "COLUMN_BIT": [3,4,5,6,7,8,9,10,11,12],
+        "BANK_BIT": [13,14,15],
+        "ROW_BIT": [16,17,18,19,20,21,22,23,24,25,26,27,28,29]
+    }	
+}
+
+```
+
+### Memory Controller
+
+An example follows.
+
+```json
+{
+    "mcconfig": {
+        "PagePolicy": "Open", 
+        "Scheduler": "Fifo", 
+        "SchedulerBuffer": "ReadWrite",
+        "RequestBufferSize": 8, 
+        "CmdMux": "Oldest", 
+        "RespQueue": "Fifo", 
+        "RefreshPolicy": "AllBank", 
+        "RefreshMaxPostponed": 8, 
+        "RefreshMaxPulledin": 8, 
+        "PowerDownPolicy": "NoPowerDown", 
+        "Arbiter": "Fifo",
+        "MaxActiveTransactions": 128,
+        "RefreshManagement": true
+    }
+}
+```
+
+- *PagePolicy* (string)
+    - "Open": no auto-precharge is performed after read or write commands
+    - "OpenAdaptive": auto-precharge after read or write commands is only performed if further requests for the targeted bank are stored in the scheduler and all the requests are row misses
+    - "Closed": auto-precharge is performed after each read or write command
+    - "ClosedAdaptive": auto-precharge after read or write commands is performed if all further requests for the targeted bank stored in the scheduler are row misses or if there are no further requests stored
+- *Scheduler* (string)
+    - all policies are applied locally to one bank, not globally to the whole channel
+    - "Fifo": first in, first out policy
+    - "FrFcfs": first-ready - first-come, first-served policy (row hits are preferred to row misses)
+    - "FrFcfsGrp": first-ready - first-come, first-served policy with additional grouping of read and write requests
+- *SchedulerBuffer* (string)
+    - "Bankwise": requests are stored in bankwise buffers
+    - "ReadWrite": read and write requests are stored in different buffers
+    - "Shared": all requests are stored in one shared buffer
+- *RequestBufferSize* (unsigned int)
+    - depth of a single scheduler buffer entity, total buffer depth depends on the selected scheduler buffer policy
+- *CmdMux* (string)
+    - "Oldest": from all commands that are ready to be issued in the current clock cycle the one that belongs to the oldest transaction has the highest priority; commands from refresh managers have a higher priority than all other commands, commands from power down managers have a lower priority than all other commands
+    - "Strict": based on "Oldest", in addition, read and write commands are strictly issued in the order their corresponding requests arrived at the channel controller (can only be used in combination with the "Fifo" scheduler)
+- *RespQueue* (string)
+    - "Fifo": the original request order is not restored for outgoing responses
+    - "Reorder": the original request order is restored for outgoing responses (only within the channel)
+- *RefreshPolicy* (string)
+    - "NoRefresh": refresh is disabled
+    - "AllBank": all-bank refresh commands are issued (per rank)
+    - "PerBank": per-bank refresh commands are issued (only available in combination with LPDDR4, Wide I/O 2, GDDR5/5X/6 or HBM2)
+    - "SameBank": same-bank refresh commands are issued (only available in combination with DDR5)
+- *RefreshMaxPostponed* (unsigned int)
+    - maximum number of refresh commands that can be postponed (with per-bank refresh the number is internally multiplied with the number of banks, with same-bank refresh the number is internally multiplied with the number of banks per bank group)
+- *RefreshMaxPulledin* (unsigned int)
+    - maximum number of refresh commands that can be pulled in (with per-bank refresh the number is internally multiplied with the number of banks, with same-bank refresh the number is internally multiplied with the number of banks per bank group)
+- *PowerDownPolicy* (string)
+    - "NoPowerDown": power down disabled
+    - "Staggered": staggered power down policy [5]
+- *Arbiter* (string)
+    - "Simple": simple forwarding of transactions to the right channel or initiator
+    - "Fifo": transactions can be buffered internally to achieve a higher throughput especially in multi-initiator-multi-channel configurations
+    - "Reorder": based on "Fifo", in addition, the original request order is restored for outgoing responses (separately for each initiator and globally to all channels)
+- *MaxActiveTransactions* (unsigned int)
+    - maximum number of active transactions per initiator (only applies to "Fifo" and "Reorder" arbiter policy)
+- *RefreshManagement* (boolean)
+    - enable the sending of refresh management commands when the number of activates to one bank exceeds a certain management threshold (only supported in DDR5 and LPDDR5)
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_brc.json b/configs/addressmapping/am_ddr3_4x4Gbx16_dimm_p2KB_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_brc.json
rename to configs/addressmapping/am_ddr3_4x4Gbx16_dimm_p2KB_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.json b/configs/addressmapping/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.json
rename to configs/addressmapping/am_ddr3_4x4Gbx16_dimm_p2KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.json b/configs/addressmapping/am_ddr3_8x1Gbx8_dimm_p1KB_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_brc.json
rename to configs/addressmapping/am_ddr3_8x1Gbx8_dimm_p1KB_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json b/configs/addressmapping/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.json b/configs/addressmapping/am_ddr3_8x2Gbx8_dimm_p1KB_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_brc.json
rename to configs/addressmapping/am_ddr3_8x2Gbx8_dimm_p1KB_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.json b/configs/addressmapping/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_ddr3_8x2Gbx8_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_brc.json b/configs/addressmapping/am_ddr3_x16_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_brc.json
rename to configs/addressmapping/am_ddr3_x16_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_rbc.json b/configs/addressmapping/am_ddr3_x16_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr3_x16_rbc.json
rename to configs/addressmapping/am_ddr3_x16_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json b/configs/addressmapping/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
rename to configs/addressmapping/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x2x8x4Gbx4_dimm_p1KB_rbc.json b/configs/addressmapping/am_ddr5_2x2x8x4Gbx4_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x2x8x4Gbx4_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_ddr5_2x2x8x4Gbx4_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x4x1Gbx8_dimm_p1KB_rbc.json b/configs/addressmapping/am_ddr5_2x4x1Gbx8_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x4x1Gbx8_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_ddr5_2x4x1Gbx8_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json b/configs/addressmapping/am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x8x8x2Gbx4_dimm_p1KB_rbc.json b/configs/addressmapping/am_ddr5_2x8x8x2Gbx4_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ddr5_2x8x8x2Gbx4_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_ddr5_2x8x8x2Gbx4_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_hbm2_8Gb_pc_brc.json b/configs/addressmapping/am_hbm2_8Gb_pc_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_hbm2_8Gb_pc_brc.json
rename to configs/addressmapping/am_hbm2_8Gb_pc_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_hbm3_8Gb_pc_brc.json b/configs/addressmapping/am_hbm3_8Gb_pc_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_hbm3_8Gb_pc_brc.json
rename to configs/addressmapping/am_hbm3_8Gb_pc_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_1Gbx16_baroco.json b/configs/addressmapping/am_lpddr4_1Gbx16_baroco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_1Gbx16_baroco.json
rename to configs/addressmapping/am_lpddr4_1Gbx16_baroco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_1Gbx16_robaco.json b/configs/addressmapping/am_lpddr4_1Gbx16_robaco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_1Gbx16_robaco.json
rename to configs/addressmapping/am_lpddr4_1Gbx16_robaco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_1Gbx16_rocoba.json b/configs/addressmapping/am_lpddr4_1Gbx16_rocoba.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_1Gbx16_rocoba.json
rename to configs/addressmapping/am_lpddr4_1Gbx16_rocoba.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_512Mbx16_baroco.json b/configs/addressmapping/am_lpddr4_512Mbx16_baroco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_512Mbx16_baroco.json
rename to configs/addressmapping/am_lpddr4_512Mbx16_baroco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_512Mbx16_robaco.json b/configs/addressmapping/am_lpddr4_512Mbx16_robaco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_512Mbx16_robaco.json
rename to configs/addressmapping/am_lpddr4_512Mbx16_robaco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_512Mbx16_rocoba.json b/configs/addressmapping/am_lpddr4_512Mbx16_rocoba.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_512Mbx16_rocoba.json
rename to configs/addressmapping/am_lpddr4_512Mbx16_rocoba.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr4_8Gbx16_brc.json b/configs/addressmapping/am_lpddr4_8Gbx16_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr4_8Gbx16_brc.json
rename to configs/addressmapping/am_lpddr4_8Gbx16_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_16B_robaco.json b/configs/addressmapping/am_lpddr5_1Gbx16_16B_robaco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_16B_robaco.json
rename to configs/addressmapping/am_lpddr5_1Gbx16_16B_robaco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_16B_rocoba.json b/configs/addressmapping/am_lpddr5_1Gbx16_16B_rocoba.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_16B_rocoba.json
rename to configs/addressmapping/am_lpddr5_1Gbx16_16B_rocoba.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_8B_robaco.json b/configs/addressmapping/am_lpddr5_1Gbx16_8B_robaco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_8B_robaco.json
rename to configs/addressmapping/am_lpddr5_1Gbx16_8B_robaco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_8B_rocoba.json b/configs/addressmapping/am_lpddr5_1Gbx16_8B_rocoba.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_8B_rocoba.json
rename to configs/addressmapping/am_lpddr5_1Gbx16_8B_rocoba.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_BG_robacobg.json b/configs/addressmapping/am_lpddr5_1Gbx16_BG_robacobg.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_BG_robacobg.json
rename to configs/addressmapping/am_lpddr5_1Gbx16_BG_robacobg.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_BG_rocobabg.json b/configs/addressmapping/am_lpddr5_1Gbx16_BG_rocobabg.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_1Gbx16_BG_rocobabg.json
rename to configs/addressmapping/am_lpddr5_1Gbx16_BG_rocobabg.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_16B_robaco.json b/configs/addressmapping/am_lpddr5_512Mbx16_16B_robaco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_16B_robaco.json
rename to configs/addressmapping/am_lpddr5_512Mbx16_16B_robaco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_16B_rocoba.json b/configs/addressmapping/am_lpddr5_512Mbx16_16B_rocoba.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_16B_rocoba.json
rename to configs/addressmapping/am_lpddr5_512Mbx16_16B_rocoba.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_8B_robaco.json b/configs/addressmapping/am_lpddr5_512Mbx16_8B_robaco.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_8B_robaco.json
rename to configs/addressmapping/am_lpddr5_512Mbx16_8B_robaco.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_8B_rocoba.json b/configs/addressmapping/am_lpddr5_512Mbx16_8B_rocoba.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_8B_rocoba.json
rename to configs/addressmapping/am_lpddr5_512Mbx16_8B_rocoba.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_BG_robacobg.json b/configs/addressmapping/am_lpddr5_512Mbx16_BG_robacobg.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_BG_robacobg.json
rename to configs/addressmapping/am_lpddr5_512Mbx16_BG_robacobg.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_BG_rocobabg.json b/configs/addressmapping/am_lpddr5_512Mbx16_BG_rocobabg.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_lpddr5_512Mbx16_BG_rocobabg.json
rename to configs/addressmapping/am_lpddr5_512Mbx16_BG_rocobabg.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ranktest.json b/configs/addressmapping/am_ranktest.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_ranktest.json
rename to configs/addressmapping/am_ranktest.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_stt-mram_8x2Gbx8_dimm_p1KB_rbc.json b/configs/addressmapping/am_stt-mram_8x2Gbx8_dimm_p1KB_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_stt-mram_8x2Gbx8_dimm_p1KB_rbc.json
rename to configs/addressmapping/am_stt-mram_8x2Gbx8_dimm_p1KB_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio2_4x64_4x2Gb_brc.json b/configs/addressmapping/am_wideio2_4x64_4x2Gb_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio2_4x64_4x2Gb_brc.json
rename to configs/addressmapping/am_wideio2_4x64_4x2Gb_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio2_4x64_4x2Gb_rbc.json b/configs/addressmapping/am_wideio2_4x64_4x2Gb_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio2_4x64_4x2Gb_rbc.json
rename to configs/addressmapping/am_wideio2_4x64_4x2Gb_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x1Gb_brc.json b/configs/addressmapping/am_wideio_4x1Gb_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x1Gb_brc.json
rename to configs/addressmapping/am_wideio_4x1Gb_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x1Gb_rbc.json b/configs/addressmapping/am_wideio_4x1Gb_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x1Gb_rbc.json
rename to configs/addressmapping/am_wideio_4x1Gb_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x256Mb_brc.json b/configs/addressmapping/am_wideio_4x256Mb_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x256Mb_brc.json
rename to configs/addressmapping/am_wideio_4x256Mb_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x256Mb_rbc.json b/configs/addressmapping/am_wideio_4x256Mb_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x256Mb_rbc.json
rename to configs/addressmapping/am_wideio_4x256Mb_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x2Gb_brc.json b/configs/addressmapping/am_wideio_4x2Gb_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x2Gb_brc.json
rename to configs/addressmapping/am_wideio_4x2Gb_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x2Gb_rbc.json b/configs/addressmapping/am_wideio_4x2Gb_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x2Gb_rbc.json
rename to configs/addressmapping/am_wideio_4x2Gb_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x4Gb_brc.json b/configs/addressmapping/am_wideio_4x4Gb_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x4Gb_brc.json
rename to configs/addressmapping/am_wideio_4x4Gb_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x4Gb_rbc.json b/configs/addressmapping/am_wideio_4x4Gb_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x4Gb_rbc.json
rename to configs/addressmapping/am_wideio_4x4Gb_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x512Mb_brc.json b/configs/addressmapping/am_wideio_4x512Mb_brc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x512Mb_brc.json
rename to configs/addressmapping/am_wideio_4x512Mb_brc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_4x512Mb_rbc.json b/configs/addressmapping/am_wideio_4x512Mb_rbc.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_4x512Mb_rbc.json
rename to configs/addressmapping/am_wideio_4x512Mb_rbc.json
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_wideio_thermal.json b/configs/addressmapping/am_wideio_thermal.json
similarity index 100%
rename from DRAMSys/library/resources/configs/amconfigs/am_wideio_thermal.json
rename to configs/addressmapping/am_wideio_thermal.json
diff --git a/DRAMSys/library/resources/simulations/ddr3-example.json b/configs/ddr3-example.json
similarity index 73%
rename from DRAMSys/library/resources/simulations/ddr3-example.json
rename to configs/ddr3-example.json
index 6b820354..4a947a58 100644
--- a/DRAMSys/library/resources/simulations/ddr3-example.json
+++ b/configs/ddr3-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3.json",
+        "simconfig": "example.json",
         "simulationid": "ddr3-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 800,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/simulations/ddr3-gem5-se.json b/configs/ddr3-gem5-se.json
similarity index 60%
rename from DRAMSys/library/resources/simulations/ddr3-gem5-se.json
rename to configs/ddr3-gem5-se.json
index 51b870ad..a340dc39 100644
--- a/DRAMSys/library/resources/simulations/ddr3-gem5-se.json
+++ b/configs/ddr3-gem5-se.json
@@ -3,8 +3,7 @@
         "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3_gem5_se.json",
-        "simulationid": "ddr3-gem5-se",
-        "thermalconfig": "config.json"
+        "simconfig": "gem5_se.json",
+        "simulationid": "ddr3-gem5-se"
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/simulations/ddr4-example.json b/configs/ddr4-example.json
similarity index 73%
rename from DRAMSys/library/resources/simulations/ddr4-example.json
rename to configs/ddr4-example.json
index 09fdac1b..645ca907 100644
--- a/DRAMSys/library/resources/simulations/ddr4-example.json
+++ b/configs/ddr4-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_ddr4_8x4Gbx8_dimm_p1KB_brc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "JEDEC_4Gb_DDR4-1866_8bit_A.json",
-        "simconfig": "ddr4.json",
+        "simconfig": "example.json",
         "simulationid": "ddr4-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/simulations/ddr5-example.json b/configs/ddr5-example.json
similarity index 73%
rename from DRAMSys/library/resources/simulations/ddr5-example.json
rename to configs/ddr5-example.json
index e85d1b92..d66dae74 100644
--- a/DRAMSys/library/resources/simulations/ddr5-example.json
+++ b/configs/ddr5-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "JEDEC_2x8x2Gbx4_DDR5-3200A.json",
-        "simconfig": "ddr5.json",
+        "simconfig": "example.json",
         "simulationid": "ddr5-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 2000,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/simulations/ddr5-generator-example.json b/configs/ddr5-generator-example.json
similarity index 93%
rename from DRAMSys/library/resources/simulations/ddr5-generator-example.json
rename to configs/ddr5-generator-example.json
index 1835e48b..d3a74944 100644
--- a/DRAMSys/library/resources/simulations/ddr5-generator-example.json
+++ b/configs/ddr5-generator-example.json
@@ -3,9 +3,8 @@
         "addressmapping": "am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "JEDEC_2x8x2Gbx4_DDR5-3200A.json",
-        "simconfig": "ddr5.json",
+        "simconfig": "example.json",
         "simulationid": "ddr5-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 2000,
diff --git a/DRAMSys/library/resources/simulations/ddr5-rfm.json b/configs/ddr5-rfm.json
similarity index 91%
rename from DRAMSys/library/resources/simulations/ddr5-rfm.json
rename to configs/ddr5-rfm.json
index eee91152..c8bb8160 100644
--- a/DRAMSys/library/resources/simulations/ddr5-rfm.json
+++ b/configs/ddr5-rfm.json
@@ -3,9 +3,8 @@
         "addressmapping": "am_ddr5_2x2x8x4Gbx4_dimm_p1KB_rbc.json",
         "mcconfig": "fr_fcfs_rfm.json",
         "memspec": "JEDEC_2x2x8x4Gbx4_DDR5-3200A.json",
-        "simconfig": "ddr5.json",
+        "simconfig": "example.json",
         "simulationid": "ddr5-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 2000,
diff --git a/DRAMSys/gem5/gem5_etrace/config.ini b/configs/gem5/gem5_etrace/config.ini
similarity index 100%
rename from DRAMSys/gem5/gem5_etrace/config.ini
rename to configs/gem5/gem5_etrace/config.ini
diff --git a/configs/gem5/gem5_etrace/system.cpu.traceListener.data.gz b/configs/gem5/gem5_etrace/system.cpu.traceListener.data.gz
new file mode 100644
index 00000000..d0c9160e
--- /dev/null
+++ b/configs/gem5/gem5_etrace/system.cpu.traceListener.data.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea692bb0f6a9e7b7c9ce17d031ef24e8aa28c41e9b365eca703af546f4d94192
+size 6417136
diff --git a/configs/gem5/gem5_etrace/system.cpu.traceListener.inst.gz b/configs/gem5/gem5_etrace/system.cpu.traceListener.inst.gz
new file mode 100644
index 00000000..9651753b
--- /dev/null
+++ b/configs/gem5/gem5_etrace/system.cpu.traceListener.inst.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:095bc05bd624fecc75629e0b155fbf4632bf697c470440d8b003e7e0f0aa788c
+size 704043
diff --git a/DRAMSys/gem5/gem5_se/hello-ARM/config.ini b/configs/gem5/gem5_se/hello-ARM/config.ini
similarity index 100%
rename from DRAMSys/gem5/gem5_se/hello-ARM/config.ini
rename to configs/gem5/gem5_se/hello-ARM/config.ini
diff --git a/DRAMSys/gem5/gem5_se/hello-ARM/hello b/configs/gem5/gem5_se/hello-ARM/hello
similarity index 100%
rename from DRAMSys/gem5/gem5_se/hello-ARM/hello
rename to configs/gem5/gem5_se/hello-ARM/hello
diff --git a/DRAMSys/gem5/gem5_se/hello-X86/config.ini b/configs/gem5/gem5_se/hello-X86/config.ini
similarity index 100%
rename from DRAMSys/gem5/gem5_se/hello-X86/config.ini
rename to configs/gem5/gem5_se/hello-X86/config.ini
diff --git a/DRAMSys/gem5/gem5_se/hello-X86/hello b/configs/gem5/gem5_se/hello-X86/hello
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/gem5/gem5_se/hello-X86/hello
rename to configs/gem5/gem5_se/hello-X86/hello
diff --git a/DRAMSys/library/resources/simulations/hbm2-example.json b/configs/hbm2-example.json
similarity index 70%
rename from DRAMSys/library/resources/simulations/hbm2-example.json
rename to configs/hbm2-example.json
index 22eed0df..7b48bc60 100644
--- a/DRAMSys/library/resources/simulations/hbm2-example.json
+++ b/configs/hbm2-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_hbm2_8Gb_pc_brc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "HBM2.json",
-        "simconfig": "hbm2.json",
+        "simconfig": "example.json",
         "simulationid": "hbm2-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/simulations/hbm3-example.json b/configs/hbm3-example.json
similarity index 70%
rename from DRAMSys/library/resources/simulations/hbm3-example.json
rename to configs/hbm3-example.json
index 6f64aa04..4d3505b8 100644
--- a/DRAMSys/library/resources/simulations/hbm3-example.json
+++ b/configs/hbm3-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_hbm3_8Gb_pc_brc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "HBM3.json",
-        "simconfig": "hbm3.json",
+        "simconfig": "example.json",
         "simulationid": "hbm3-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/simulations/lpddr4-example.json b/configs/lpddr4-example.json
similarity index 72%
rename from DRAMSys/library/resources/simulations/lpddr4-example.json
rename to configs/lpddr4-example.json
index 0054b777..39ba60fd 100644
--- a/DRAMSys/library/resources/simulations/lpddr4-example.json
+++ b/configs/lpddr4-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_lpddr4_8Gbx16_brc.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "JEDEC_8Gb_LPDDR4-3200_16bit.json",
-        "simconfig": "lpddr4.json",
+        "simconfig": "example.json",
         "simulationid": "lpddr4-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/simulations/lpddr5-example.json b/configs/lpddr5-example.json
similarity index 81%
rename from DRAMSys/library/resources/simulations/lpddr5-example.json
rename to configs/lpddr5-example.json
index 0c250ae0..26179bec 100644
--- a/DRAMSys/library/resources/simulations/lpddr5-example.json
+++ b/configs/lpddr5-example.json
@@ -5,11 +5,10 @@
         "memspec": "JEDEC_1Gbx16_BG_LPDDR5-6400.json",
         "simconfig": "example.json",
         "simulationid": "lpddr5-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fifo.json b/configs/mcconfig/fifo.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fifo.json
rename to configs/mcconfig/fifo.json
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json b/configs/mcconfig/fifoStrict.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fifoStrict.json
rename to configs/mcconfig/fifoStrict.json
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json b/configs/mcconfig/fr_fcfs.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fr_fcfs.json
rename to configs/mcconfig/fr_fcfs.json
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json b/configs/mcconfig/fr_fcfs_grp.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_grp.json
rename to configs/mcconfig/fr_fcfs_grp.json
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_noref.json b/configs/mcconfig/fr_fcfs_noref.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_noref.json
rename to configs/mcconfig/fr_fcfs_noref.json
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_refp2b.json b/configs/mcconfig/fr_fcfs_refp2b.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_refp2b.json
rename to configs/mcconfig/fr_fcfs_refp2b.json
diff --git a/DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_rfm.json b/configs/mcconfig/fr_fcfs_rfm.json
similarity index 100%
rename from DRAMSys/library/resources/configs/mcconfigs/fr_fcfs_rfm.json
rename to configs/mcconfig/fr_fcfs_rfm.json
diff --git a/DRAMSys/library/resources/configs/memspecs/HBM2.json b/configs/memspec/HBM2.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/HBM2.json
rename to configs/memspec/HBM2.json
diff --git a/DRAMSys/library/resources/configs/memspecs/HBM3.json b/configs/memspec/HBM3.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/HBM3.json
rename to configs/memspec/HBM3.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-0533.json b/configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-0533.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-0533.json
rename to configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-0533.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-1067.json b/configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-1067.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-1067.json
rename to configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-1067.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-1600.json b/configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-1600.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-1600.json
rename to configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-1600.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-2133.json b/configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-2133.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-2133.json
rename to configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-2133.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-2750.json b/configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-2750.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-2750.json
rename to configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-2750.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-3200.json b/configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-3200.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_16B_LPDDR5-3200.json
rename to configs/memspec/JEDEC_1Gbx16_16B_LPDDR5-3200.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-0533.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-0533.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-0533.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-0533.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-1067.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-1067.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-1067.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-1067.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-1600.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-1600.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-1600.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-1600.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-2133.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-2133.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-2133.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-2133.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-2750.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-2750.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-2750.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-2750.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-3200.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-3200.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-3200.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-3200.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-3733.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-3733.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-3733.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-3733.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-4267.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-4267.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-4267.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-4267.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-4800.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-4800.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-4800.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-4800.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-5500.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-5500.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-5500.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-5500.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-6000.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-6000.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-6000.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-6000.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-6400.json b/configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-6400.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_8B_LPDDR5-6400.json
rename to configs/memspec/JEDEC_1Gbx16_8B_LPDDR5-6400.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-3733.json b/configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-3733.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-3733.json
rename to configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-3733.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-4267.json b/configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-4267.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-4267.json
rename to configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-4267.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-4800.json b/configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-4800.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-4800.json
rename to configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-4800.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-5500.json b/configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-5500.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-5500.json
rename to configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-5500.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-6000.json b/configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-6000.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-6000.json
rename to configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-6000.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-6400.json b/configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-6400.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_BG_LPDDR5-6400.json
rename to configs/memspec/JEDEC_1Gbx16_BG_LPDDR5-6400.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-0533.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-0533.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-0533.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-0533.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-1066.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-1066.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-1066.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-1066.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-1600.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-1600.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-1600.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-1600.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-2133.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-2133.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-2133.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-2133.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-2666.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-2666.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-2666.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-2666.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-3200.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-3200.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-3200.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-3200.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-3733.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-3733.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-3733.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-3733.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-4266.json b/configs/memspec/JEDEC_1Gbx16_LPDDR4-4266.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_1Gbx16_LPDDR4-4266.json
rename to configs/memspec/JEDEC_1Gbx16_LPDDR4-4266.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO-200_128bit.json b/configs/memspec/JEDEC_256Mb_WIDEIO-200_128bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO-200_128bit.json
rename to configs/memspec/JEDEC_256Mb_WIDEIO-200_128bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO-266_128bit.json b/configs/memspec/JEDEC_256Mb_WIDEIO-266_128bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_256Mb_WIDEIO-266_128bit.json
rename to configs/memspec/JEDEC_256Mb_WIDEIO-266_128bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json b/configs/memspec/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json
rename to configs/memspec/JEDEC_2x2x8x4Gbx4_DDR5-3200A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-3200A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3200A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-3200A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3200A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-3600A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3600A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-3600A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-3600A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-4000A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4000A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-4000A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4000A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-4400A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4400A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-4400A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4400A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-4800A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4800A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-4800A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-4800A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-5200A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5200A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-5200A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5200A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-5600A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5600A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-5600A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-5600A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-6000A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6000A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-6000A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6000A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-6400A.json b/configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6400A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x4x1Gbx8_DDR5-6400A.json
rename to configs/memspec/JEDEC_2x4x1Gbx8_DDR5-6400A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-3200A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-3200A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3200A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-3600A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3600A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-3600A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-3600A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-4000A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4000A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-4000A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4000A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-4400A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4400A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-4400A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4400A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-4800A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4800A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-4800A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-4800A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-5200A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5200A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-5200A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5200A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-5600A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5600A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-5600A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-5600A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-6000A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6000A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-6000A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6000A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-6400A.json b/configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6400A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x2Gbx4_DDR5-6400A.json
rename to configs/memspec/JEDEC_2x8x2Gbx4_DDR5-6400A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json b/configs/memspec/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json
rename to configs/memspec/JEDEC_2x8x8x2Gbx4_DDR5-3200A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_4Gb_DDR4-1866_8bit_A.json b/configs/memspec/JEDEC_4Gb_DDR4-1866_8bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_4Gb_DDR4-1866_8bit_A.json
rename to configs/memspec/JEDEC_4Gb_DDR4-1866_8bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_4Gb_DDR4-2400_8bit_A.json b/configs/memspec/JEDEC_4Gb_DDR4-2400_8bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_4Gb_DDR4-2400_8bit_A.json
rename to configs/memspec/JEDEC_4Gb_DDR4-2400_8bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_4x64_2Gb_WIDEIO2-400_64bit.json b/configs/memspec/JEDEC_4x64_2Gb_WIDEIO2-400_64bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_4x64_2Gb_WIDEIO2-400_64bit.json
rename to configs/memspec/JEDEC_4x64_2Gb_WIDEIO2-400_64bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_4x64_2Gb_WIDEIO2-533_64bit.json b/configs/memspec/JEDEC_4x64_2Gb_WIDEIO2-533_64bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_4x64_2Gb_WIDEIO2-533_64bit.json
rename to configs/memspec/JEDEC_4x64_2Gb_WIDEIO2-533_64bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-0533.json b/configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-0533.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-0533.json
rename to configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-0533.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-1067.json b/configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-1067.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-1067.json
rename to configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-1067.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-1600.json b/configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-1600.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-1600.json
rename to configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-1600.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-2133.json b/configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-2133.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-2133.json
rename to configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-2133.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-2750.json b/configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-2750.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-2750.json
rename to configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-2750.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-3200.json b/configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-3200.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_16B_LPDDR5-3200.json
rename to configs/memspec/JEDEC_512Mbx16_16B_LPDDR5-3200.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-0533.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-0533.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-0533.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-0533.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-1067.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-1067.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-1067.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-1067.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-1600.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-1600.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-1600.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-1600.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-2133.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-2133.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-2133.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-2133.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-2750.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-2750.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-2750.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-2750.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-3200.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-3200.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-3200.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-3200.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-3733.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-3733.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-3733.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-3733.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-4267.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-4267.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-4267.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-4267.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-4800.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-4800.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-4800.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-4800.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-5500.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-5500.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-5500.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-5500.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-6000.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-6000.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-6000.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-6000.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-6400.json b/configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-6400.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_8B_LPDDR5-6400.json
rename to configs/memspec/JEDEC_512Mbx16_8B_LPDDR5-6400.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-3733.json b/configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-3733.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-3733.json
rename to configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-3733.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-4267.json b/configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-4267.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-4267.json
rename to configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-4267.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-4800.json b/configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-4800.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-4800.json
rename to configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-4800.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-5500.json b/configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-5500.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-5500.json
rename to configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-5500.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-6000.json b/configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-6000.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-6000.json
rename to configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-6000.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-6400.json b/configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-6400.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_BG_LPDDR5-6400.json
rename to configs/memspec/JEDEC_512Mbx16_BG_LPDDR5-6400.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-0533.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-0533.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-0533.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-0533.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-1066.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-1066.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-1066.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-1066.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-1600.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-1600.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-1600.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-1600.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-2133.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-2133.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-2133.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-2133.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-2666.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-2666.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-2666.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-2666.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-3200.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-3200.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-3200.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-3200.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-3733.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-3733.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-3733.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-3733.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-4266.json b/configs/memspec/JEDEC_512Mbx16_LPDDR4-4266.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_512Mbx16_LPDDR4-4266.json
rename to configs/memspec/JEDEC_512Mbx16_LPDDR4-4266.json
diff --git a/DRAMSys/library/resources/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json b/configs/memspec/JEDEC_8Gb_LPDDR4-3200_16bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json
rename to configs/memspec/JEDEC_8Gb_LPDDR4-3200_16bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.json b/configs/memspec/MICRON_1Gb_DDR2-1066_16bit_H.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.json
rename to configs/memspec/MICRON_1Gb_DDR2-1066_16bit_H.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.json b/configs/memspec/MICRON_1Gb_DDR2-800_16bit_H.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR2-800_16bit_H.json
rename to configs/memspec/MICRON_1Gb_DDR2-800_16bit_H.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.json b/configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.json b/configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G_2s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G_2s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.json b/configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G_3s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G_3s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.json b/configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G_mu.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_16bit_G_mu.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.json b/configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.json b/configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G_2s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G_2s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.json b/configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G_3s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G_3s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.json b/configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G_mu.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.json
rename to configs/memspec/MICRON_1Gb_DDR3-1066_8bit_G_mu.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.json b/configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.json
rename to configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.json b/configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_2s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.json
rename to configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_2s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.json b/configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_3s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.json
rename to configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_3s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.json b/configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.json
rename to configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.json b/configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_mu.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.json
rename to configs/memspec/MICRON_1Gb_DDR3-1600_8bit_G_mu.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-800_8bit_G.json b/configs/memspec/MICRON_1Gb_DDR3-800_8bit_G.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_1Gb_DDR3-800_8bit_G.json
rename to configs/memspec/MICRON_1Gb_DDR3-800_8bit_G.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json b/configs/memspec/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json
rename to configs/memspec/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.json b/configs/memspec/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.json
rename to configs/memspec/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.json b/configs/memspec/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.json
rename to configs/memspec/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.json b/configs/memspec/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.json
rename to configs/memspec/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.json b/configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.json
rename to configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.json b/configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D_2s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.json
rename to configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D_2s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.json b/configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D_3s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.json
rename to configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D_3s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.json b/configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D_mu.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.json
rename to configs/memspec/MICRON_2Gb_DDR3-1066_8bit_D_mu.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.json b/configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.json
rename to configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.json b/configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D_2s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.json
rename to configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D_2s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.json b/configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D_3s.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.json
rename to configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D_3s.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.json b/configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D_mu.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.json
rename to configs/memspec/MICRON_2Gb_DDR3-1600_16bit_D_mu.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.json b/configs/memspec/MICRON_2Gb_LPDDR-266_16bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.json
rename to configs/memspec/MICRON_2Gb_LPDDR-266_16bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.json b/configs/memspec/MICRON_2Gb_LPDDR-333_16bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.json
rename to configs/memspec/MICRON_2Gb_LPDDR-333_16bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.json b/configs/memspec/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.json
rename to configs/memspec/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.json b/configs/memspec/MICRON_2Gb_LPDDR2-800-S4_16bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.json
rename to configs/memspec/MICRON_2Gb_LPDDR2-800-S4_16bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json b/configs/memspec/MICRON_4Gb_DDR4-1866_8bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json
rename to configs/memspec/MICRON_4Gb_DDR4-1866_8bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.json b/configs/memspec/MICRON_4Gb_DDR4-2400_8bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.json
rename to configs/memspec/MICRON_4Gb_DDR4-2400_8bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.json b/configs/memspec/MICRON_4Gb_LPDDR3-1333_32bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.json
rename to configs/memspec/MICRON_4Gb_LPDDR3-1333_32bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.json b/configs/memspec/MICRON_4Gb_LPDDR3-1600_32bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.json
rename to configs/memspec/MICRON_4Gb_LPDDR3-1600_32bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/MICRON_6Gb_LPDDR4-3200_32bit_A.json b/configs/memspec/MICRON_6Gb_LPDDR4-3200_32bit_A.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/MICRON_6Gb_LPDDR4-3200_32bit_A.json
rename to configs/memspec/MICRON_6Gb_LPDDR4-3200_32bit_A.json
diff --git a/DRAMSys/library/resources/configs/memspecs/README.md b/configs/memspec/README.md
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/README.md
rename to configs/memspec/README.md
diff --git a/DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.json b/configs/memspec/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.json
rename to configs/memspec/SAMSUNG_K4B1G1646E_1Gb_DDR3-1600_16bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.json b/configs/memspec/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.json
rename to configs/memspec/SAMSUNG_K4B4G1646Q_4Gb_DDR3-1066_16bit.json
diff --git a/DRAMSys/library/resources/configs/memspecs/STT-MRAM-1.2x.json b/configs/memspec/STT-MRAM-1.2x.json
similarity index 96%
rename from DRAMSys/library/resources/configs/memspecs/STT-MRAM-1.2x.json
rename to configs/memspec/STT-MRAM-1.2x.json
index 0d13d8be..e4d537a6 100644
--- a/DRAMSys/library/resources/configs/memspecs/STT-MRAM-1.2x.json
+++ b/configs/memspec/STT-MRAM-1.2x.json
@@ -1,44 +1,44 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 8,
-            "dataRate": 2,
-            "nbrOfBanks": 8,
-            "nbrOfColumns": 1024,
-            "nbrOfRanks": 1, 
-            "nbrOfRows": 32768,
-            "width": 8,
-            "nbrOfDevices": 8,
-            "nbrOfChannels": 1
-        },
-        "memoryId": "STT-MRAM-1.2x",
-        "memoryType": "STT-MRAM",
-        "memtimingspec": {
-            "AL": 0,
-            "CCD": 4,
-            "CKE": 4,
-            "CKESR": 7,
-            "CL": 11,
-            "DQSCK": 0, 
-            "FAW": 29,
-            "RAS": 20,
-            "RC": 34,
-            "RCD": 14, 
-            "RL": 11, 
-            "RP": 14, 
-            "RRD": 6,
-            "RTP": 6, 
-            "WL": 11, 
-            "WR": 12, 
-            "WTR": 2,
-            "XP": 5,
-            "XPDLL": 325, 
-            "XS": 324, 
-            "XSDLL": 512, 
-            "ACTPDEN": 2, 
-            "PRPDEN": 2, 
-            "RTRS": 1,
-            "clkMhz": 800
-        }
-    }
+{
+    "memspec": {
+        "memarchitecturespec": {
+            "burstLength": 8,
+            "dataRate": 2,
+            "nbrOfBanks": 8,
+            "nbrOfColumns": 1024,
+            "nbrOfRanks": 1, 
+            "nbrOfRows": 32768,
+            "width": 8,
+            "nbrOfDevices": 8,
+            "nbrOfChannels": 1
+        },
+        "memoryId": "STT-MRAM-1.2x",
+        "memoryType": "STT-MRAM",
+        "memtimingspec": {
+            "AL": 0,
+            "CCD": 4,
+            "CKE": 4,
+            "CKESR": 7,
+            "CL": 11,
+            "DQSCK": 0, 
+            "FAW": 29,
+            "RAS": 20,
+            "RC": 34,
+            "RCD": 14, 
+            "RL": 11, 
+            "RP": 14, 
+            "RRD": 6,
+            "RTP": 6, 
+            "WL": 11, 
+            "WR": 12, 
+            "WTR": 2,
+            "XP": 5,
+            "XPDLL": 325, 
+            "XS": 324, 
+            "XSDLL": 512, 
+            "ACTPDEN": 2, 
+            "PRPDEN": 2, 
+            "RTRS": 1,
+            "clkMhz": 800
+        }
+    }
 }
\ No newline at end of file
diff --git a/DRAMSys/library/resources/configs/memspecs/STT-MRAM-1.5x.json b/configs/memspec/STT-MRAM-1.5x.json
similarity index 96%
rename from DRAMSys/library/resources/configs/memspecs/STT-MRAM-1.5x.json
rename to configs/memspec/STT-MRAM-1.5x.json
index 09a29967..71cefb79 100644
--- a/DRAMSys/library/resources/configs/memspecs/STT-MRAM-1.5x.json
+++ b/configs/memspec/STT-MRAM-1.5x.json
@@ -1,44 +1,44 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 8,
-            "dataRate": 2,
-            "nbrOfBanks": 8,
-            "nbrOfColumns": 1024,
-            "nbrOfRanks": 1,
-            "nbrOfRows": 32768,
-            "width": 8,
-            "nbrOfDevices": 8,
-            "nbrOfChannels": 1
-        },
-        "memoryId": "STT-MRAM-1.5x",
-        "memoryType": "STT-MRAM",
-        "memtimingspec": {
-            "AL": 0,
-            "CCD": 4,
-            "CKE": 4,
-            "CKESR": 7, 
-            "CL": 11,
-            "DQSCK": 0, 
-            "FAW": 36,
-            "RAS": 23,
-            "RC": 40,
-            "RCD": 14, 
-            "RL": 11,
-            "RP": 17, 
-            "RRD": 8,
-            "RTP": 6, 
-            "WL": 11, 
-            "WR": 12, 
-            "WTR": 6,
-            "XP": 5,
-            "XPDLL": 325, 
-            "XS": 324,
-            "XSDLL": 512, 
-            "ACTPDEN": 2, 
-            "PRPDEN": 2, 
-            "RTRS": 1,
-            "clkMhz": 800
-        }
-    }
+{
+    "memspec": {
+        "memarchitecturespec": {
+            "burstLength": 8,
+            "dataRate": 2,
+            "nbrOfBanks": 8,
+            "nbrOfColumns": 1024,
+            "nbrOfRanks": 1,
+            "nbrOfRows": 32768,
+            "width": 8,
+            "nbrOfDevices": 8,
+            "nbrOfChannels": 1
+        },
+        "memoryId": "STT-MRAM-1.5x",
+        "memoryType": "STT-MRAM",
+        "memtimingspec": {
+            "AL": 0,
+            "CCD": 4,
+            "CKE": 4,
+            "CKESR": 7, 
+            "CL": 11,
+            "DQSCK": 0, 
+            "FAW": 36,
+            "RAS": 23,
+            "RC": 40,
+            "RCD": 14, 
+            "RL": 11,
+            "RP": 17, 
+            "RRD": 8,
+            "RTP": 6, 
+            "WL": 11, 
+            "WR": 12, 
+            "WTR": 6,
+            "XP": 5,
+            "XPDLL": 325, 
+            "XS": 324,
+            "XSDLL": 512, 
+            "ACTPDEN": 2, 
+            "PRPDEN": 2, 
+            "RTRS": 1,
+            "clkMhz": 800
+        }
+    }
 }
\ No newline at end of file
diff --git a/DRAMSys/library/resources/configs/memspecs/STT-MRAM-2.0x.json b/configs/memspec/STT-MRAM-2.0x.json
similarity index 96%
rename from DRAMSys/library/resources/configs/memspecs/STT-MRAM-2.0x.json
rename to configs/memspec/STT-MRAM-2.0x.json
index dd1fb2cc..56691163 100644
--- a/DRAMSys/library/resources/configs/memspecs/STT-MRAM-2.0x.json
+++ b/configs/memspec/STT-MRAM-2.0x.json
@@ -1,44 +1,44 @@
-{
-    "memspec": {
-        "memarchitecturespec": {
-            "burstLength": 8,
-            "dataRate": 2,
-            "nbrOfBanks": 8,
-            "nbrOfColumns": 1024,
-            "nbrOfRanks": 1,
-            "nbrOfRows": 32768,
-            "width": 8,
-            "nbrOfDevices": 8,
-            "nbrOfChannels": 1
-        },
-        "memoryId": "STT-MRAM-2.0x",
-        "memoryType": "STT-MRAM",
-        "memtimingspec": {
-            "AL": 0,
-            "CCD": 4,
-            "CKE": 4,
-            "CKESR": 7, 
-            "CL": 11,
-            "DQSCK": 0, 
-            "FAW": 36,
-            "RAS": 28,
-            "RC": 50,
-            "RCD": 14, 
-            "RL": 11,
-            "RP": 22, 
-            "RRD": 10,
-            "RTP": 6, 
-            "WL": 11, 
-            "WR": 48, 
-            "WTR": 6,
-            "XP": 5,
-            "XPDLL": 325, 
-            "XS": 324, 
-            "XSDLL": 512, 
-            "ACTPDEN": 2, 
-            "PRPDEN": 2,
-            "RTRS": 1,
-            "clkMhz": 800
-        }
-    }
+{
+    "memspec": {
+        "memarchitecturespec": {
+            "burstLength": 8,
+            "dataRate": 2,
+            "nbrOfBanks": 8,
+            "nbrOfColumns": 1024,
+            "nbrOfRanks": 1,
+            "nbrOfRows": 32768,
+            "width": 8,
+            "nbrOfDevices": 8,
+            "nbrOfChannels": 1
+        },
+        "memoryId": "STT-MRAM-2.0x",
+        "memoryType": "STT-MRAM",
+        "memtimingspec": {
+            "AL": 0,
+            "CCD": 4,
+            "CKE": 4,
+            "CKESR": 7, 
+            "CL": 11,
+            "DQSCK": 0, 
+            "FAW": 36,
+            "RAS": 28,
+            "RC": 50,
+            "RCD": 14, 
+            "RL": 11,
+            "RP": 22, 
+            "RRD": 10,
+            "RTP": 6, 
+            "WL": 11, 
+            "WR": 48, 
+            "WTR": 6,
+            "XP": 5,
+            "XPDLL": 325, 
+            "XS": 324, 
+            "XSDLL": 512, 
+            "ACTPDEN": 2, 
+            "PRPDEN": 2,
+            "RTRS": 1,
+            "clkMhz": 800
+        }
+    }
 }
\ No newline at end of file
diff --git a/DRAMSys/library/resources/configs/memspecs/memspec_ranktest.json b/configs/memspec/memspec_ranktest.json
similarity index 100%
rename from DRAMSys/library/resources/configs/memspecs/memspec_ranktest.json
rename to configs/memspec/memspec_ranktest.json
diff --git a/DRAMSys/library/resources/simulations/ranktest.json b/configs/ranktest.json
similarity index 81%
rename from DRAMSys/library/resources/simulations/ranktest.json
rename to configs/ranktest.json
index 47f6b1c4..fbd2c08c 100644
--- a/DRAMSys/library/resources/simulations/ranktest.json
+++ b/configs/ranktest.json
@@ -3,9 +3,8 @@
         "addressmapping": "am_ranktest.json",
         "mcconfig": "fr_fcfs.json",
         "memspec": "memspec_ranktest.json",
-        "simconfig": "ddr3.json",
+        "simconfig": "example.json",
         "simulationid": "ranktest",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
diff --git a/DRAMSys/library/resources/configs/simulator/example.json b/configs/simconfig/example.json
similarity index 74%
rename from DRAMSys/library/resources/configs/simulator/example.json
rename to configs/simconfig/example.json
index b57e9d14..6b65d7d0 100644
--- a/DRAMSys/library/resources/configs/simulator/example.json
+++ b/configs/simconfig/example.json
@@ -4,15 +4,11 @@
         "CheckTLM2Protocol": false,
         "DatabaseRecording": true,
         "Debug": false,
-        "ECCControllerMode": "Disabled",
         "EnableWindowing": false,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
         "PowerAnalysis": false,
         "SimulationName": "example",
         "SimulationProgressBar": true,
         "StoreMode": "NoStorage",
-        "ThermalSimulation": false,
         "UseMalloc": false,
         "WindowSize": 1000
     }
diff --git a/DRAMSys/library/resources/configs/simulator/ddr3_gem5_se.json b/configs/simconfig/gem5_se.json
similarity index 66%
rename from DRAMSys/library/resources/configs/simulator/ddr3_gem5_se.json
rename to configs/simconfig/gem5_se.json
index c0b12f97..36f846ee 100644
--- a/DRAMSys/library/resources/configs/simulator/ddr3_gem5_se.json
+++ b/configs/simconfig/gem5_se.json
@@ -4,15 +4,11 @@
         "CheckTLM2Protocol": false,
         "DatabaseRecording": true,
         "Debug": false,
-        "ECCControllerMode": "Disabled",
         "EnableWindowing": true,
-        "ErrorCSVFile": "",
-        "ErrorChipSeed": 42,
         "PowerAnalysis": true,
-        "SimulationName": "ddr3",
+        "SimulationName": "gem5_se",
         "SimulationProgressBar": true,
         "StoreMode": "Store",
-        "ThermalSimulation": false,
         "UseMalloc": false,
         "WindowSize": 1000
     }
diff --git a/DRAMSys/library/resources/simulations/stt-mram-example.json b/configs/stt-mram-example.json
similarity index 72%
rename from DRAMSys/library/resources/simulations/stt-mram-example.json
rename to configs/stt-mram-example.json
index fd9e3fce..83403d0c 100644
--- a/DRAMSys/library/resources/simulations/stt-mram-example.json
+++ b/configs/stt-mram-example.json
@@ -3,13 +3,12 @@
         "addressmapping": "am_stt-mram_8x2Gbx8_dimm_p1KB_rbc.json",
         "mcconfig": "fr_fcfs_noref.json",
         "memspec": "STT-MRAM-1.2x.json",
-        "simconfig": "stt-mram.json",
+        "simconfig": "example.json",
         "simulationid": "stt-mram-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 800,
-                "name": "ddr3_example.stl"
+                "name": "example.stl"
             }
         ]
     }
diff --git a/configs/traces/example.stl b/configs/traces/example.stl
new file mode 100644
index 00000000..bd538719
--- /dev/null
+++ b/configs/traces/example.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c4a6442736df0c17ecb8676e55f2dc8638d151a43c502ee4b85d51b6dd028fd
+size 36204
diff --git a/configs/traces/pct.stl b/configs/traces/pct.stl
new file mode 100644
index 00000000..0829ea1b
--- /dev/null
+++ b/configs/traces/pct.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c1762dfe1890441b65c7e7e3aa08288ec952c5e91fff075f73b62c500c28043
+size 15280
diff --git a/configs/traces/ranktest.stl b/configs/traces/ranktest.stl
new file mode 100644
index 00000000..537c9877
--- /dev/null
+++ b/configs/traces/ranktest.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:135b1bdfc37d384bd26b09cf1f381737b91a9b43179eba1fc15337122681d96f
+size 754
diff --git a/DRAMSys/library/resources/simulations/wideio-thermal.json b/configs/wideio-thermal.json
similarity index 90%
rename from DRAMSys/library/resources/simulations/wideio-thermal.json
rename to configs/wideio-thermal.json
index 1e9a1c0b..d0f488fa 100644
--- a/DRAMSys/library/resources/simulations/wideio-thermal.json
+++ b/configs/wideio-thermal.json
@@ -5,7 +5,6 @@
         "memspec": "JEDEC_256Mb_WIDEIO-200_128bit.json",
         "simconfig": "wideio_thermal.json",
         "simulationid": "wideio-example",
-        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/docs/images/dramsys_logo.png b/docs/images/dramsys_logo.png
new file mode 100644
index 00000000..856cbde2
--- /dev/null
+++ b/docs/images/dramsys_logo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74230fea7a27704772d6c519cd87a6d7f030406fdc6b0fa2a1b3ef06fddcd7b2
+size 48614
diff --git a/docs/images/dramsys_uml.png b/docs/images/dramsys_uml.png
new file mode 100644
index 00000000..554a10c7
--- /dev/null
+++ b/docs/images/dramsys_uml.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:376d0ae8425c75d974e2bfce79448bfb346d9592879e909e8a75e6eb542bf4a9
+size 237217
diff --git a/docs/images/traceanalyzer.png b/docs/images/traceanalyzer.png
new file mode 100644
index 00000000..2e1affe4
--- /dev/null
+++ b/docs/images/traceanalyzer.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76588299b4a04c4c76ffde81994985f73c4f2b38f02d91a12e61bab8a5acb3bf
+size 1686917
diff --git a/extensions/apps/CMakeLists.txt b/extensions/apps/CMakeLists.txt
new file mode 100644
index 00000000..54dd7659
--- /dev/null
+++ b/extensions/apps/CMakeLists.txt
@@ -0,0 +1,17 @@
+##############################################
+##############################################
+###                                        ###
+###       DRAMSys Extensions - Apps        ###
+###                                        ###
+##############################################
+##############################################
+
+##############################################
+###             TraceAnalyzer              ###
+##############################################
+
+option(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE "Enable DRAMSys Trace Analyzer" OFF)
+if(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE)
+	message(STATUS " * Trace Analyzer")
+	add_subdirectory(traceAnalyzer)
+endif()
\ No newline at end of file
diff --git a/DRAMSys/traceAnalyzer/.clang-format b/extensions/apps/traceAnalyzer/.clang-format
similarity index 100%
rename from DRAMSys/traceAnalyzer/.clang-format
rename to extensions/apps/traceAnalyzer/.clang-format
diff --git a/DRAMSys/traceAnalyzer/.directory b/extensions/apps/traceAnalyzer/.directory
similarity index 100%
rename from DRAMSys/traceAnalyzer/.directory
rename to extensions/apps/traceAnalyzer/.directory
diff --git a/extensions/apps/traceAnalyzer/CMakeLists.txt b/extensions/apps/traceAnalyzer/CMakeLists.txt
new file mode 100644
index 00000000..2576b624
--- /dev/null
+++ b/extensions/apps/traceAnalyzer/CMakeLists.txt
@@ -0,0 +1,90 @@
+# Copyright (c) 2020, Technische Universität Kaiserslautern
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. 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.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# 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.
+#
+# Authors: 
+#    Matthias Jung
+#    Lukas Steiner
+#    Derek Christ
+#    Iron Prando da Silva
+
+########################################
+###           TraceAnalyzer          ###
+########################################
+
+project(TraceAnalyzer)
+
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+
+# Add Python3 Dependency:
+find_package(Python3 COMPONENTS Development)
+
+# Add QWT Dependency:
+find_library(QWT_LIBRARY NAMES "qwt" "qwt-qt5" PATHS
+    "$ENV{QWT_HOME}/lib"
+    "/opt/homebrew/opt/qwt-qt5/lib"
+)
+find_path(QWT_INCLUDE_DIRS NAMES "qwt_plot.h" PATHS
+    "$ENV{QWT_HOME}/include"
+    "/usr/include/qwt-qt5"
+    "/usr/include/qwt"
+    "/opt/homebrew/opt/qwt-qt5/include"
+    "/opt/homebrew/opt/qwt-qt5/lib/qwt.framework/Headers"
+)
+
+# Add QT Library:
+if (APPLE)
+    set(Qt5_DIR "/opt/homebrew/opt/qt@5/lib/cmake/Qt5")
+endif(APPLE)
+find_package(Qt5 COMPONENTS Core Gui Widgets Sql REQUIRED)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+add_executable(TraceAnalyzer ${SOURCE_FILES} ${HEADER_FILES})
+
+target_include_directories(TraceAnalyzer
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+    PRIVATE ${QWT_INCLUDE_DIRS}
+    PRIVATE ${Python3_INCLUDE_DIRS}
+)
+
+target_link_libraries(TraceAnalyzer
+    PRIVATE ${Python3_LIBRARIES}
+    PRIVATE ${QWT_LIBRARY}
+    PRIVATE Qt5::Widgets
+    PRIVATE Qt5::Sql
+    PRIVATE DRAMSys::util
+    PRIVATE DRAMSys::config
+)
+
+build_source_group()
+diagnostics_print(${PROJECT_NAME})
diff --git a/DRAMSys/traceAnalyzer/README.md b/extensions/apps/traceAnalyzer/README.md
similarity index 100%
rename from DRAMSys/traceAnalyzer/README.md
rename to extensions/apps/traceAnalyzer/README.md
diff --git a/DRAMSys/traceAnalyzer/businessObjects/calculatedMetric.h b/extensions/apps/traceAnalyzer/businessObjects/calculatedMetric.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/calculatedMetric.h
rename to extensions/apps/traceAnalyzer/businessObjects/calculatedMetric.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/commandlengths.h b/extensions/apps/traceAnalyzer/businessObjects/commandlengths.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/commandlengths.h
rename to extensions/apps/traceAnalyzer/businessObjects/commandlengths.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/commentmodel.cpp b/extensions/apps/traceAnalyzer/businessObjects/commentmodel.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/commentmodel.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/commentmodel.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/commentmodel.h b/extensions/apps/traceAnalyzer/businessObjects/commentmodel.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/commentmodel.h
rename to extensions/apps/traceAnalyzer/businessObjects/commentmodel.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/configmodels.cpp b/extensions/apps/traceAnalyzer/businessObjects/configmodels.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/configmodels.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/configmodels.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/configmodels.h b/extensions/apps/traceAnalyzer/businessObjects/configmodels.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/configmodels.h
rename to extensions/apps/traceAnalyzer/businessObjects/configmodels.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dependencymodels.cpp b/extensions/apps/traceAnalyzer/businessObjects/dependencymodels.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dependencymodels.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dependencymodels.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dependencymodels.h b/extensions/apps/traceAnalyzer/businessObjects/dependencymodels.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dependencymodels.h
rename to extensions/apps/traceAnalyzer/businessObjects/dependencymodels.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/README.md b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/README.md
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/README.md
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/README.md
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/QStringComparator.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/StringMapper.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR5dbphaseentry.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR5.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h b/extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h
rename to extensions/apps/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/generalinfo.h b/extensions/apps/traceAnalyzer/businessObjects/generalinfo.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/generalinfo.h
rename to extensions/apps/traceAnalyzer/businessObjects/generalinfo.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/dependencyinfos.cpp b/extensions/apps/traceAnalyzer/businessObjects/phases/dependencyinfos.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/dependencyinfos.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/phases/dependencyinfos.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/dependencyinfos.h b/extensions/apps/traceAnalyzer/businessObjects/phases/dependencyinfos.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/dependencyinfos.h
rename to extensions/apps/traceAnalyzer/businessObjects/phases/dependencyinfos.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp b/extensions/apps/traceAnalyzer/businessObjects/phases/phase.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/phases/phase.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phase.h b/extensions/apps/traceAnalyzer/businessObjects/phases/phase.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/phase.h
rename to extensions/apps/traceAnalyzer/businessObjects/phases/phase.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp b/extensions/apps/traceAnalyzer/businessObjects/phases/phasedependency.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/phases/phasedependency.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h b/extensions/apps/traceAnalyzer/businessObjects/phases/phasedependency.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h
rename to extensions/apps/traceAnalyzer/businessObjects/phases/phasedependency.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.cpp b/extensions/apps/traceAnalyzer/businessObjects/phases/phasefactory.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/phases/phasefactory.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.h b/extensions/apps/traceAnalyzer/businessObjects/phases/phasefactory.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/phases/phasefactory.h
rename to extensions/apps/traceAnalyzer/businessObjects/phases/phasefactory.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/pythoncaller.cpp b/extensions/apps/traceAnalyzer/businessObjects/pythoncaller.cpp
similarity index 99%
rename from DRAMSys/traceAnalyzer/businessObjects/pythoncaller.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/pythoncaller.cpp
index 2df106e8..fa21e2c8 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/pythoncaller.cpp
+++ b/extensions/apps/traceAnalyzer/businessObjects/pythoncaller.cpp
@@ -57,7 +57,7 @@ PythonCaller::PythonCaller() :
     getMetricFunctionName("getMetrics"),
 
     pathToScripts(QApplication::applicationDirPath().toStdString() +
-                  "/../../DRAMSys/traceAnalyzer/scripts/"),
+                  "/../../extensions/apps/traceAnalyzer/scripts/"),
     plotsModuleName("plots"),
     plotsFunctionName("generatePlots"),
     checkDependenciesModuleName("checkDependencies"),
diff --git a/DRAMSys/traceAnalyzer/businessObjects/pythoncaller.h b/extensions/apps/traceAnalyzer/businessObjects/pythoncaller.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/pythoncaller.h
rename to extensions/apps/traceAnalyzer/businessObjects/pythoncaller.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/testresult.h b/extensions/apps/traceAnalyzer/businessObjects/testresult.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/testresult.h
rename to extensions/apps/traceAnalyzer/businessObjects/testresult.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/timespan.cpp b/extensions/apps/traceAnalyzer/businessObjects/timespan.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/timespan.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/timespan.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/timespan.h b/extensions/apps/traceAnalyzer/businessObjects/timespan.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/timespan.h
rename to extensions/apps/traceAnalyzer/businessObjects/timespan.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/tracecalculatedmetrics.h b/extensions/apps/traceAnalyzer/businessObjects/tracecalculatedmetrics.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/tracecalculatedmetrics.h
rename to extensions/apps/traceAnalyzer/businessObjects/tracecalculatedmetrics.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/traceplotlinemodel.cpp b/extensions/apps/traceAnalyzer/businessObjects/traceplotlinemodel.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/traceplotlinemodel.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/traceplotlinemodel.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/traceplotlinemodel.h b/extensions/apps/traceAnalyzer/businessObjects/traceplotlinemodel.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/traceplotlinemodel.h
rename to extensions/apps/traceAnalyzer/businessObjects/traceplotlinemodel.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/tracetime.h b/extensions/apps/traceAnalyzer/businessObjects/tracetime.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/tracetime.h
rename to extensions/apps/traceAnalyzer/businessObjects/tracetime.h
diff --git a/DRAMSys/traceAnalyzer/businessObjects/transaction.cpp b/extensions/apps/traceAnalyzer/businessObjects/transaction.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/transaction.cpp
rename to extensions/apps/traceAnalyzer/businessObjects/transaction.cpp
diff --git a/DRAMSys/traceAnalyzer/businessObjects/transaction.h b/extensions/apps/traceAnalyzer/businessObjects/transaction.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/businessObjects/transaction.h
rename to extensions/apps/traceAnalyzer/businessObjects/transaction.h
diff --git a/DRAMSys/traceAnalyzer/data/QueryTexts.h b/extensions/apps/traceAnalyzer/data/QueryTexts.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/data/QueryTexts.h
rename to extensions/apps/traceAnalyzer/data/QueryTexts.h
diff --git a/DRAMSys/traceAnalyzer/data/tracedb.cpp b/extensions/apps/traceAnalyzer/data/tracedb.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/data/tracedb.cpp
rename to extensions/apps/traceAnalyzer/data/tracedb.cpp
diff --git a/DRAMSys/traceAnalyzer/data/tracedb.h b/extensions/apps/traceAnalyzer/data/tracedb.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/data/tracedb.h
rename to extensions/apps/traceAnalyzer/data/tracedb.h
diff --git a/DRAMSys/traceAnalyzer/evaluationtool.cpp b/extensions/apps/traceAnalyzer/evaluationtool.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/evaluationtool.cpp
rename to extensions/apps/traceAnalyzer/evaluationtool.cpp
diff --git a/DRAMSys/traceAnalyzer/evaluationtool.h b/extensions/apps/traceAnalyzer/evaluationtool.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/evaluationtool.h
rename to extensions/apps/traceAnalyzer/evaluationtool.h
diff --git a/DRAMSys/traceAnalyzer/evaluationtool.ui b/extensions/apps/traceAnalyzer/evaluationtool.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/evaluationtool.ui
rename to extensions/apps/traceAnalyzer/evaluationtool.ui
diff --git a/DRAMSys/traceAnalyzer/gototimedialog.cpp b/extensions/apps/traceAnalyzer/gototimedialog.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/gototimedialog.cpp
rename to extensions/apps/traceAnalyzer/gototimedialog.cpp
diff --git a/DRAMSys/traceAnalyzer/gototimedialog.h b/extensions/apps/traceAnalyzer/gototimedialog.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/gototimedialog.h
rename to extensions/apps/traceAnalyzer/gototimedialog.h
diff --git a/DRAMSys/traceAnalyzer/gototimedialog.ui b/extensions/apps/traceAnalyzer/gototimedialog.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/gototimedialog.ui
rename to extensions/apps/traceAnalyzer/gototimedialog.ui
diff --git a/DRAMSys/traceAnalyzer/icon.svg b/extensions/apps/traceAnalyzer/icon.svg
similarity index 100%
rename from DRAMSys/traceAnalyzer/icon.svg
rename to extensions/apps/traceAnalyzer/icon.svg
diff --git a/DRAMSys/traceAnalyzer/main.cpp b/extensions/apps/traceAnalyzer/main.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/main.cpp
rename to extensions/apps/traceAnalyzer/main.cpp
diff --git a/DRAMSys/traceAnalyzer/markerplotitem.h b/extensions/apps/traceAnalyzer/markerplotitem.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/markerplotitem.h
rename to extensions/apps/traceAnalyzer/markerplotitem.h
diff --git a/DRAMSys/traceAnalyzer/preferences.ui b/extensions/apps/traceAnalyzer/preferences.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/preferences.ui
rename to extensions/apps/traceAnalyzer/preferences.ui
diff --git a/DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.cpp b/extensions/apps/traceAnalyzer/presentation/debugmessagetreewidget.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.cpp
rename to extensions/apps/traceAnalyzer/presentation/debugmessagetreewidget.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.h b/extensions/apps/traceAnalyzer/presentation/debugmessagetreewidget.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/debugmessagetreewidget.h
rename to extensions/apps/traceAnalyzer/presentation/debugmessagetreewidget.h
diff --git a/DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.cpp b/extensions/apps/traceAnalyzer/presentation/selectedtransactiontreewidget.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.cpp
rename to extensions/apps/traceAnalyzer/presentation/selectedtransactiontreewidget.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.h b/extensions/apps/traceAnalyzer/presentation/selectedtransactiontreewidget.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/selectedtransactiontreewidget.h
rename to extensions/apps/traceAnalyzer/presentation/selectedtransactiontreewidget.h
diff --git a/DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.cpp b/extensions/apps/traceAnalyzer/presentation/tracePlotMouseLabel.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.cpp
rename to extensions/apps/traceAnalyzer/presentation/tracePlotMouseLabel.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.h b/extensions/apps/traceAnalyzer/presentation/tracePlotMouseLabel.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracePlotMouseLabel.h
rename to extensions/apps/traceAnalyzer/presentation/tracePlotMouseLabel.h
diff --git a/DRAMSys/traceAnalyzer/presentation/tracedrawing.cpp b/extensions/apps/traceAnalyzer/presentation/tracedrawing.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracedrawing.cpp
rename to extensions/apps/traceAnalyzer/presentation/tracedrawing.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/tracedrawing.h b/extensions/apps/traceAnalyzer/presentation/tracedrawing.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracedrawing.h
rename to extensions/apps/traceAnalyzer/presentation/tracedrawing.h
diff --git a/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.cpp b/extensions/apps/traceAnalyzer/presentation/tracedrawingproperties.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.cpp
rename to extensions/apps/traceAnalyzer/presentation/tracedrawingproperties.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h b/extensions/apps/traceAnalyzer/presentation/tracedrawingproperties.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracedrawingproperties.h
rename to extensions/apps/traceAnalyzer/presentation/tracedrawingproperties.h
diff --git a/DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.cpp b/extensions/apps/traceAnalyzer/presentation/tracemetrictreewidget.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.cpp
rename to extensions/apps/traceAnalyzer/presentation/tracemetrictreewidget.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.h b/extensions/apps/traceAnalyzer/presentation/tracemetrictreewidget.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracemetrictreewidget.h
rename to extensions/apps/traceAnalyzer/presentation/tracemetrictreewidget.h
diff --git a/DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp b/extensions/apps/traceAnalyzer/presentation/tracenavigator.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracenavigator.cpp
rename to extensions/apps/traceAnalyzer/presentation/tracenavigator.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/tracenavigator.h b/extensions/apps/traceAnalyzer/presentation/tracenavigator.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracenavigator.h
rename to extensions/apps/traceAnalyzer/presentation/tracenavigator.h
diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.cpp b/extensions/apps/traceAnalyzer/presentation/traceplot.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/traceplot.cpp
rename to extensions/apps/traceAnalyzer/presentation/traceplot.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/traceplot.h b/extensions/apps/traceAnalyzer/presentation/traceplot.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/traceplot.h
rename to extensions/apps/traceAnalyzer/presentation/traceplot.h
diff --git a/DRAMSys/traceAnalyzer/presentation/traceplotitem.cpp b/extensions/apps/traceAnalyzer/presentation/traceplotitem.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/traceplotitem.cpp
rename to extensions/apps/traceAnalyzer/presentation/traceplotitem.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/traceplotitem.h b/extensions/apps/traceAnalyzer/presentation/traceplotitem.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/traceplotitem.h
rename to extensions/apps/traceAnalyzer/presentation/traceplotitem.h
diff --git a/DRAMSys/traceAnalyzer/presentation/tracescroller.cpp b/extensions/apps/traceAnalyzer/presentation/tracescroller.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracescroller.cpp
rename to extensions/apps/traceAnalyzer/presentation/tracescroller.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/tracescroller.h b/extensions/apps/traceAnalyzer/presentation/tracescroller.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/tracescroller.h
rename to extensions/apps/traceAnalyzer/presentation/tracescroller.h
diff --git a/DRAMSys/traceAnalyzer/presentation/transactiontreewidget.cpp b/extensions/apps/traceAnalyzer/presentation/transactiontreewidget.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/transactiontreewidget.cpp
rename to extensions/apps/traceAnalyzer/presentation/transactiontreewidget.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/transactiontreewidget.h b/extensions/apps/traceAnalyzer/presentation/transactiontreewidget.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/transactiontreewidget.h
rename to extensions/apps/traceAnalyzer/presentation/transactiontreewidget.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/clkgrid.cpp b/extensions/apps/traceAnalyzer/presentation/util/clkgrid.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/clkgrid.cpp
rename to extensions/apps/traceAnalyzer/presentation/util/clkgrid.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/util/clkgrid.h b/extensions/apps/traceAnalyzer/presentation/util/clkgrid.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/clkgrid.h
rename to extensions/apps/traceAnalyzer/presentation/util/clkgrid.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp b/extensions/apps/traceAnalyzer/presentation/util/colorgenerator.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp
rename to extensions/apps/traceAnalyzer/presentation/util/colorgenerator.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h b/extensions/apps/traceAnalyzer/presentation/util/colorgenerator.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/colorgenerator.h
rename to extensions/apps/traceAnalyzer/presentation/util/colorgenerator.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp b/extensions/apps/traceAnalyzer/presentation/util/colorobject.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/colorobject.cpp
rename to extensions/apps/traceAnalyzer/presentation/util/colorobject.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/util/colorobject.h b/extensions/apps/traceAnalyzer/presentation/util/colorobject.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/colorobject.h
rename to extensions/apps/traceAnalyzer/presentation/util/colorobject.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/customlabelscaledraw.cpp b/extensions/apps/traceAnalyzer/presentation/util/customlabelscaledraw.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/customlabelscaledraw.cpp
rename to extensions/apps/traceAnalyzer/presentation/util/customlabelscaledraw.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/util/customlabelscaledraw.h b/extensions/apps/traceAnalyzer/presentation/util/customlabelscaledraw.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/customlabelscaledraw.h
rename to extensions/apps/traceAnalyzer/presentation/util/customlabelscaledraw.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/engineeringScaleDraw.h b/extensions/apps/traceAnalyzer/presentation/util/engineeringScaleDraw.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/engineeringScaleDraw.h
rename to extensions/apps/traceAnalyzer/presentation/util/engineeringScaleDraw.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/testlight.cpp b/extensions/apps/traceAnalyzer/presentation/util/testlight.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/testlight.cpp
rename to extensions/apps/traceAnalyzer/presentation/util/testlight.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/util/testlight.h b/extensions/apps/traceAnalyzer/presentation/util/testlight.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/testlight.h
rename to extensions/apps/traceAnalyzer/presentation/util/testlight.h
diff --git a/DRAMSys/traceAnalyzer/presentation/util/togglecollapsedaction.cpp b/extensions/apps/traceAnalyzer/presentation/util/togglecollapsedaction.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/togglecollapsedaction.cpp
rename to extensions/apps/traceAnalyzer/presentation/util/togglecollapsedaction.cpp
diff --git a/DRAMSys/traceAnalyzer/presentation/util/togglecollapsedaction.h b/extensions/apps/traceAnalyzer/presentation/util/togglecollapsedaction.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/presentation/util/togglecollapsedaction.h
rename to extensions/apps/traceAnalyzer/presentation/util/togglecollapsedaction.h
diff --git a/DRAMSys/traceAnalyzer/queryeditor.cpp b/extensions/apps/traceAnalyzer/queryeditor.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/queryeditor.cpp
rename to extensions/apps/traceAnalyzer/queryeditor.cpp
diff --git a/DRAMSys/traceAnalyzer/queryeditor.h b/extensions/apps/traceAnalyzer/queryeditor.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/queryeditor.h
rename to extensions/apps/traceAnalyzer/queryeditor.h
diff --git a/DRAMSys/traceAnalyzer/queryeditor.ui b/extensions/apps/traceAnalyzer/queryeditor.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/queryeditor.ui
rename to extensions/apps/traceAnalyzer/queryeditor.ui
diff --git a/DRAMSys/traceAnalyzer/resources.qrc b/extensions/apps/traceAnalyzer/resources.qrc
similarity index 95%
rename from DRAMSys/traceAnalyzer/resources.qrc
rename to extensions/apps/traceAnalyzer/resources.qrc
index 4470471f..c047e82d 100644
--- a/DRAMSys/traceAnalyzer/resources.qrc
+++ b/extensions/apps/traceAnalyzer/resources.qrc
@@ -1,5 +1,5 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="icon">icon.svg</file>
-    </qresource>
-</RCC>
+<RCC>
+    <qresource prefix="/">
+        <file alias="icon">icon.svg</file>
+    </qresource>
+</RCC>
diff --git a/DRAMSys/traceAnalyzer/scripts/checkDependencies.py b/extensions/apps/traceAnalyzer/scripts/checkDependencies.py
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/checkDependencies.py
rename to extensions/apps/traceAnalyzer/scripts/checkDependencies.py
diff --git a/DRAMSys/traceAnalyzer/scripts/dataExtractForNN.pl b/extensions/apps/traceAnalyzer/scripts/dataExtractForNN.pl
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/dataExtractForNN.pl
rename to extensions/apps/traceAnalyzer/scripts/dataExtractForNN.pl
diff --git a/DRAMSys/traceAnalyzer/scripts/memUtil.py b/extensions/apps/traceAnalyzer/scripts/memUtil.py
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/memUtil.py
rename to extensions/apps/traceAnalyzer/scripts/memUtil.py
diff --git a/DRAMSys/traceAnalyzer/scripts/metrics.py b/extensions/apps/traceAnalyzer/scripts/metrics.py
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/metrics.py
rename to extensions/apps/traceAnalyzer/scripts/metrics.py
diff --git a/DRAMSys/traceAnalyzer/scripts/plots.py b/extensions/apps/traceAnalyzer/scripts/plots.py
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/plots.py
rename to extensions/apps/traceAnalyzer/scripts/plots.py
diff --git a/DRAMSys/traceAnalyzer/scripts/sonification.pl b/extensions/apps/traceAnalyzer/scripts/sonification.pl
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/sonification.pl
rename to extensions/apps/traceAnalyzer/scripts/sonification.pl
diff --git a/DRAMSys/traceAnalyzer/scripts/tests.py b/extensions/apps/traceAnalyzer/scripts/tests.py
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/tests.py
rename to extensions/apps/traceAnalyzer/scripts/tests.py
diff --git a/DRAMSys/traceAnalyzer/scripts/vcdExport.py b/extensions/apps/traceAnalyzer/scripts/vcdExport.py
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/traceAnalyzer/scripts/vcdExport.py
rename to extensions/apps/traceAnalyzer/scripts/vcdExport.py
diff --git a/DRAMSys/traceAnalyzer/selectmetrics.cpp b/extensions/apps/traceAnalyzer/selectmetrics.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/selectmetrics.cpp
rename to extensions/apps/traceAnalyzer/selectmetrics.cpp
diff --git a/DRAMSys/traceAnalyzer/selectmetrics.h b/extensions/apps/traceAnalyzer/selectmetrics.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/selectmetrics.h
rename to extensions/apps/traceAnalyzer/selectmetrics.h
diff --git a/DRAMSys/traceAnalyzer/selectmetrics.ui b/extensions/apps/traceAnalyzer/selectmetrics.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/selectmetrics.ui
rename to extensions/apps/traceAnalyzer/selectmetrics.ui
diff --git a/DRAMSys/traceAnalyzer/simulationdialog.cpp b/extensions/apps/traceAnalyzer/simulationdialog.cpp
similarity index 89%
rename from DRAMSys/traceAnalyzer/simulationdialog.cpp
rename to extensions/apps/traceAnalyzer/simulationdialog.cpp
index cc0f6958..df72ec9a 100644
--- a/DRAMSys/traceAnalyzer/simulationdialog.cpp
+++ b/extensions/apps/traceAnalyzer/simulationdialog.cpp
@@ -34,7 +34,7 @@
  */
 
 #include "simulationdialog.h"
-#include "TraceSetup.h"
+#include "DRAMSys/config/TraceSetup.h"
 
 #include <QDateTime>
 #include <QDebug>
@@ -217,7 +217,7 @@ void SimulationDialog::saveConfiguration(QFile &file)
 
     loadConfigurationFromTextFields();
 
-    std::string dump = DRAMSysConfiguration::dump(configuration, 4);
+    std::string dump = DRAMSys::Config::dump(configuration, 4);
     out << dump.c_str();
 }
 
@@ -239,14 +239,13 @@ void SimulationDialog::processMessage(const std::string &msg)
 
 void SimulationDialog::loadConfigurationFromTextFields()
 {
-    using namespace DRAMSysConfiguration;
+    using namespace DRAMSys::Config;
 
     AddressMapping addressMapping;
     McConfig mcConfig;
     MemSpec memSpec;
     SimConfig simConfig;
     std::string simulationId;
-    ThermalConfig thermalConfig;
     TraceSetup traceSetup;
 
     simulationId = ui->simulationIdLineEdit->text().toStdString();
@@ -258,9 +257,6 @@ void SimulationDialog::loadConfigurationFromTextFields()
         from_dump(ui->memSpecTextEdit->toPlainText().toStdString(), memSpec);
         from_dump(ui->simConfigTextEdit->toPlainText().toStdString(), simConfig);
 
-        if (!ui->thermalConfigTextEdit->toPlainText().toStdString().empty())
-            from_dump(ui->thermalConfigTextEdit->toPlainText().toStdString(), thermalConfig);
-
         if (!ui->traceSetupTextEdit->toPlainText().toStdString().empty())
             from_dump(ui->traceSetupTextEdit->toPlainText().toStdString(), traceSetup);
     }
@@ -270,12 +266,11 @@ void SimulationDialog::loadConfigurationFromTextFields()
         return;
     }
 
-    configuration = DRAMSysConfiguration::Configuration{addressMapping,
+    configuration = DRAMSys::Config::Configuration{addressMapping,
                                                         mcConfig,
                                                         memSpec,
                                                         simConfig,
                                                         simulationId,
-                                                        std::make_optional<ThermalConfig>(std::move(thermalConfig)),
                                                         std::make_optional<TraceSetup>(std::move(traceSetup))};
 
     loadConfiguration();
@@ -290,7 +285,7 @@ void SimulationDialog::loadConfigurationFromPath()
 
     try
     {
-        configuration = DRAMSysConfiguration::from_path(ui->jsonPath->text().toStdString());
+        configuration = DRAMSys::Config::from_path(ui->jsonPath->text().toStdString());
     }
     catch (const std::exception &e)
     {
@@ -313,7 +308,6 @@ void SimulationDialog::loadConfiguration()
     loadMcConfig();
     loadMemSpec();
     loadAddressMapping();
-    loadThermalConfig();
     loadTraceSetup();
     loadPreview();
 }
@@ -322,7 +316,7 @@ void SimulationDialog::loadSimConfig()
 {
     ui->simConfigTextEdit->clear();
 
-    std::string dump = DRAMSysConfiguration::dump(configuration.simConfig, 4);
+    std::string dump = DRAMSys::Config::dump(configuration.simConfig, 4);
     ui->simConfigTextEdit->setText(dump.c_str());
 }
 
@@ -330,7 +324,7 @@ void SimulationDialog::loadMcConfig()
 {
     ui->mcConfigTextEdit->clear();
 
-    std::string dump = DRAMSysConfiguration::dump(configuration.mcConfig, 4);
+    std::string dump = DRAMSys::Config::dump(configuration.mcConfig, 4);
     ui->mcConfigTextEdit->setText(dump.c_str());
 }
 
@@ -338,7 +332,7 @@ void SimulationDialog::loadMemSpec()
 {
     ui->memSpecTextEdit->clear();
 
-    std::string dump = DRAMSysConfiguration::dump(configuration.memSpec, 4);
+    std::string dump = DRAMSys::Config::dump(configuration.memSpec, 4);
     ui->memSpecTextEdit->setText(dump.c_str());
 }
 
@@ -346,28 +340,17 @@ void SimulationDialog::loadAddressMapping()
 {
     ui->addressMappingTextEdit->clear();
 
-    std::string dump = DRAMSysConfiguration::dump(configuration.addressMapping, 4);
+    std::string dump = DRAMSys::Config::dump(configuration.addressMapping, 4);
     ui->addressMappingTextEdit->setText(dump.c_str());
 }
 
-void SimulationDialog::loadThermalConfig()
-{
-    ui->thermalConfigTextEdit->clear();
-
-    if (const auto &thermalConfig = configuration.thermalConfig)
-    {
-        std::string dump = DRAMSysConfiguration::dump(*thermalConfig, 4);
-        ui->thermalConfigTextEdit->setText(dump.c_str());
-    }
-}
-
 void SimulationDialog::loadTraceSetup()
 {
     ui->traceSetupTextEdit->clear();
 
     if (const auto &traceSetup = configuration.traceSetup)
     {
-        std::string dump = DRAMSysConfiguration::dump(*traceSetup, 4);
+        std::string dump = DRAMSys::Config::dump(*traceSetup, 4);
         ui->traceSetupTextEdit->setText(dump.c_str());
     }
 }
@@ -376,7 +359,7 @@ void SimulationDialog::loadPreview()
 {
     ui->previewTextEdit->clear();
 
-    std::string dump = DRAMSysConfiguration::dump(configuration, 4);
+    std::string dump = DRAMSys::Config::dump(configuration, 4);
     ui->previewTextEdit->setText(dump.c_str());
 }
 
diff --git a/DRAMSys/traceAnalyzer/simulationdialog.h b/extensions/apps/traceAnalyzer/simulationdialog.h
similarity index 96%
rename from DRAMSys/traceAnalyzer/simulationdialog.h
rename to extensions/apps/traceAnalyzer/simulationdialog.h
index 168ceb55..d4d8cd0c 100644
--- a/DRAMSys/traceAnalyzer/simulationdialog.h
+++ b/extensions/apps/traceAnalyzer/simulationdialog.h
@@ -38,7 +38,8 @@
 
 #include "ui_simulationdialog.h"
 
-#include <DRAMSysConfiguration.h>
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+
 #include <QFileInfo>
 #include <QPointer>
 #include <QProcess>
@@ -80,7 +81,6 @@ private:
     void loadMcConfig();
     void loadMemSpec();
     void loadAddressMapping();
-    void loadThermalConfig();
     void loadTraceSetup();
     void loadPreview();
 
@@ -92,7 +92,7 @@ private:
     void openSimulationResults(const QFileInfoList &fileInfos);
 
     QTemporaryFile temporaryConfigurationFile;
-    DRAMSysConfiguration::Configuration configuration;
+    DRAMSys::Config::Configuration configuration;
 
     QPointer<QProcess> simulatorProcess;
 
diff --git a/DRAMSys/traceAnalyzer/simulationdialog.ui b/extensions/apps/traceAnalyzer/simulationdialog.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/simulationdialog.ui
rename to extensions/apps/traceAnalyzer/simulationdialog.ui
diff --git a/DRAMSys/traceAnalyzer/traceanalyzer.cpp b/extensions/apps/traceAnalyzer/traceanalyzer.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/traceanalyzer.cpp
rename to extensions/apps/traceAnalyzer/traceanalyzer.cpp
diff --git a/DRAMSys/traceAnalyzer/traceanalyzer.h b/extensions/apps/traceAnalyzer/traceanalyzer.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/traceanalyzer.h
rename to extensions/apps/traceAnalyzer/traceanalyzer.h
diff --git a/DRAMSys/traceAnalyzer/traceanalyzer.ui b/extensions/apps/traceAnalyzer/traceanalyzer.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/traceanalyzer.ui
rename to extensions/apps/traceAnalyzer/traceanalyzer.ui
diff --git a/DRAMSys/traceAnalyzer/tracefiletab.cpp b/extensions/apps/traceAnalyzer/tracefiletab.cpp
similarity index 100%
rename from DRAMSys/traceAnalyzer/tracefiletab.cpp
rename to extensions/apps/traceAnalyzer/tracefiletab.cpp
diff --git a/DRAMSys/traceAnalyzer/tracefiletab.h b/extensions/apps/traceAnalyzer/tracefiletab.h
similarity index 100%
rename from DRAMSys/traceAnalyzer/tracefiletab.h
rename to extensions/apps/traceAnalyzer/tracefiletab.h
diff --git a/DRAMSys/traceAnalyzer/tracefiletab.ui b/extensions/apps/traceAnalyzer/tracefiletab.ui
similarity index 100%
rename from DRAMSys/traceAnalyzer/tracefiletab.ui
rename to extensions/apps/traceAnalyzer/tracefiletab.ui
diff --git a/extensions/standards/CMakeLists.txt b/extensions/standards/CMakeLists.txt
new file mode 100644
index 00000000..86694d5b
--- /dev/null
+++ b/extensions/standards/CMakeLists.txt
@@ -0,0 +1,9 @@
+file(GLOB sub_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+
+message(STATUS " Standards:")
+
+FOREACH(sub_dir ${sub_dirs})
+	IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${sub_dir}")
+		add_subdirectory(${sub_dir})
+	ENDIF()
+ENDFOREACH()
\ No newline at end of file
diff --git a/extensions/standards/DDR5/CMakeLists.txt b/extensions/standards/DDR5/CMakeLists.txt
new file mode 100644
index 00000000..f537c8ac
--- /dev/null
+++ b/extensions/standards/DDR5/CMakeLists.txt
@@ -0,0 +1,14 @@
+option(DRAMSYS_EXTENSION_DDR5_ENABLE "Enable DRAMSys DDR5 Support" ON)
+
+if(DRAMSYS_EXTENSION_DDR5_ENABLE)
+	message(STATUS " * DDR5")
+
+	file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+	file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+
+	target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
+	target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+	target_compile_definitions(DRAMSys_libdramsys PUBLIC DDR5_SIM)
+
+	build_source_group()
+endif()
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp
similarity index 99%
rename from DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp
rename to extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp
index c8ff40ba..1558946a 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.cpp
+++ b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecDDR5.h"
 
+#include <DRAMSys/common/utils.h>
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecDDR5::MemSpecDDR5(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecDDR5::MemSpecDDR5(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::DDR5,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.h b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h
similarity index 97%
rename from DRAMSys/library/src/configuration/memspec/MemSpecDDR5.h
rename to extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h
index 25cf54f5..156d2a96 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR5.h
+++ b/extensions/standards/DDR5/DRAMSys/configuration/memspec/MemSpecDDR5.h
@@ -38,12 +38,12 @@
 #define MEMSPECDDR5_H
 
 #include <systemc>
-#include "MemSpec.h"
+#include <DRAMSys/configuration/memspec/MemSpec.h>
 
 class MemSpecDDR5 final : public MemSpec
 {
 public:
-    explicit MemSpecDDR5(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecDDR5(const DRAMSys::Config::MemSpec &memSpec);
 
     const unsigned dimmRanksPerChannel;
     const unsigned physicalRanksPerDimmRank;
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp b/extensions/standards/DDR5/DRAMSys/controller/checker/CheckerDDR5.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerDDR5.cpp
rename to extensions/standards/DDR5/DRAMSys/controller/checker/CheckerDDR5.cpp
index 5a6d92ef..d1c9d87b 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp
+++ b/extensions/standards/DDR5/DRAMSys/controller/checker/CheckerDDR5.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerDDR5.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR5.h b/extensions/standards/DDR5/DRAMSys/controller/checker/CheckerDDR5.h
similarity index 95%
rename from DRAMSys/library/src/controller/checker/CheckerDDR5.h
rename to extensions/standards/DDR5/DRAMSys/controller/checker/CheckerDDR5.h
index 62ddf7d7..c03cd051 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR5.h
+++ b/extensions/standards/DDR5/DRAMSys/controller/checker/CheckerDDR5.h
@@ -38,10 +38,11 @@
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecDDR5.h"
-#include "../../configuration/Configuration.h"
-#include "../../common/utils.h"
+#include <DRAMSys/controller/checker/CheckerIF.h>
+
+#include <DRAMSys/configuration/memspec/MemSpecDDR5.h>
+#include <DRAMSys/configuration/Configuration.h>
+#include <DRAMSys/common/utils.h>
 
 class CheckerDDR5 final : public CheckerIF
 {
diff --git a/DRAMSys/library/src/simulation/dram/DramDDR5.cpp b/extensions/standards/DDR5/DRAMSys/simulation/dram/DramDDR5.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramDDR5.cpp
rename to extensions/standards/DDR5/DRAMSys/simulation/dram/DramDDR5.cpp
index 135ff852..95c35db3 100644
--- a/DRAMSys/library/src/simulation/dram/DramDDR5.cpp
+++ b/extensions/standards/DDR5/DRAMSys/simulation/dram/DramDDR5.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramDDR5.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecDDR5.h"
 
 using namespace sc_core;
 
-DramDDR5::DramDDR5(const sc_module_name& name, const Configuration& config,
-                   TemperatureController& temperatureController)
+DramDDR5::DramDDR5(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramDDR5", "Error Model not supported for DDR5");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramDDR5", "DRAMPower does not support DDR5");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramDDR5.h b/extensions/standards/DDR5/DRAMSys/simulation/dram/DramDDR5.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramDDR5.h
rename to extensions/standards/DDR5/DRAMSys/simulation/dram/DramDDR5.h
index 039ebae8..1e06dba3 100644
--- a/DRAMSys/library/src/simulation/dram/DramDDR5.h
+++ b/extensions/standards/DDR5/DRAMSys/simulation/dram/DramDDR5.h
@@ -36,16 +36,14 @@
 #ifndef DRAMDDR5_H
 #define DRAMDDR5_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramDDR5 : public Dram
 {
 public:
-    DramDDR5(const sc_core::sc_module_name& name, const Configuration& config,
-             TemperatureController& temperatureController);
+    DramDDR5(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramDDR5);
 };
 
diff --git a/extensions/standards/HBM3/CMakeLists.txt b/extensions/standards/HBM3/CMakeLists.txt
new file mode 100644
index 00000000..46de65f7
--- /dev/null
+++ b/extensions/standards/HBM3/CMakeLists.txt
@@ -0,0 +1,14 @@
+option(DRAMSYS_EXTENSION_HBM3_ENABLE "Enable DRAMSys HBM3 Support" ON)
+
+if(DRAMSYS_EXTENSION_HBM3_ENABLE)
+	message(STATUS " * HBM3")
+
+	file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+	file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+
+	target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
+	target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+	target_compile_definitions(DRAMSys_libdramsys PUBLIC HBM3_SIM)
+
+	build_source_group()
+endif()
\ No newline at end of file
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecHBM3.cpp b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecHBM3.cpp
rename to extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp
index d5aeaada..7a4251c7 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecHBM3.cpp
+++ b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.cpp
@@ -36,13 +36,13 @@
 
 #include <iostream>
 
-#include "../../common/utils.h"
+#include <DRAMSys/common/utils.h>
 #include "MemSpecHBM3.h"
 
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecHBM3::MemSpecHBM3(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecHBM3::MemSpecHBM3(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::HBM3,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       memSpec.memArchitectureSpec.entries.at("nbrOfPseudoChannels"),
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecHBM3.h b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecHBM3.h
rename to extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h
index f9a32241..02126885 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecHBM3.h
+++ b/extensions/standards/HBM3/DRAMSys/configuration/memspec/MemSpecHBM3.h
@@ -38,12 +38,12 @@
 #define MemSpecHBM3_H
 
 #include <systemc>
-#include "MemSpec.h"
+#include <DRAMSys/configuration/memspec/MemSpec.h>
 
 class MemSpecHBM3 final : public MemSpec
 {
 public:
-    explicit MemSpecHBM3(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecHBM3(const DRAMSys::Config::MemSpec& memSpec);
 
     const unsigned RAAIMT;
     const unsigned RAAMMT;
diff --git a/DRAMSys/library/src/controller/checker/CheckerHBM3.cpp b/extensions/standards/HBM3/DRAMSys/controller/checker/CheckerHBM3.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerHBM3.cpp
rename to extensions/standards/HBM3/DRAMSys/controller/checker/CheckerHBM3.cpp
index 88fe561c..85cb7782 100644
--- a/DRAMSys/library/src/controller/checker/CheckerHBM3.cpp
+++ b/extensions/standards/HBM3/DRAMSys/controller/checker/CheckerHBM3.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerHBM3.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerHBM3.h b/extensions/standards/HBM3/DRAMSys/controller/checker/CheckerHBM3.h
similarity index 93%
rename from DRAMSys/library/src/controller/checker/CheckerHBM3.h
rename to extensions/standards/HBM3/DRAMSys/controller/checker/CheckerHBM3.h
index 8bd4423d..1215b2d0 100644
--- a/DRAMSys/library/src/controller/checker/CheckerHBM3.h
+++ b/extensions/standards/HBM3/DRAMSys/controller/checker/CheckerHBM3.h
@@ -38,9 +38,11 @@
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecHBM3.h"
-#include "../../configuration/Configuration.h"
+#include <DRAMSys/controller/checker/CheckerIF.h>
+
+#include <DRAMSys/configuration/memspec/MemSpecHBM3.h>
+#include <DRAMSys/configuration/Configuration.h>
+#include <DRAMSys/common/utils.h>
 
 class CheckerHBM3 final : public CheckerIF
 {
diff --git a/DRAMSys/library/src/simulation/dram/DramHBM3.cpp b/extensions/standards/HBM3/DRAMSys/simulation/dram/DramHBM3.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramHBM3.cpp
rename to extensions/standards/HBM3/DRAMSys/simulation/dram/DramHBM3.cpp
index 0fee7304..62802a4d 100644
--- a/DRAMSys/library/src/simulation/dram/DramHBM3.cpp
+++ b/extensions/standards/HBM3/DRAMSys/simulation/dram/DramHBM3.cpp
@@ -34,18 +34,17 @@
  */
 
 #include "DramHBM3.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecHBM3.h"
+
+#include <DRAMSys/configuration/Configuration.h>
+#include <DRAMSys/configuration/memspec/MemSpecDDR5.h>
 
 using namespace sc_core;
 
-DramHBM3::DramHBM3(const sc_module_name& name, const Configuration& config,
-                   TemperatureController& temperatureController)
+DramHBM3::DramHBM3(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramHBM3", "Error Model not supported for HBM3");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramHBM3", "DRAMPower does not support HBM3");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramHBM3.h b/extensions/standards/HBM3/DRAMSys/simulation/dram/DramHBM3.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramHBM3.h
rename to extensions/standards/HBM3/DRAMSys/simulation/dram/DramHBM3.h
index e1137002..a5d2d67e 100644
--- a/DRAMSys/library/src/simulation/dram/DramHBM3.h
+++ b/extensions/standards/HBM3/DRAMSys/simulation/dram/DramHBM3.h
@@ -36,16 +36,14 @@
 #ifndef DRAMHBM3_H
 #define DRAMHBM3_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramHBM3 : public Dram
 {
 public:
-    DramHBM3(const sc_core::sc_module_name &name, const Configuration& config,
-             TemperatureController& temperatureController);
+    DramHBM3(const sc_core::sc_module_name &name, const Configuration& config);
     SC_HAS_PROCESS(DramHBM3);
 };
 
diff --git a/extensions/standards/LPDDR5/CMakeLists.txt b/extensions/standards/LPDDR5/CMakeLists.txt
new file mode 100644
index 00000000..fae4a84f
--- /dev/null
+++ b/extensions/standards/LPDDR5/CMakeLists.txt
@@ -0,0 +1,14 @@
+option(DRAMSYS_EXTENSION_LPDDR5_ENABLE "Enable DRAMSys LPDDR5 Support" ON)
+
+if(DRAMSYS_EXTENSION_LPDDR5_ENABLE)
+	message(STATUS " * LPDDR5")
+
+	file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+	file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+
+	target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
+	target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+	target_compile_definitions(DRAMSys_libdramsys PUBLIC LPDDR5_SIM)
+
+	build_source_group()
+endif()
\ No newline at end of file
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp b/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp
rename to extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.cpp
index dcf670a9..7754f188 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.cpp
+++ b/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.cpp
@@ -33,15 +33,16 @@
  *    Lukas Steiner
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecLPDDR5.h"
 
+#include <DRAMSys/common/utils.h>
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecLPDDR5::MemSpecLPDDR5(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecLPDDR5::MemSpecLPDDR5(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::LPDDR5,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.h b/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h
similarity index 95%
rename from DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.h
rename to extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h
index 1a356ecc..49b1c284 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR5.h
+++ b/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h
@@ -37,13 +37,14 @@
 #define MEMSPECLPDDR5_H
 
 #include <systemc>
-#include "MemSpec.h"
-#include "../../common/third_party/nlohmann/single_include/nlohmann/json.hpp"
+#include <DRAMSys/configuration/memspec/MemSpec.h>
+
+#include <nlohmann/json.hpp>
 
 class MemSpecLPDDR5 final : public MemSpec
 {
 public:
-    explicit MemSpecLPDDR5(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecLPDDR5(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tREFI;
diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR5.cpp b/extensions/standards/LPDDR5/DRAMSys/controller/checker/CheckerLPDDR5.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerLPDDR5.cpp
rename to extensions/standards/LPDDR5/DRAMSys/controller/checker/CheckerLPDDR5.cpp
index 59e1c1ee..f5f68f3a 100644
--- a/DRAMSys/library/src/controller/checker/CheckerLPDDR5.cpp
+++ b/extensions/standards/LPDDR5/DRAMSys/controller/checker/CheckerLPDDR5.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerLPDDR5.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR5.h b/extensions/standards/LPDDR5/DRAMSys/controller/checker/CheckerLPDDR5.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerLPDDR5.h
rename to extensions/standards/LPDDR5/DRAMSys/controller/checker/CheckerLPDDR5.h
index b6a8f52c..eeec8f6d 100644
--- a/DRAMSys/library/src/controller/checker/CheckerLPDDR5.h
+++ b/extensions/standards/LPDDR5/DRAMSys/controller/checker/CheckerLPDDR5.h
@@ -38,10 +38,11 @@
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecLPDDR5.h"
-#include "../../configuration/Configuration.h"
-#include "../../common/utils.h"
+#include <DRAMSys/controller/checker/CheckerIF.h>
+
+#include <DRAMSys/configuration/memspec/MemSpecLPDDR5.h>
+#include <DRAMSys/configuration/Configuration.h>
+#include <DRAMSys/common/utils.h>
 
 class CheckerLPDDR5 final : public CheckerIF
 {
diff --git a/DRAMSys/library/src/simulation/dram/DramLPDDR5.cpp b/extensions/standards/LPDDR5/DRAMSys/simulation/dram/DramLPDDR5.cpp
similarity index 84%
rename from DRAMSys/library/src/simulation/dram/DramLPDDR5.cpp
rename to extensions/standards/LPDDR5/DRAMSys/simulation/dram/DramLPDDR5.cpp
index 58e19439..156d0946 100644
--- a/DRAMSys/library/src/simulation/dram/DramLPDDR5.cpp
+++ b/extensions/standards/LPDDR5/DRAMSys/simulation/dram/DramLPDDR5.cpp
@@ -35,19 +35,17 @@
 
 #include "DramLPDDR5.h"
 
-#include "Dram.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecLPDDR5.h"
+#include <DRAMSys/configuration/Configuration.h>
+#include <DRAMSys/configuration/memspec/MemSpecDDR5.h>
+
 
 using namespace sc_core;
 
-DramLPDDR5::DramLPDDR5(const sc_module_name& name, const Configuration& config,
-                       TemperatureController& temperatureController)
+DramLPDDR5::DramLPDDR5(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramLPDDR5", "Error Model not supported for LPDDR5");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramLPDDR5", "DRAMPower does not support LPDDR5");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramLPDDR5.h b/extensions/standards/LPDDR5/DRAMSys/simulation/dram/DramLPDDR5.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramLPDDR5.h
rename to extensions/standards/LPDDR5/DRAMSys/simulation/dram/DramLPDDR5.h
index 2326ab75..62ce647b 100644
--- a/DRAMSys/library/src/simulation/dram/DramLPDDR5.h
+++ b/extensions/standards/LPDDR5/DRAMSys/simulation/dram/DramLPDDR5.h
@@ -36,16 +36,14 @@
 #ifndef DRAMLPDDR5_H
 #define DRAMLPDDR5_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramLPDDR5 : public Dram
 {
 public:
-    DramLPDDR5(const sc_core::sc_module_name& name, const Configuration& config,
-               TemperatureController& temperatureController);
+    DramLPDDR5(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramLPDDR5);
 };
 
diff --git a/lib/nlohmann_json/CMakeLists.txt b/lib/nlohmann_json/CMakeLists.txt
new file mode 100644
index 00000000..cd30eaff
--- /dev/null
+++ b/lib/nlohmann_json/CMakeLists.txt
@@ -0,0 +1,10 @@
+########################################
+###          nlohmann_json           ###
+########################################
+
+project(nlohmann_json VERSION 3.11.2)
+
+add_library(${PROJECT_NAME} INTERFACE)
+target_include_directories(${PROJECT_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
\ No newline at end of file
diff --git a/lib/nlohmann_json/include/nlohmann/json.hpp b/lib/nlohmann_json/include/nlohmann/json.hpp
new file mode 100644
index 00000000..e11f5296
--- /dev/null
+++ b/lib/nlohmann_json/include/nlohmann/json.hpp
@@ -0,0 +1,24640 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file docs/README.md.                                                     *
+\****************************************************************************/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#include <algorithm> // all_of, find, for_each
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 2   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // nullptr_t
+#include <exception> // exception
+#if JSON_DIAGNOSTICS
+    #include <numeric> // accumulate
+#endif
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+#include <vector> // vector
+
+// #include <nlohmann/detail/value_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+// #include <nlohmann/detail/macro_scope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility> // declval, pair
+// #include <nlohmann/detail/meta/detected.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
+
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+
+
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson <evan@nemerson.com>
+// SPDX-License-Identifier: MIT
+
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 15
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(JSON_HEDLEY_MSVC_VERSION)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
+    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION
+#endif
+#if defined(__LCC__) && defined(__LCC_MINOR__)
+    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_CRAY_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__) && \
+    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if \
+  defined(__has_attribute) && \
+  ( \
+    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
+  )
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      else
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      endif
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    ) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#else
+    #define JSON_HEDLEY_FLAGS
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if \
+    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions (except those affecting ABI)
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#ifdef __has_include
+    #if __has_include(<version>)
+        #include <version>
+    #endif
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1914
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_THREE_WAY_COMPARISON
+    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
+        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+        #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #else
+        #define JSON_HAS_THREE_WAY_COMPARISON 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_RANGES
+    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
+    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
+        #define JSON_HAS_RANGES 0
+    #elif defined(__cpp_lib_ranges)
+        #define JSON_HAS_RANGES 1
+    #else
+        #define JSON_HAS_RANGES 0
+    #endif
+#endif
+
+#ifdef JSON_HAS_CPP_17
+    #define JSON_INLINE_VARIABLE inline
+#else
+    #define JSON_INLINE_VARIABLE
+#endif
+
+#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
+    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define JSON_NO_UNIQUE_ADDRESS
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
+#endif
+
+// allow disabling exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow overriding assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+// allow to access some private functions (needed by the test suite)
+#if defined(JSON_TESTS_PRIVATE)
+    #define JSON_PRIVATE_UNLESS_TESTED public
+#else
+    #define JSON_PRIVATE_UNLESS_TESTED private
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType,                                             \
+             class CustomBaseClass>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType, CustomBaseClass>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1);
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows to call any std function as if (e.g. with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
+#ifndef JSON_DISABLE_ENUM_SERIALIZATION
+    #define JSON_DISABLE_ENUM_SERIALIZATION 0
+#endif
+
+#ifndef JSON_USE_GLOBAL_UDLS
+    #define JSON_USE_GLOBAL_UDLS 1
+#endif
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare> // partial_ordering
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+#if JSON_HAS_THREE_WAY_COMPARISON
+    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
+#else
+    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#endif
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+    if (l_index < order.size() && r_index < order.size())
+    {
+        return order[l_index] <=> order[r_index]; // *NOPAD*
+    }
+    return std::partial_ordering::unordered;
+#else
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+#endif
+}
+
+// GCC selects the built-in operator< over an operator rewritten from
+// a user-defined spaceship operator
+// Clang, MSVC, and ICC select the rewritten candidate
+// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
+#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    return std::is_lt(lhs <=> rhs); // *NOPAD*
+}
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_escape.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief replace all occurrences of a substring by another string
+
+@param[in,out] s  the string to manipulate; changed so that all
+               occurrences of @a f are replaced with @a t
+@param[in]     f  the substring to replace with @a t
+@param[in]     t  the string to replace @a f
+
+@pre The search string @a f must not be empty. **This precondition is
+enforced with an assertion.**
+
+@since version 2.0.0
+*/
+template<typename StringType>
+inline void replace_substring(StringType& s, const StringType& f,
+                              const StringType& t)
+{
+    JSON_ASSERT(!f.empty());
+    for (auto pos = s.find(f);                // find first occurrence of f
+            pos != StringType::npos;          // make sure f was found
+            s.replace(pos, f.size(), t),      // replace with t, and
+            pos = s.find(f, pos + t.size()))  // find next occurrence of f
+    {}
+}
+
+/*!
+ * @brief string escaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to escape
+ * @return    escaped string
+ *
+ * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
+ */
+template<typename StringType>
+inline StringType escape(StringType s)
+{
+    replace_substring(s, StringType{"~"}, StringType{"~0"});
+    replace_substring(s, StringType{"/"}, StringType{"~1"});
+    return s;
+}
+
+/*!
+ * @brief string unescaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to unescape
+ * @return    unescaped string
+ *
+ * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
+ */
+template<typename StringType>
+static void unescape(StringType& s)
+{
+    replace_substring(s, StringType{"~1"}, StringType{"/"});
+    replace_substring(s, StringType{"~0"}, StringType{"~"});
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/position_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 The Abseil Authors
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // index_sequence, make_index_sequence, index_sequence_for
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+#ifdef JSON_HAS_CPP_14
+
+// the following utilities are natively available in C++14
+using std::enable_if_t;
+using std::index_sequence;
+using std::make_index_sequence;
+using std::index_sequence_for;
+
+#else
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
+
+//// START OF CODE FROM GOOGLE ABSEIL
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
+{
+    using value_type = T;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
+
+namespace utility_internal
+{
+
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
+};
+
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
+
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
+};
+
+template <typename T>
+struct Gen<T, 0>
+{
+    using type = integer_sequence<T>;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+//// END OF CODE FROM GOOGLE ABSEIL
+
+#endif
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static JSON_INLINE_VARIABLE constexpr T value{};
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename T>
+    constexpr T static_const<T>::value;
+#endif
+
+template<typename T, typename... Args>
+inline constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
+{
+    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+#include <tuple> // tuple
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename It, typename = void>
+struct iterator_types {};
+
+template<typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template<typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template<typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template<typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/call_std/begin.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/call_std/end.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+    #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+    #include <cstdint> // int64_t, uint64_t
+    #include <map> // map
+    #include <memory> // allocator
+    #include <string> // string
+    #include <vector> // vector
+
+    // #include <nlohmann/detail/abi_macros.hpp>
+
+
+    /*!
+    @brief namespace for Niels Lohmann
+    @see https://github.com/nlohmann
+    @since version 1.0.0
+    */
+    NLOHMANN_JSON_NAMESPACE_BEGIN
+
+    /*!
+    @brief default JSONSerializer template argument
+
+    This serializer ignores the template arguments and uses ADL
+    ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+    for serialization.
+    */
+    template<typename T = void, typename SFINAE = void>
+    struct adl_serializer;
+
+    /// a class to store JSON values
+    /// @sa https://json.nlohmann.me/api/basic_json/
+    template<template<typename U, typename V, typename... Args> class ObjectType =
+    std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string, class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer =
+    adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+    class CustomBaseClass = void>
+    class basic_json;
+
+    /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+    /// @sa https://json.nlohmann.me/api/json_pointer/
+    template<typename RefStringType>
+    class json_pointer;
+
+    /*!
+    @brief default specialization
+    @sa https://json.nlohmann.me/api/json/
+    */
+    using json = basic_json<>;
+
+    /// @brief a minimal map-like container that preserves insertion order
+    /// @sa https://json.nlohmann.me/api/ordered_map/
+    template<class Key, class T, class IgnoredLess, class Allocator>
+    struct ordered_map;
+
+    /// @brief specialization that maintains the insertion order of object keys
+    /// @sa https://json.nlohmann.me/api/ordered_json/
+    using ordered_json = basic_json<nlohmann::ordered_map>;
+
+    NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+// used by exceptions create() member functions
+// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
+// false_type otherwise
+template<typename BasicJsonContext>
+struct is_basic_json_context :
+    std::integral_constant < bool,
+    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
+    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
+{};
+
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template<typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template<typename T>
+using key_type_t = typename T::key_type;
+
+template<typename T>
+using value_type_t = typename T::value_type;
+
+template<typename T>
+using difference_type_t = typename T::difference_type;
+
+template<typename T>
+using pointer_t = typename T::pointer;
+
+template<typename T>
+using reference_t = typename T::reference;
+
+template<typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template<typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template<typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template<typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
+template <typename BasicJsonType, typename T>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template<typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+template<typename T>
+using detect_key_compare = typename T::key_compare;
+
+template<typename T>
+struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
+
+// obtains the actual object key comparator
+template<typename BasicJsonType>
+struct actual_object_comparator
+{
+    using object_t = typename BasicJsonType::object_t;
+    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
+    using type = typename std::conditional < has_key_compare<object_t>::value,
+          typename object_t::key_compare, object_comparator_t>::type;
+};
+
+template<typename BasicJsonType>
+using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
+
+///////////////////
+// is_ functions //
+///////////////////
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B> struct conjunction<B> : B { };
+template<class B, class... Bn>
+struct conjunction<B, Bn...>
+: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
+
+template<typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template<typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
+// The following implementation of is_complete_type is taken from
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+// and is written by Xiang Fan who agreed to using it in this library.
+
+template<typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template<typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value &&
+        is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template<typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type
+{
+    static constexpr auto value =
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+{
+    // launder type through decltype() to fix compilation failure on ICPC
+#ifdef __INTEL_COMPILER
+    using laundered_type = decltype(std::declval<ConstructibleStringType>());
+#else
+    using laundered_type = ConstructibleStringType;
+#endif
+
+    static constexpr auto value =
+        conjunction <
+        is_constructible<laundered_type, typename BasicJsonType::string_t>,
+        is_detected_exact<typename BasicJsonType::string_t::value_type,
+        value_type_t, laundered_type >>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t <
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+        is_complete_type <
+        detected_t<range_value_t, ConstructibleArrayType >>::value >>
+{
+    using value_type = range_value_t<ConstructibleArrayType>;
+
+    static constexpr bool value =
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+template<typename BasicJsonType, typename T>
+struct is_json_iterator_of : std::false_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
+{};
+
+// checks if a given type T is a template specialization of Primary
+template<template <typename...> class Primary, typename T>
+struct is_specialization_of : std::false_type {};
+
+template<template <typename...> class Primary, typename... Args>
+struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
+
+template<typename T>
+using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
+
+// checks if A and B are comparable using Compare functor
+template<typename Compare, typename A, typename B, typename = void>
+struct is_comparable : std::false_type {};
+
+template<typename Compare, typename A, typename B>
+struct is_comparable<Compare, A, B, void_t<
+decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
+decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
+>> : std::true_type {};
+
+template<typename T>
+using detect_is_transparent = typename T::is_transparent;
+
+// type trait to check if KeyType can be used as object key (without a BasicJsonType)
+// see is_usable_as_basic_json_key_type below
+template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_key_type = typename std::conditional <
+                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
+                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
+                                   ObjectKeyType>::value)
+                              && (!RequireTransparentComparator
+                                  || is_detected <detect_is_transparent, Comparator>::value)
+                              && !is_json_pointer<KeyType>::value,
+                              std::true_type,
+                              std::false_type >::type;
+
+// type trait to check if KeyType can be used as object key
+// true if:
+//   - KeyType is comparable with BasicJsonType::object_t::key_type
+//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
+//   - the comparator is transparent or RequireTransparentComparator is false
+//   - KeyType is not a JSON iterator or json_pointer
+template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_basic_json_key_type = typename std::conditional <
+        is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
+        typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
+        RequireTransparentComparator, ExcludeObjectKeyType>::value
+        && !is_json_iterator_of<BasicJsonType, KeyType>::value,
+        std::true_type,
+        std::false_type >::type;
+
+template<typename ObjectType, typename KeyType>
+using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
+
+// type trait to check if object_t has an erase() member functions accepting KeyType
+template<typename BasicJsonType, typename KeyType>
+using has_erase_with_key_type = typename std::conditional <
+                                is_detected <
+                                detect_erase_with_key_type,
+                                typename BasicJsonType::object_t, KeyType >::value,
+                                std::true_type,
+                                std::false_type >::type;
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+template<typename... Types>
+using all_integral = conjunction<std::is_integral<Types>...>;
+
+template<typename... Types>
+using all_signed = conjunction<std::is_signed<Types>...>;
+
+template<typename... Types>
+using all_unsigned = conjunction<std::is_unsigned<Types>...>;
+
+// there's a disjunction trait in another PR; replace when merged
+template<typename... Types>
+using same_sign = std::integral_constant < bool,
+      all_signed<Types...>::value || all_unsigned<Types...>::value >;
+
+template<typename OfType, typename T>
+using never_out_of_range = std::integral_constant < bool,
+      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
+      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
+
+template<typename OfType, typename T,
+         bool OfTypeSigned = std::is_signed<OfType>::value,
+         bool TSigned = std::is_signed<T>::value>
+struct value_in_range_of_impl2;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
+               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T,
+         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
+         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
+struct value_in_range_of_impl1;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, false>
+{
+    static constexpr bool test(T val)
+    {
+        return value_in_range_of_impl2<OfType, T>::test(val);
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, true>
+{
+    static constexpr bool test(T /*val*/)
+    {
+        return true;
+    }
+};
+
+template<typename OfType, typename T>
+inline constexpr bool value_in_range_of(T val)
+{
+    return value_in_range_of_impl1<OfType, T>::test(val);
+}
+
+template<bool Value>
+using bool_constant = std::integral_constant<bool, Value>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_c_string
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_c_string()
+{
+    using TUnExt = typename std::remove_extent<T>::type;
+    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
+    using TUnPtr = typename std::remove_pointer<T>::type;
+    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
+    return
+        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
+        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
+}
+
+}  // namespace impl
+
+// checks whether T is a [cv] char */[cv] char[] C string
+template<typename T>
+struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
+
+template<typename T>
+using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_transparent
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_transparent()
+{
+    return is_detected<detect_is_transparent, T>::value;
+}
+
+}  // namespace impl
+
+// checks whether T has a member named is_transparent
+template<typename T>
+struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
+
+///////////////////////////////////////////////////////////////////////////////
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstring> // strlen
+#include <string> // string
+#include <utility> // forward
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+inline std::size_t concat_length()
+{
+    return 0;
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, Args&& ... rest);
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, Args&& ... rest);
+
+template<typename... Args>
+inline std::size_t concat_length(const char /*c*/, Args&& ... rest)
+{
+    return 1 + concat_length(std::forward<Args>(rest)...);
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, Args&& ... rest)
+{
+    // cppcheck-suppress ignoredReturnValue
+    return ::strlen(cstr) + concat_length(std::forward<Args>(rest)...);
+}
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, Args&& ... rest)
+{
+    return str.size() + concat_length(std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType>
+inline void concat_into(OutStringType& /*out*/)
+{}
+
+template<typename StringType, typename Arg>
+using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template<typename OutStringType, typename Arg, typename... Args,
+         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
+{
+    out.append(std::forward<Arg>(arg));
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
+{
+    out += std::forward<Arg>(arg);
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.begin(), arg.end());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.data(), arg.size());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType = std::string, typename... Args>
+inline OutStringType concat(Args && ... args)
+{
+    OutStringType str;
+    str.reserve(concat_length(std::forward<Args>(args)...));
+    concat_into(str, std::forward<Args>(args)...);
+    return str;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+////////////////
+// exceptions //
+////////////////
+
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
+    }
+
+    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
+    {
+        return "";
+    }
+
+    template<typename BasicJsonType>
+    static std::string diagnostics(const BasicJsonType* leaf_element)
+    {
+#if JSON_DIAGNOSTICS
+        std::vector<std::string> tokens;
+        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
+        {
+            switch (current->m_parent->type())
+            {
+                case value_t::array:
+                {
+                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
+                    {
+                        if (&current->m_parent->m_value.array->operator[](i) == current)
+                        {
+                            tokens.emplace_back(std::to_string(i));
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    for (const auto& element : *current->m_parent->m_value.object)
+                    {
+                        if (&element.second == current)
+                        {
+                            tokens.emplace_back(element.first.c_str());
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:   // LCOV_EXCL_LINE
+                    break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (tokens.empty())
+        {
+            return "";
+        }
+
+        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                   [](const std::string & a, const std::string & b)
+        {
+            return concat(a, '/', detail::escape(b));
+        });
+        return concat('(', str, ") ");
+#else
+        static_cast<void>(leaf_element);
+        return "";
+#endif
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     position_string(pos), ": ", exception::diagnostics(context), what_arg);
+        return {id_, pos.chars_read_total, w.c_str()};
+    }
+
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
+                                     ": ", exception::diagnostics(context), what_arg);
+        return {id_, byte_, w.c_str()};
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return concat(" at line ", std::to_string(pos.lines_read + 1),
+                      ", column ", std::to_string(pos.chars_read_current_line));
+    }
+};
+
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
+class invalid_iterator : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
+class type_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
+class out_of_range : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
+class other_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// dispatching helper struct
+template <class T> struct identity_tag {};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::experimental::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#endif
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
+    }
+    n = nullptr;
+}
+
+// overloads for basic_json template parameters
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename StringType,
+    enable_if_t <
+        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
+        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
+        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
+        && !is_json_ref<StringType>::value, int > = 0 >
+inline void from_json(const BasicJsonType& j, StringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.resize(j.size());
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                                 priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
+    }
+
+    ConstructibleObjectType ret;
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
+inline void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
+{
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
+{
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
+{
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+#endif
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
+    {
+        return from_json(j, std::forward<T>(val));
+    }
+};
+
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::from_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // copy
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+#if JSON_HAS_RANGES
+    #include <ranges> // enable_borrowed_range
+#endif
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+template<typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type *;
+    using reference = value_type &;
+    using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor{};
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    string_type empty_str{};
+
+  public:
+    explicit iteration_proxy_value() = default;
+    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_default_constructible<string_type>::value)
+        : anchor(std::move(it))
+        , array_index(array_index_)
+    {}
+
+    iteration_proxy_value(iteration_proxy_value const&) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
+    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
+    iteration_proxy_value(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_move_constructible<string_type>::value) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
+             && std::is_nothrow_move_assignable<string_type>::value) = default;
+    ~iteration_proxy_value() = default;
+
+    /// dereference operator (needed for range-based for)
+    const iteration_proxy_value& operator*() const
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto tmp = iteration_proxy_value(anchor, array_index);
+        ++anchor;
+        ++array_index;
+        return tmp;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        JSON_ASSERT(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::pointer container = nullptr;
+
+  public:
+    explicit iteration_proxy() = default;
+
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(&cont) {}
+
+    iteration_proxy(iteration_proxy const&) = default;
+    iteration_proxy& operator=(iteration_proxy const&) = default;
+    iteration_proxy(iteration_proxy&&) noexcept = default;
+    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
+    ~iteration_proxy() = default;
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->end());
+    }
+};
+
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template<typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
+            : public std::integral_constant<std::size_t, 2> {};
+
+template<std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+}  // namespace std
+
+#if JSON_HAS_RANGES
+    template <typename IteratorType>
+    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
+#endif
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////
+// constructors //
+//////////////////
+
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_value.destroy(j.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::boolean;
+        j.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::string;
+        j.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::binary;
+        j.m_value = typename BasicJsonType::binary_t(b);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::binary;
+        j.m_value = typename BasicJsonType::binary_t(std::move(b));
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::number_float;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::number_unsigned;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::number_integer;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = arr;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+            j.set_parent(j.m_value.array->back());
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        }
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::object;
+        j.m_value = obj;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::object;
+        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+inline void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template < typename BasicJsonType, typename BoolRef,
+           enable_if_t <
+               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
+                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
+                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
+                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
+                                      typename BasicJsonType::boolean_t >::value))
+               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                  int > = 0 >
+inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+inline void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+    j = p.string();
+}
+#endif
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `to_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::to_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
+struct adl_serializer
+{
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
+
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
+    }
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/byte_container_with_subtype.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t, uint64_t
+#include <tuple> // tie
+#include <utility> // move
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
+    {
+        m_subtype = subtype_;
+        m_has_subtype = true;
+    }
+
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
+    {
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
+    }
+
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    subtype_type m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/hash.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
+#include <functional> // hash
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default:                   // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            return 0;              // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstring> // strlen
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
+
+////////////////////
+// input adapters //
+////////////////////
+
+#ifndef JSON_NO_IO
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter
+{
+  public:
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
+        : m_file(f)
+    {
+        JSON_ASSERT(m_file != nullptr);
+    }
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
+
+    std::char_traits<char>::int_type get_character() noexcept
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter
+{
+  public:
+    using char_type = char;
+
+    ~input_stream_adapter()
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(&i), sb(i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, e.g. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character()
+    {
+        auto res = sb->sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
+};
+#endif  // JSON_NO_IO
+
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
+{
+  public:
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
+
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last))
+    {}
+
+    typename std::char_traits<char_type>::int_type get_character()
+    {
+        if (JSON_HEDLEY_LIKELY(current != end))
+        {
+            auto result = std::char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+
+        return std::char_traits<char_type>::eof();
+    }
+
+  private:
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+};
+
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
+{
+    // UTF-32
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
+{
+    // UTF-16
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc || wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
+                {
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+// Wraps another input apdater to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
+{
+  public:
+    using char_type = char;
+
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(WideCharType)>();
+
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    BaseInputAdapter base_adapter;
+
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+// Enables ADL on begin(container) and end(container)
+// Encloses the using declarations in namespace for not to leak them to outside scope
+
+namespace container_input_adapter_factory_impl
+{
+
+using std::begin;
+using std::end;
+
+template<typename ContainerType, typename Enable = void>
+struct container_input_adapter_factory {};
+
+template<typename ContainerType>
+struct container_input_adapter_factory< ContainerType,
+       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
+       {
+           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
+
+           static adapter_type create(const ContainerType& container)
+{
+    return input_adapter(begin(container), end(container));
+}
+       };
+
+}  // namespace container_input_adapter_factory_impl
+
+template<typename ContainerType>
+typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
+{
+    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
+}
+
+#ifndef JSON_NO_IO
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+#endif  // JSON_NO_IO
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length);
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitly cast
+// to the correct adapter.
+class span_input_adapter
+{
+  public:
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
+
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
+    {
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
+    }
+
+  private:
+    contiguous_bytes_input_adapter ia;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief a floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string value was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string value.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief a binary value was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary value.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
+    virtual ~json_sax() = default;
+};
+
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @param[in,out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_array());
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_value.array->back());
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep && ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back())
+        {
+            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+            {
+                // discard object
+                *ref_stack.back() = discarded;
+            }
+            else
+            {
+                ref_stack.back()->set_parents();
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (keep)
+            {
+                ref_stack.back()->set_parents();
+            }
+            else
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        JSON_ASSERT(!keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (!keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (!keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, &root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (!ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::move(value));
+            return {true, &(ref_stack.back()->m_value.array->back())};
+        }
+
+        // object
+        JSON_ASSERT(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        JSON_ASSERT(!key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (!store_element)
+        {
+            return {false, nullptr};
+        }
+
+        JSON_ASSERT(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/lexer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////
+// lexer //
+///////////
+
+template<typename BasicJsonType>
+class lexer_base
+{
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+};
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        JSON_ASSERT(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' && current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' && current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' && current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
+    {
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 8259. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        JSON_ASSERT(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char_type>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result, so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(static_cast<char_int_type>(codepoint));
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 8259.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 8259. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia.get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        {
+            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        {
+            JSON_ASSERT(!token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(char_int_type c)
+    {
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if (static_cast<unsigned char>(c) <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(static_cast<std::string::value_type>(c));
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB && get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 && !skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
+        {
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
+        }
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+            {
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
+            case 'f':
+            {
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
+            case 'n':
+            {
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char_type>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char_type> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char_int_type decimal_point_char = '.';
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianness(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return whether parsing was successful
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+            case input_format_t::bjdata:
+                result = parse_ubjson_internal();
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
+                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in,out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                const std::string cr_str{cr.data()};
+                return sax->parse_error(element_type_parse_position, cr_str,
+                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(
+                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        // ignore binary subtype
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
+                    default:                 // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                        return false;        // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != static_cast<std::size_t>(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        if (len != 0)
+        {
+            string_t key;
+            if (len != static_cast<std::size_t>(-1))
+            {
+                for (std::size_t i = 0; i < len; ++i)
+                {
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                while (get() != 0xFF)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
+    }
+
+    /*!
+    @param[out] dim  an integer vector storing the ND array dimensions
+    @return whether reading ND array size vector is successful
+    */
+    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        size_t dimlen = 0;
+        bool no_ndarray = true;
+
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
+                        {
+                            return false;
+                        }
+                        dim.push_back(dimlen);
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
+                    {
+                        return false;
+                    }
+                    dim.push_back(dimlen);
+                }
+            }
+        }
+        else
+        {
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
+                {
+                    return false;
+                }
+                dim.push_back(dimlen);
+                get_ignore_noop();
+            }
+        }
+        return true;
+    }
+
+    /*!
+    @param[out] result  determined size
+    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
+                               or ndarray dimension is not allowed; `false` means ndarray
+                               is allowed; for output, `true` means an ndarray is found;
+                               is_ndarray can only return `true` when its initial value
+                               is `false`
+    @param[in] prefix  type marker if already read, otherwise set to 0
+
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
+    {
+        if (prefix == 0)
+        {
+            prefix = get_ignore_noop();
+        }
+
+        switch (prefix)
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = detail::conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case '[':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimensional vector is not allowed", "size"), nullptr));
+                }
+                std::vector<size_t> dim;
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
+                {
+                    return false;
+                }
+                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
+                {
+                    result = dim.at(dim.size() - 1);
+                    return true;
+                }
+                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
+                {
+                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
+                    {
+                        if ( i == 0 )
+                        {
+                            result = 0;
+                            return true;
+                        }
+                    }
+
+                    string_t key = "_ArraySize_";
+                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
+                    {
+                        return false;
+                    }
+                    result = 1;
+                    for (auto i : dim)
+                    {
+                        result *= i;
+                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
+                        {
+                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
+                        {
+                            return false;
+                        }
+                    }
+                    is_ndarray = true;
+                    return sax->end_array();
+                }
+                result = 0;
+                return true;
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
+    {
+        result.first = npos; // size
+        result.second = 0; // type
+        bool is_ndarray = false;
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (input_format == input_format_t::bjdata
+                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
+            }
+
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                if (inside_ndarray)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
+                }
+                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
+            }
+            return is_error;
+        }
+
+        if (current == '#')
+        {
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
+            }
+            return is_error;
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'h':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+                break;
+        }
+        auto last_token = get_token_string();
+        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
+        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
+
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
+            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
+            {
+                return p.first < t;
+            });
+            string_t key = "_ArrayType_";
+            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
+            }
+
+            string_t type = it->second; // sax->string() takes a reference
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second == 'C')
+            {
+                size_and_type.second = 'U';
+            }
+
+            key = "_ArrayData_";
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
+            {
+                return false;
+            }
+
+            for (std::size_t i = 0; i < size_and_type.first; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                {
+                    return false;
+                }
+            }
+
+            return (sax->end_array() && sax->end_object());
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // do not accept ND-array size in objects in BJData
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
+        }
+
+        string_t key;
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        bool no_ndarray = true;
+        auto res = get_ubjson_size_value(size, no_ndarray);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianness, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec{};
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            case input_format_t::bjdata:
+                error_msg += "BJData";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        return concat(error_msg, ' ', context, ": ", detail);
+    }
+
+  private:
+    static JSON_INLINE_VARIABLE constexpr std::size_t npos = static_cast<std::size_t>(-1);
+
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// input format
+    const input_format_t input_format = input_format_t::json;
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+
+    // excluded markers in bjdata optimized type
+#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
+    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
+
+#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
+    make_array<bjd_type>(                      \
+    bjd_type{'C', "char"},                     \
+    bjd_type{'D', "double"},                   \
+    bjd_type{'I', "int16"},                    \
+    bjd_type{'L', "int64"},                    \
+    bjd_type{'M', "uint64"},                   \
+    bjd_type{'U', "uint8"},                    \
+    bjd_type{'d', "single"},                   \
+    bjd_type{'i', "int8"},                     \
+    bjd_type{'l', "int32"},                    \
+    bjd_type{'m', "uint32"},                   \
+    bjd_type{'u', "uint16"})
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // lookup tables
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
+        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
+
+    using bjd_type = std::pair<char_int_type, string_t>;
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
+        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
+
+#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
+#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
+    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/input/parser.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+enum class parse_event_t : std::uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive descent parser.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    /// a parser reading from an input adapter
+    explicit parser(InputAdapterType&& adapter,
+                    const parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(cb)
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+
+        result.assert_invariant();
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result && strict && (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+        }
+
+        return result;
+    }
+
+  private:
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (!skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
+                    }
+
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::end_of_input:
+                    case token_type::literal_or_value:
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
+            }
+
+            // states.back() is false -> object
+
+            // comma -> next value
+            if (get_token() == token_type::value_separator)
+            {
+                // parse key
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                {
+                    return false;
+                }
+
+                // parse separator (:)
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                }
+
+                // parse values
+                get_token();
+                continue;
+            }
+
+            // closing }
+            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                {
+                    return false;
+                }
+
+                // We are done with this object. Before we can parse a
+                // new value, we need to evaluate the new state first.
+                // By setting skip_to_state_evaluation to false, we
+                // are effectively jumping to the beginning of this if.
+                JSON_ASSERT(!states.empty());
+                states.pop_back();
+                skip_to_state_evaluation = true;
+                continue;
+            }
+
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (!context.empty())
+        {
+            error_msg += concat("while parsing ", context, ' ');
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
+                                m_lexer.get_token_string(), '\'');
+        }
+        else
+        {
+            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t<BasicJsonType> callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+    /// the iterator with BasicJsonType of different const-ness
+    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    /// allow basic_json to access private members
+    friend other_iter_impl;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+    // superficial check for the LegacyBidirectionalIterator named requirement
+    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
+                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
+                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
+
+  public:
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator==(const IterImpl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator!=(const IterImpl& other) const
+    {
+        return !operator==(other);
+    }
+
+    /*!
+    @brief comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return !other.operator < (*this);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return !operator<=(other);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return !operator<(other);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
+    }
+
+    /*!
+    @brief return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_custom_base_class.hpp>
+
+
+#include <type_traits> // conditional, is_same
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief Default base class of the @ref basic_json class.
+
+So that the correct implementations of the copy / move ctors / assign operators
+of @ref basic_json do not require complex case distinctions
+(no base class / custom base class used as customization point),
+@ref basic_json always has a base class.
+By default, this class is used because it is empty and thus has no effect
+on the behavior of @ref basic_json.
+*/
+struct json_default_base {};
+
+template<class T>
+using json_base_class = typename std::conditional <
+                        std::is_same<T, void>::value,
+                        json_default_base,
+                        T
+                        >::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_pointer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // all_of
+#include <cctype> // isdigit
+#include <cerrno> // errno, ERANGE
+#include <cstdlib> // strtoull
+#ifndef JSON_NO_IO
+    #include <iosfwd> // ostream
+#endif  // JSON_NO_IO
+#include <limits> // max
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+    template<typename>
+    friend class json_pointer;
+
+    template<typename T>
+    struct string_t_helper
+    {
+        using type = T;
+    };
+
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
+    {
+        using type = StringType;
+    };
+
+  public:
+    // for backwards compatibility accept BasicJsonType
+    using string_t = typename string_t_helper<RefStringType>::type;
+
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const string_t& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    string_t to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               string_t{},
+                               [](const string_t& a, const string_t& b)
+        {
+            return detail::concat(a, '/', detail::escape(b));
+        });
+    }
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
+    operator string_t() const
+    {
+        return to_string();
+    }
+
+#ifndef JSON_NO_IO
+    /// @brief write string representation of the JSON pointer to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
+    {
+        o << ptr.to_string();
+        return o;
+    }
+#endif
+
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(string_t token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(std::size_t array_idx)
+    {
+        return *this /= std::to_string(array_idx);
+    }
+
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
+    {
+        return json_pointer(lhs) /= std::move(token);
+    }
+
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
+    {
+        return json_pointer(lhs) /= array_idx;
+    }
+
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const string_t& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const string_t& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(string_t&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
+    */
+    template<typename BasicJsonType>
+    static typename BasicJsonType::size_type array_index(const string_t& s)
+    {
+        using size_type = typename BasicJsonType::size_type;
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
+        }
+
+        const char* p = s.c_str();
+        char* p_end = nullptr;
+        errno = 0; // strtoull doesn't reset errno
+        const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
+        if (p == p_end // invalid input or empty string
+                || errno == ERANGE // out of range
+                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
+        {
+            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
+        {
+            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+  private:
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        auto* result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums || reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    }
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_value.array->size()), ") is out of range"), ptr));
+                    }
+
+                    // use unchecked array access
+                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    template<typename BasicJsonType>
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index<BasicJsonType>(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<string_t> split(const string_t& reference_string)
+    {
+        std::vector<string_t> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == string_t::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == string_t::npos)
+            start = (slash == string_t::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != string_t::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                JSON_ASSERT(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
+                }
+            }
+
+            // finally, store the reference token
+            detail::unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+  private:
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    template<typename BasicJsonType>
+    static void flatten(const string_t& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    {
+                        flatten(detail::concat(reference_string, '/', std::to_string(i)),
+                                value.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_value.object)
+                    {
+                        flatten(detail::concat(reference_string, '/', detail::escape(element.first)), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    // can't use conversion operator because of ambiguity
+    json_pointer<string_t> convert() const&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = reference_tokens;
+        return result;
+    }
+
+    json_pointer<string_t> convert()&&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = std::move(reference_tokens);
+        return result;
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs>
+    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
+    {
+        return reference_tokens == rhs.reference_tokens;
+    }
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
+    bool operator==(const string_t& rhs) const
+    {
+        return *this == json_pointer(rhs);
+    }
+
+    /// @brief 3-way compares two JSON pointers
+    template<typename RefStringTypeRhs>
+    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
+    {
+        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
+    }
+#else
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointers for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointer for less-than
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+#endif
+
+  private:
+    /// the reference tokens
+    std::vector<string_t> reference_tokens;
+};
+
+#if !JSON_HAS_THREE_WAY_COMPARISON
+// functions cannot be defined inside class due to ODR violations
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens == rhs.reference_tokens;
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return lhs == json_pointer<RefStringTypeLhs>(rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens < rhs.reference_tokens;
+}
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_ref.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value))
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(&value)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) noexcept = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (value_ref == nullptr)
+        {
+            return std::move(owned_value);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return value_ref ? *value_ref : owned_value;
+    }
+
+    value_type const* operator->() const
+    {
+        return &** this;
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type const* value_ref = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <map> // map
+#include <cmath> // isnan, isinf
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <string> // basic_string
+#include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        v.insert(v.end(), s, s + length);
+    }
+
+  private:
+    std::vector<CharType, AllocatorType>& v;
+};
+
+#ifndef JSON_NO_IO
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+#endif  // JSON_NO_IO
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
+
+#ifndef JSON_NO_IO
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
+    {
+        JSON_ASSERT(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_value.object);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                if (std::isnan(j.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
+                }
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (j.m_value.binary->has_subtype())
+                {
+                    if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_value.binary->subtype()));
+                    }
+                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_value.binary->subtype()));
+                    }
+                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_value.binary->subtype()));
+                    }
+                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_value.binary->subtype()));
+                    }
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether or not to use the ext or fixext types
+                const bool use_ext = j.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC8 // ext 16
+                                                     : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC9 // ext 32
+                                                     : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    @param[in] use_bjdata  whether write in BJData format, default is false
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true,
+                      const bool use_bjdata = false)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_value.string->size(), true, use_bjdata);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_value.array->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.array->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && !j.m_value.binary->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character('U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true, use_bjdata);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                        j.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type('U'));
+                        oa->write_character(j.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (use_bjdata && j.m_value.object->size() == 3 && j.m_value.object->find("_ArrayType_") != j.m_value.object->end() && j.m_value.object->find("_ArraySize_") != j.m_value.object->end() && j.m_value.object->find("_ArrayData_") != j.m_value.object->end())
+                {
+                    if (!write_bjdata_ndarray(*j.m_value.object, use_count, use_type))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
+                    {
+                        break;
+                    }
+                }
+
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_value.object->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.object->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
+            static_cast<void>(j);
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double>(value, true);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const BasicJsonType& j)
+    {
+        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_value.number_unsigned), true);
+        }
+        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_value.number_unsigned), true);
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, concat("integer number ", std::to_string(j.m_value.number_unsigned), " cannot be represented by BSON as it does not fit int64"), &j));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name, j);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_value.array);
+
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_value.binary);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_value.array);
+
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_value.binary);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                          [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n, use_bjdata);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<std::uint16_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<std::uint32_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
+            }
+            write_number(static_cast<std::uint64_t>(n), use_bjdata);
+        }
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n), use_bjdata);
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<uint16_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<uint32_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+    */
+    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (use_bjdata && j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                if (use_bjdata && j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                if (use_bjdata && j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    return 'M';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array: // fallthrough
+            case value_t::binary:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            case value_t::discarded:
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    /*!
+    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
+    */
+    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type)
+    {
+        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
+            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'}, {"char", 'C'}
+        };
+
+        string_t key = "_ArrayType_";
+        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
+        if (it == bjdtype.end())
+        {
+            return true;
+        }
+        CharType dtype = it->second;
+
+        key = "_ArraySize_";
+        std::size_t len = (value.at(key).empty() ? 0 : 1);
+        for (const auto& el : value.at(key))
+        {
+            len *= static_cast<std::size_t>(el.m_value.number_unsigned);
+        }
+
+        key = "_ArrayData_";
+        if (value.at(key).size() != len)
+        {
+            return true;
+        }
+
+        oa->write_character('[');
+        oa->write_character('$');
+        oa->write_character(dtype);
+        oa->write_character('#');
+
+        key = "_ArraySize_";
+        write_ubjson(value.at(key), use_count, use_type, true,  true);
+
+        key = "_ArrayData_";
+        if (dtype == 'U' || dtype == 'C')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint8_t>(el.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'i')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int8_t>(el.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'u')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint16_t>(el.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'I')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int16_t>(el.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'm')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint32_t>(el.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'l')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int32_t>(el.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'M')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint64_t>(el.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'L')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int64_t>(el.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'd')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<float>(el.m_value.number_float), true);
+            }
+        }
+        else if (dtype == 'D')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<double>(el.m_value.number_float), true);
+            }
+        }
+        return false;
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @param[in] OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+    @tparam NumberType the type of the number
+
+    @note This function needs to respect the system's endianness, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType>
+    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec{};
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2008-2009 Björn Hoehrmann <bjoern@hoehrmann.de>
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string, char_traits
+#include <iomanip> // setfill, setw
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template<typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        JSON_ASSERT(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template<typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+
+    pow10 = 1;
+    return 1;
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
+    {
+        JSON_ASSERT(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    JSON_ASSERT(p1 > 0);
+
+    std::uint32_t pow10{};
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    JSON_ASSERT(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n && n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (static_cast<size_t>(n) + 2);
+    }
+
+    if (0 < n && n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        JSON_ASSERT(k > n);
+
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
+        buf[n] = '.';
+        return buf + (static_cast<size_t>(k) + 1U);
+    }
+
+    if (min_exp < n && n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
+        buf[1] = '.';
+        buf += 1 + static_cast<size_t>(k);
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+}  // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    JSON_ASSERT(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
+
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint{};
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<std::uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (!ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        }
+    }
+
+  private:
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+     * @brief convert a byte to a uppercase hex representation
+     * @param[in] byte byte to represent
+     * @return representation ("00".."FF")
+     */
+    static std::string hex_bytes(std::uint8_t byte)
+    {
+        std::string result = "FF";
+        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
+        result[0] = nibble_to_hex[byte / 16];
+        result[1] = nibble_to_hex[byte % 16];
+        return result;
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars{};
+
+        if (is_negative_number(x))
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward,
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (!std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        JSON_ASSERT(len > 0);
+        // check if buffer was large enough
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' && decimal_point != '.')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if we need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' || c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        JSON_ASSERT(byte < utf8d.size());
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        const std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < 400);
+        state = utf8d[index];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/ordered_map.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <functional> // equal_to, less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
+#include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
+#include <utility> // pair
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+#ifdef JSON_HAS_CPP_14
+    using key_compare = std::equal_to<>;
+#else
+    using key_compare = std::equal_to<Key>;
+#endif
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map() noexcept(noexcept(Container())) : Container{} {}
+    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    std::pair<iterator, bool> emplace(KeyType && key, T && t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    T& operator[](const key_type& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & operator[](KeyType && key)
+    {
+        return emplace(std::forward<KeyType>(key), T{}).first->second;
+    }
+
+    const T& operator[](const key_type& key) const
+    {
+        return at(key);
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & operator[](KeyType && key) const
+    {
+        return at(std::forward<KeyType>(key));
+    }
+
+    T& at(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & at(KeyType && key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    const T& at(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & at(KeyType && key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    size_type erase(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        if (first == last)
+        {
+            return first;
+        }
+
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
+
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
+
+    size_type count(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, value.first))
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+
+    template<typename InputIt>
+    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+            std::input_iterator_tag>::value>::type;
+
+    template<typename InputIt, typename = require_input_iter<InputIt>>
+    void insert(InputIt first, InputIt last)
+    {
+        for (auto it = first; it != last; ++it)
+        {
+            insert(*it);
+        }
+    }
+
+private:
+    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+
+#if defined(JSON_HAS_CPP_17)
+    #include <any>
+    #include <string_view>
+#endif
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief a class to store JSON values
+
+@internal
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@note ObjectType trick from https://stackoverflow.com/a/9860911
+@endinternal
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+    : public ::nlohmann::detail::json_base_class<CustomBaseClass>
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+
+    template<typename>
+    friend class ::nlohmann::json_pointer;
+    // can be restored when json_pointer backwards compatibility is removed
+    // friend ::nlohmann::json_pointer<StringType>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename InputType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+    friend class ::nlohmann::detail::exception;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+    using json_base_class_t = ::nlohmann::detail::json_base_class<CustomBaseClass>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+                std::move(cb), allow_exceptions, ignore_comments);
+    }
+
+  private:
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<StringType>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    using exception = detail::exception;
+    using parse_error = detail::parse_error;
+    using invalid_iterator = detail::invalid_iterator;
+    using type_error = detail::type_error;
+    using out_of_range = detail::out_of_range;
+    using other_error = detail::other_error;
+
+    /// @}
+
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2022 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
+                    std::to_string(__GNUC__), '.',
+                    std::to_string(__GNUC_MINOR__), '.',
+                    std::to_string(__GNUC_PATCHLEVEL__))
+            }
+        };
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+
+#if defined(_MSVC_LANG)
+        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+    /// @brief default object key comparator type
+    /// The actual object key comparator type (@ref object_comparator_t) may be
+    /// different.
+    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
+#if defined(JSON_HAS_CPP_14)
+    // use of transparent comparator avoids unnecessary repeated construction of temporaries
+    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
+    using default_object_comparator_t = std::less<>;
+#else
+    using default_object_comparator_t = std::less<StringType>;
+#endif
+
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
+    using object_t = ObjectType<StringType,
+          basic_json,
+          default_object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
+    using string_t = StringType;
+
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
+    using boolean_t = BooleanType;
+
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
+    using number_integer_t = NumberIntegerType;
+
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
+    using number_unsigned_t = NumberUnsignedType;
+
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
+    using number_float_t = NumberFloatType;
+
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * obj)
+        {
+            AllocatorTraits::deallocate(alloc, obj, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
+        JSON_ASSERT(obj != nullptr);
+        return obj.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = static_cast<boolean_t>(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = static_cast<number_integer_t>(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = static_cast<number_unsigned_t>(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = static_cast<number_float_t>(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                case value_t::discarded:
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.2", nullptr)); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
+
+        /// constructor for objects
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
+
+        /// constructor for arrays
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
+
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        void destroy(value_t t)
+        {
+            if (t == value_t::array || t == value_t::object)
+            {
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
+
+                // move the top-level items to stack
+                if (t == value_t::array)
+                {
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
+                }
+                else
+                {
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+                }
+
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+  private:
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+
+    Furthermore, the parent relation is checked for arrays and objects: If
+    @a check_parents true and the value is an array or object, then the
+    container's elements must have the current value as parent.
+
+    @param[in] check_parents  whether the parent relation should be checked.
+               The value is true by default and should only be set to false
+               during destruction of objects when the invariant does not
+               need to hold.
+    */
+    void assert_invariant(bool check_parents = true) const noexcept
+    {
+        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
+        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
+        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
+        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
+
+#if JSON_DIAGNOSTICS
+        JSON_TRY
+        {
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
+#endif
+        static_cast<void>(check_parents);
+    }
+
+    void set_parents()
+    {
+#if JSON_DIAGNOSTICS
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                for (auto& element : *m_value.array)
+                {
+                    element.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                for (auto& element : *m_value.object)
+                {
+                    element.second.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+#endif
+    }
+
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
+    {
+#if JSON_DIAGNOSTICS
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
+        {
+            (it + i)->m_parent = this;
+        }
+#else
+        static_cast<void>(count_set_parents);
+#endif
+        return it;
+    }
+
+    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
+    {
+#if JSON_DIAGNOSTICS
+        if (old_capacity != static_cast<std::size_t>(-1))
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
+        j.m_parent = this;
+#else
+        static_cast<void>(j);
+        static_cast<void>(old_capacity);
+#endif
+        return j;
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
+    using parse_event_t = detail::parse_event_t;
+
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+        JSON_ASSERT(m_type == val.type());
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (!type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_type = value_t::object;
+            m_value = value_t::object;
+
+            for (auto& element_ref : init)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
+            }
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_type = value_t::array;
+            m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = init;
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = std::move(init);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val)
+        : m_type(value_t::array)
+    {
+        m_value.array = create<array_t>(cnt, val);
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
+    basic_json(InputIT first, InputIT last)
+    {
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
+        }
+
+        // copy type from first iterator
+        m_type = first.m_object->m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = first.m_object->m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = first.m_object->m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = first.m_object->m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *first.m_object->m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object = create<object_t>(first.m_it.object_iterator,
+                                                  last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value = *first.m_object->m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const basic_json& other)
+        : json_base_class_t(other),
+          m_type(other.m_type)
+    {
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_type)
+        {
+            case value_t::object:
+            {
+                m_value = *other.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value = *other.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *other.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value = other.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_value = other.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value = other.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value = other.m_value.number_float;
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value = *other.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(basic_json&& other) noexcept
+        : json_base_class_t(std::move(other)),
+          m_type(std::move(other.m_type)),
+          m_value(std::move(other.m_value))
+    {
+        // check that passed value is valid
+        other.assert_invariant(false); // NOLINT(bugprone-use-after-move,hicpp-invalid-access-moved)
+
+        // invalidate payload
+        other.m_type = value_t::null;
+        other.m_value = {};
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value&&
+        std::is_nothrow_move_assignable<json_base_class_t>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_type, other.m_type);
+        swap(m_value, other.m_value);
+        json_base_class_t::operator=(std::move(other));
+
+        set_parents();
+        assert_invariant();
+        return *this;
+    }
+
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
+    ~basic_json() noexcept
+    {
+        assert_invariant(false);
+        m_value.destroy(m_type);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
+    constexpr value_t type() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+    }
+
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() || is_object();
+    }
+
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
+    constexpr bool is_null() const noexcept
+    {
+        return m_type == value_t::null;
+    }
+
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_type == value_t::boolean;
+    }
+
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() || is_number_float();
+    }
+
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_type == value_t::number_float;
+    }
+
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
+    constexpr bool is_object() const noexcept
+    {
+        return m_type == value_t::object;
+    }
+
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
+    constexpr bool is_array() const noexcept
+    {
+        return m_type == value_t::array;
+    }
+
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
+    constexpr bool is_string() const noexcept
+    {
+        return m_type == value_t::string;
+    }
+
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
+    constexpr bool is_binary() const noexcept
+    {
+        return m_type == value_t::binary;
+    }
+
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_type == value_t::discarded;
+    }
+
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
+    constexpr operator value_t() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+  private:
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        auto ret = ValueType();
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueType>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @a BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value,
+                   int > = 0 >
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
+                 int> = 0>
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+  public:
+    /*!
+    @brief get a (pointer) value (explicit)
+
+    Performs explicit type conversion between the JSON value and a compatible value if required.
+
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
+
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
+
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa see @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+#if defined(JSON_HAS_CPP_17)
+                                                detail::negation<std::is_same<ValueType, std::any>>,
+#endif
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
+    /// @}
+
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return set_parent(m_value.array->at(idx));
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_value.object->find(key);
+        if (it == m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    reference at(KeyType && key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_value.object->find(key);
+        if (it == m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_reference at(KeyType && key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_value.array->size())
+            {
+#if JSON_DIAGNOSTICS
+                // remember array size & capacity before resizing
+                const auto old_size = m_value.array->size();
+                const auto old_capacity = m_value.array->capacity();
+#endif
+                m_value.array->resize(idx + 1);
+
+#if JSON_DIAGNOSTICS
+                if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
+#endif
+                assert_invariant();
+            }
+
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](typename object_t::key_type key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_value.object->emplace(std::move(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_value.object->find(key);
+            JSON_ASSERT(it != m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
+    // (they seemingly cannot be constrained to resolve the ambiguity)
+    template<typename T>
+    reference operator[](T* key)
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    reference operator[](KeyType && key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_value.object->emplace(std::forward<KeyType>(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    const_reference operator[](KeyType && key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_value.object->find(std::forward<KeyType>(key));
+            JSON_ASSERT(it != m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+  private:
+    template<typename KeyType>
+    using is_comparable_with_object_key = detail::is_comparable <
+        object_comparator_t, const typename object_t::key_type&, KeyType >;
+
+    template<typename ValueType>
+    using value_return_type = std::conditional <
+        detail::is_c_string_uncvref<ValueType>::value,
+        string_t, typename std::decay<ValueType>::type >;
+
+  public:
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(KeyType && key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(KeyType && key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ValueType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ReturnType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return std::forward<ValueType>(default_value);
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    template < class ValueType, class BasicJsonType, detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
+    {
+        return value(ptr.convert(), default_value);
+    }
+
+    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
+    {
+        return value(ptr.convert(), std::forward<ValueType>(default_value));
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    reference front()
+    {
+        return *begin();
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+  private:
+    template < typename KeyType, detail::enable_if_t <
+                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return m_value.object->erase(std::forward<KeyType>(key));
+    }
+
+    template < typename KeyType, detail::enable_if_t <
+                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        const auto it = m_value.object->find(std::forward<KeyType>(key));
+        if (it != m_value.object->end())
+        {
+            m_value.object->erase(it);
+            return 1;
+        }
+        return 0;
+    }
+
+  public:
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // the indirection via erase_internal() is added to avoid making this
+        // function a template and thus de-rank it during overload resolution
+        return erase_internal(key);
+    }
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        return erase_internal(std::forward<KeyType>(key));
+    }
+
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+
+            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    iterator find(const typename object_t::key_type& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    const_iterator find(const typename object_t::key_type& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_iterator find(KeyType && key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    size_type count(const typename object_t::key_type& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(key) : 0;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(std::forward<KeyType>(key)) : 0;
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const typename object_t::key_type& key) const
+    {
+        return is_object() && m_value.object->find(key) != m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    bool contains(KeyType && key) const
+    {
+        return is_object() && m_value.object->find(std::forward<KeyType>(key)) != m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
+    bool empty() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_value.object->empty();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
+    size_type size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_value.object->size();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
+    size_type max_size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_value.object->max_size();
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
+    void clear() noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value.string->clear();
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value.binary->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object->clear();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        const auto old_capacity = m_value.array->capacity();
+        m_value.array->push_back(std::move(val));
+        set_parent(m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        const auto old_capacity = m_value.array->capacity();
+        m_value.array->push_back(val);
+        set_parent(m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to object
+        auto res = m_value.object->insert(val);
+        set_parent(res.first->second);
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        const auto old_capacity = m_value.array->capacity();
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        set_parent(res.first->second);
+
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        JSON_ASSERT(m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
+        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        set_parents();
+        return result;
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
+    {
+        update(j.begin(), j.end(), merge_objects);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_value.object->find(it.key());
+                if (it2 != m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_value.object->operator[](it.key()).m_parent = this;
+#endif
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_type, other.m_type);
+        std::swap(m_value, other.m_value);
+
+        set_parents();
+        other.set_parents();
+        assert_invariant();
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            using std::swap;
+            swap(*(m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            using std::swap;
+            swap(*(m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            using std::swap;
+            swap(*(m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    // note parentheses around operands are necessary; see
+    // https://github.com/nlohmann/json/issues/1530
+#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
+    const auto lhs_type = lhs.type();                                                                    \
+    const auto rhs_type = rhs.type();                                                                    \
+    \
+    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
+    {                                                                                                    \
+        switch (lhs_type)                                                                                \
+        {                                                                                                \
+            case value_t::array:                                                                         \
+                return (*lhs.m_value.array) op (*rhs.m_value.array);                                     \
+                \
+            case value_t::object:                                                                        \
+                return (*lhs.m_value.object) op (*rhs.m_value.object);                                   \
+                \
+            case value_t::null:                                                                          \
+                return (null_result);                                                                    \
+                \
+            case value_t::string:                                                                        \
+                return (*lhs.m_value.string) op (*rhs.m_value.string);                                   \
+                \
+            case value_t::boolean:                                                                       \
+                return (lhs.m_value.boolean) op (rhs.m_value.boolean);                                   \
+                \
+            case value_t::number_integer:                                                                \
+                return (lhs.m_value.number_integer) op (rhs.m_value.number_integer);                     \
+                \
+            case value_t::number_unsigned:                                                               \
+                return (lhs.m_value.number_unsigned) op (rhs.m_value.number_unsigned);                   \
+                \
+            case value_t::number_float:                                                                  \
+                return (lhs.m_value.number_float) op (rhs.m_value.number_float);                         \
+                \
+            case value_t::binary:                                                                        \
+                return (*lhs.m_value.binary) op (*rhs.m_value.binary);                                   \
+                \
+            case value_t::discarded:                                                                     \
+            default:                                                                                     \
+                return (unordered_result);                                                               \
+        }                                                                                                \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_value.number_integer) op rhs.m_value.number_float;      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
+    {                                                                                                    \
+        return lhs.m_value.number_float op static_cast<number_float_t>(rhs.m_value.number_integer);      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_value.number_unsigned) op rhs.m_value.number_float;     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
+    {                                                                                                    \
+        return lhs.m_value.number_float op static_cast<number_float_t>(rhs.m_value.number_unsigned);     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
+    {                                                                                                    \
+        return static_cast<number_integer_t>(lhs.m_value.number_unsigned) op rhs.m_value.number_integer; \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
+    {                                                                                                    \
+        return lhs.m_value.number_integer op static_cast<number_integer_t>(rhs.m_value.number_unsigned); \
+    }                                                                                                    \
+    else if(compares_unordered(lhs, rhs))\
+    {\
+        return (unordered_result);\
+    }\
+    \
+    return (default_result);
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // returns true if:
+    // - any operand is NaN and the other operand is of number type
+    // - any operand is discarded
+    // in legacy mode, discarded values are considered ordered if
+    // an operation is computed as an odd number of inverses of others
+    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
+    {
+        if ((lhs.is_number_float() && std::isnan(lhs.m_value.number_float) && rhs.is_number())
+                || (rhs.is_number_float() && std::isnan(rhs.m_value.number_float) && lhs.is_number()))
+        {
+            return true;
+        }
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
+#else
+        static_cast<void>(inverse);
+        return lhs.is_discarded() || rhs.is_discarded();
+#endif
+    }
+
+  private:
+    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
+    {
+        return compares_unordered(*this, rhs, inverse);
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    bool operator==(const_reference rhs) const noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const_reference lhs = *this;
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator==(ScalarType rhs) const noexcept
+    {
+        return *this == basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    bool operator!=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !operator==(rhs);
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
+    {
+        const_reference lhs = *this;
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types.
+        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
+                                std::partial_ordering::equivalent,
+                                std::partial_ordering::unordered,
+                                lhs_type <=> rhs_type) // *NOPAD*
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
+    {
+        return *this <=> basic_json(rhs); // *NOPAD*
+    }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    // all operators that are computed as an odd number of inverses of others
+    // need to be overloaded to emulate the legacy comparison behavior
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator<=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < *this);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator<=(ScalarType rhs) const noexcept
+    {
+        return *this <= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator>=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(*this < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator>=(ScalarType rhs) const noexcept
+    {
+        return *this >= basic_json(rhs);
+    }
+#endif
+#else
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs == rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < lhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        // double inverse
+        if (compares_unordered(lhs, rhs))
+        {
+            return false;
+        }
+        return !(lhs <= rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+#endif
+
+#undef JSON_IMPLEMENT_OPERATOR
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = i.get();
+        return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
+        }
+    }
+
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    /// the type of the current element
+    value_t m_type = value_t::null;
+
+    /// the value of the current element
+    json_value m_value = {};
+
+#if JSON_DIAGNOSTICS
+    /// a pointer to a parent value (for debugging purposes)
+    basic_json* m_parent = nullptr;
+#endif
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_cbor(j);
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_bjdata(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_bson(j);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /// @brief applies a JSON patch in-place without copying the object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    void patch_inplace(const basic_json& json_patch)
+    {
+        basic_json& result = *this;
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer const top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            // parent must exist when performing patch add per RFC6902 specs
+            basic_json& parent = result.at(ptr);
+
+            switch (parent.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [this, &result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\'');
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
+            }
+
+            // collect mandatory members
+            const auto op = get_value("op", "op", true).template get<std::string>();
+            const auto path = get_value(op, "path", true).template get<std::string>();
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const auto from_path = get_value("move", "from", true).template get<std::string>();
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(!success))
+                    {
+                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
+                    }
+
+                    break;
+                }
+
+                case patch_operations::invalid:
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
+                }
+            }
+        }
+    }
+
+    /// @brief applies a JSON patch to a copy of the current object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        basic_json result = *this;
+        result.patch_inplace(json_patch);
+        return result;
+    }
+
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() && i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], detail::concat(path, '/', std::to_string(i)));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // We now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", detail::concat(path, '/', std::to_string(i))}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", detail::concat(path, "/-")},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path_key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path_key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (!is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+
+inline namespace literals
+{
+inline namespace json_literals
+{
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+}  // namespace json_literals
+}  // namespace literals
+NLOHMANN_JSON_NAMESPACE_END
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+namespace std // NOLINT(cert-dcl58-cpp)
+{
+
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> // NOLINT(cert-dcl58-cpp)
+{
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
+    {
+        return nlohmann::detail::hash(j);
+    }
+};
+
+// specialization for std::less<value_t>
+template<>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(::nlohmann::detail::value_t lhs,
+                    ::nlohmann::detail::value_t rhs) const noexcept
+    {
+#if JSON_HAS_THREE_WAY_COMPARISON
+        return std::is_lt(lhs <=> rhs); // *NOPAD*
+#else
+        return ::nlohmann::detail::operator<(lhs, rhs);
+#endif
+    }
+};
+
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name, cert-dcl58-cpp)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
+{
+    j1.swap(j2);
+}
+
+#endif
+
+}  // namespace std
+
+#if JSON_USE_GLOBAL_UDLS
+    using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+#endif
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// restore clang diagnostic settings
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// clean up
+#undef JSON_ASSERT
+#undef JSON_INTERNAL_CATCH
+#undef JSON_THROW
+#undef JSON_PRIVATE_UNLESS_TESTED
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+#undef JSON_INLINE_VARIABLE
+#undef JSON_NO_UNIQUE_ADDRESS
+#undef JSON_DISABLE_ENUM_SERIALIZATION
+#undef JSON_USE_GLOBAL_UDLS
+
+#ifndef JSON_TEST_KEEP_MACROS
+    #undef JSON_CATCH
+    #undef JSON_TRY
+    #undef JSON_HAS_CPP_11
+    #undef JSON_HAS_CPP_14
+    #undef JSON_HAS_CPP_17
+    #undef JSON_HAS_CPP_20
+    #undef JSON_HAS_FILESYSTEM
+    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #undef JSON_HAS_THREE_WAY_COMPARISON
+    #undef JSON_HAS_RANGES
+    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_CL_VERSION
+#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MCST_LCC_VERSION
+#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/lib/nlohmann_json/include/nlohmann/json_fwd.hpp b/lib/nlohmann_json/include/nlohmann/json_fwd.hpp
new file mode 100644
index 00000000..98070dfc
--- /dev/null
+++ b/lib/nlohmann_json/include/nlohmann/json_fwd.hpp
@@ -0,0 +1,176 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.2
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 2   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+         class CustomBaseClass = void>
+class basic_json;
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer;
+
+/*!
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
+*/
+using json = basic_json<>;
+
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/lib/sqlite3/CMakeLists.txt b/lib/sqlite3/CMakeLists.txt
new file mode 100644
index 00000000..7aed6b6f
--- /dev/null
+++ b/lib/sqlite3/CMakeLists.txt
@@ -0,0 +1,24 @@
+########################################
+###              sqlite3             ###
+########################################
+
+project(sqlite3 VERSION 3.40.1)
+
+
+FetchContent_Declare(sqlite3 URL "https://www.sqlite.org/2022/sqlite-amalgamation-3400100.zip")
+if (NOT sqlite3_POPULATED)
+	FetchContent_Populate(sqlite3)
+endif()
+
+add_library(${PROJECT_NAME})
+target_sources(${PROJECT_NAME} PRIVATE ${sqlite3_SOURCE_DIR}/sqlite3.c ${sqlite3_SOURCE_DIR}/sqlite3.h ${sqlite3_SOURCE_DIR}/sqlite3ext.h )
+target_include_directories(${PROJECT_NAME} PUBLIC ${sqlite3_SOURCE_DIR})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER lib)
+
+### Compile options ###
+# refer to https://www.sqlite.org/compile.html
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC SQLITE_ENABLE_RTREE SQLITE_OMIT_LOAD_EXTENSION)
+
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
\ No newline at end of file
diff --git a/DRAMSys/library/src/common/configuration/CMakeLists.txt b/src/configuration/CMakeLists.txt
similarity index 67%
rename from DRAMSys/library/src/common/configuration/CMakeLists.txt
rename to src/configuration/CMakeLists.txt
index ce990f0f..1cec593a 100644
--- a/DRAMSys/library/src/common/configuration/CMakeLists.txt
+++ b/src/configuration/CMakeLists.txt
@@ -30,33 +30,39 @@
 #
 # Authors:
 #   Derek Christ
+#   Thomas Psota
 
-set(JSON_BuildTests OFF CACHE INTERNAL "")
-set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/nlohmann ${CMAKE_CURRENT_BINARY_DIR}/nlohmann)
+########################################
+###      DRAMSys::config             ###
+########################################
+
+project(DRAMSys_Configuration)
+
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(${PROJECT_NAME} 
+	PUBLIC 
+		DRAMSys::util
+)
+
+target_compile_definitions(${PROJECT_NAME} 
+	PUBLIC 
+		DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
+)
+
+add_library(DRAMSys::config ALIAS ${PROJECT_NAME})
 
 option(DRAMSYS_CONFIGURATION_TESTS "Build the unit tests for configuration." OFF)
 
 if (DRAMSYS_CONFIGURATION_TESTS)
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tests)
+    include("${DRAMSYS_TESTS_DIR}/tests_configuration/CMakeLists.txt")
 endif()
 
-add_library(DRAMSysConfiguration STATIC
-    DRAMSysConfiguration.cpp
-    AddressMapping.cpp
-    McConfig.cpp
-    SimConfig.cpp
-    ThermalConfig.cpp
-    TraceSetup.cpp
-    memspec/MemSpec.cpp
-    memspec/MemArchitectureSpec.cpp
-    memspec/MemPowerSpec.cpp
-    memspec/MemTimingSpec.cpp
-    util.cpp
-)
 
-target_compile_definitions(DRAMSysConfiguration PUBLIC DRAMSysResourceDirectory="${CMAKE_CURRENT_LIST_DIR}/../../../resources")
-
-target_include_directories(DRAMSysConfiguration PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-
-target_link_libraries(DRAMSysConfiguration PUBLIC nlohmann_json::nlohmann_json)
+build_source_group()
+diagnostics_print(${PROJECT_NAME})
\ No newline at end of file
diff --git a/DRAMSys/library/src/common/configuration/AddressMapping.cpp b/src/configuration/DRAMSys/config/AddressMapping.cpp
similarity index 85%
rename from DRAMSys/library/src/common/configuration/AddressMapping.cpp
rename to src/configuration/DRAMSys/config/AddressMapping.cpp
index 6158e40b..8123c88f 100644
--- a/DRAMSys/library/src/common/configuration/AddressMapping.cpp
+++ b/src/configuration/DRAMSys/config/AddressMapping.cpp
@@ -37,14 +37,12 @@
 
 #include <iostream>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
-void to_json(json &j, const AddressMapping &m)
+void to_json(json_t &j, const AddressMapping &m)
 {
-    json congen = json{};
-
-    congen = json{{"BYTE_BIT", m.byteBits},
+    auto congen = json_t{{"BYTE_BIT", m.byteBits},
                   {"COLUMN_BIT", m.columnBits},
                   {"ROW_BIT", m.rowBits},
                   {"BANK_BIT", m.bankBits},
@@ -58,11 +56,11 @@ void to_json(json &j, const AddressMapping &m)
     j["CONGEN"] = congen;
 }
 
-void from_json(const json &j, AddressMapping &m)
+void from_json(const json_t &j, AddressMapping &m)
 {
-    json j_addressmapping = get_config_json(j, addressMappingPath, "CONGEN");
+    json_t j_addressmapping = get_config_json(j, addressMappingPath, "CONGEN");
 
-    json congen;
+    json_t congen;
     if (j_addressmapping["CONGEN"].is_null())
         congen = j_addressmapping;
     else
@@ -97,12 +95,12 @@ void from_json(const json &j, AddressMapping &m)
         congen.at("XOR").get_to(m.xorBits);
 }
 
-void to_json(json &j, const XorPair &x)
+void to_json(json_t &j, const XorPair &x)
 {
-    j = json{{"FIRST", x.first}, {"SECOND", x.second}};
+    j = json_t{{"FIRST", x.first}, {"SECOND", x.second}};
 }
 
-void from_json(const json &j, XorPair &x)
+void from_json(const json_t &j, XorPair &x)
 {
     j.at("FIRST").get_to(x.first);
     j.at("SECOND").get_to(x.second);
@@ -110,15 +108,15 @@ void from_json(const json &j, XorPair &x)
 
 void from_dump(const std::string &dump, AddressMapping &c)
 {
-    json json_addressmapping = json::parse(dump).at("addressmapping");
+    json_t json_addressmapping = json_t::parse(dump).at("addressmapping");
     json_addressmapping.get_to(c);
 }
 
 std::string dump(const AddressMapping &c, unsigned int indentation)
 {
-    json json_addressmapping;
+    json_t json_addressmapping;
     json_addressmapping["addressmapping"] = c;
     return json_addressmapping.dump(indentation);
 }
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
diff --git a/DRAMSys/library/src/common/configuration/AddressMapping.h b/src/configuration/DRAMSys/config/AddressMapping.h
similarity index 87%
rename from DRAMSys/library/src/common/configuration/AddressMapping.h
rename to src/configuration/DRAMSys/config/AddressMapping.h
index 2fbf40e3..4426ff8d 100644
--- a/DRAMSys/library/src/common/configuration/AddressMapping.h
+++ b/src/configuration/DRAMSys/config/AddressMapping.h
@@ -36,16 +36,13 @@
 #ifndef DRAMSYSCONFIGURATION_ADDRESSMAPPING_H
 #define DRAMSYSCONFIGURATION_ADDRESSMAPPING_H
 
-#include "util.h"
+#include "DRAMSys/config/ConfigUtil.h"
 
-#include <nlohmann/json.hpp>
 #include <optional>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
-using json = nlohmann::json;
-
-const std::string addressMappingPath = "configs/amconfigs";
+const std::string addressMappingPath = "addressmapping";
 
 struct XorPair
 {
@@ -53,8 +50,8 @@ struct XorPair
     unsigned int second;
 };
 
-void to_json(json &j, const XorPair &x);
-void from_json(const json &j, XorPair &x);
+void to_json(json_t &j, const XorPair &x);
+void from_json(const json_t &j, XorPair &x);
 
 struct AddressMapping
 {
@@ -68,8 +65,8 @@ struct AddressMapping
     std::optional<std::vector<XorPair>> xorBits;
 };
 
-void to_json(json &j, const AddressMapping &m);
-void from_json(const json &j, AddressMapping &m);
+void to_json(json_t &j, const AddressMapping &m);
+void from_json(const json_t &j, AddressMapping &m);
 
 void from_dump(const std::string &dump, AddressMapping &c);
 std::string dump(const AddressMapping &c, unsigned int indentation = -1);
diff --git a/DRAMSys/library/src/common/configuration/util.cpp b/src/configuration/DRAMSys/config/ConfigUtil.cpp
similarity index 71%
rename from DRAMSys/library/src/common/configuration/util.cpp
rename to src/configuration/DRAMSys/config/ConfigUtil.cpp
index 1b444917..8024cfee 100644
--- a/DRAMSys/library/src/common/configuration/util.cpp
+++ b/src/configuration/DRAMSys/config/ConfigUtil.cpp
@@ -33,29 +33,31 @@
  *    Derek Christ
  */
 
-#include "util.h"
-#include "DRAMSysConfiguration.h"
+#include "ConfigUtil.h"
+
+#include "DRAMSys/config/DRAMSysConfiguration.h"
 
 #include <fstream>
 #include <iostream>
-namespace DRAMSysConfiguration
+
+namespace DRAMSys::Config
 {
 
-json get_config_json(const json &j, const std::string &configPath, const std::string &objectName)
-{
-    if (j.is_object())
+    json_t get_config_json(const json_t& j, const std::string& configPath, const std::string& objectName)
     {
-        return j;
-    }
-    else // j should be a string path to the real json file
-    {
-        std::string jsonFileName;
-        j.get_to(jsonFileName);
+        if (j.is_object())
+        {
+            return j;
+        }
+        else // j should be a string path to the real json file
+        {
+            std::string jsonFileName;
+            j.get_to(jsonFileName);
 
-        std::ifstream file(std::string(Configuration::resourceDirectory) + "/" + configPath + "/" + jsonFileName);
-        json j_object = json::parse(file);
-        return j_object.at(objectName);
+            std::ifstream file(std::string(Configuration::resourceDirectory) + "/" + configPath + "/" + jsonFileName);
+            json_t j_object = json_t::parse(file);
+            return j_object.at(objectName);
+        }
     }
-}
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
diff --git a/src/configuration/DRAMSys/config/ConfigUtil.h b/src/configuration/DRAMSys/config/ConfigUtil.h
new file mode 100644
index 00000000..9c45aa5b
--- /dev/null
+++ b/src/configuration/DRAMSys/config/ConfigUtil.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2021, Technische Universität Kaiserslautern
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * 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.
+ *
+ * Authors:
+ *    Derek Christ
+ */
+
+#ifndef DRAMSYSCONFIGURATION_UTIL_H
+#define DRAMSYSCONFIGURATION_UTIL_H
+
+#include "DRAMSys/util/json.h"
+
+#include <optional>
+#include <utility>
+
+namespace DRAMSys::Config
+{
+    //using json_t = nlohmann::json;
+
+    // template <typename T>
+    // class Optional : public std::pair<T, bool>
+    // {
+    // public:
+    //     Optional() : std::pair<T, bool>{{}, false}
+    //     {
+    //     }
+    //     Optional(const T &v) : std::pair<T, bool>{v, true}
+    //     {
+    //     }
+
+    //     bool isValid() const
+    //     {
+    //         return this->second;
+    //     }
+
+    //     const T &getValue() const
+    //     {
+    //         assert(this->second == true);
+    //         return this->first;
+    //     }
+
+    //     void setValue(const T &v)
+    //     {
+    //         this->first = v;
+    //         this->second = true;
+    //     }
+
+    //     void invalidate()
+    //     {
+    //         this->second = false;
+    //     }
+
+    //     /**
+    //      * This methods only purpose is to make a optional type
+    //      * valid so that it can be written to by reference.
+    //      */
+    //     T &setByReference()
+    //     {
+    //         this->second = true;
+    //         return this->first;
+    //     }
+    // };
+
+    template <typename T>
+    void invalidateEnum(T& value)
+    {
+        if (value.has_value() && value.value() == T::value_type::Invalid)
+            value.reset();
+    }
+
+    json_t get_config_json(const json_t& j, const std::string& configPath, const std::string& objectName);
+
+    inline void remove_null_values(json_t& j)
+    {
+        std::vector<std::string> keysToRemove;
+
+        for (const auto& element : j.items())
+        {
+            if (element.value() == nullptr)
+                keysToRemove.emplace_back(element.key());
+        }
+
+        std::for_each(keysToRemove.begin(), keysToRemove.end(), [&](const std::string& key) { j.erase(key); });
+    }
+
+} // namespace DRAMSys::Config
+
+#endif // DRAMSYSCONFIGURATION_UTIL_H
diff --git a/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp b/src/configuration/DRAMSys/config/DRAMSysConfiguration.cpp
similarity index 79%
rename from DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
rename to src/configuration/DRAMSys/config/DRAMSysConfiguration.cpp
index 1403fd46..c93f9002 100644
--- a/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
+++ b/src/configuration/DRAMSys/config/DRAMSysConfiguration.cpp
@@ -35,24 +35,24 @@
 
 #include "DRAMSysConfiguration.h"
 
-#include <exception>
+#include "DRAMSys/config/ConfigUtil.h"
+
 #include <fstream>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
 std::string Configuration::resourceDirectory;
 
-void to_json(json &j, const Configuration &c)
+void to_json(json_t &j, const Configuration &c)
 {
-    j = json{{"addressmapping", c.addressMapping}, {"mcconfig", c.mcConfig},   {"memspec", c.memSpec},
-             {"simulationid", c.simulationId},     {"simconfig", c.simConfig}, {"thermalconfig", c.thermalConfig},
-             {"tracesetup", c.traceSetup}};
+    j = json_t{{"addressmapping", c.addressMapping}, {"mcconfig", c.mcConfig},   {"memspec", c.memSpec},
+             {"simulationid", c.simulationId},     {"simconfig", c.simConfig}, {"tracesetup", c.traceSetup}};
 
     remove_null_values(j);
 }
 
-void from_json(const json &j, Configuration &c)
+void from_json(const json_t &j, Configuration &c)
 {
     j.at("addressmapping").get_to(c.addressMapping);
     j.at("mcconfig").get_to(c.mcConfig);
@@ -60,22 +60,19 @@ void from_json(const json &j, Configuration &c)
     j.at("simulationid").get_to(c.simulationId);
     j.at("simconfig").get_to(c.simConfig);
 
-    if (j.contains("thermalconfig"))
-        j.at("thermalconfig").get_to(c.thermalConfig);
-
     if (j.contains("tracesetup"))
         j.at("tracesetup").get_to(c.traceSetup);
 }
 
 void from_dump(const std::string &dump, Configuration &c)
 {
-    json json_simulation = json::parse(dump).at("simulation");
+    json_t json_simulation = json_t::parse(dump).at("simulation");
     json_simulation.get_to(c);
 }
 
 std::string dump(const Configuration &c, unsigned int indentation)
 {
-    json json_simulation;
+    json_t json_simulation;
     json_simulation["simulation"] = c;
     return json_simulation.dump(indentation);
 }
@@ -88,8 +85,8 @@ Configuration from_path(const std::string &path, const std::string &resourceDire
 
     if (file.is_open())
     {
-        json simulation = json::parse(file).at("simulation");
-        return simulation.get<DRAMSysConfiguration::Configuration>();
+        json_t simulation = json_t::parse(file).at("simulation");
+        return simulation.get<DRAMSys::Config::Configuration>();
     }
     else
     {
@@ -97,4 +94,4 @@ Configuration from_path(const std::string &path, const std::string &resourceDire
     }
 }
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
diff --git a/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h b/src/configuration/DRAMSys/config/DRAMSysConfiguration.h
similarity index 87%
rename from DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
rename to src/configuration/DRAMSys/config/DRAMSysConfiguration.h
index 6d6bd799..2f2e4e52 100644
--- a/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
+++ b/src/configuration/DRAMSys/config/DRAMSysConfiguration.h
@@ -36,15 +36,13 @@
 #ifndef DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
 #define DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
 
-#include "AddressMapping.h"
-#include "McConfig.h"
-#include "SimConfig.h"
-#include "ThermalConfig.h"
-#include "TraceSetup.h"
-#include "memspec/MemSpec.h"
-#include "util.h"
+#include "DRAMSys/config/AddressMapping.h"
+#include "DRAMSys/config/McConfig.h"
+#include "DRAMSys/config/SimConfig.h"
+#include "DRAMSys/config/TraceSetup.h"
+#include "DRAMSys/config/memspec/MemSpec.h"
+#include "DRAMSys/config/ConfigUtil.h"
 
-#include <nlohmann/json.hpp>
 #include <optional>
 #include <string>
 
@@ -58,9 +56,7 @@
  * To achieve static polymorphism, std::variant is used.
  */
 
-namespace DRAMSysConfiguration
-{
-using json = nlohmann::json;
+namespace DRAMSys::Config {
 
 struct Configuration
 {
@@ -69,7 +65,6 @@ struct Configuration
     MemSpec memSpec;
     SimConfig simConfig;
     std::string simulationId;
-    std::optional<ThermalConfig> thermalConfig;
     std::optional<TraceSetup> traceSetup;
 
     static std::string resourceDirectory;
@@ -81,8 +76,8 @@ void from_json(const json &j, Configuration &p);
 void from_dump(const std::string &dump, Configuration &c);
 std::string dump(const Configuration &c, unsigned int indentation = -1);
 
-Configuration from_path(const std::string &path, const std::string &resourceDirectory = DRAMSysResourceDirectory);
+Configuration from_path(const std::string &path, const std::string &resourceDirectory = DRAMSYS_RESOURCE_DIR);
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
 
 #endif // DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
diff --git a/DRAMSys/library/src/common/configuration/McConfig.cpp b/src/configuration/DRAMSys/config/McConfig.cpp
similarity index 93%
rename from DRAMSys/library/src/common/configuration/McConfig.cpp
rename to src/configuration/DRAMSys/config/McConfig.cpp
index e2f684fb..04556b78 100644
--- a/DRAMSys/library/src/common/configuration/McConfig.cpp
+++ b/src/configuration/DRAMSys/config/McConfig.cpp
@@ -35,12 +35,12 @@
 
 #include "McConfig.h"
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
-void to_json(json &j, const McConfig &c)
+void to_json(json_t &j, const McConfig &c)
 {
-    j = json{{"PagePolicy", c.pagePolicy},
+    j = json_t{{"PagePolicy", c.pagePolicy},
              {"Scheduler", c.scheduler},
              {"HighWatermark", c.highWatermark},
              {"LowWatermark", c.lowWatermark},
@@ -65,9 +65,9 @@ void to_json(json &j, const McConfig &c)
     remove_null_values(j);
 }
 
-void from_json(const json &j, McConfig &c)
+void from_json(const json_t &j, McConfig &c)
 {
-    json j_mcconfig = get_config_json(j, mcConfigPath, "mcconfig");
+    json_t j_mcconfig = get_config_json(j, mcConfigPath, "mcconfig");
 
     if (j_mcconfig.contains("PagePolicy"))
         j_mcconfig.at("PagePolicy").get_to(c.pagePolicy);
@@ -143,7 +143,7 @@ void from_json(const json &j, McConfig &c)
     invalidateEnum(c.arbiter);
 }
 
-void to_json(json &j, const RefreshPolicy &r)
+void to_json(json_t &j, const RefreshPolicy &r)
 {
     if (r == RefreshPolicy::NoRefresh)
         j = "NoRefresh";
@@ -159,7 +159,7 @@ void to_json(json &j, const RefreshPolicy &r)
         j = nullptr;
 }
 
-void from_json(const json &j, RefreshPolicy &r)
+void from_json(const json_t &j, RefreshPolicy &r)
 {
     if (j == "NoRefresh")
         r = RefreshPolicy::NoRefresh;
@@ -177,15 +177,15 @@ void from_json(const json &j, RefreshPolicy &r)
 
 void from_dump(const std::string &dump, McConfig &c)
 {
-    json json_mcconfig = json::parse(dump).at("mcconfig");
+    json_t json_mcconfig = json_t::parse(dump).at("mcconfig");
     json_mcconfig.get_to(c);
 }
 
 std::string dump(const McConfig &c, unsigned int indentation)
 {
-    json json_mcconfig;
+    json_t json_mcconfig;
     json_mcconfig["mcconfig"] = c;
     return json_mcconfig.dump(indentation);
 }
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
diff --git a/DRAMSys/library/src/common/configuration/McConfig.h b/src/configuration/DRAMSys/config/McConfig.h
similarity index 94%
rename from DRAMSys/library/src/common/configuration/McConfig.h
rename to src/configuration/DRAMSys/config/McConfig.h
index c9bfbe03..16769e4b 100644
--- a/DRAMSys/library/src/common/configuration/McConfig.h
+++ b/src/configuration/DRAMSys/config/McConfig.h
@@ -36,17 +36,15 @@
 #ifndef DRAMSYSCONFIGURATION_MCCONFIG_H
 #define DRAMSYSCONFIGURATION_MCCONFIG_H
 
-#include "util.h"
+#include "DRAMSys/config/ConfigUtil.h"
 
-#include <nlohmann/json.hpp>
 #include <optional>
 #include <utility>
+#include <string>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
-using json = nlohmann::json;
-
-const std::string mcConfigPath = "configs/mcconfigs";
+const std::string mcConfigPath = "mcconfig";
 
 enum class PagePolicy
 {
@@ -175,11 +173,11 @@ struct McConfig
     std::optional<unsigned int> phyDelayBw;
 };
 
-void to_json(json &j, const McConfig &c);
-void from_json(const json &j, McConfig &c);
+void to_json(json_t &j, const McConfig &c);
+void from_json(const json_t &j, McConfig &c);
 
-void to_json(json &j, const RefreshPolicy &r);
-void from_json(const json &j, RefreshPolicy &r);
+void to_json(json_t &j, const RefreshPolicy &r);
+void from_json(const json_t &j, RefreshPolicy &r);
 
 void from_dump(const std::string &dump, McConfig &c);
 std::string dump(const McConfig &c, unsigned int indentation = -1);
diff --git a/DRAMSys/library/src/common/configuration/SimConfig.cpp b/src/configuration/DRAMSys/config/SimConfig.cpp
similarity index 92%
rename from DRAMSys/library/src/common/configuration/SimConfig.cpp
rename to src/configuration/DRAMSys/config/SimConfig.cpp
index e0894a78..83d89ca8 100644
--- a/DRAMSys/library/src/common/configuration/SimConfig.cpp
+++ b/src/configuration/DRAMSys/config/SimConfig.cpp
@@ -35,12 +35,12 @@
 
 #include "SimConfig.h"
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
-void to_json(json &j, const SimConfig &c)
+void to_json(json_t &j, const SimConfig &c)
 {
-    j = json{{"AddressOffset", c.addressOffset},
+    j = json_t{{"AddressOffset", c.addressOffset},
              {"CheckTLM2Protocol", c.checkTLM2Protocol},
              {"DatabaseRecording", c.databaseRecording},
              {"Debug", c.debug},
@@ -56,9 +56,9 @@ void to_json(json &j, const SimConfig &c)
              {"WindowSize", c.windowSize}};
 }
 
-void from_json(const json &j, SimConfig &c)
+void from_json(const json_t &j, SimConfig &c)
 {
-    json j_simconfig = get_config_json(j, simConfigPath, "simconfig");
+    json_t j_simconfig = get_config_json(j, simConfigPath, "simconfig");
 
     if (j_simconfig.contains("AddressOffset"))
         j_simconfig.at("AddressOffset").get_to(c.addressOffset);
@@ -107,15 +107,15 @@ void from_json(const json &j, SimConfig &c)
 
 void from_dump(const std::string &dump, SimConfig &c)
 {
-    json json_simconfig = json::parse(dump).at("simconfig");
+    json_t json_simconfig = json_t::parse(dump).at("simconfig");
     json_simconfig.get_to(c);
 }
 
 std::string dump(const SimConfig &c, unsigned int indentation)
 {
-    json json_simconfig;
+    json_t json_simconfig;
     json_simconfig["simconfig"] = c;
     return json_simconfig.dump(indentation);
 }
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
diff --git a/DRAMSys/library/src/common/configuration/SimConfig.h b/src/configuration/DRAMSys/config/SimConfig.h
similarity index 92%
rename from DRAMSys/library/src/common/configuration/SimConfig.h
rename to src/configuration/DRAMSys/config/SimConfig.h
index 212d0ef6..5dee2443 100644
--- a/DRAMSys/library/src/common/configuration/SimConfig.h
+++ b/src/configuration/DRAMSys/config/SimConfig.h
@@ -36,16 +36,13 @@
 #ifndef DRAMSYSCONFIGURATION_SIMCONFIG_H
 #define DRAMSYSCONFIGURATION_SIMCONFIG_H
 
-#include "util.h"
+#include "DRAMSys/config/ConfigUtil.h"
 
-#include <nlohmann/json.hpp>
 #include <optional>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
-using json = nlohmann::json;
-
-const std::string simConfigPath = "configs/simulator";
+const std::string simConfigPath = "simconfig";
 
 enum class StoreMode
 {
@@ -78,8 +75,8 @@ struct SimConfig
     std::optional<unsigned int> windowSize;
 };
 
-void to_json(json &j, const SimConfig &c);
-void from_json(const json &j, SimConfig &c);
+void to_json(json_t &j, const SimConfig &c);
+void from_json(const json_t &j, SimConfig &c);
 
 void from_dump(const std::string &dump, SimConfig &c);
 std::string dump(const SimConfig &c, unsigned int indentation = -1);
diff --git a/DRAMSys/library/src/common/configuration/TraceSetup.cpp b/src/configuration/DRAMSys/config/TraceSetup.cpp
similarity index 95%
rename from DRAMSys/library/src/common/configuration/TraceSetup.cpp
rename to src/configuration/DRAMSys/config/TraceSetup.cpp
index d8824ad9..9462c838 100644
--- a/DRAMSys/library/src/common/configuration/TraceSetup.cpp
+++ b/src/configuration/DRAMSys/config/TraceSetup.cpp
@@ -37,7 +37,7 @@
 
 #include <variant>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
 TrafficInitiator::~TrafficInitiator()
@@ -48,14 +48,14 @@ TraceGeneratorState::~TraceGeneratorState()
 {
 }
 
-void to_json(json &j, const TraceSetup &c)
+void to_json(json_t &j, const TraceSetup &c)
 {
     // Create an empty array
-    j = json::array();
+    j = json_t::array();
 
     for (const auto &initiator : c.initiators)
     {
-        json initiator_j;
+        json_t initiator_j;
 
         std::visit(
             [&initiator_j](auto &&initiator)
@@ -101,11 +101,11 @@ void to_json(json &j, const TraceSetup &c)
                     }
                     else
                     {
-                        json states_j = json::array();
+                        json_t states_j = json_t::array();
 
                         for (const auto &state : initiator.states)
                         {
-                            json state_j;
+                            json_t state_j;
                             state_j["id"] = state.first;
 
                             std::visit(
@@ -136,11 +136,11 @@ void to_json(json &j, const TraceSetup &c)
                         }
                         initiator_j["states"] = states_j;
 
-                        json transitions_j = json::array();
+                        json_t transitions_j = json_t::array();
 
                         for (const auto &transition : initiator.transitions)
                         {
-                            json transition_j;
+                            json_t transition_j;
                             transition_j["from"] = transition.first;
                             transition_j["to"] = transition.second.to;
                             transition_j["probability"] = transition.second.probability;
@@ -168,7 +168,7 @@ void to_json(json &j, const TraceSetup &c)
     }
 }
 
-void from_json(const json &j, TraceSetup &c)
+void from_json(const json_t&j, TraceSetup &c)
 {
     for (const auto &initiator_j : j)
     {
@@ -185,7 +185,7 @@ void from_json(const json &j, TraceSetup &c)
         {
             TraceGenerator generator;
 
-            auto process_state = [](const json &state_j)
+            auto process_state = [](const json_t&state_j)
                 -> std::pair<unsigned int, std::variant<TraceGeneratorIdleState, TraceGeneratorTrafficState>>
             {
                 std::variant<TraceGeneratorIdleState, TraceGeneratorTrafficState> state;
@@ -300,15 +300,15 @@ void from_json(const json &j, TraceSetup &c)
 
 void from_dump(const std::string &dump, TraceSetup &c)
 {
-    json json_tracesetup = json::parse(dump).at("tracesetup");
+    json_t json_tracesetup = json_t::parse(dump).at("tracesetup");
     json_tracesetup.get_to(c);
 }
 
 std::string dump(const TraceSetup &c, unsigned int indentation)
 {
-    json json_tracesetup;
+    json_t json_tracesetup;
     json_tracesetup["tracesetup"] = c;
     return json_tracesetup.dump(indentation);
 }
 
-} // namespace DRAMSysConfiguration
+} // namespace DRAMSys::Config
diff --git a/DRAMSys/library/src/common/configuration/TraceSetup.h b/src/configuration/DRAMSys/config/TraceSetup.h
similarity index 95%
rename from DRAMSys/library/src/common/configuration/TraceSetup.h
rename to src/configuration/DRAMSys/config/TraceSetup.h
index c651b94a..3f14cbe1 100644
--- a/DRAMSys/library/src/common/configuration/TraceSetup.h
+++ b/src/configuration/DRAMSys/config/TraceSetup.h
@@ -36,15 +36,13 @@
 #ifndef DRAMSYSCONFIGURATION_TRACESETUP_H
 #define DRAMSYSCONFIGURATION_TRACESETUP_H
 
-#include "util.h"
+#include "DRAMSys/config/ConfigUtil.h"
 
-#include <nlohmann/json.hpp>
 #include <optional>
 #include <variant>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
-using json = nlohmann::json;
 
 enum class TrafficInitiatorType
 {
@@ -133,8 +131,8 @@ struct TraceSetup
     std::vector<std::variant<TracePlayer, TraceGenerator, TraceHammer>> initiators;
 };
 
-void to_json(json &j, const TraceSetup &c);
-void from_json(const json &j, TraceSetup &c);
+void to_json(json_t &j, const TraceSetup &c);
+void from_json(const json_t &j, TraceSetup &c);
 
 void from_dump(const std::string &dump, TraceSetup &c);
 std::string dump(const TraceSetup &c, unsigned int indentation = -1);
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemArchitectureSpec.cpp b/src/configuration/DRAMSys/config/memspec/MemArchitectureSpec.cpp
similarity index 92%
rename from DRAMSys/library/src/common/configuration/memspec/MemArchitectureSpec.cpp
rename to src/configuration/DRAMSys/config/memspec/MemArchitectureSpec.cpp
index ce2b33d2..977add14 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemArchitectureSpec.cpp
+++ b/src/configuration/DRAMSys/config/memspec/MemArchitectureSpec.cpp
@@ -35,12 +35,12 @@
 
 #include "MemArchitectureSpec.h"
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
-void to_json(json &j, const MemArchitectureSpec &c)
+void to_json(json_t &j, const MemArchitectureSpec &c)
 {
-    j = json{};
+    j = json_t{};
 
     for (const auto &entry : c.entries)
     {
@@ -48,7 +48,7 @@ void to_json(json &j, const MemArchitectureSpec &c)
     }
 }
 
-void from_json(const json &j, MemArchitectureSpec &c)
+void from_json(const json_t &j, MemArchitectureSpec &c)
 {
     for (const auto &entry : j.items())
     {
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemArchitectureSpec.h b/src/configuration/DRAMSys/config/memspec/MemArchitectureSpec.h
similarity index 90%
rename from DRAMSys/library/src/common/configuration/memspec/MemArchitectureSpec.h
rename to src/configuration/DRAMSys/config/memspec/MemArchitectureSpec.h
index cc56a3bc..a03604ee 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemArchitectureSpec.h
+++ b/src/configuration/DRAMSys/config/memspec/MemArchitectureSpec.h
@@ -36,20 +36,20 @@
 #ifndef DRAMSYSCONFIGURATION_MEMARCHITECTURESPEC_H
 #define DRAMSYSCONFIGURATION_MEMARCHITECTURESPEC_H
 
-#include <nlohmann/json.hpp>
+#include "DRAMSys/config/ConfigUtil.h"
+
 #include <unordered_map>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
-using json = nlohmann::json;
 
 struct MemArchitectureSpec
 {
     std::unordered_map<std::string, unsigned int> entries;
 };
 
-void to_json(json &j, const MemArchitectureSpec &c);
-void from_json(const json &j, MemArchitectureSpec &c);
+void to_json(json_t &j, const MemArchitectureSpec &c);
+void from_json(const json_t &j, MemArchitectureSpec &c);
 
 } // namespace Configuration
 
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemPowerSpec.cpp b/src/configuration/DRAMSys/config/memspec/MemPowerSpec.cpp
similarity index 93%
rename from DRAMSys/library/src/common/configuration/memspec/MemPowerSpec.cpp
rename to src/configuration/DRAMSys/config/memspec/MemPowerSpec.cpp
index 0cdb3059..640b5a90 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemPowerSpec.cpp
+++ b/src/configuration/DRAMSys/config/memspec/MemPowerSpec.cpp
@@ -35,12 +35,12 @@
 
 #include "MemPowerSpec.h"
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
-void to_json(json &j, const MemPowerSpec &c)
+void to_json(json_t &j, const MemPowerSpec &c)
 {
-    j = json{};
+    j = json_t{};
 
     for (const auto &entry : c.entries)
     {
@@ -48,7 +48,7 @@ void to_json(json &j, const MemPowerSpec &c)
     }
 }
 
-void from_json(const json &j, MemPowerSpec &c)
+void from_json(const json_t &j, MemPowerSpec &c)
 {
     for (const auto &entry : j.items())
     {
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemPowerSpec.h b/src/configuration/DRAMSys/config/memspec/MemPowerSpec.h
similarity index 91%
rename from DRAMSys/library/src/common/configuration/memspec/MemPowerSpec.h
rename to src/configuration/DRAMSys/config/memspec/MemPowerSpec.h
index 2e4713ae..1c85879f 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemPowerSpec.h
+++ b/src/configuration/DRAMSys/config/memspec/MemPowerSpec.h
@@ -36,20 +36,20 @@
 #ifndef DRAMSYSCONFIGURATION_MEMPOWERSPEC_H
 #define DRAMSYSCONFIGURATION_MEMPOWERSPEC_H
 
-#include <nlohmann/json.hpp>
+#include "DRAMSys/config/ConfigUtil.h"
+
 #include <unordered_map>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
-using json = nlohmann::json;
 
 struct MemPowerSpec
 {
     std::unordered_map<std::string, double> entries;
 };
 
-void to_json(json &j, const MemPowerSpec &c);
-void from_json(const json &j, MemPowerSpec &c);
+void to_json(json_t &j, const MemPowerSpec &c);
+void from_json(const json_t &j, MemPowerSpec &c);
 
 } // namespace Configuration
 
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemSpec.cpp b/src/configuration/DRAMSys/config/memspec/MemSpec.cpp
similarity index 98%
rename from DRAMSys/library/src/common/configuration/memspec/MemSpec.cpp
rename to src/configuration/DRAMSys/config/memspec/MemSpec.cpp
index cc5dee89..2da6b91d 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemSpec.cpp
+++ b/src/configuration/DRAMSys/config/memspec/MemSpec.cpp
@@ -35,7 +35,7 @@
 
 #include "MemSpec.h"
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
 void to_json(json &j, const MemSpec &c)
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemSpec.h b/src/configuration/DRAMSys/config/memspec/MemSpec.h
similarity index 89%
rename from DRAMSys/library/src/common/configuration/memspec/MemSpec.h
rename to src/configuration/DRAMSys/config/memspec/MemSpec.h
index 05b7ad24..d20f0c03 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemSpec.h
+++ b/src/configuration/DRAMSys/config/memspec/MemSpec.h
@@ -36,19 +36,16 @@
 #ifndef DRAMSYSCONFIGURATION_MEMSPEC_H
 #define DRAMSYSCONFIGURATION_MEMSPEC_H
 
-#include "MemArchitectureSpec.h"
-#include "MemPowerSpec.h"
-#include "MemTimingSpec.h"
-#include "util.h"
+#include "DRAMSys/config/ConfigUtil.h"
+#include "DRAMSys/config/memspec/MemArchitectureSpec.h"
+#include "DRAMSys/config/memspec/MemPowerSpec.h"
+#include "DRAMSys/config/memspec/MemTimingSpec.h"
 
-#include <nlohmann/json.hpp>
 #include <optional>
 
-namespace DRAMSysConfiguration
-{
-using json = nlohmann::json;
+namespace DRAMSys::Config {
 
-const std::string memSpecPath = "configs/memspecs";
+const std::string memSpecPath = "memspec";
 
 struct MemSpec
 {
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemTimingSpec.cpp b/src/configuration/DRAMSys/config/memspec/MemTimingSpec.cpp
similarity index 93%
rename from DRAMSys/library/src/common/configuration/memspec/MemTimingSpec.cpp
rename to src/configuration/DRAMSys/config/memspec/MemTimingSpec.cpp
index 27414e57..f70e836d 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemTimingSpec.cpp
+++ b/src/configuration/DRAMSys/config/memspec/MemTimingSpec.cpp
@@ -35,12 +35,12 @@
 
 #include "MemTimingSpec.h"
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 
-void to_json(json &j, const MemTimingSpec &c)
+void to_json(json_t &j, const MemTimingSpec &c)
 {
-    j = json{};
+    j = json_t{};
 
     for (const auto &entry : c.entries)
     {
@@ -48,7 +48,7 @@ void to_json(json &j, const MemTimingSpec &c)
     }
 }
 
-void from_json(const json &j, MemTimingSpec &c)
+void from_json(const json_t &j, MemTimingSpec &c)
 {
     for (const auto &entry : j.items())
     {
diff --git a/DRAMSys/library/src/common/configuration/memspec/MemTimingSpec.h b/src/configuration/DRAMSys/config/memspec/MemTimingSpec.h
similarity index 96%
rename from DRAMSys/library/src/common/configuration/memspec/MemTimingSpec.h
rename to src/configuration/DRAMSys/config/memspec/MemTimingSpec.h
index 9cda4ac0..239ac824 100644
--- a/DRAMSys/library/src/common/configuration/memspec/MemTimingSpec.h
+++ b/src/configuration/DRAMSys/config/memspec/MemTimingSpec.h
@@ -36,10 +36,11 @@
 #ifndef DRAMSYSCONFIGURATION_MEMTIMINGSPEC_H
 #define DRAMSYSCONFIGURATION_MEMTIMINGSPEC_H
 
-#include <nlohmann/json.hpp>
+#include "DRAMSys/config/ConfigUtil.h"
+
 #include <unordered_map>
 
-namespace DRAMSysConfiguration
+namespace DRAMSys::Config
 {
 using json = nlohmann::json;
 
diff --git a/DRAMSys/gem5/CMakeLists.txt b/src/gem5/CMakeLists.txt
similarity index 95%
rename from DRAMSys/gem5/CMakeLists.txt
rename to src/gem5/CMakeLists.txt
index 527055c2..06ee211e 100644
--- a/DRAMSys/gem5/CMakeLists.txt
+++ b/src/gem5/CMakeLists.txt
@@ -42,10 +42,6 @@ set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
 
 find_library(GEM5_LIBRARY gem5_${GEM5_VARIANT} PATHS $ENV{GEM5}/build/${GEM5_ISA}/)
 
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/../library/src/simulation/DRAMSysRecordable.cpp)
-    add_definitions(-DRECORDING)
-endif()
-
 add_executable(DRAMSys_gem5 
     main.cpp
     $ENV{GEM5}/util/systemc/gem5_within_systemc/sc_logger.cc
diff --git a/DRAMSys/gem5/README.md b/src/gem5/README.md
similarity index 100%
rename from DRAMSys/gem5/README.md
rename to src/gem5/README.md
diff --git a/DRAMSys/gem5/main.cpp b/src/gem5/main.cpp
similarity index 99%
rename from DRAMSys/gem5/main.cpp
rename to src/gem5/main.cpp
index 8f680099..63801b9d 100644
--- a/DRAMSys/gem5/main.cpp
+++ b/src/gem5/main.cpp
@@ -52,10 +52,7 @@
 
 #include "Configuration.h"
 #include "simulation/DRAMSys.h"
-
-#ifdef RECORDING
 #include "simulation/DRAMSysRecordable.h"
-#endif
 
 using namespace sc_core;
 using namespace tlm;
@@ -167,11 +164,9 @@ int sc_main(int argc, char **argv)
     // Instantiate DRAMSys:
     std::unique_ptr<DRAMSys> dramSys;
 
-#ifdef RECORDING
     if (configLib.simConfig.databaseRecording.value_or(false))
         dramSys = std::make_unique<DRAMSysRecordable>("DRAMSys", configLib);
     else
-#endif
         dramSys = std::make_unique<DRAMSys>("DRAMSys", configLib);
 
     // Instantiate gem5:
diff --git a/src/libdramsys/CMakeLists.txt b/src/libdramsys/CMakeLists.txt
new file mode 100644
index 00000000..7e2d382a
--- /dev/null
+++ b/src/libdramsys/CMakeLists.txt
@@ -0,0 +1,64 @@
+# Copyright (c) 2021, Technische Universität Kaiserslautern
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. 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.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# 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.
+#
+# Authors:
+#   Derek Christ
+#   Thomas Psota
+
+########################################
+###      DRAMSys::libdramsys         ###
+########################################
+
+project(DRAMSys_libdramsys)
+
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(${PROJECT_NAME} 
+	PUBLIC 
+		SystemC::systemc
+		DRAMSys::util
+		DRAMSys::config
+		sqlite3::sqlite3
+)
+
+if (DRAMSYS_WITH_DRAMPOWER)
+	target_link_libraries(${PROJECT_NAME} PRIVATE DRAMPower)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE DRAMPOWER)
+endif ()
+
+add_library(DRAMSys::libdramsys ALIAS ${PROJECT_NAME})
+
+build_source_group()
+diagnostics_print(${PROJECT_NAME})
diff --git a/DRAMSys/library/src/common/DebugManager.cpp b/src/libdramsys/DRAMSys/common/DebugManager.cpp
similarity index 98%
rename from DRAMSys/library/src/common/DebugManager.cpp
rename to src/libdramsys/DRAMSys/common/DebugManager.cpp
index 9d857209..4259e8fb 100644
--- a/DRAMSys/library/src/common/DebugManager.cpp
+++ b/src/libdramsys/DRAMSys/common/DebugManager.cpp
@@ -38,7 +38,7 @@
 
 #ifndef NDEBUG
 
-#include "../configuration/Configuration.h"
+#include <DRAMSys/configuration/Configuration.h>
 
 using namespace sc_core;
 
diff --git a/DRAMSys/library/src/common/DebugManager.h b/src/libdramsys/DRAMSys/common/DebugManager.h
similarity index 100%
rename from DRAMSys/library/src/common/DebugManager.h
rename to src/libdramsys/DRAMSys/common/DebugManager.h
diff --git a/DRAMSys/library/src/common/TlmRecorder.cpp b/src/libdramsys/DRAMSys/common/TlmRecorder.cpp
similarity index 98%
rename from DRAMSys/library/src/common/TlmRecorder.cpp
rename to src/libdramsys/DRAMSys/common/TlmRecorder.cpp
index 70681f8a..e1e6d5b4 100644
--- a/DRAMSys/library/src/common/TlmRecorder.cpp
+++ b/src/libdramsys/DRAMSys/common/TlmRecorder.cpp
@@ -40,9 +40,8 @@
  */
 
 #include "TlmRecorder.h"
-#include "../configuration/Configuration.h"
-#include "../controller/Command.h"
-#include "DebugManager.h"
+
+#include "DRAMSys/common/DebugManager.h"
 
 #include <fstream>
 #include <sqlite3.h>
@@ -427,13 +426,13 @@ void TlmRecorder::insertGeneralInfo()
 
 void TlmRecorder::insertCommandLengths()
 {
-    const MemSpec& memSpec = *config.memSpec;
+    const MemSpec& _memSpec = *config.memSpec;
 
-    auto insertCommandLength = [this, &memSpec](Command command) {
+    auto insertCommandLength = [this, &_memSpec](Command command) {
         auto commandName = command.toString();
 
         sqlite3_bind_text(insertCommandLengthsStatement, 1, commandName.c_str(), commandName.length(), nullptr);
-        sqlite3_bind_double(insertCommandLengthsStatement, 2, memSpec.getCommandLengthInCycles(command));
+        sqlite3_bind_double(insertCommandLengthsStatement, 2, _memSpec.getCommandLengthInCycles(command));
         executeSqlStatement(insertCommandLengthsStatement);
     };
 
diff --git a/DRAMSys/library/src/common/TlmRecorder.h b/src/libdramsys/DRAMSys/common/TlmRecorder.h
similarity index 99%
rename from DRAMSys/library/src/common/TlmRecorder.h
rename to src/libdramsys/DRAMSys/common/TlmRecorder.h
index b4ccd8fc..1b01a163 100644
--- a/DRAMSys/library/src/common/TlmRecorder.h
+++ b/src/libdramsys/DRAMSys/common/TlmRecorder.h
@@ -41,6 +41,10 @@
 #ifndef TLMRECORDER_H
 #define TLMRECORDER_H
 
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/common/utils.h"
+
 #include <string>
 #include <systemc>
 #include <thread>
@@ -49,10 +53,6 @@
 #include <utility>
 #include <vector>
 
-#include "../configuration/Configuration.h"
-#include "dramExtensions.h"
-#include "utils.h"
-
 class sqlite3;
 class sqlite3_stmt;
 
diff --git a/DRAMSys/library/src/common/dramExtensions.cpp b/src/libdramsys/DRAMSys/common/dramExtensions.cpp
similarity index 99%
rename from DRAMSys/library/src/common/dramExtensions.cpp
rename to src/libdramsys/DRAMSys/common/dramExtensions.cpp
index b77a57ba..dead3e18 100644
--- a/DRAMSys/library/src/common/dramExtensions.cpp
+++ b/src/libdramsys/DRAMSys/common/dramExtensions.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "dramExtensions.h"
-#include "../configuration/Configuration.h"
+#include <DRAMSys/configuration/Configuration.h>
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/common/dramExtensions.h b/src/libdramsys/DRAMSys/common/dramExtensions.h
similarity index 100%
rename from DRAMSys/library/src/common/dramExtensions.h
rename to src/libdramsys/DRAMSys/common/dramExtensions.h
diff --git a/DRAMSys/library/src/common/tlm2_base_protocol_checker.h b/src/libdramsys/DRAMSys/common/tlm2_base_protocol_checker.h
old mode 100755
new mode 100644
similarity index 100%
rename from DRAMSys/library/src/common/tlm2_base_protocol_checker.h
rename to src/libdramsys/DRAMSys/common/tlm2_base_protocol_checker.h
diff --git a/DRAMSys/library/src/common/utils.cpp b/src/libdramsys/DRAMSys/common/utils.cpp
similarity index 99%
rename from DRAMSys/library/src/common/utils.cpp
rename to src/libdramsys/DRAMSys/common/utils.cpp
index 9784289d..70df58d6 100644
--- a/DRAMSys/library/src/common/utils.cpp
+++ b/src/libdramsys/DRAMSys/common/utils.cpp
@@ -37,11 +37,10 @@
  *    Derek Christ
  */
 
-#include <sstream>
-#include <fstream>
-
 #include "utils.h"
 
+#include <sstream>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/common/utils.h b/src/libdramsys/DRAMSys/common/utils.h
similarity index 98%
rename from DRAMSys/library/src/common/utils.h
rename to src/libdramsys/DRAMSys/common/utils.h
index a0b90f26..f6c6a2c0 100644
--- a/DRAMSys/library/src/common/utils.h
+++ b/src/libdramsys/DRAMSys/common/utils.h
@@ -40,11 +40,11 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <string>
+#include "DRAMSys/common/dramExtensions.h"
 
 #include <systemc>
 #include <tlm>
-#include "dramExtensions.h"
+#include <string>
 
 class TimeInterval
 {
diff --git a/DRAMSys/library/src/configuration/Configuration.cpp b/src/libdramsys/DRAMSys/configuration/Configuration.cpp
similarity index 65%
rename from DRAMSys/library/src/configuration/Configuration.cpp
rename to src/libdramsys/DRAMSys/configuration/Configuration.cpp
index 3306c479..d7ca08d7 100644
--- a/DRAMSys/library/src/configuration/Configuration.cpp
+++ b/src/libdramsys/DRAMSys/configuration/Configuration.cpp
@@ -40,25 +40,26 @@
  */
 
 #include "Configuration.h"
-#include "memspec/MemSpecDDR3.h"
-#include "memspec/MemSpecDDR4.h"
-#include "memspec/MemSpecWideIO.h"
-#include "memspec/MemSpecLPDDR4.h"
-#include "memspec/MemSpecWideIO2.h"
-#include "memspec/MemSpecHBM2.h"
-#include "memspec/MemSpecGDDR5.h"
-#include "memspec/MemSpecGDDR5X.h"
-#include "memspec/MemSpecGDDR6.h"
-#include "memspec/MemSpecSTTMRAM.h"
+
+#include "DRAMSys/configuration/memspec/MemSpecDDR3.h"
+#include "DRAMSys/configuration/memspec/MemSpecDDR4.h"
+#include "DRAMSys/configuration/memspec/MemSpecWideIO.h"
+#include "DRAMSys/configuration/memspec/MemSpecLPDDR4.h"
+#include "DRAMSys/configuration/memspec/MemSpecWideIO2.h"
+#include "DRAMSys/configuration/memspec/MemSpecHBM2.h"
+#include "DRAMSys/configuration/memspec/MemSpecGDDR5.h"
+#include "DRAMSys/configuration/memspec/MemSpecGDDR5X.h"
+#include "DRAMSys/configuration/memspec/MemSpecGDDR6.h"
+#include "DRAMSys/configuration/memspec/MemSpecSTTMRAM.h"
 
 #ifdef DDR5_SIM
-#include "memspec/MemSpecDDR5.h"
+#include "DRAMSys/configuration/memspec/MemSpecDDR5.h"
 #endif
 #ifdef LPDDR5_SIM
-#include "memspec/MemSpecLPDDR5.h"
+#include "DRAMSys/configuration/memspec/MemSpecLPDDR5.h"
 #endif
 #ifdef HBM3_SIM
-#include "memspec/MemSpecHBM3.h"
+#include "DRAMSys/configuration/memspec/MemSpecHBM3.h"
 #endif
 
 using namespace sc_core;
@@ -84,7 +85,7 @@ enum sc_time_unit string2TimeUnit(const std::string &s)
     }
 }
 
-void Configuration::loadSimConfig(const DRAMSysConfiguration::SimConfig &simConfig)
+void Configuration::loadSimConfig(const DRAMSys::Config::SimConfig &simConfig)
 {
     if (const auto& _addressOffset = simConfig.addressOffset)
         addressOffset = *_addressOffset;
@@ -102,7 +103,13 @@ void Configuration::loadSimConfig(const DRAMSysConfiguration::SimConfig &simConf
         enableWindowing = *_enableWindowing;
 
     if (const auto& _powerAnalysis = simConfig.powerAnalysis)
+    {
         powerAnalysis = *_powerAnalysis;
+#ifndef DRAMPOWER
+        if (powerAnalysis)
+            SC_REPORT_FATAL("Configuration", "Power analysis is only supported with included DRAMPower library!");
+#endif
+    }
 
     if (const auto& _simulationName = simConfig.simulationName)
         simulationName = *_simulationName;
@@ -110,9 +117,6 @@ void Configuration::loadSimConfig(const DRAMSysConfiguration::SimConfig &simConf
     if (const auto& _simulationProgressBar = simConfig.simulationProgressBar)
         simulationProgressBar = *_simulationProgressBar;
 
-    if (const auto& _thermalSimulation = simConfig.thermalSimulation)
-        thermalSimulation = *_thermalSimulation;
-
     if (const auto& _useMalloc = simConfig.useMalloc)
         useMalloc = *_useMalloc;
 
@@ -122,77 +126,24 @@ void Configuration::loadSimConfig(const DRAMSysConfiguration::SimConfig &simConf
     if (windowSize == 0)
             SC_REPORT_FATAL("Configuration", "Minimum window size is 1");
 
-    if (const auto& _errorCsvFile = simConfig.errorCsvFile)
-        errorCSVFile = *_errorCsvFile;
-
-    if (const auto& _errorChipSeed = simConfig.errorChipSeed)
-        errorChipSeed = *_errorChipSeed;
-
     if (const auto& _storeMode = simConfig.storeMode)
         storeMode = [=] {
-            if (_storeMode == DRAMSysConfiguration::StoreMode::NoStorage)
+            if (_storeMode == DRAMSys::Config::StoreMode::NoStorage)
                 return StoreMode::NoStorage;
-            else if (_storeMode == DRAMSysConfiguration::StoreMode::Store)
+            else // (_storeMode == DRAMSys::Config::StoreMode::Store)
                 return StoreMode::Store;
-            else
-                return StoreMode::ErrorModel;
         }();
 }
 
-void Configuration::loadTemperatureSimConfig(const DRAMSysConfiguration::ThermalConfig &thermalConfig)
-{
-    temperatureSim.temperatureScale = [=] {
-        if (thermalConfig.temperatureScale == DRAMSysConfiguration::TemperatureScale::Celsius)
-            return TemperatureSimConfig::TemperatureScale::Celsius;
-        else if (thermalConfig.temperatureScale == DRAMSysConfiguration::TemperatureScale::Fahrenheit)
-            return TemperatureSimConfig::TemperatureScale::Fahrenheit;
-        else
-            return TemperatureSimConfig::TemperatureScale::Kelvin;
-    }();
-
-    temperatureSim.staticTemperatureDefaultValue = thermalConfig.staticTemperatureDefaultValue;
-    temperatureSim.thermalSimPeriod = thermalConfig.thermalSimPeriod;
-
-    temperatureSim.thermalSimUnit = [=] {
-        if (thermalConfig.thermalSimUnit == DRAMSysConfiguration::ThermalSimUnit::Seconds)
-            return sc_core::SC_SEC;
-        else if (thermalConfig.thermalSimUnit == DRAMSysConfiguration::ThermalSimUnit::Milliseconds)
-            return sc_core::SC_MS;
-        else if (thermalConfig.thermalSimUnit == DRAMSysConfiguration::ThermalSimUnit::Microseconds)
-            return sc_core::SC_US;
-        else if (thermalConfig.thermalSimUnit == DRAMSysConfiguration::ThermalSimUnit::Nanoseconds)
-            return sc_core::SC_NS;
-        else if (thermalConfig.thermalSimUnit == DRAMSysConfiguration::ThermalSimUnit::Picoseconds)
-            return sc_core::SC_PS;
-        else
-            return sc_core::SC_FS;
-    }();
-
-    for (const auto &channel : thermalConfig.powerInfo.channels)
-    {
-        temperatureSim.powerInitialValues.push_back(channel.init_pow);
-        temperatureSim.powerThresholds.push_back(channel.threshold);
-    }
-
-    temperatureSim.iceServerIp = thermalConfig.iceServerIp;
-    temperatureSim.iceServerPort = thermalConfig.iceServerPort;
-    temperatureSim.simPeriodAdjustFactor = thermalConfig.simPeriodAdjustFactor;
-    temperatureSim.nPowStableCyclesToIncreasePeriod = thermalConfig.nPowStableCyclesToIncreasePeriod;
-    temperatureSim.generateTemperatureMap = thermalConfig.generateTemperatureMap;
-    temperatureSim.generatePowerMap = thermalConfig.generatePowerMap;
-
-    temperatureSim.showTemperatureSimConfig();
-}
-
-void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
+void Configuration::loadMCConfig(const DRAMSys::Config::McConfig &mcConfig)
 {
     if (const auto& _pagePolicy = mcConfig.pagePolicy)
         pagePolicy = [=] {
-            if (_pagePolicy == DRAMSysConfiguration::PagePolicy::Open)
+            if (_pagePolicy == DRAMSys::Config::PagePolicy::Open)
                 return PagePolicy::Open;
-            else if (_pagePolicy == DRAMSysConfiguration::PagePolicy::OpenAdaptive)
+            else if (_pagePolicy == DRAMSys::Config::PagePolicy::OpenAdaptive)
                 return PagePolicy::OpenAdaptive;
-            else if (_pagePolicy == DRAMSysConfiguration::PagePolicy::Closed)
+            else if (_pagePolicy == DRAMSys::Config::PagePolicy::Closed)
                 return PagePolicy::Closed;
             else
                 return PagePolicy::ClosedAdaptive;
@@ -200,13 +151,13 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _scheduler = mcConfig.scheduler)
         scheduler = [=] {
-           if (_scheduler == DRAMSysConfiguration::Scheduler::Fifo)
+           if (_scheduler == DRAMSys::Config::Scheduler::Fifo)
                return Scheduler::Fifo;
-           else if (_scheduler == DRAMSysConfiguration::Scheduler::FrFcfs)
+           else if (_scheduler == DRAMSys::Config::Scheduler::FrFcfs)
                return Scheduler::FrFcfs;
-           else if (_scheduler == DRAMSysConfiguration::Scheduler::FrFcfsGrp)
+           else if (_scheduler == DRAMSys::Config::Scheduler::FrFcfsGrp)
                return Scheduler::FrFcfsGrp;
-           else if (_scheduler == DRAMSysConfiguration::Scheduler::GrpFrFcfs)
+           else if (_scheduler == DRAMSys::Config::Scheduler::GrpFrFcfs)
                return Scheduler::GrpFrFcfs;
            else
                return Scheduler::GrpFrFcfsWm;
@@ -220,9 +171,9 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _schedulerBuffer = mcConfig.schedulerBuffer)
         schedulerBuffer = [=] {
-            if (_schedulerBuffer == DRAMSysConfiguration::SchedulerBuffer::Bankwise)
+            if (_schedulerBuffer == DRAMSys::Config::SchedulerBuffer::Bankwise)
                 return SchedulerBuffer::Bankwise;
-            else if (_schedulerBuffer == DRAMSysConfiguration::SchedulerBuffer::ReadWrite)
+            else if (_schedulerBuffer == DRAMSys::Config::SchedulerBuffer::ReadWrite)
                 return SchedulerBuffer::ReadWrite;
             else
                 return SchedulerBuffer::Shared;
@@ -236,7 +187,7 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _cmdMux = mcConfig.cmdMux)
         cmdMux = [=] {
-            if (_cmdMux == DRAMSysConfiguration::CmdMux::Oldest)
+            if (_cmdMux == DRAMSys::Config::CmdMux::Oldest)
                 return CmdMux::Oldest;
             else
                 return CmdMux::Strict;
@@ -244,7 +195,7 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _respQueue = mcConfig.respQueue)
         respQueue = [=] {
-            if (_respQueue == DRAMSysConfiguration::RespQueue::Fifo)
+            if (_respQueue == DRAMSys::Config::RespQueue::Fifo)
                 return RespQueue::Fifo;
             else
                 return RespQueue::Reorder;
@@ -252,15 +203,15 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _refreshPolicy = mcConfig.refreshPolicy)
         refreshPolicy = [=] {
-            if (_refreshPolicy == DRAMSysConfiguration::RefreshPolicy::NoRefresh)
+            if (_refreshPolicy == DRAMSys::Config::RefreshPolicy::NoRefresh)
                 return RefreshPolicy::NoRefresh;
-            else if (_refreshPolicy == DRAMSysConfiguration::RefreshPolicy::AllBank)
+            else if (_refreshPolicy == DRAMSys::Config::RefreshPolicy::AllBank)
                 return RefreshPolicy::AllBank;
-            else if (_refreshPolicy == DRAMSysConfiguration::RefreshPolicy::PerBank)
+            else if (_refreshPolicy == DRAMSys::Config::RefreshPolicy::PerBank)
                 return RefreshPolicy::PerBank;
-            else if (_refreshPolicy == DRAMSysConfiguration::RefreshPolicy::Per2Bank)
+            else if (_refreshPolicy == DRAMSys::Config::RefreshPolicy::Per2Bank)
                 return RefreshPolicy::Per2Bank;
-            else // if (policy == DRAMSysConfiguration::RefreshPolicy::SameBank)
+            else // if (policy == DRAMSys::Config::RefreshPolicy::SameBank)
                 return RefreshPolicy::SameBank;
         }();
 
@@ -272,7 +223,7 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _powerDownPolicy = mcConfig.powerDownPolicy)
         powerDownPolicy = [=] {
-            if (_powerDownPolicy == DRAMSysConfiguration::PowerDownPolicy::NoPowerDown)
+            if (_powerDownPolicy == DRAMSys::Config::PowerDownPolicy::NoPowerDown)
                 return PowerDownPolicy::NoPowerDown;
             else
                 return PowerDownPolicy::Staggered;
@@ -280,9 +231,9 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
 
     if (const auto& _arbiter = mcConfig.arbiter)
         arbiter = [=] {
-            if (_arbiter == DRAMSysConfiguration::Arbiter::Simple)
+            if (_arbiter == DRAMSys::Config::Arbiter::Simple)
                 return Arbiter::Simple;
-            else if (_arbiter == DRAMSysConfiguration::Arbiter::Fifo)
+            else if (_arbiter == DRAMSys::Config::Arbiter::Fifo)
                 return Arbiter::Fifo;
             else
                 return Arbiter::Reorder;
@@ -325,7 +276,7 @@ void Configuration::loadMCConfig(const DRAMSysConfiguration::McConfig &mcConfig)
     }
 }
 
-void Configuration::loadMemSpec(const DRAMSysConfiguration::MemSpec &memSpecConfig)
+void Configuration::loadMemSpec(const DRAMSys::Config::MemSpec &memSpecConfig)
 {
     std::string memoryType = memSpecConfig.memoryType;
 
diff --git a/DRAMSys/library/src/configuration/Configuration.h b/src/libdramsys/DRAMSys/configuration/Configuration.h
similarity index 83%
rename from DRAMSys/library/src/configuration/Configuration.h
rename to src/libdramsys/DRAMSys/configuration/Configuration.h
index fbad1cd5..7a4cfc20 100644
--- a/DRAMSys/library/src/configuration/Configuration.h
+++ b/src/libdramsys/DRAMSys/configuration/Configuration.h
@@ -37,16 +37,17 @@
  *    Lukas Steiner
  *    Luiza Correa
  *    Derek Christ
+ *    Thomas Psota
  */
 
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-#include <string>
-#include <DRAMSysConfiguration.h>
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+
 #include <systemc>
-#include "memspec/MemSpec.h"
-#include "TemperatureSimConfig.h"
+#include <string>
 
 class Configuration
 {
@@ -70,7 +71,6 @@ public:
     unsigned int refreshMaxPostponed = 0;
     unsigned int refreshMaxPulledin = 0;
     enum class PowerDownPolicy {NoPowerDown, Staggered} powerDownPolicy = PowerDownPolicy::NoPowerDown;
-    unsigned int powerDownTimeout = 3;
     unsigned int maxActiveTransactions = 64;
     bool refreshManagement = false;
     sc_core::sc_time arbitrationDelayFw = sc_core::SC_ZERO_TIME;
@@ -87,27 +87,19 @@ public:
     bool enableWindowing = false;
     unsigned int windowSize = 1000;
     bool debug = false;
-    bool thermalSimulation = false;
     bool simulationProgressBar = false;
     bool checkTLM2Protocol = false;
     bool useMalloc = false;
     unsigned long long int addressOffset = 0;
 
-    //Configs for Seed, csv file and StorageMode
-    unsigned int errorChipSeed = 0;
-    std::string errorCSVFile = "not defined.";
-    enum class StoreMode {NoStorage, Store, ErrorModel} storeMode = StoreMode::NoStorage;
+    enum class StoreMode {NoStorage, Store} storeMode = StoreMode::NoStorage;
 
     // MemSpec (from DRAM-Power)
     std::unique_ptr<const MemSpec> memSpec;
 
-    // Temperature Simulation related
-    TemperatureSimConfig temperatureSim;
-
-    void loadMCConfig(const DRAMSysConfiguration::McConfig& mcConfig);
-    void loadSimConfig(const DRAMSysConfiguration::SimConfig& simConfig);
-    void loadMemSpec(const DRAMSysConfiguration::MemSpec& memSpec);
-    void loadTemperatureSimConfig(const DRAMSysConfiguration::ThermalConfig& thermalConfig);
+    void loadMCConfig(const DRAMSys::Config::McConfig& mcConfig);
+    void loadSimConfig(const DRAMSys::Config::SimConfig& simConfig);
+    void loadMemSpec(const DRAMSys::Config::MemSpec& memSpec);
 };
 
 #endif // CONFIGURATION_H
diff --git a/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp
new file mode 100644
index 00000000..6d25dac1
--- /dev/null
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.cpp
@@ -0,0 +1,146 @@
+/*
+* Copyright (c) 2015, Technische Universität Kaiserslautern
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+*    this list of conditions and the following disclaimer.
+*
+* 2. 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.
+*
+* 3. Neither the name of the copyright holder nor the names of its
+*    contributors may be used to endorse or promote products derived from
+*    this software without specific prior written permission.
+*
+* 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.
+*
+* Authors:
+*    Lukas Steiner
+*    Derek Christ
+*/
+
+#include "MemSpec.h"
+
+using namespace sc_core;
+using namespace tlm;
+
+MemSpec::MemSpec(const DRAMSys::Config::MemSpec& memSpec,
+    MemoryType memoryType,
+    unsigned numberOfChannels, unsigned pseudoChannelsPerChannel,
+    unsigned ranksPerChannel, unsigned banksPerRank,
+    unsigned groupsPerRank, unsigned banksPerGroup,
+    unsigned banksPerChannel, unsigned bankGroupsPerChannel,
+    unsigned devicesPerRank)
+    : numberOfChannels(numberOfChannels),
+    pseudoChannelsPerChannel(pseudoChannelsPerChannel),
+    ranksPerChannel(ranksPerChannel),
+    banksPerRank(banksPerRank),
+    groupsPerRank(groupsPerRank),
+    banksPerGroup(banksPerGroup),
+    banksPerChannel(banksPerChannel),
+    bankGroupsPerChannel(bankGroupsPerChannel),
+    devicesPerRank(devicesPerRank),
+    rowsPerBank(memSpec.memArchitectureSpec.entries.at("nbrOfRows")),
+    columnsPerRow(memSpec.memArchitectureSpec.entries.at("nbrOfColumns")),
+    defaultBurstLength(memSpec.memArchitectureSpec.entries.at("burstLength")),
+    maxBurstLength(memSpec.memArchitectureSpec.entries.find("maxBurstLength") !=
+        memSpec.memArchitectureSpec.entries.end()
+        ? memSpec.memArchitectureSpec.entries.at("maxBurstLength")
+        : defaultBurstLength),
+    dataRate(memSpec.memArchitectureSpec.entries.at("dataRate")),
+    bitWidth(memSpec.memArchitectureSpec.entries.at("width")),
+    dataBusWidth(bitWidth* devicesPerRank),
+    bytesPerBeat(dataBusWidth / 8),
+    defaultBytesPerBurst((defaultBurstLength* dataBusWidth) / 8),
+    maxBytesPerBurst((maxBurstLength* dataBusWidth) / 8),
+    fCKMHz(memSpec.memTimingSpec.entries.at("clkMhz")),
+    tCK(sc_time(1.0 / fCKMHz, SC_US)),
+    memoryId(memSpec.memoryId),
+    memoryType(memoryType),
+    burstDuration(tCK* (static_cast<double>(defaultBurstLength) / dataRate)),
+    memorySizeBytes(0)
+{
+    commandLengthInCycles = std::vector<double>(Command::numberOfCommands(), 1);
+}
+
+sc_time MemSpec::getCommandLength(Command command) const
+{
+    return tCK * commandLengthInCycles[command];
+}
+
+double MemSpec::getCommandLengthInCycles(Command command) const
+{
+    return commandLengthInCycles[command];
+}
+
+uint64_t MemSpec::getSimMemSizeInBytes() const
+{
+    return memorySizeBytes;
+}
+
+sc_time MemSpec::getRefreshIntervalAB() const
+{
+    SC_REPORT_FATAL("MemSpec", "All-bank refresh not supported");
+    return SC_ZERO_TIME;
+}
+
+sc_time MemSpec::getRefreshIntervalPB() const
+{
+    SC_REPORT_FATAL("MemSpec", "Per-bank refresh not supported");
+    return SC_ZERO_TIME;
+}
+
+sc_time MemSpec::getRefreshIntervalP2B() const
+{
+    SC_REPORT_FATAL("MemSpec", "Per-2-bank refresh not supported");
+    return SC_ZERO_TIME;
+}
+
+sc_time MemSpec::getRefreshIntervalSB() const
+{
+    SC_REPORT_FATAL("MemSpec", "Same-bank refresh not supported");
+    return SC_ZERO_TIME;
+}
+
+unsigned MemSpec::getPer2BankOffset() const
+{
+    return 0;
+}
+
+unsigned MemSpec::getRAACDR() const
+{
+    SC_REPORT_FATAL("MemSpec", "Refresh Management not supported");
+    return 0;
+}
+
+unsigned MemSpec::getRAAIMT() const
+{
+    SC_REPORT_FATAL("MemSpec", "Refresh Management not supported");
+    return 0;
+}
+
+unsigned MemSpec::getRAAMMT() const
+{
+    SC_REPORT_FATAL("MemSpec", "Refresh Management not supported");
+    return 0;
+}
+
+bool MemSpec::hasRasAndCasBus() const
+{
+    return false;
+}
diff --git a/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h
new file mode 100644
index 00000000..f431886a
--- /dev/null
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpec.h
@@ -0,0 +1,123 @@
+/*
+* Copyright (c) 2015, Technische Universität Kaiserslautern
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*
+* 1. Redistributions of source code must retain the above copyright notice,
+*    this list of conditions and the following disclaimer.
+*
+* 2. 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.
+*
+* 3. Neither the name of the copyright holder nor the names of its
+*    contributors may be used to endorse or promote products derived from
+*    this software without specific prior written permission.
+*
+* 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.
+*
+* Authors:
+*    Janik Schlemminger
+*    Matthias Jung
+*    Lukas Steiner
+*    Derek Christ
+*/
+
+#ifndef MEMSPEC_H
+#define MEMSPEC_H
+
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+#include "DRAMSys/common/utils.h"
+#include "DRAMSys/controller/Command.h"
+
+#include <systemc>
+#include <tlm>
+#include <vector>
+#include <string>
+
+class MemSpec
+{
+public:
+    const unsigned numberOfChannels;
+    const unsigned pseudoChannelsPerChannel;
+    const unsigned ranksPerChannel;
+    const unsigned banksPerRank;
+    const unsigned groupsPerRank;
+    const unsigned banksPerGroup;
+    const unsigned banksPerChannel;
+    const unsigned bankGroupsPerChannel;
+    const unsigned devicesPerRank;
+    const unsigned rowsPerBank;
+    const unsigned columnsPerRow;
+    const unsigned defaultBurstLength;
+    const unsigned maxBurstLength;
+    const unsigned dataRate;
+    const unsigned bitWidth;
+    const unsigned dataBusWidth;
+    const unsigned bytesPerBeat;
+    const unsigned defaultBytesPerBurst;
+    const unsigned maxBytesPerBurst;
+
+    // Clock
+    const double fCKMHz;
+    const sc_core::sc_time tCK;
+
+    const std::string memoryId;
+    const enum class MemoryType {
+        DDR3, DDR4, DDR5, LPDDR4, LPDDR5, WideIO,
+        WideIO2, GDDR5, GDDR5X, GDDR6, HBM2, HBM3, STTMRAM
+    } memoryType;
+
+    virtual ~MemSpec() = default;
+
+    virtual sc_core::sc_time getRefreshIntervalAB() const;
+    virtual sc_core::sc_time getRefreshIntervalPB() const;
+    virtual sc_core::sc_time getRefreshIntervalP2B() const;
+    virtual sc_core::sc_time getRefreshIntervalSB() const;
+
+    virtual unsigned getPer2BankOffset() const;
+
+    virtual unsigned getRAAIMT() const;
+    virtual unsigned getRAAMMT() const;
+    virtual unsigned getRAACDR() const;
+
+    virtual bool hasRasAndCasBus() const;
+
+    virtual sc_core::sc_time getExecutionTime(Command command, const tlm::tlm_generic_payload& payload) const = 0;
+    virtual TimeInterval getIntervalOnDataStrobe(Command command, const tlm::tlm_generic_payload& payload) const = 0;
+
+    sc_core::sc_time getCommandLength(Command) const;
+    double getCommandLengthInCycles(Command) const;
+    uint64_t getSimMemSizeInBytes() const;
+
+protected:
+    MemSpec(const DRAMSys::Config::MemSpec& memSpec,
+        MemoryType memoryType,
+        unsigned numberOfChannels, unsigned pseudoChannelsPerChannel,
+        unsigned ranksPerChannel, unsigned banksPerRank,
+        unsigned groupsPerRank, unsigned banksPerGroup,
+        unsigned banksPerChannel, unsigned bankGroupsPerChannel,
+        unsigned devicesPerRank);
+
+    // Command lengths in cycles on bus, usually one clock cycle
+    std::vector<double> commandLengthInCycles;
+    sc_core::sc_time burstDuration;
+    uint64_t memorySizeBytes;
+};
+
+
+#endif // MEMSPEC_H
+
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR3.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR3.cpp
index 4a0503f6..9271fdf5 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR3.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecDDR3.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecDDR3::MemSpecDDR3(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecDDR3::MemSpecDDR3(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::DDR3,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR3.h
similarity index 95%
rename from DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR3.h
index fc9818a6..a5c03d58 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR3.h
@@ -37,15 +37,15 @@
 #ifndef MEMSPECDDR3_H
 #define MEMSPECDDR3_H
 
-#include "MemSpec.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+#include "DRAMSys/config/DRAMSysConfiguration.h"
 
 #include <systemc>
-#include <DRAMSysConfiguration.h>
 
 class MemSpecDDR3 final : public MemSpec
 {
 public:
-    explicit MemSpecDDR3(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecDDR3(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tCKE;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR4.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR4.cpp
index 60ddb3ea..594cda9b 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR4.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecDDR4.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecDDR4::MemSpecDDR4(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecDDR4::MemSpecDDR4(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::DDR4,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR4.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecDDR4.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR4.h
index e7db402b..51b9d320 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR4.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecDDR4.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECDDR4_H
 #define MEMSPECDDR4_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecDDR4 final : public MemSpec
 {
 public:
-    explicit MemSpecDDR4(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecDDR4(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tCKE;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5.cpp
index 886075b7..976f5ae1 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecGDDR5.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecGDDR5::MemSpecGDDR5(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecGDDR5::MemSpecGDDR5(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::GDDR5,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5.h
index f5998776..72634e58 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECGDDR5_H
 #define MEMSPECGDDR5_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecGDDR5 final : public MemSpec
 {
 public:
-    explicit MemSpecGDDR5(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecGDDR5(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tRP;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5X.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5X.cpp
index ff7d05ad..7b4cf66e 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5X.cpp
@@ -33,15 +33,17 @@
  *    Lukas Steiner
  *    Derek Christ
  */
-#include <iostream>
 
-#include "../../common/utils.h"
 #include "MemSpecGDDR5X.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecGDDR5X::MemSpecGDDR5X(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecGDDR5X::MemSpecGDDR5X(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::GDDR5X,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5X.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5X.h
index 432ea1e0..75faec54 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR5X.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR5X.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECGDDR5X_H
 #define MEMSPECGDDR5X_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecGDDR5X final : public MemSpec
 {
 public:
-    explicit MemSpecGDDR5X(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecGDDR5X(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tRP;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR6.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR6.cpp
index d59f8528..64b78b14 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR6.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecGDDR6.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecGDDR6::MemSpecGDDR6(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecGDDR6::MemSpecGDDR6(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::GDDR6,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR6.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR6.h
index e96c8513..82711fbc 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecGDDR6.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecGDDR6.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECGDDR6_H
 #define MEMSPECGDDR6_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 struct MemSpecGDDR6 final : public MemSpec
 {
 public:
-    explicit MemSpecGDDR6(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecGDDR6(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tRP;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecHBM2.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecHBM2.cpp
index 4c41951a..479a9069 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecHBM2.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecHBM2.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecHBM2::MemSpecHBM2(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecHBM2::MemSpecHBM2(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::HBM2,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       memSpec.memArchitectureSpec.entries.at("nbrOfPseudoChannels"),
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecHBM2.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecHBM2.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecHBM2.h
index 71dffc76..b9d4e8a8 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecHBM2.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecHBM2.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECHBM2_H
 #define MEMSPECHBM2_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecHBM2 final : public MemSpec
 {
 public:
-    explicit MemSpecHBM2(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecHBM2(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tDQSCK;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecLPDDR4.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecLPDDR4.cpp
index 7743a83b..0c8b80ea 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecLPDDR4.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecLPDDR4.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecLPDDR4::MemSpecLPDDR4(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecLPDDR4::MemSpecLPDDR4(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::LPDDR4,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecLPDDR4.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecLPDDR4.h
index d93cf8cc..343677c5 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecLPDDR4.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecLPDDR4.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECLPDDR4_H
 #define MEMSPECLPDDR4_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecLPDDR4 final : public MemSpec
 {
 public:
-    explicit MemSpecLPDDR4(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecLPDDR4(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tREFI;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecSTTMRAM.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecSTTMRAM.cpp
index f9b9aa33..b68f15f0 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecSTTMRAM.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecSTTMRAM.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecSTTMRAM::MemSpecSTTMRAM(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecSTTMRAM::MemSpecSTTMRAM(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::STTMRAM,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecSTTMRAM.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecSTTMRAM.h
index 33a91056..b31e2b2d 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecSTTMRAM.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecSTTMRAM.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECSTTMRAM_H
 #define MEMSPECSTTMRAM_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecSTTMRAM final : public MemSpec
 {
 public:
-    explicit MemSpecSTTMRAM(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecSTTMRAM(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tCKE;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO.cpp
index 5eef8e4d..a47a3e77 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecWideIO.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecWideIO::MemSpecWideIO(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecWideIO::MemSpecWideIO(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::WideIO,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecWideIO.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO.h
index ef300a2c..e34a8892 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECWIDEIO_H
 #define MEMSPECWIDEIO_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecWideIO final : public MemSpec
 {
 public:
-    explicit MemSpecWideIO(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecWideIO(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tCKE;
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO2.cpp
similarity index 98%
rename from DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO2.cpp
index dce901fa..2cb5a443 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.cpp
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO2.cpp
@@ -34,15 +34,16 @@
  *    Derek Christ
  */
 
-#include <iostream>
-
-#include "../../common/utils.h"
 #include "MemSpecWideIO2.h"
 
+#include "DRAMSys/common/utils.h"
+
+#include <iostream>
+
 using namespace sc_core;
 using namespace tlm;
 
-MemSpecWideIO2::MemSpecWideIO2(const DRAMSysConfiguration::MemSpec &memSpec)
+MemSpecWideIO2::MemSpecWideIO2(const DRAMSys::Config::MemSpec &memSpec)
     : MemSpec(memSpec, MemoryType::WideIO2,
       memSpec.memArchitectureSpec.entries.at("nbrOfChannels"),
       1,
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.h b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO2.h
similarity index 96%
rename from DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.h
rename to src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO2.h
index 4746d792..8138e9ec 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecWideIO2.h
+++ b/src/libdramsys/DRAMSys/configuration/memspec/MemSpecWideIO2.h
@@ -37,13 +37,14 @@
 #ifndef MEMSPECWIDEIO2_H
 #define MEMSPECWIDEIO2_H
 
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+
 #include <systemc>
-#include "MemSpec.h"
 
 class MemSpecWideIO2 final : public MemSpec
 {
 public:
-    explicit MemSpecWideIO2(const DRAMSysConfiguration::MemSpec &memSpec);
+    explicit MemSpecWideIO2(const DRAMSys::Config::MemSpec &memSpec);
 
     // Memspec Variables:
     const sc_core::sc_time tDQSCK;
diff --git a/DRAMSys/library/src/controller/BankMachine.cpp b/src/libdramsys/DRAMSys/controller/BankMachine.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/BankMachine.cpp
rename to src/libdramsys/DRAMSys/controller/BankMachine.cpp
index 6316280a..9f7cabcd 100644
--- a/DRAMSys/library/src/controller/BankMachine.cpp
+++ b/src/libdramsys/DRAMSys/controller/BankMachine.cpp
@@ -32,10 +32,11 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "BankMachine.h"
-#include "../configuration/Configuration.h"
+
+#include "DRAMSys/configuration/Configuration.h"
+
+#include <algorithm>
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/controller/BankMachine.h b/src/libdramsys/DRAMSys/controller/BankMachine.h
similarity index 83%
rename from DRAMSys/library/src/controller/BankMachine.h
rename to src/libdramsys/DRAMSys/controller/BankMachine.h
index 6f17d1c4..820d0919 100644
--- a/DRAMSys/library/src/controller/BankMachine.h
+++ b/src/libdramsys/DRAMSys/controller/BankMachine.h
@@ -35,14 +35,15 @@
 #ifndef BANKMACHINE_H
 #define BANKMACHINE_H
 
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/controller/Command.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <systemc>
 #include <tlm>
-#include "../common/dramExtensions.h"
-#include "Command.h"
-#include "scheduler/SchedulerIF.h"
-#include "checker/CheckerIF.h"
-#include "../configuration/memspec/MemSpec.h"
-#include "../configuration/Configuration.h"
 
 class BankMachine
 {
@@ -53,20 +54,20 @@ public:
     void updateState(Command);
     void block();
 
-    Rank getRank() const;
-    BankGroup getBankGroup() const;
-    Bank getBank() const;
-    Row getOpenRow() const;
-    bool isIdle() const;
-    bool isActivated() const;
-    bool isPrecharged() const;
-    uint64_t getRefreshManagementCounter() const;
+    [[nodiscard]] Rank getRank() const;
+    [[nodiscard]] BankGroup getBankGroup() const;
+    [[nodiscard]] Bank getBank() const;
+    [[nodiscard]] Row getOpenRow() const;
+    [[nodiscard]] bool isIdle() const;
+    [[nodiscard]] bool isActivated() const;
+    [[nodiscard]] bool isPrecharged() const;
+    [[nodiscard]] uint64_t getRefreshManagementCounter() const;
 
 protected:
     enum class State {Precharged, Activated} state = State::Precharged;
     BankMachine(const Configuration& config, const SchedulerIF& scheduler, const CheckerIF& checker, Bank bank);
     const MemSpec& memSpec;
-    tlm::tlm_generic_payload *currentPayload = nullptr;
+    tlm::tlm_generic_payload* currentPayload = nullptr;
     const SchedulerIF& scheduler;
     const CheckerIF& checker;
     Command nextCommand = Command::NOP;
diff --git a/DRAMSys/library/src/controller/Command.cpp b/src/libdramsys/DRAMSys/controller/Command.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/Command.cpp
rename to src/libdramsys/DRAMSys/controller/Command.cpp
index fbb7562f..1ad12525 100644
--- a/DRAMSys/library/src/controller/Command.cpp
+++ b/src/libdramsys/DRAMSys/controller/Command.cpp
@@ -36,9 +36,10 @@
  *    Lukas Steiner
  */
 
-#include <array>
 #include "Command.h"
 
+#include <array>
+
 using namespace tlm;
 
 #ifdef DRAMPOWER
diff --git a/DRAMSys/library/src/controller/Command.h b/src/libdramsys/DRAMSys/controller/Command.h
similarity index 91%
rename from DRAMSys/library/src/controller/Command.h
rename to src/libdramsys/DRAMSys/controller/Command.h
index 9826f083..bbd5437d 100644
--- a/DRAMSys/library/src/controller/Command.h
+++ b/src/libdramsys/DRAMSys/controller/Command.h
@@ -37,17 +37,16 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
+#ifdef DRAMPOWER
+#include "MemCommand.h"
+#endif
+
 #include <string>
 #include <vector>
 #include <tuple>
-
 #include <systemc>
 #include <tlm>
 
-#ifdef DRAMPOWER
-#include "../common/third_party/DRAMPower/src/MemCommand.h"
-#endif
-
 // DO NOT CHANGE THE ORDER!
 
 //                     BEGIN_REQ      // 1
@@ -84,6 +83,7 @@ DECLARE_EXTENDED_PHASE(END_SREF);     // 27
 #ifdef DRAMPOWER
 DRAMPower::MemCommand::cmds phaseToDRAMPowerCommand(tlm::tlm_phase);
 #endif
+
 bool phaseHasDataStrobe(tlm::tlm_phase phase);
 bool isPowerDownEntryPhase(tlm::tlm_phase phase);
 bool isPowerDownExitPhase(tlm::tlm_phase phase);
@@ -129,15 +129,15 @@ public:
     Command(Type type);
     Command(tlm::tlm_phase phase);
 
-    std::string toString() const;
-    tlm::tlm_phase toPhase() const;
+    [[nodiscard]] std::string toString() const;
+    [[nodiscard]] tlm::tlm_phase toPhase() const;
     static unsigned numberOfCommands();
-    bool isBankCommand() const;
-    bool is2BankCommand() const;
-    bool isGroupCommand() const;
-    bool isRankCommand() const;
-    bool isCasCommand() const;
-    bool isRasCommand() const;
+    [[nodiscard]] bool isBankCommand() const;
+    [[nodiscard]] bool is2BankCommand() const;
+    [[nodiscard]] bool isGroupCommand() const;
+    [[nodiscard]] bool isRankCommand() const;
+    [[nodiscard]] bool isCasCommand() const;
+    [[nodiscard]] bool isRasCommand() const;
 
     constexpr operator uint8_t() const
     {
diff --git a/DRAMSys/library/src/controller/Controller.cpp b/src/libdramsys/DRAMSys/controller/Controller.cpp
similarity index 93%
rename from DRAMSys/library/src/controller/Controller.cpp
rename to src/libdramsys/DRAMSys/controller/Controller.cpp
index 7a2c3959..0965809a 100644
--- a/DRAMSys/library/src/controller/Controller.cpp
+++ b/src/libdramsys/DRAMSys/controller/Controller.cpp
@@ -34,44 +34,43 @@
 
 #include "Controller.h"
 
-#include "../configuration/Configuration.h"
-#include "../common/dramExtensions.h"
-
-#include "checker/CheckerDDR3.h"
-#include "checker/CheckerDDR4.h"
-#include "checker/CheckerWideIO.h"
-#include "checker/CheckerLPDDR4.h"
-#include "checker/CheckerWideIO2.h"
-#include "checker/CheckerHBM2.h"
-#include "checker/CheckerGDDR5.h"
-#include "checker/CheckerGDDR5X.h"
-#include "checker/CheckerGDDR6.h"
-#include "checker/CheckerSTTMRAM.h"
-#include "scheduler/SchedulerFifo.h"
-#include "scheduler/SchedulerFrFcfs.h"
-#include "scheduler/SchedulerFrFcfsGrp.h"
-#include "scheduler/SchedulerGrpFrFcfs.h"
-#include "scheduler/SchedulerGrpFrFcfsWm.h"
-#include "cmdmux/CmdMuxStrict.h"
-#include "cmdmux/CmdMuxOldest.h"
-#include "respqueue/RespQueueFifo.h"
-#include "respqueue/RespQueueReorder.h"
-#include "refresh/RefreshManagerDummy.h"
-#include "refresh/RefreshManagerAllBank.h"
-#include "refresh/RefreshManagerPerBank.h"
-#include "refresh/RefreshManagerPer2Bank.h"
-#include "refresh/RefreshManagerSameBank.h"
-#include "powerdown/PowerDownManagerStaggered.h"
-#include "powerdown/PowerDownManagerDummy.h"
+#include "DRAMSys/controller/checker/CheckerDDR3.h"
+#include "DRAMSys/controller/checker/CheckerDDR4.h"
+#include "DRAMSys/controller/checker/CheckerWideIO.h"
+#include "DRAMSys/controller/checker/CheckerLPDDR4.h"
+#include "DRAMSys/controller/checker/CheckerWideIO2.h"
+#include "DRAMSys/controller/checker/CheckerHBM2.h"
+#include "DRAMSys/controller/checker/CheckerGDDR5.h"
+#include "DRAMSys/controller/checker/CheckerGDDR5X.h"
+#include "DRAMSys/controller/checker/CheckerGDDR6.h"
+#include "DRAMSys/controller/checker/CheckerSTTMRAM.h"
+#include "DRAMSys/controller/scheduler/SchedulerFifo.h"
+#include "DRAMSys/controller/scheduler/SchedulerFrFcfs.h"
+#include "DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.h"
+#include "DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.h"
+#include "DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.h"
+#include "DRAMSys/controller/cmdmux/CmdMuxStrict.h"
+#include "DRAMSys/controller/cmdmux/CmdMuxOldest.h"
+#include "DRAMSys/controller/respqueue/RespQueueFifo.h"
+#include "DRAMSys/controller/respqueue/RespQueueReorder.h"
+#include "DRAMSys/controller/refresh/RefreshManagerDummy.h"
+#include "DRAMSys/controller/refresh/RefreshManagerAllBank.h"
+#include "DRAMSys/controller/refresh/RefreshManagerPerBank.h"
+#include "DRAMSys/controller/refresh/RefreshManagerPer2Bank.h"
+#include "DRAMSys/controller/refresh/RefreshManagerSameBank.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerStaggered.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerDummy.h"
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/common/dramExtensions.h"
 
 #ifdef DDR5_SIM
-#include "checker/CheckerDDR5.h"
+#include "DRAMSys/controller/checker/CheckerDDR5.h"
 #endif
 #ifdef LPDDR5_SIM
-#include "checker/CheckerLPDDR5.h"
+#include "DRAMSys/controller/checker/CheckerLPDDR5.h"
 #endif
 #ifdef HBM3_SIM
-#include "checker/CheckerHBM3.h"
+#include "DRAMSys/controller/checker/CheckerHBM3.h"
 #endif
 
 using namespace sc_core;
diff --git a/DRAMSys/library/src/controller/Controller.h b/src/libdramsys/DRAMSys/controller/Controller.h
similarity index 88%
rename from DRAMSys/library/src/controller/Controller.h
rename to src/libdramsys/DRAMSys/controller/Controller.h
index b51cfa3a..5154102e 100644
--- a/DRAMSys/library/src/controller/Controller.h
+++ b/src/libdramsys/DRAMSys/controller/Controller.h
@@ -35,21 +35,20 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
+#include "DRAMSys/controller/ControllerIF.h"
+#include "DRAMSys/controller/Command.h"
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/cmdmux/CmdMuxIF.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/controller/refresh/RefreshManagerIF.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
+#include "DRAMSys/controller/respqueue/RespQueueIF.h"
+#include "DRAMSys/simulation/AddressDecoder.h"
 
 #include <vector>
 #include <stack>
-
 #include <systemc>
 #include <tlm>
-#include "ControllerIF.h"
-#include "Command.h"
-#include "BankMachine.h"
-#include "cmdmux/CmdMuxIF.h"
-#include "checker/CheckerIF.h"
-#include "refresh/RefreshManagerIF.h"
-#include "powerdown/PowerDownManagerIF.h"
-#include "respqueue/RespQueueIF.h"
-#include "../simulation/AddressDecoder.h"
 
 class Controller : public ControllerIF
 {
@@ -93,12 +92,12 @@ private:
 
     struct Transaction
     {
-        tlm::tlm_generic_payload *payload = nullptr;
+        tlm::tlm_generic_payload* payload = nullptr;
         sc_core::sc_time time = sc_core::sc_max_time();
     } transToAcquire, transToRelease;
 
     void manageResponses();
-    void manageRequests(const sc_core::sc_time &delay);
+    void manageRequests(const sc_core::sc_time& delay);
 
     bool isFullCycle(const sc_core::sc_time& time) const;
 
diff --git a/DRAMSys/library/src/controller/ControllerIF.h b/src/libdramsys/DRAMSys/controller/ControllerIF.h
similarity index 97%
rename from DRAMSys/library/src/controller/ControllerIF.h
rename to src/libdramsys/DRAMSys/controller/ControllerIF.h
index 6964c1f5..cc80c655 100644
--- a/DRAMSys/library/src/controller/ControllerIF.h
+++ b/src/libdramsys/DRAMSys/controller/ControllerIF.h
@@ -37,15 +37,16 @@
 #ifndef CONTROLLERIF_H
 #define CONTROLLERIF_H
 
-#include <iomanip>
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/common/DebugManager.h"
 
+#include <iomanip>
 #include <systemc>
 #include <tlm>
 #include <tlm_utils/simple_initiator_socket.h>
 #include <tlm_utils/simple_target_socket.h>
-#include "../configuration/Configuration.h"
 
-// Utiliy class to pass around the DRAMSys, without having to propagate the template defintions
+// Utility class to pass around DRAMSys, without having to propagate the template definitions
 // throughout all classes
 class ControllerIF : public sc_core::sc_module
 {
diff --git a/DRAMSys/library/src/controller/ControllerRecordable.cpp b/src/libdramsys/DRAMSys/controller/ControllerRecordable.cpp
similarity index 93%
rename from DRAMSys/library/src/controller/ControllerRecordable.cpp
rename to src/libdramsys/DRAMSys/controller/ControllerRecordable.cpp
index da6a0d0b..241913d2 100644
--- a/DRAMSys/library/src/controller/ControllerRecordable.cpp
+++ b/src/libdramsys/DRAMSys/controller/ControllerRecordable.cpp
@@ -33,13 +33,13 @@
  */
 
 #include "ControllerRecordable.h"
-#include "../configuration/Configuration.h"
-#include "scheduler/SchedulerIF.h"
+
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
 
 using namespace sc_core;
 using namespace tlm;
 
-ControllerRecordable::ControllerRecordable(const sc_module_name &name, const Configuration& config,
+ControllerRecordable::ControllerRecordable(const sc_module_name& name, const Configuration& config,
                                            const AddressDecoder& addressDecoder, TlmRecorder& tlmRecorder)
     : Controller(name, config, addressDecoder), tlmRecorder(tlmRecorder),
     activeTimeMultiplier(config.memSpec->tCK / config.memSpec->dataRate), enableWindowing(config.enableWindowing),
@@ -55,15 +55,15 @@ ControllerRecordable::ControllerRecordable(const sc_module_name &name, const Con
     }
 }
 
-tlm_sync_enum ControllerRecordable::nb_transport_fw(tlm_generic_payload &trans,
-                              tlm_phase &phase, sc_time &delay)
+tlm_sync_enum ControllerRecordable::nb_transport_fw(tlm_generic_payload& trans,
+                              tlm_phase& phase, sc_time& delay)
 {
     tlmRecorder.recordPhase(trans, phase, delay);
     return Controller::nb_transport_fw(trans, phase, delay);
 }
 
-tlm_sync_enum ControllerRecordable::nb_transport_bw(tlm_generic_payload &,
-                              tlm_phase &, sc_time &)
+tlm_sync_enum ControllerRecordable::nb_transport_bw(tlm_generic_payload&,
+                              tlm_phase&, sc_time&)
 {
     SC_REPORT_FATAL("Controller", "nb_transport_bw of controller must not be called");
     return TLM_ACCEPTED;
diff --git a/DRAMSys/library/src/controller/ControllerRecordable.h b/src/libdramsys/DRAMSys/controller/ControllerRecordable.h
similarity index 85%
rename from DRAMSys/library/src/controller/ControllerRecordable.h
rename to src/libdramsys/DRAMSys/controller/ControllerRecordable.h
index 8594fb23..125c188d 100644
--- a/DRAMSys/library/src/controller/ControllerRecordable.h
+++ b/src/libdramsys/DRAMSys/controller/ControllerRecordable.h
@@ -35,23 +35,24 @@
 #ifndef CONTROLLERRECORDABLE_H
 #define CONTROLLERRECORDABLE_H
 
+#include "DRAMSys/controller/Controller.h"
+#include "DRAMSys/common/TlmRecorder.h"
+
 #include <systemc>
 #include <tlm>
-#include "Controller.h"
-#include "../common/TlmRecorder.h"
 
 class ControllerRecordable final : public Controller
 {
 public:
-    ControllerRecordable(const sc_core::sc_module_name &name, const Configuration& config,
+    ControllerRecordable(const sc_core::sc_module_name& name, const Configuration& config,
                          const AddressDecoder& addressDecoder, TlmRecorder& tlmRecorder);
     ~ControllerRecordable() override = default;
 
 protected:
-    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &trans, tlm::tlm_phase &phase,
-                                       sc_core::sc_time &delay) override;
-    tlm::tlm_sync_enum nb_transport_bw(tlm::tlm_generic_payload &trans, tlm::tlm_phase &phase,
-                                       sc_core::sc_time &delay) override;
+    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase,
+                                       sc_core::sc_time& delay) override;
+    tlm::tlm_sync_enum nb_transport_bw(tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase,
+                                       sc_core::sc_time& delay) override;
 
     void sendToFrontend(tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_core::sc_time& delay) override;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR3.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerDDR3.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerDDR3.cpp
index 4743ceb4..81585509 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR3.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerDDR3.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.h b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR3.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerDDR3.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerDDR3.h
index 41e2708b..8aa5372a 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR3.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR3.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERDDR3_H
 #define CHECKERDDR3_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecDDR3.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecDDR3.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerDDR3 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR4.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR4.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerDDR4.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerDDR4.cpp
index a15b8dfa..ff2a56c9 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR4.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR4.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerDDR4.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR4.h b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR4.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerDDR4.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerDDR4.h
index 4871c76c..2c603d7c 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR4.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerDDR4.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERDDR4_H
 #define CHECKERDDR4_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecDDR4.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecDDR4.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerDDR4 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5.cpp
index 8ed0bf46..5fc7d80c 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR5.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerGDDR5.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5.h b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerGDDR5.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5.h
index 7384867b..3dd19f6b 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR5.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERGDDR5_H
 #define CHECKERGDDR5_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecGDDR5.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecGDDR5.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerGDDR5 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5X.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5X.cpp
index beb43e2f..68bbcecb 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5X.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerGDDR5X.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.h b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5X.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerGDDR5X.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5X.h
index 06408ec6..771e4b60 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR5X.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR5X.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERGDDR5X_H
 #define CHECKERGDDR5X_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecGDDR5X.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecGDDR5X.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerGDDR5X final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR6.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerGDDR6.cpp
index 681f251d..1be0ccb5 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR6.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR6.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerGDDR6.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerGDDR6.h b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR6.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerGDDR6.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerGDDR6.h
index a415cffe..281ab583 100644
--- a/DRAMSys/library/src/controller/checker/CheckerGDDR6.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerGDDR6.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERGDDR6_H
 #define CHECKERGDDR6_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecGDDR6.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecGDDR6.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerGDDR6 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerHBM2.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerHBM2.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerHBM2.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerHBM2.cpp
index 76bd4650..ebe67169 100644
--- a/DRAMSys/library/src/controller/checker/CheckerHBM2.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerHBM2.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerHBM2.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerHBM2.h b/src/libdramsys/DRAMSys/controller/checker/CheckerHBM2.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerHBM2.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerHBM2.h
index bb83fb0b..50b7c527 100644
--- a/DRAMSys/library/src/controller/checker/CheckerHBM2.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerHBM2.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERHBM2_H
 #define CHECKERHBM2_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecHBM2.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecHBM2.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerHBM2 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerIF.h b/src/libdramsys/DRAMSys/controller/checker/CheckerIF.h
similarity index 98%
rename from DRAMSys/library/src/controller/checker/CheckerIF.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerIF.h
index 994a0243..773a3d0e 100644
--- a/DRAMSys/library/src/controller/checker/CheckerIF.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerIF.h
@@ -35,9 +35,9 @@
 #ifndef CHECKERIF_H
 #define CHECKERIF_H
 
-#include <systemc>
+#include "DRAMSys/controller/Command.h"
 
-#include "../Command.h"
+#include <systemc>
 
 class CheckerIF
 {
diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerLPDDR4.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerLPDDR4.cpp
index 8f0d6622..e7f164e8 100644
--- a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerLPDDR4.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerLPDDR4.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.h b/src/libdramsys/DRAMSys/controller/checker/CheckerLPDDR4.h
similarity index 95%
rename from DRAMSys/library/src/controller/checker/CheckerLPDDR4.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerLPDDR4.h
index 5f39c3f8..b01f1699 100644
--- a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerLPDDR4.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERLPDDR4_H
 #define CHECKERLPDDR4_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecLPDDR4.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecLPDDR4.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerLPDDR4 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerSTTMRAM.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerSTTMRAM.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerSTTMRAM.cpp
index 887c59a3..a087f9c2 100644
--- a/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerSTTMRAM.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerSTTMRAM.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h b/src/libdramsys/DRAMSys/controller/checker/CheckerSTTMRAM.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerSTTMRAM.h
index 4a1498f2..212bacf3 100644
--- a/DRAMSys/library/src/controller/checker/CheckerSTTMRAM.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerSTTMRAM.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERSTTMRAM_H
 #define CHECKERSTTMRAM_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecSTTMRAM.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecSTTMRAM.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerSTTMRAM final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerWideIO.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerWideIO.cpp
index 76c0abbb..4b9df385 100644
--- a/DRAMSys/library/src/controller/checker/CheckerWideIO.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerWideIO.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO.h b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerWideIO.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerWideIO.h
index eea2a9d5..a525ea35 100644
--- a/DRAMSys/library/src/controller/checker/CheckerWideIO.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERWIDEIO_H
 #define CHECKERWIDEIO_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecWideIO.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecWideIO.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerWideIO final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO2.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp
rename to src/libdramsys/DRAMSys/controller/checker/CheckerWideIO2.cpp
index ca42f0fd..525382ad 100644
--- a/DRAMSys/library/src/controller/checker/CheckerWideIO2.cpp
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO2.cpp
@@ -32,10 +32,12 @@
  * Author: Lukas Steiner
  */
 
-#include <algorithm>
-
 #include "CheckerWideIO2.h"
 
+#include "DRAMSys/common/DebugManager.h"
+
+#include <algorithm>
+
 using namespace sc_core;
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/checker/CheckerWideIO2.h b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO2.h
similarity index 94%
rename from DRAMSys/library/src/controller/checker/CheckerWideIO2.h
rename to src/libdramsys/DRAMSys/controller/checker/CheckerWideIO2.h
index 8c08a9e5..ef102ea6 100644
--- a/DRAMSys/library/src/controller/checker/CheckerWideIO2.h
+++ b/src/libdramsys/DRAMSys/controller/checker/CheckerWideIO2.h
@@ -35,13 +35,13 @@
 #ifndef CHECKERWIDEIO2_H
 #define CHECKERWIDEIO2_H
 
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpecWideIO2.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <queue>
 #include <vector>
 
-#include "CheckerIF.h"
-#include "../../configuration/memspec/MemSpecWideIO2.h"
-#include "../../configuration/Configuration.h"
-
 class CheckerWideIO2 final : public CheckerIF
 {
 public:
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxIF.h
similarity index 97%
rename from DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h
rename to src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxIF.h
index 006c4e5d..f286f0de 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxIF.h
+++ b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxIF.h
@@ -35,7 +35,7 @@
 #ifndef CMDMUXIF_H
 #define CMDMUXIF_H
 
-#include "../Command.h"
+#include "DRAMSys/controller/Command.h"
 
 class CmdMuxIF
 {
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxOldest.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp
rename to src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxOldest.cpp
index 151b34dc..6ebbe109 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.cpp
+++ b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxOldest.cpp
@@ -32,9 +32,9 @@
  * Author: Lukas Steiner
  */
 
-#include <systemc>
 #include "CmdMuxOldest.h"
-#include "../../common/dramExtensions.h"
+
+#include <systemc>
 
 using namespace sc_core;
 
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxOldest.h
similarity index 95%
rename from DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h
rename to src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxOldest.h
index 196b5242..3df42450 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxOldest.h
+++ b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxOldest.h
@@ -35,8 +35,8 @@
 #ifndef CMDMUXOLDEST_H
 #define CMDMUXOLDEST_H
 
-#include "CmdMuxIF.h"
-#include "../../configuration/Configuration.h"
+#include "DRAMSys/controller/cmdmux/CmdMuxIF.h"
+#include "DRAMSys/configuration/Configuration.h"
 
 class CmdMuxOldest : public CmdMuxIF
 {
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxStrict.cpp
similarity index 99%
rename from DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp
rename to src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxStrict.cpp
index 9f3dd176..89777c0e 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.cpp
+++ b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxStrict.cpp
@@ -32,9 +32,9 @@
  * Author: Lukas Steiner
  */
 
-#include <systemc>
 #include "CmdMuxStrict.h"
-#include "../../common/dramExtensions.h"
+
+#include <systemc>
 
 using namespace sc_core;
 
diff --git a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxStrict.h
similarity index 96%
rename from DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h
rename to src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxStrict.h
index cf806e39..da384d5d 100644
--- a/DRAMSys/library/src/controller/cmdmux/CmdMuxStrict.h
+++ b/src/libdramsys/DRAMSys/controller/cmdmux/CmdMuxStrict.h
@@ -35,8 +35,8 @@
 #ifndef CMDMUXSTRICT_H
 #define CMDMUXSTRICT_H
 
-#include "CmdMuxIF.h"
-#include "../../configuration/Configuration.h"
+#include "DRAMSys/controller/cmdmux/CmdMuxIF.h"
+#include "DRAMSys/configuration/Configuration.h"
 
 class CmdMuxStrict : public CmdMuxIF
 {
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerDummy.cpp
similarity index 98%
rename from DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp
rename to src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerDummy.cpp
index f81c8d45..120f9e39 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.cpp
+++ b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerDummy.cpp
@@ -32,7 +32,6 @@
  * Author: Lukas Steiner
  */
 
-#include "../Command.h"
 #include "PowerDownManagerDummy.h"
 
 using namespace sc_core;
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerDummy.h
similarity index 97%
rename from DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h
rename to src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerDummy.h
index d28aa011..35e5e461 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerDummy.h
+++ b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerDummy.h
@@ -35,7 +35,7 @@
 #ifndef POWERDOWNMANAGERDUMMY_H
 #define POWERDOWNMANAGERDUMMY_H
 
-#include "PowerDownManagerIF.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
 
 class PowerDownManagerDummy final : public PowerDownManagerIF
 {
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerIF.h
similarity index 98%
rename from DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h
rename to src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerIF.h
index 5e2fa4ba..c4d08e92 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerIF.h
+++ b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerIF.h
@@ -35,8 +35,9 @@
 #ifndef POWERDOWNMANAGERIF_H
 #define POWERDOWNMANAGERIF_H
 
+#include "DRAMSys/controller/Command.h"
+
 #include <systemc>
-#include "../Command.h"
 
 class PowerDownManagerIF
 {
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerStaggered.cpp
similarity index 98%
rename from DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp
rename to src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerStaggered.cpp
index 72db9e14..16da02d8 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.cpp
+++ b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerStaggered.cpp
@@ -33,8 +33,8 @@
  */
 
 #include "PowerDownManagerStaggered.h"
-#include "../BankMachine.h"
-#include "../../common/utils.h"
+
+#include "DRAMSys/controller/BankMachine.h"
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerStaggered.h
similarity index 94%
rename from DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h
rename to src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerStaggered.h
index faf474a3..2fcce6da 100644
--- a/DRAMSys/library/src/controller/powerdown/PowerDownManagerStaggered.h
+++ b/src/libdramsys/DRAMSys/controller/powerdown/PowerDownManagerStaggered.h
@@ -35,10 +35,11 @@
 #ifndef POWERDOWNMANAGERSTAGGERED_H
 #define POWERDOWNMANAGERSTAGGERED_H
 
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+
 #include <systemc>
-#include "PowerDownManagerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../checker/CheckerIF.h"
 
 class BankMachine;
 
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.cpp b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerAllBank.cpp
similarity index 97%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.cpp
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerAllBank.cpp
index 06199c2f..f51fd319 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.cpp
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerAllBank.cpp
@@ -34,11 +34,9 @@
  */
 
 #include "RefreshManagerAllBank.h"
-#include "../BankMachine.h"
-#include "../powerdown/PowerDownManagerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../../configuration/Configuration.h"
-#include "../../common/utils.h"
+
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.h b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerAllBank.h
similarity index 93%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.h
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerAllBank.h
index 321e0d82..92ee1a00 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerAllBank.h
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerAllBank.h
@@ -35,14 +35,14 @@
 #ifndef REFRESHMANAGERALLBANK_H
 #define REFRESHMANAGERALLBANK_H
 
-#include <vector>
+#include "DRAMSys/controller/refresh/RefreshManagerIF.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
 
+#include <vector>
 #include <systemc>
 #include <tlm>
-#include "RefreshManagerIF.h"
-#include "../checker/CheckerIF.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpec.h"
 
 class BankMachine;
 class PowerDownManagerIF;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.cpp b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerDummy.cpp
similarity index 100%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerDummy.cpp
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerDummy.cpp
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerDummy.h
similarity index 97%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerDummy.h
index 05d127e7..8fa857c0 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerDummy.h
@@ -35,8 +35,9 @@
 #ifndef REFRESHMANAGERDUMMY_H
 #define REFRESHMANAGERDUMMY_H
 
+#include "DRAMSys/controller/refresh/RefreshManagerIF.h"
+
 #include <systemc>
-#include "RefreshManagerIF.h"
 
 class RefreshManagerDummy final : public RefreshManagerIF
 {
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerIF.h b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerIF.h
similarity index 97%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerIF.h
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerIF.h
index 8e281fdb..2a9eea72 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerIF.h
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerIF.h
@@ -35,11 +35,12 @@
 #ifndef REFRESHMANAGERIF_H
 #define REFRESHMANAGERIF_H
 
-#include <cmath>
 
+#include "DRAMSys/controller/Command.h"
+#include "DRAMSys/configuration/Configuration.h"
+
+#include <cmath>
 #include <systemc>
-#include "../Command.h"
-#include "../../configuration/Configuration.h"
 
 class RefreshManagerIF
 {
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerPer2Bank.cpp b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPer2Bank.cpp
similarity index 98%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerPer2Bank.cpp
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPer2Bank.cpp
index aaf27e04..98d555b3 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerPer2Bank.cpp
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPer2Bank.cpp
@@ -33,11 +33,9 @@
  */
 
 #include "RefreshManagerPer2Bank.h"
-#include "../BankMachine.h"
-#include "../powerdown/PowerDownManagerIF.h"
-#include "../../configuration/Configuration.h"
-#include "../../common/utils.h"
-#include "../../common/dramExtensions.h"
+
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerPer2Bank.h b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPer2Bank.h
similarity index 93%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerPer2Bank.h
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPer2Bank.h
index 5ced622a..cf188ebf 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerPer2Bank.h
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPer2Bank.h
@@ -35,16 +35,16 @@
 #ifndef REFRESHMANAGERPER2BANK_H
 #define REFRESHMANAGERPER2BANK_H
 
+#include "DRAMSys/controller/refresh/RefreshManagerIF.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <vector>
 #include <list>
 #include <unordered_map>
-
 #include <systemc>
 #include <tlm>
-#include "RefreshManagerIF.h"
-#include "../checker/CheckerIF.h"
-#include "../../configuration/memspec/MemSpec.h"
-#include "../../configuration/Configuration.h"
 
 class BankMachine;
 class PowerDownManagerIF;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.cpp b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPerBank.cpp
similarity index 97%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.cpp
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPerBank.cpp
index 33d8da8a..6107e746 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.cpp
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPerBank.cpp
@@ -33,11 +33,9 @@
  */
 
 #include "RefreshManagerPerBank.h"
-#include "../BankMachine.h"
-#include "../powerdown/PowerDownManagerIF.h"
-#include "../../configuration/Configuration.h"
-#include "../../common/utils.h"
-#include "../../common/dramExtensions.h"
+
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.h b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPerBank.h
similarity index 93%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.h
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPerBank.h
index b642398f..98ad4634 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerPerBank.h
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerPerBank.h
@@ -35,16 +35,16 @@
 #ifndef REFRESHMANAGERPERBANK_H
 #define REFRESHMANAGERPERBANK_H
 
+#include "DRAMSys/controller/refresh/RefreshManagerIF.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <vector>
 #include <list>
 #include <unordered_map>
-
 #include <systemc>
 #include <tlm>
-#include "RefreshManagerIF.h"
-#include "../checker/CheckerIF.h"
-#include "../../configuration/memspec/MemSpec.h"
-#include "../../configuration/Configuration.h"
 
 class BankMachine;
 class PowerDownManagerIF;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.cpp b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerSameBank.cpp
similarity index 98%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.cpp
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerSameBank.cpp
index 989881cb..8b99f2bb 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.cpp
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerSameBank.cpp
@@ -33,11 +33,9 @@
  */
 
 #include "RefreshManagerSameBank.h"
-#include "../BankMachine.h"
-#include "../powerdown/PowerDownManagerIF.h"
-#include "../../configuration/Configuration.h"
-#include "../../common/utils.h"
-#include "../../common/dramExtensions.h"
+
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/powerdown/PowerDownManagerIF.h"
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.h b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerSameBank.h
similarity index 93%
rename from DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.h
rename to src/libdramsys/DRAMSys/controller/refresh/RefreshManagerSameBank.h
index b914ff38..00c790e3 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerSameBank.h
+++ b/src/libdramsys/DRAMSys/controller/refresh/RefreshManagerSameBank.h
@@ -35,15 +35,15 @@
 #ifndef REFRESHMANAGERSAMEBANK_H
 #define REFRESHMANAGERSAMEBANK_H
 
+#include "DRAMSys/controller/refresh/RefreshManagerIF.h"
+#include "DRAMSys/controller/checker/CheckerIF.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <vector>
 #include <list>
-
 #include <systemc>
 #include <tlm>
-#include "RefreshManagerIF.h"
-#include "../checker/CheckerIF.h"
-#include "../../configuration/memspec/MemSpec.h"
-#include "../../configuration/Configuration.h"
 
 class BankMachine;
 class PowerDownManagerIF;
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueFifo.cpp b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueFifo.cpp
similarity index 90%
rename from DRAMSys/library/src/controller/respqueue/RespQueueFifo.cpp
rename to src/libdramsys/DRAMSys/controller/respqueue/RespQueueFifo.cpp
index 825efd13..2186a70f 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueFifo.cpp
+++ b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueFifo.cpp
@@ -37,16 +37,16 @@
 using namespace sc_core;
 using namespace tlm;
 
-void RespQueueFifo::insertPayload(tlm_generic_payload *payload, sc_time strobeEnd)
+void RespQueueFifo::insertPayload(tlm_generic_payload* payload, sc_time strobeEnd)
 {
-    buffer.push({payload, strobeEnd});
+    buffer.emplace(payload, strobeEnd);
 }
 
-tlm_generic_payload *RespQueueFifo::nextPayload()
+tlm_generic_payload* RespQueueFifo::nextPayload()
 {
     if (!buffer.empty())
     {
-        std::pair<tlm_generic_payload *, sc_time> element = buffer.front();
+        std::pair<tlm_generic_payload*, sc_time> element = buffer.front();
         if (element.second <= sc_time_stamp())
         {
             buffer.pop();
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueFifo.h b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueFifo.h
similarity index 84%
rename from DRAMSys/library/src/controller/respqueue/RespQueueFifo.h
rename to src/libdramsys/DRAMSys/controller/respqueue/RespQueueFifo.h
index 7c611d45..6b96b972 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueFifo.h
+++ b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueFifo.h
@@ -35,22 +35,22 @@
 #ifndef RESPQUEUEFIFO_H
 #define RESPQUEUEFIFO_H
 
+#include "DRAMSys/controller/respqueue/RespQueueIF.h"
+
 #include <utility>
 #include <queue>
-
 #include <systemc>
 #include <tlm>
-#include "RespQueueIF.h"
 
 class RespQueueFifo final : public RespQueueIF
 {
 public:
-    void insertPayload(tlm::tlm_generic_payload *, sc_core::sc_time) override;
-    tlm::tlm_generic_payload *nextPayload() override;
-    sc_core::sc_time getTriggerTime() const override;
+    void insertPayload(tlm::tlm_generic_payload*, sc_core::sc_time) override;
+    tlm::tlm_generic_payload* nextPayload() override;
+    [[nodiscard]] sc_core::sc_time getTriggerTime() const override;
 
 private:
-    std::queue<std::pair<tlm::tlm_generic_payload *, sc_core::sc_time>> buffer;
+    std::queue<std::pair<tlm::tlm_generic_payload*, sc_core::sc_time>> buffer;
 };
 
 #endif // RESPQUEUEFIFO_H
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueIF.h b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueIF.h
similarity index 89%
rename from DRAMSys/library/src/controller/respqueue/RespQueueIF.h
rename to src/libdramsys/DRAMSys/controller/respqueue/RespQueueIF.h
index 9f566a78..f9119ae1 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueIF.h
+++ b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueIF.h
@@ -41,9 +41,9 @@
 class RespQueueIF
 {
 public:
-    virtual void insertPayload(tlm::tlm_generic_payload *, sc_core::sc_time) = 0;
-    virtual tlm::tlm_generic_payload *nextPayload() = 0;
-    virtual sc_core::sc_time getTriggerTime() const = 0;
+    virtual void insertPayload(tlm::tlm_generic_payload*, sc_core::sc_time) = 0;
+    virtual tlm::tlm_generic_payload* nextPayload() = 0;
+    [[nodiscard]] virtual sc_core::sc_time getTriggerTime() const = 0;
     virtual ~RespQueueIF() = default;
 };
 
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueReorder.cpp b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueReorder.cpp
similarity index 90%
rename from DRAMSys/library/src/controller/respqueue/RespQueueReorder.cpp
rename to src/libdramsys/DRAMSys/controller/respqueue/RespQueueReorder.cpp
index 2ce372ad..117c5635 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueReorder.cpp
+++ b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueReorder.cpp
@@ -33,23 +33,24 @@
  */
 
 #include "RespQueueReorder.h"
-#include "../../common/dramExtensions.h"
+
+#include "DRAMSys/common/dramExtensions.h"
 
 using namespace sc_core;
 using namespace tlm;
 
-void RespQueueReorder::insertPayload(tlm_generic_payload *payload, sc_time strobeEnd)
+void RespQueueReorder::insertPayload(tlm_generic_payload* payload, sc_time strobeEnd)
 {
     buffer[ControllerExtension::getChannelPayloadID(*payload)] = {payload, strobeEnd};
 }
 
-tlm_generic_payload *RespQueueReorder::nextPayload()
+tlm_generic_payload* RespQueueReorder::nextPayload()
 {
     if (!buffer.empty())
     {
         if (buffer.begin()->first == nextPayloadID)
         {
-            std::pair<tlm_generic_payload *, sc_time> element = buffer.begin()->second;
+            std::pair<tlm_generic_payload*, sc_time> element = buffer.begin()->second;
             if (element.second <= sc_time_stamp())
             {
                 buffer.erase(nextPayloadID++);
diff --git a/DRAMSys/library/src/controller/respqueue/RespQueueReorder.h b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueReorder.h
similarity index 84%
rename from DRAMSys/library/src/controller/respqueue/RespQueueReorder.h
rename to src/libdramsys/DRAMSys/controller/respqueue/RespQueueReorder.h
index f236affe..2f3b5fdf 100644
--- a/DRAMSys/library/src/controller/respqueue/RespQueueReorder.h
+++ b/src/libdramsys/DRAMSys/controller/respqueue/RespQueueReorder.h
@@ -35,22 +35,22 @@
 #ifndef RESPQUEUEREORDER_H
 #define RESPQUEUEREORDER_H
 
-#include <map>
+#include "DRAMSys/controller/respqueue/RespQueueIF.h"
 
+#include <map>
 #include <systemc>
 #include <tlm>
-#include "RespQueueIF.h"
 
 class RespQueueReorder final : public RespQueueIF
 {
 public:
-    void insertPayload(tlm::tlm_generic_payload *, sc_core::sc_time) override;
-    tlm::tlm_generic_payload *nextPayload() override;
-    sc_core::sc_time getTriggerTime() const override;
+    void insertPayload(tlm::tlm_generic_payload*, sc_core::sc_time) override;
+    tlm::tlm_generic_payload* nextPayload() override;
+    [[nodiscard]] sc_core::sc_time getTriggerTime() const override;
 
 private:
     uint64_t nextPayloadID = 1;
-    std::map<uint64_t, std::pair<tlm::tlm_generic_payload *, sc_core::sc_time>> buffer;
+    std::map<uint64_t, std::pair<tlm::tlm_generic_payload*, sc_core::sc_time>> buffer;
 };
 
 #endif // RESPQUEUEREORDER_H
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.cpp b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterBankwise.cpp
similarity index 96%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterBankwise.cpp
index d31db7e6..423ccfb1 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterBankwise.cpp
@@ -33,7 +33,8 @@
  */
 
 #include "BufferCounterBankwise.h"
-#include "../../common/dramExtensions.h"
+
+#include "DRAMSys/common/dramExtensions.h"
 
 using namespace tlm;
 
@@ -67,7 +68,7 @@ void BufferCounterBankwise::removeRequest(const tlm_generic_payload& trans)
         numWriteRequests--;
 }
 
-const std::vector<unsigned> &BufferCounterBankwise::getBufferDepth() const
+const std::vector<unsigned>& BufferCounterBankwise::getBufferDepth() const
 {
     return numRequestsOnBank;
 }
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterBankwise.h
similarity index 87%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterBankwise.h
index f970a697..4b70a819 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterBankwise.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterBankwise.h
@@ -35,21 +35,21 @@
 #ifndef BUFFERCOUNTERBANKWISE_H
 #define BUFFERCOUNTERBANKWISE_H
 
-#include <vector>
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
 
+#include <vector>
 #include <tlm>
-#include "BufferCounterIF.h"
 
 class BufferCounterBankwise final : public BufferCounterIF
 {
 public:
     BufferCounterBankwise(unsigned requestBufferSize, unsigned numberOfBanks);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(const tlm::tlm_generic_payload& trans) override;
     void removeRequest(const tlm::tlm_generic_payload& trans) override;
-    const std::vector<unsigned> &getBufferDepth() const override;
-    unsigned getNumReadRequests() const override;
-    unsigned getNumWriteRequests() const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
+    [[nodiscard]] unsigned getNumReadRequests() const override;
+    [[nodiscard]] unsigned getNumWriteRequests() const override;
 
 private:
     const unsigned requestBufferSize;
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterIF.h b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterIF.h
similarity index 87%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterIF.h
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterIF.h
index 87936fbf..237cb9ea 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterIF.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterIF.h
@@ -36,19 +36,18 @@
 #define BUFFERCOUNTERIF_H
 
 #include <vector>
-
 #include <tlm>
 
 class BufferCounterIF
 {
 public:
     virtual ~BufferCounterIF() = default;
-    virtual bool hasBufferSpace() const = 0;
+    [[nodiscard]] virtual bool hasBufferSpace() const = 0;
     virtual void storeRequest(const tlm::tlm_generic_payload& trans) = 0;
     virtual void removeRequest(const tlm::tlm_generic_payload& trans) = 0;
-    virtual const std::vector<unsigned> &getBufferDepth() const = 0;
-    virtual unsigned getNumReadRequests() const = 0;
-    virtual unsigned getNumWriteRequests() const = 0;
+    [[nodiscard]] virtual const std::vector<unsigned>& getBufferDepth() const = 0;
+    [[nodiscard]] virtual unsigned getNumReadRequests() const = 0;
+    [[nodiscard]] virtual unsigned getNumWriteRequests() const = 0;
 };
 
 #endif // BUFFERCOUNTERIF_H
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.cpp b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterReadWrite.cpp
similarity index 97%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterReadWrite.cpp
index fae82ad5..b794560c 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterReadWrite.cpp
@@ -63,7 +63,7 @@ void BufferCounterReadWrite::removeRequest(const tlm_generic_payload& trans)
         numReadWriteRequests[1]--;
 }
 
-const std::vector<unsigned> &BufferCounterReadWrite::getBufferDepth() const
+const std::vector<unsigned>& BufferCounterReadWrite::getBufferDepth() const
 {
     return numReadWriteRequests;
 }
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterReadWrite.h
similarity index 86%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterReadWrite.h
index fb330499..9ea6a971 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterReadWrite.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterReadWrite.h
@@ -35,21 +35,21 @@
 #ifndef BUFFERCOUNTERREADWRITE_H
 #define BUFFERCOUNTERREADWRITE_H
 
-#include <vector>
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
 
+#include <vector>
 #include <tlm>
-#include "BufferCounterIF.h"
 
 class BufferCounterReadWrite final : public BufferCounterIF
 {
 public:
     explicit BufferCounterReadWrite(unsigned requestBufferSize);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(const tlm::tlm_generic_payload& trans) override;
     void removeRequest(const tlm::tlm_generic_payload& trans) override;
-    const std::vector<unsigned> &getBufferDepth() const override;
-    unsigned getNumReadRequests() const override;
-    unsigned getNumWriteRequests() const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
+    [[nodiscard]] unsigned getNumReadRequests() const override;
+    [[nodiscard]] unsigned getNumWriteRequests() const override;
 
 private:
     const unsigned requestBufferSize;
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterShared.cpp b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterShared.cpp
similarity index 97%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterShared.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterShared.cpp
index 7008d899..ae37069a 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterShared.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterShared.cpp
@@ -65,7 +65,7 @@ void BufferCounterShared::removeRequest(const tlm_generic_payload& trans)
         numWriteRequests--;
 }
 
-const std::vector<unsigned> &BufferCounterShared::getBufferDepth() const
+const std::vector<unsigned>& BufferCounterShared::getBufferDepth() const
 {
     return numRequests;
 }
diff --git a/DRAMSys/library/src/controller/scheduler/BufferCounterShared.h b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterShared.h
similarity index 87%
rename from DRAMSys/library/src/controller/scheduler/BufferCounterShared.h
rename to src/libdramsys/DRAMSys/controller/scheduler/BufferCounterShared.h
index 31277f6a..3c2880e3 100644
--- a/DRAMSys/library/src/controller/scheduler/BufferCounterShared.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/BufferCounterShared.h
@@ -35,21 +35,21 @@
 #ifndef BUFFERCOUNTERSHARED_H
 #define BUFFERCOUNTERSHARED_H
 
-#include <vector>
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
 
+#include <vector>
 #include <tlm>
-#include "BufferCounterIF.h"
 
 class BufferCounterShared final : public BufferCounterIF
 {
 public:
     explicit BufferCounterShared(unsigned requestBufferSize);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(const tlm::tlm_generic_payload& trans) override;
     void removeRequest(const tlm::tlm_generic_payload& trans) override;
-    const std::vector<unsigned> &getBufferDepth() const override;
-    unsigned getNumReadRequests() const override;
-    unsigned getNumWriteRequests() const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
+    [[nodiscard]] unsigned getNumReadRequests() const override;
+    [[nodiscard]] unsigned getNumWriteRequests() const override;
 
 private:
     const unsigned requestBufferSize;
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFifo.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFifo.cpp
similarity index 89%
rename from DRAMSys/library/src/controller/scheduler/SchedulerFifo.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerFifo.cpp
index 9e1f9ede..455f0507 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFifo.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFifo.cpp
@@ -33,16 +33,16 @@
  */
 
 #include "SchedulerFifo.h"
-#include "../../configuration/Configuration.h"
-#include "BufferCounterBankwise.h"
-#include "BufferCounterReadWrite.h"
-#include "BufferCounterShared.h"
+
+#include "DRAMSys/controller/scheduler/BufferCounterBankwise.h"
+#include "DRAMSys/controller/scheduler/BufferCounterReadWrite.h"
+#include "DRAMSys/controller/scheduler/BufferCounterShared.h"
 
 using namespace tlm;
 
 SchedulerFifo::SchedulerFifo(const Configuration& config)
 {
-    buffer = std::vector<std::deque<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
+    buffer = std::vector<std::deque<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
 
     if (config.schedulerBuffer == Configuration::SchedulerBuffer::Bankwise)
         bufferCounter = std::make_unique<BufferCounterBankwise>(config.requestBufferSize, config.memSpec->banksPerChannel);
@@ -69,7 +69,7 @@ void SchedulerFifo::removeRequest(tlm_generic_payload& payload)
     bufferCounter->removeRequest(payload);
 }
 
-tlm_generic_payload *SchedulerFifo::getNextRequest(const BankMachine& bankMachine) const
+tlm_generic_payload* SchedulerFifo::getNextRequest(const BankMachine& bankMachine) const
 {
     unsigned bankID = bankMachine.getBank().ID();
     if (!buffer[bankID].empty())
@@ -97,7 +97,7 @@ bool SchedulerFifo::hasFurtherRequest(Bank bank, tlm_command command) const
         return false;
 }
 
-const std::vector<unsigned> &SchedulerFifo::getBufferDepth() const
+const std::vector<unsigned>& SchedulerFifo::getBufferDepth() const
 {
     return bufferCounter->getBufferDepth();
 }
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFifo.h b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFifo.h
similarity index 76%
rename from DRAMSys/library/src/controller/scheduler/SchedulerFifo.h
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerFifo.h
index 154cddde..f6dc34f7 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFifo.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFifo.h
@@ -35,30 +35,30 @@
 #ifndef SCHEDULERFIFO_H
 #define SCHEDULERFIFO_H
 
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
+
 #include <vector>
 #include <deque>
 #include <memory>
-
 #include <tlm>
-#include "SchedulerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../BankMachine.h"
-#include "BufferCounterIF.h"
 
 class SchedulerFifo final : public SchedulerIF
 {
 public:
     explicit SchedulerFifo(const Configuration& config);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(tlm::tlm_generic_payload&) override;
     void removeRequest(tlm::tlm_generic_payload&) override;
-    tlm::tlm_generic_payload *getNextRequest(const BankMachine&) const override;
-    bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
-    bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
-    const std::vector<unsigned> &getBufferDepth() const override;
+    [[nodiscard]] tlm::tlm_generic_payload* getNextRequest(const BankMachine&) const override;
+    [[nodiscard]] bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
+    [[nodiscard]] bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
 
 private:
-    std::vector<std::deque<tlm::tlm_generic_payload *>> buffer;
+    std::vector<std::deque<tlm::tlm_generic_payload*>> buffer;
     std::unique_ptr<BufferCounterIF> bufferCounter;
 };
 
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp
similarity index 90%
rename from DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp
index dffdd224..076d8708 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.cpp
@@ -33,16 +33,16 @@
  */
 
 #include "SchedulerFrFcfs.h"
-#include "../../configuration/Configuration.h"
-#include "BufferCounterBankwise.h"
-#include "BufferCounterReadWrite.h"
-#include "BufferCounterShared.h"
+
+#include "DRAMSys/controller/scheduler/BufferCounterBankwise.h"
+#include "DRAMSys/controller/scheduler/BufferCounterReadWrite.h"
+#include "DRAMSys/controller/scheduler/BufferCounterShared.h"
 
 using namespace tlm;
 
 SchedulerFrFcfs::SchedulerFrFcfs(const Configuration& config)
 {
-    buffer = std::vector<std::list<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
+    buffer = std::vector<std::list<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
 
     if (config.schedulerBuffer == Configuration::SchedulerBuffer::Bankwise)
         bufferCounter = std::make_unique<BufferCounterBankwise>(config.requestBufferSize, config.memSpec->banksPerChannel);
@@ -77,7 +77,7 @@ void SchedulerFrFcfs::removeRequest(tlm_generic_payload& trans)
     }
 }
 
-tlm_generic_payload *SchedulerFrFcfs::getNextRequest(const BankMachine& bankMachine) const
+tlm_generic_payload* SchedulerFrFcfs::getNextRequest(const BankMachine& bankMachine) const
 {
     unsigned bankID = bankMachine.getBank().ID();
     if (!buffer[bankID].empty())
@@ -118,7 +118,7 @@ bool SchedulerFrFcfs::hasFurtherRequest(Bank bank, tlm_command command) const
     return (buffer[bank.ID()].size() >= 2);
 }
 
-const std::vector<unsigned> &SchedulerFrFcfs::getBufferDepth() const
+const std::vector<unsigned>& SchedulerFrFcfs::getBufferDepth() const
 {
     return bufferCounter->getBufferDepth();
 }
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.h
similarity index 76%
rename from DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.h
index df7196cc..2526e890 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfs.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfs.h
@@ -35,30 +35,30 @@
 #ifndef SCHEDULERFRFCFS_H
 #define SCHEDULERFRFCFS_H
 
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
+
 #include <vector>
 #include <list>
 #include <memory>
-
 #include <tlm>
-#include "SchedulerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../BankMachine.h"
-#include "BufferCounterIF.h"
 
 class SchedulerFrFcfs final : public SchedulerIF
 {
 public:
     explicit SchedulerFrFcfs(const Configuration& config);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(tlm::tlm_generic_payload&) override;
     void removeRequest(tlm::tlm_generic_payload&) override;
-    tlm::tlm_generic_payload *getNextRequest(const BankMachine&) const override;
-    bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
-    bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
-    const std::vector<unsigned> &getBufferDepth() const override;
+    [[nodiscard]] tlm::tlm_generic_payload* getNextRequest(const BankMachine&) const override;
+    [[nodiscard]] bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
+    [[nodiscard]] bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
 
 private:
-    std::vector<std::list<tlm::tlm_generic_payload *>> buffer;
+    std::vector<std::list<tlm::tlm_generic_payload*>> buffer;
     std::unique_ptr<BufferCounterIF> bufferCounter;
 };
 
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.cpp
similarity index 92%
rename from DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.cpp
index 5d3a2b8e..bb6bc990 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.cpp
@@ -33,16 +33,16 @@
  */
 
 #include "SchedulerFrFcfsGrp.h"
-#include "../../configuration/Configuration.h"
-#include "BufferCounterBankwise.h"
-#include "BufferCounterReadWrite.h"
-#include "BufferCounterShared.h"
+
+#include "DRAMSys/controller/scheduler/BufferCounterBankwise.h"
+#include "DRAMSys/controller/scheduler/BufferCounterReadWrite.h"
+#include "DRAMSys/controller/scheduler/BufferCounterShared.h"
 
 using namespace tlm;
 
 SchedulerFrFcfsGrp::SchedulerFrFcfsGrp(const Configuration& config)
 {
-    buffer = std::vector<std::list<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
+    buffer = std::vector<std::list<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
 
     if (config.schedulerBuffer == Configuration::SchedulerBuffer::Bankwise)
         bufferCounter = std::make_unique<BufferCounterBankwise>(config.requestBufferSize, config.memSpec->banksPerChannel);
@@ -78,7 +78,7 @@ void SchedulerFrFcfsGrp::removeRequest(tlm_generic_payload& trans)
     }
 }
 
-tlm_generic_payload *SchedulerFrFcfsGrp::getNextRequest(const BankMachine& bankMachine) const
+tlm_generic_payload* SchedulerFrFcfsGrp::getNextRequest(const BankMachine& bankMachine) const
 {
     unsigned bankID = bankMachine.getBank().ID();
     if (!buffer[bankID].empty())
@@ -146,7 +146,7 @@ bool SchedulerFrFcfsGrp::hasFurtherRequest(Bank bank, tlm_command command) const
         return false;
 }
 
-const std::vector<unsigned> &SchedulerFrFcfsGrp::getBufferDepth() const
+const std::vector<unsigned>& SchedulerFrFcfsGrp::getBufferDepth() const
 {
     return bufferCounter->getBufferDepth();
 }
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.h
similarity index 79%
rename from DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.h
index d10e5bf0..5b130188 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerFrFcfsGrp.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerFrFcfsGrp.h
@@ -35,27 +35,27 @@
 #ifndef SCHEDULERFRFCFSGRP_H
 #define SCHEDULERFRFCFSGRP_H
 
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
+
 #include <vector>
 #include <list>
 #include <memory>
-
 #include <tlm>
-#include "SchedulerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../BankMachine.h"
-#include "BufferCounterIF.h"
 
 class SchedulerFrFcfsGrp final : public SchedulerIF
 {
 public:
     explicit SchedulerFrFcfsGrp(const Configuration& config);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(tlm::tlm_generic_payload&) override;
     void removeRequest(tlm::tlm_generic_payload&) override;
-    tlm::tlm_generic_payload *getNextRequest(const BankMachine&) const override;
-    bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
-    bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
-    const std::vector<unsigned> &getBufferDepth() const override;
+    [[nodiscard]] tlm::tlm_generic_payload* getNextRequest(const BankMachine&) const override;
+    [[nodiscard]] bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
+    [[nodiscard]] bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
 
 private:
     std::vector<std::list<tlm::tlm_generic_payload *>> buffer;
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfs.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp
similarity index 93%
rename from DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfs.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp
index 35b7fa48..cbc8b694 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfs.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.cpp
@@ -33,17 +33,17 @@
  */
 
 #include "SchedulerGrpFrFcfs.h"
-#include "../../configuration/Configuration.h"
-#include "BufferCounterBankwise.h"
-#include "BufferCounterReadWrite.h"
-#include "BufferCounterShared.h"
+
+#include "DRAMSys/controller/scheduler/BufferCounterBankwise.h"
+#include "DRAMSys/controller/scheduler/BufferCounterReadWrite.h"
+#include "DRAMSys/controller/scheduler/BufferCounterShared.h"
 
 using namespace tlm;
 
 SchedulerGrpFrFcfs::SchedulerGrpFrFcfs(const Configuration& config)
 {
-    readBuffer = std::vector<std::list<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
-    writeBuffer = std::vector<std::list<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
+    readBuffer = std::vector<std::list<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
+    writeBuffer = std::vector<std::list<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
 
     if (config.schedulerBuffer == Configuration::SchedulerBuffer::Bankwise)
         bufferCounter = std::make_unique<BufferCounterBankwise>(config.requestBufferSize, config.memSpec->banksPerChannel);
@@ -81,7 +81,7 @@ void SchedulerGrpFrFcfs::removeRequest(tlm_generic_payload& trans)
         writeBuffer[bankID].remove(&trans);
 }
 
-tlm_generic_payload *SchedulerGrpFrFcfs::getNextRequest(const BankMachine& bankMachine) const
+tlm_generic_payload* SchedulerGrpFrFcfs::getNextRequest(const BankMachine& bankMachine) const
 {
     // search row hits, search wrd/wr hits
     // search rd/wr hits, search row hits
@@ -209,7 +209,7 @@ bool SchedulerGrpFrFcfs::hasFurtherRequest(Bank bank, tlm_command command) const
     }
 }
 
-const std::vector<unsigned> &SchedulerGrpFrFcfs::getBufferDepth() const
+const std::vector<unsigned>& SchedulerGrpFrFcfs::getBufferDepth() const
 {
     return bufferCounter->getBufferDepth();
 }
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfs.h b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.h
similarity index 75%
rename from DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfs.h
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.h
index 47a82916..9078915e 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfs.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfs.h
@@ -35,31 +35,31 @@
 #ifndef SCHEDULERGRPFRFCFS_H
 #define SCHEDULERGRPFRFCFS_H
 
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
+
 #include <vector>
 #include <list>
 #include <memory>
-
 #include <tlm>
-#include "SchedulerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../BankMachine.h"
-#include "BufferCounterIF.h"
 
 class SchedulerGrpFrFcfs final : public SchedulerIF
 {
 public:
     explicit SchedulerGrpFrFcfs(const Configuration& config);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(tlm::tlm_generic_payload&) override;
     void removeRequest(tlm::tlm_generic_payload&) override;
-    tlm::tlm_generic_payload *getNextRequest(const BankMachine&) const override;
-    bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
-    bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
-    const std::vector<unsigned> &getBufferDepth() const override;
+    [[nodiscard]] tlm::tlm_generic_payload* getNextRequest(const BankMachine&) const override;
+    [[nodiscard]] bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
+    [[nodiscard]] bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
 
 private:
-    std::vector<std::list<tlm::tlm_generic_payload *>> readBuffer;
-    std::vector<std::list<tlm::tlm_generic_payload *>> writeBuffer;
+    std::vector<std::list<tlm::tlm_generic_payload*>> readBuffer;
+    std::vector<std::list<tlm::tlm_generic_payload*>> writeBuffer;
     tlm::tlm_command lastCommand = tlm::TLM_READ_COMMAND;
     std::unique_ptr<BufferCounterIF> bufferCounter;
 };
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfsWm.cpp b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
similarity index 90%
rename from DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
index 6a4a8971..32be6603 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.cpp
@@ -33,18 +33,18 @@
  */
 
 #include "SchedulerGrpFrFcfsWm.h"
-#include "../../configuration/Configuration.h"
-#include "BufferCounterBankwise.h"
-#include "BufferCounterReadWrite.h"
-#include "BufferCounterShared.h"
+
+#include "DRAMSys/controller/scheduler/BufferCounterBankwise.h"
+#include "DRAMSys/controller/scheduler/BufferCounterReadWrite.h"
+#include "DRAMSys/controller/scheduler/BufferCounterShared.h"
 
 using namespace tlm;
 
 SchedulerGrpFrFcfsWm::SchedulerGrpFrFcfsWm(const Configuration& config)
-    :lowWatermark(config.lowWatermark), highWatermark(config.highWatermark)
+    : lowWatermark(config.lowWatermark), highWatermark(config.highWatermark)
 {
-    readBuffer = std::vector<std::list<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
-    writeBuffer = std::vector<std::list<tlm_generic_payload *>>(config.memSpec->banksPerChannel);
+    readBuffer = std::vector<std::list<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
+    writeBuffer = std::vector<std::list<tlm_generic_payload*>>(config.memSpec->banksPerChannel);
 
     if (config.schedulerBuffer == Configuration::SchedulerBuffer::Bankwise)
         bufferCounter = std::make_unique<BufferCounterBankwise>(config.requestBufferSize, config.memSpec->banksPerChannel);
@@ -53,7 +53,7 @@ SchedulerGrpFrFcfsWm::SchedulerGrpFrFcfsWm(const Configuration& config)
     else if (config.schedulerBuffer == Configuration::SchedulerBuffer::Shared)
         bufferCounter = std::make_unique<BufferCounterShared>(config.requestBufferSize);
 
-    if (lowWatermark == 0 || highWatermark == 0 || lowWatermark == highWatermark)
+    if (lowWatermark == 0 || lowWatermark >= highWatermark)
         SC_REPORT_FATAL("SchedulerGrpFrFcfsWm", "Invalid watermark configuration.");
 
     SC_REPORT_WARNING("SchedulerGrpFrFcfsWm", "Hazard detection not yet implemented!");
@@ -87,7 +87,7 @@ void SchedulerGrpFrFcfsWm::removeRequest(tlm_generic_payload& trans)
     evaluateWriteMode();
 }
 
-tlm_generic_payload *SchedulerGrpFrFcfsWm::getNextRequest(const BankMachine& bankMachine) const
+tlm_generic_payload* SchedulerGrpFrFcfsWm::getNextRequest(const BankMachine& bankMachine) const
 {
     unsigned bankID = bankMachine.getBank().ID();
 
@@ -172,7 +172,7 @@ bool SchedulerGrpFrFcfsWm::hasFurtherRequest(Bank bank, tlm::tlm_command command
         return (writeBuffer[bank.ID()].size() >= 2);
 }
 
-const std::vector<unsigned> &SchedulerGrpFrFcfsWm::getBufferDepth() const
+const std::vector<unsigned>& SchedulerGrpFrFcfsWm::getBufferDepth() const
 {
     return bufferCounter->getBufferDepth();
 }
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfsWm.h b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.h
similarity index 79%
rename from DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfsWm.h
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.h
index 38f8b7f6..9e3932f2 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerGrpFrFcfsWm.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerGrpFrFcfsWm.h
@@ -35,28 +35,28 @@
 #ifndef SCHEDULERGRPFRFCFSWM_H
 #define SCHEDULERGRPFRFCFSWM_H
 
+#include "DRAMSys/controller/scheduler/SchedulerIF.h"
+#include "DRAMSys/common/dramExtensions.h"
+#include "DRAMSys/controller/BankMachine.h"
+#include "DRAMSys/controller/scheduler/BufferCounterIF.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <vector>
 #include <list>
 #include <memory>
-
 #include <tlm>
-#include "SchedulerIF.h"
-#include "../../common/dramExtensions.h"
-#include "../BankMachine.h"
-#include "BufferCounterIF.h"
-#include "../../configuration/Configuration.h"
 
 class SchedulerGrpFrFcfsWm final : public SchedulerIF
 {
 public:
     explicit SchedulerGrpFrFcfsWm(const Configuration& config);
-    bool hasBufferSpace() const override;
+    [[nodiscard]] bool hasBufferSpace() const override;
     void storeRequest(tlm::tlm_generic_payload&) override;
     void removeRequest(tlm::tlm_generic_payload&) override;
-    tlm::tlm_generic_payload *getNextRequest(const BankMachine&) const override;
-    bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
-    bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
-    const std::vector<unsigned> &getBufferDepth() const override;
+    [[nodiscard]] tlm::tlm_generic_payload* getNextRequest(const BankMachine&) const override;
+    [[nodiscard]] bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const override;
+    [[nodiscard]] bool hasFurtherRequest(Bank, tlm::tlm_command) const override;
+    [[nodiscard]] const std::vector<unsigned>& getBufferDepth() const override;
 
 private:
     void evaluateWriteMode();
diff --git a/DRAMSys/library/src/controller/scheduler/SchedulerIF.h b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerIF.h
similarity index 81%
rename from DRAMSys/library/src/controller/scheduler/SchedulerIF.h
rename to src/libdramsys/DRAMSys/controller/scheduler/SchedulerIF.h
index 3b45a0db..87a3c7b6 100644
--- a/DRAMSys/library/src/controller/scheduler/SchedulerIF.h
+++ b/src/libdramsys/DRAMSys/controller/scheduler/SchedulerIF.h
@@ -35,10 +35,10 @@
 #ifndef SCHEDULERIF_H
 #define SCHEDULERIF_H
 
-#include <vector>
+#include "DRAMSys/common/dramExtensions.h"
 
+#include <vector>
 #include <tlm>
-#include "../../common/dramExtensions.h"
 
 class BankMachine;
 
@@ -46,13 +46,13 @@ class SchedulerIF
 {
 public:
     virtual ~SchedulerIF() = default;
-    virtual bool hasBufferSpace() const = 0;
+    [[nodiscard]] virtual bool hasBufferSpace() const = 0;
     virtual void storeRequest(tlm::tlm_generic_payload&) = 0;
     virtual void removeRequest(tlm::tlm_generic_payload&) = 0;
-    virtual tlm::tlm_generic_payload *getNextRequest(const BankMachine&) const = 0;
-    virtual bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const = 0;
-    virtual bool hasFurtherRequest(Bank, tlm::tlm_command) const = 0;
-    virtual const std::vector<unsigned> &getBufferDepth() const = 0;
+    [[nodiscard]] virtual tlm::tlm_generic_payload* getNextRequest(const BankMachine&) const = 0;
+    [[nodiscard]] virtual bool hasFurtherRowHit(Bank, Row, tlm::tlm_command) const = 0;
+    [[nodiscard]] virtual bool hasFurtherRequest(Bank, tlm::tlm_command) const = 0;
+    [[nodiscard]] virtual const std::vector<unsigned>& getBufferDepth() const = 0;
 };
 
 #endif // SCHEDULERIF_H
diff --git a/DRAMSys/library/src/simulation/AddressDecoder.cpp b/src/libdramsys/DRAMSys/simulation/AddressDecoder.cpp
similarity index 94%
rename from DRAMSys/library/src/simulation/AddressDecoder.cpp
rename to src/libdramsys/DRAMSys/simulation/AddressDecoder.cpp
index 4179ca70..60f1c6b0 100644
--- a/DRAMSys/library/src/simulation/AddressDecoder.cpp
+++ b/src/libdramsys/DRAMSys/simulation/AddressDecoder.cpp
@@ -36,56 +36,54 @@
  *    Derek Christ
  */
 
+#include "AddressDecoder.h"
+
 #include <cmath>
 #include <iostream>
 #include <iomanip>
 #include <bitset>
 
-#include "AddressDecoder.h"
-#include "../common/utils.h"
-#include "../configuration/Configuration.h"
-
-AddressDecoder::AddressDecoder(const Configuration& config, const DRAMSysConfiguration::AddressMapping &addressMapping)
+AddressDecoder::AddressDecoder(const Configuration& config, const DRAMSys::Config::AddressMapping& addressMapping)
 {
-    if (const auto &channelBits = addressMapping.channelBits)
+    if (const auto& channelBits = addressMapping.channelBits)
     {
         std::copy(channelBits->begin(), channelBits->end(), std::back_inserter(vChannelBits));
     }
 
-    if (const auto &rankBits = addressMapping.rankBits)
+    if (const auto& rankBits = addressMapping.rankBits)
     {
         std::copy(rankBits->begin(), rankBits->end(), std::back_inserter(vRankBits));
     }
 
-    if (const auto &bankGroupBits = addressMapping.bankGroupBits)
+    if (const auto& bankGroupBits = addressMapping.bankGroupBits)
     {
         std::copy(bankGroupBits->begin(), bankGroupBits->end(), std::back_inserter(vBankGroupBits));
     }
 
-    if (const auto &byteBits = addressMapping.byteBits)
+    if (const auto& byteBits = addressMapping.byteBits)
     {
         std::copy(byteBits->begin(), byteBits->end(), std::back_inserter(vByteBits));
     }
 
-    if (const auto &xorBits = addressMapping.xorBits)
+    if (const auto& xorBits = addressMapping.xorBits)
     {
-        for (const auto &xorBit : *xorBits)
+        for (const auto& xorBit : *xorBits)
         {
             vXor.emplace_back(xorBit.first, xorBit.second);
         }
     }
 
-    if (const auto &bankBits = addressMapping.bankBits)
+    if (const auto& bankBits = addressMapping.bankBits)
     {
         std::copy(bankBits->begin(), bankBits->end(), std::back_inserter(vBankBits));
     }
 
-    if (const auto &rowBits = addressMapping.rowBits)
+    if (const auto& rowBits = addressMapping.rowBits)
     {
         std::copy(rowBits->begin(), rowBits->end(), std::back_inserter(vRowBits));
     }
 
-    if (const auto &columnBits = addressMapping.columnBits)
+    if (const auto& columnBits = addressMapping.columnBits)
     {
         std::copy(columnBits->begin(), columnBits->end(), std::back_inserter(vColumnBits));
     }
@@ -154,7 +152,7 @@ DecodedAddress AddressDecoder::decodeAddress(uint64_t encAddr) const
     // Apply XOR
     // For each used xor:
     //   Get the first bit and second bit. Apply a bitwise xor operator and save it back to the first bit.
-    for (auto &it : vXor)
+    for (auto& it : vXor)
     {
         uint64_t xoredBit;
         xoredBit = (((encAddr >> it.first) & UINT64_C(1)) ^ ((encAddr >> it.second) & UINT64_C(1)));
@@ -199,7 +197,7 @@ unsigned AddressDecoder::decodeChannel(uint64_t encAddr) const
     // Apply XOR
     // For each used xor:
     //   Get the first bit and second bit. Apply a bitwise xor operator and save it back to the first bit.
-    for (auto &it : vXor)
+    for (auto& it : vXor)
     {
         uint64_t xoredBit;
         xoredBit = (((encAddr >> it.first) & UINT64_C(1)) ^ ((encAddr >> it.second) & UINT64_C(1)));
diff --git a/DRAMSys/library/src/simulation/AddressDecoder.h b/src/libdramsys/DRAMSys/simulation/AddressDecoder.h
similarity index 89%
rename from DRAMSys/library/src/simulation/AddressDecoder.h
rename to src/libdramsys/DRAMSys/simulation/AddressDecoder.h
index a72618cb..57f2f324 100644
--- a/DRAMSys/library/src/simulation/AddressDecoder.h
+++ b/src/libdramsys/DRAMSys/simulation/AddressDecoder.h
@@ -39,10 +39,12 @@
 #ifndef ADDRESSDECODER_H
 #define ADDRESSDECODER_H
 
+#include "DRAMSys/configuration/Configuration.h"
+
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+
 #include <vector>
 #include <utility>
-#include <DRAMSysConfiguration.h>
-#include "../configuration/Configuration.h"
 
 struct DecodedAddress
 {
@@ -67,9 +69,9 @@ struct DecodedAddress
 class AddressDecoder
 {
 public:
-    AddressDecoder(const Configuration& config, const DRAMSysConfiguration::AddressMapping &addressMapping);
-    DecodedAddress decodeAddress(uint64_t encAddr) const;
-    unsigned decodeChannel(uint64_t encAddr) const;
+    AddressDecoder(const Configuration& config, const DRAMSys::Config::AddressMapping& addressMapping);
+    [[nodiscard]] DecodedAddress decodeAddress(uint64_t encAddr) const;
+    [[nodiscard]] unsigned decodeChannel(uint64_t encAddr) const;
     void print() const;
 
 private:
diff --git a/DRAMSys/library/src/simulation/Arbiter.cpp b/src/libdramsys/DRAMSys/simulation/Arbiter.cpp
similarity index 81%
rename from DRAMSys/library/src/simulation/Arbiter.cpp
rename to src/libdramsys/DRAMSys/simulation/Arbiter.cpp
index 3aedfc08..6e56b92c 100644
--- a/DRAMSys/library/src/simulation/Arbiter.cpp
+++ b/src/libdramsys/DRAMSys/simulation/Arbiter.cpp
@@ -38,15 +38,17 @@
  */
 
 #include "Arbiter.h"
-#include "AddressDecoder.h"
-#include "../configuration/Configuration.h"
 
-#include <DRAMSysConfiguration.h>
+#include "DRAMSys/simulation/AddressDecoder.h"
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/common/DebugManager.h"
+
+#include "DRAMSys/config/DRAMSysConfiguration.h"
 
 using namespace sc_core;
 using namespace tlm;
 
-Arbiter::Arbiter(const sc_module_name &name, const Configuration& config,
+Arbiter::Arbiter(const sc_module_name& name, const Configuration& config,
                  const AddressDecoder& addressDecoder) :
     sc_module(name), addressDecoder(addressDecoder), payloadEventQueue(this, &Arbiter::peqCallback),
     tCK(config.memSpec->tCK),
@@ -64,12 +66,12 @@ ArbiterSimple::ArbiterSimple(const sc_module_name& name, const Configuration& co
                              const AddressDecoder& addressDecoder) :
     Arbiter(name, config, addressDecoder) {}
 
-ArbiterFifo::ArbiterFifo(const sc_module_name &name, const Configuration& config,
+ArbiterFifo::ArbiterFifo(const sc_module_name& name, const Configuration& config,
                          const AddressDecoder& addressDecoder) :
     Arbiter(name, config, addressDecoder),
     maxActiveTransactions(config.maxActiveTransactions) {}
 
-ArbiterReorder::ArbiterReorder(const sc_module_name &name, const Configuration& config,
+ArbiterReorder::ArbiterReorder(const sc_module_name& name, const Configuration& config,
                                const AddressDecoder& addressDecoder) :
     Arbiter(name, config, addressDecoder),
     maxActiveTransactions(config.maxActiveTransactions) {}
@@ -82,8 +84,8 @@ void Arbiter::end_of_elaboration()
 
     // channel side
     channelIsBusy = std::vector<bool>(iSocket.size(), false);
-    pendingRequests = std::vector<std::queue<tlm_generic_payload *>>(iSocket.size(),
-            std::queue<tlm_generic_payload *>());
+    pendingRequests = std::vector<std::queue<tlm_generic_payload*>>(iSocket.size(),
+            std::queue<tlm_generic_payload*>());
     nextChannelPayloadIDToAppend = std::vector<uint64_t>(iSocket.size(), 1);
 }
 
@@ -92,8 +94,8 @@ void ArbiterSimple::end_of_elaboration()
     Arbiter::end_of_elaboration();
 
     // initiator side
-    pendingResponses = std::vector<std::queue<tlm_generic_payload *>>(tSocket.size(),
-            std::queue<tlm_generic_payload *>());
+    pendingResponses = std::vector<std::queue<tlm_generic_payload*>>(tSocket.size(),
+            std::queue<tlm_generic_payload*>());
 }
 
 void ArbiterFifo::end_of_elaboration()
@@ -102,9 +104,9 @@ void ArbiterFifo::end_of_elaboration()
 
     // initiator side
     activeTransactions = std::vector<unsigned int>(tSocket.size(), 0);
-    outstandingEndReq = std::vector<tlm_generic_payload *>(tSocket.size(), nullptr);
-    pendingResponses = std::vector<std::queue<tlm_generic_payload *>>(tSocket.size(),
-            std::queue<tlm_generic_payload *>());
+    outstandingEndReq = std::vector<tlm_generic_payload*>(tSocket.size(), nullptr);
+    pendingResponses = std::vector<std::queue<tlm_generic_payload*>>(tSocket.size(),
+            std::queue<tlm_generic_payload*>());
 
     lastEndReq = std::vector<sc_time>(iSocket.size(), sc_max_time());
     lastEndResp = std::vector<sc_time>(tSocket.size(), sc_max_time());
@@ -116,17 +118,17 @@ void ArbiterReorder::end_of_elaboration()
 
     // initiator side
     activeTransactions = std::vector<unsigned int>(tSocket.size(), 0);
-    outstandingEndReq = std::vector<tlm_generic_payload *>(tSocket.size(), nullptr);
-    pendingResponses = std::vector<std::set<tlm_generic_payload *, ThreadPayloadIDCompare>>
-            (tSocket.size(), std::set<tlm_generic_payload *, ThreadPayloadIDCompare>());
+    outstandingEndReq = std::vector<tlm_generic_payload*>(tSocket.size(), nullptr);
+    pendingResponses = std::vector<std::set<tlm_generic_payload*, ThreadPayloadIDCompare>>
+            (tSocket.size(), std::set<tlm_generic_payload*, ThreadPayloadIDCompare>());
     nextThreadPayloadIDToReturn = std::vector<uint64_t>(tSocket.size(), 1);
 
     lastEndReq = std::vector<sc_time>(iSocket.size(), sc_max_time());
     lastEndResp = std::vector<sc_time>(tSocket.size(), sc_max_time());
 }
 
-tlm_sync_enum Arbiter::nb_transport_fw(int id, tlm_generic_payload &payload,
-                              tlm_phase &phase, sc_time &fwDelay)
+tlm_sync_enum Arbiter::nb_transport_fw(int id, tlm_generic_payload& trans,
+                              tlm_phase& phase, sc_time& fwDelay)
 {
     sc_time clockOffset = sc_time::from_value((sc_time_stamp() + fwDelay).value() % tCK.value());
     sc_time notDelay = (clockOffset == SC_ZERO_TIME) ? fwDelay : (fwDelay + tCK - clockOffset);
@@ -135,23 +137,23 @@ tlm_sync_enum Arbiter::nb_transport_fw(int id, tlm_generic_payload &payload,
     {
         // TODO: do not adjust address permanently
         // adjust address offset:
-        uint64_t adjustedAddress = payload.get_address() - addressOffset;
-        payload.set_address(adjustedAddress);
+        uint64_t adjustedAddress = trans.get_address() - addressOffset;
+        trans.set_address(adjustedAddress);
 
         unsigned channel = addressDecoder.decodeChannel(adjustedAddress);
-        assert(addressDecoder.decodeChannel(adjustedAddress + payload.get_data_length() - 1) == channel);
-        ArbiterExtension::setAutoExtension(payload, Thread(id), Channel(channel));
-        payload.acquire();
+        assert(addressDecoder.decodeChannel(adjustedAddress + trans.get_data_length() - 1) == channel);
+        ArbiterExtension::setAutoExtension(trans, Thread(id), Channel(channel));
+        trans.acquire();
     }
 
     PRINTDEBUGMESSAGE(name(), "[fw] " + getPhaseName(phase) + " notification in " +
                       notDelay.to_string());
-    payloadEventQueue.notify(payload, phase, notDelay);
+    payloadEventQueue.notify(trans, phase, notDelay);
     return TLM_ACCEPTED;
 }
 
-tlm_sync_enum Arbiter::nb_transport_bw(int, tlm_generic_payload &payload,
-                              tlm_phase &phase, sc_time &bwDelay)
+tlm_sync_enum Arbiter::nb_transport_bw(int, tlm_generic_payload& payload,
+                              tlm_phase& phase, sc_time& bwDelay)
 {
     PRINTDEBUGMESSAGE(name(), "[bw] " + getPhaseName(phase) + " notification in " +
                       bwDelay.to_string());
@@ -159,7 +161,7 @@ tlm_sync_enum Arbiter::nb_transport_bw(int, tlm_generic_payload &payload,
     return TLM_ACCEPTED;
 }
 
-unsigned int Arbiter::transport_dbg(int /*id*/, tlm::tlm_generic_payload &trans)
+unsigned int Arbiter::transport_dbg(int /*id*/, tlm::tlm_generic_payload& trans)
 {
     trans.set_address(trans.get_address() - addressOffset);
 
@@ -167,14 +169,14 @@ unsigned int Arbiter::transport_dbg(int /*id*/, tlm::tlm_generic_payload &trans)
     return iSocket[static_cast<int>(decodedAddress.channel)]->transport_dbg(trans);
 }
 
-void ArbiterSimple::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &cbPhase)
+void ArbiterSimple::peqCallback(tlm_generic_payload& cbTrans, const tlm_phase& cbPhase)
 {
-    unsigned int threadId = ArbiterExtension::getThread(cbPayload).ID();
-    unsigned int channelId = ArbiterExtension::getChannel(cbPayload).ID();
+    unsigned int threadId = ArbiterExtension::getThread(cbTrans).ID();
+    unsigned int channelId = ArbiterExtension::getChannel(cbTrans).ID();
 
     if (cbPhase == BEGIN_REQ) // from initiator
     {
-        ArbiterExtension::setIDAndTimeOfGeneration(cbPayload, nextThreadPayloadIDToAppend[threadId]++, sc_time_stamp());
+        ArbiterExtension::setIDAndTimeOfGeneration(cbTrans, nextThreadPayloadIDToAppend[threadId]++, sc_time_stamp());
 
         if (!channelIsBusy[channelId])
         {
@@ -183,10 +185,10 @@ void ArbiterSimple::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
             tlm_phase tPhase = BEGIN_REQ;
             sc_time tDelay = arbitrationDelayFw;
 
-            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbPayload, tPhase, tDelay);
+            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbTrans, tPhase, tDelay);
         }
         else
-            pendingRequests[channelId].push(&cbPayload);
+            pendingRequests[channelId].push(&cbTrans);
     }
     else if (cbPhase == END_REQ) // from target
     {
@@ -194,7 +196,7 @@ void ArbiterSimple::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
             tlm_phase tPhase = END_REQ;
             sc_time tDelay = SC_ZERO_TIME;
 
-            tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbPayload, tPhase, tDelay);
+            tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbTrans, tPhase, tDelay);
         }
 
         if (!pendingRequests[channelId].empty())
@@ -217,14 +219,14 @@ void ArbiterSimple::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
             tlm_phase tPhase = BEGIN_RESP;
             sc_time tDelay = arbitrationDelayBw;
 
-            tlm_sync_enum returnValue = tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbPayload, tPhase, tDelay);
+            tlm_sync_enum returnValue = tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbTrans, tPhase, tDelay);
             // Early completion from initiator
             if (returnValue == TLM_UPDATED)
-                payloadEventQueue.notify(cbPayload, tPhase, tDelay);
+                payloadEventQueue.notify(cbTrans, tPhase, tDelay);
             threadIsBusy[threadId] = true;
         }
         else
-            pendingResponses[threadId].push(&cbPayload);
+            pendingResponses[threadId].push(&cbTrans);
     }
     else if (cbPhase == END_RESP) // from initiator
     {
@@ -232,9 +234,9 @@ void ArbiterSimple::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
             tlm_phase tPhase = END_RESP;
             sc_time tDelay = SC_ZERO_TIME;
 
-            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbPayload, tPhase, tDelay);
+            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbTrans, tPhase, tDelay);
         }
-        cbPayload.release();
+        cbTrans.release();
 
         if (!pendingResponses[threadId].empty())
         {
@@ -256,10 +258,10 @@ void ArbiterSimple::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
         SC_REPORT_FATAL(0, "Payload event queue in arbiter was triggered with unknown phase");
 }
 
-void ArbiterFifo::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &cbPhase)
+void ArbiterFifo::peqCallback(tlm_generic_payload& cbTrans, const tlm_phase& cbPhase)
 {
-    unsigned int threadId = ArbiterExtension::getThread(cbPayload).ID();
-    unsigned int channelId = ArbiterExtension::getChannel(cbPayload).ID();
+    unsigned int threadId = ArbiterExtension::getThread(cbTrans).ID();
+    unsigned int channelId = ArbiterExtension::getChannel(cbTrans).ID();
 
     if (cbPhase == BEGIN_REQ) // from initiator
     {
@@ -267,18 +269,18 @@ void ArbiterFifo::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &c
         {
             activeTransactions[threadId]++;
 
-            ArbiterExtension::setIDAndTimeOfGeneration(cbPayload, nextThreadPayloadIDToAppend[threadId]++,
+            ArbiterExtension::setIDAndTimeOfGeneration(cbTrans, nextThreadPayloadIDToAppend[threadId]++,
                                                        sc_time_stamp());
 
             tlm_phase tPhase = END_REQ;
             sc_time tDelay = SC_ZERO_TIME;
 
-            tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbPayload, tPhase, tDelay);
+            tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbTrans, tPhase, tDelay);
 
-            payloadEventQueue.notify(cbPayload, REQ_ARBITRATION, arbitrationDelayFw);
+            payloadEventQueue.notify(cbTrans, REQ_ARBITRATION, arbitrationDelayFw);
         }
         else
-            outstandingEndReq[threadId] = &cbPayload;
+            outstandingEndReq[threadId] = &cbTrans;
     }
     else if (cbPhase == END_REQ) // from memory controller
     {
@@ -303,15 +305,15 @@ void ArbiterFifo::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &c
             tlm_phase tPhase = END_RESP;
             sc_time tDelay = SC_ZERO_TIME;
 
-            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbPayload, tPhase, tDelay);
+            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbTrans, tPhase, tDelay);
         }
 
-        payloadEventQueue.notify(cbPayload, RESP_ARBITRATION, arbitrationDelayBw);
+        payloadEventQueue.notify(cbTrans, RESP_ARBITRATION, arbitrationDelayBw);
     }
     else if (cbPhase == END_RESP) // from initiator
     {
         lastEndResp[threadId] = sc_time_stamp();
-        cbPayload.release();
+        cbTrans.release();
 
         if (outstandingEndReq[threadId] != nullptr)
         {
@@ -347,7 +349,7 @@ void ArbiterFifo::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &c
     }
     else if (cbPhase == REQ_ARBITRATION)
     {
-        pendingRequests[channelId].push(&cbPayload);
+        pendingRequests[channelId].push(&cbTrans);
 
         if (!channelIsBusy[channelId])
         {
@@ -363,7 +365,7 @@ void ArbiterFifo::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &c
     }
     else if (cbPhase == RESP_ARBITRATION)
     {
-        pendingResponses[threadId].push(&cbPayload);
+        pendingResponses[threadId].push(&cbTrans);
 
         if (!threadIsBusy[threadId])
         {
@@ -384,10 +386,10 @@ void ArbiterFifo::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &c
         SC_REPORT_FATAL(0, "Payload event queue in arbiter was triggered with unknown phase");
 }
 
-void ArbiterReorder::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase &cbPhase)
+void ArbiterReorder::peqCallback(tlm_generic_payload& cbTrans, const tlm_phase& cbPhase)
 {
-    unsigned int threadId = ArbiterExtension::getThread(cbPayload).ID();
-    unsigned int channelId = ArbiterExtension::getChannel(cbPayload).ID();
+    unsigned int threadId = ArbiterExtension::getThread(cbTrans).ID();
+    unsigned int channelId = ArbiterExtension::getChannel(cbTrans).ID();
 
     if (cbPhase == BEGIN_REQ) // from initiator
     {
@@ -395,18 +397,18 @@ void ArbiterReorder::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
         {
             activeTransactions[threadId]++;
 
-            ArbiterExtension::setIDAndTimeOfGeneration(cbPayload, nextThreadPayloadIDToAppend[threadId]++,
+            ArbiterExtension::setIDAndTimeOfGeneration(cbTrans, nextThreadPayloadIDToAppend[threadId]++,
                                                        sc_time_stamp());
 
             tlm_phase tPhase = END_REQ;
             sc_time tDelay = SC_ZERO_TIME;
 
-            tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbPayload, tPhase, tDelay);
+            tSocket[static_cast<int>(threadId)]->nb_transport_bw(cbTrans, tPhase, tDelay);
 
-            payloadEventQueue.notify(cbPayload, REQ_ARBITRATION, arbitrationDelayFw);
+            payloadEventQueue.notify(cbTrans, REQ_ARBITRATION, arbitrationDelayFw);
         }
         else
-            outstandingEndReq[threadId] = &cbPayload;
+            outstandingEndReq[threadId] = &cbTrans;
     }
     else if (cbPhase == END_REQ) // from memory controller
     {
@@ -430,15 +432,15 @@ void ArbiterReorder::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
         {
             tlm_phase tPhase = END_RESP;
             sc_time tDelay = SC_ZERO_TIME;
-            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbPayload, tPhase, tDelay);
+            iSocket[static_cast<int>(channelId)]->nb_transport_fw(cbTrans, tPhase, tDelay);
         }
 
-        payloadEventQueue.notify(cbPayload, RESP_ARBITRATION, arbitrationDelayBw);
+        payloadEventQueue.notify(cbTrans, RESP_ARBITRATION, arbitrationDelayBw);
     }
     else if (cbPhase == END_RESP) // from initiator
     {
         lastEndResp[threadId] = sc_time_stamp();
-        cbPayload.release();
+        cbTrans.release();
 
         if (outstandingEndReq[threadId] != nullptr)
         {
@@ -478,7 +480,7 @@ void ArbiterReorder::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
     }
     else if (cbPhase == REQ_ARBITRATION)
     {
-        pendingRequests[channelId].push(&cbPayload);
+        pendingRequests[channelId].push(&cbTrans);
 
         if (!channelIsBusy[channelId])
         {
@@ -494,7 +496,7 @@ void ArbiterReorder::peqCallback(tlm_generic_payload &cbPayload, const tlm_phase
     }
     else if (cbPhase == RESP_ARBITRATION)
     {
-        pendingResponses[threadId].insert(&cbPayload);
+        pendingResponses[threadId].insert(&cbTrans);
 
         if (!threadIsBusy[threadId])
         {
diff --git a/DRAMSys/library/src/simulation/Arbiter.h b/src/libdramsys/DRAMSys/simulation/Arbiter.h
similarity index 76%
rename from DRAMSys/library/src/simulation/Arbiter.h
rename to src/libdramsys/DRAMSys/simulation/Arbiter.h
index f99e997e..7865eff6 100644
--- a/DRAMSys/library/src/simulation/Arbiter.h
+++ b/src/libdramsys/DRAMSys/simulation/Arbiter.h
@@ -40,18 +40,18 @@
 #ifndef ARBITER_H
 #define ARBITER_H
 
+#include "DRAMSys/simulation/AddressDecoder.h"
+#include "DRAMSys/common/dramExtensions.h"
+
 #include <iostream>
 #include <vector>
 #include <queue>
 #include <set>
-
-#include <tlm>
 #include <systemc>
+#include <tlm>
 #include <tlm_utils/multi_passthrough_target_socket.h>
 #include <tlm_utils/multi_passthrough_initiator_socket.h>
 #include <tlm_utils/peq_with_cb_and_phase.h>
-#include "AddressDecoder.h"
-#include "../common/dramExtensions.h"
 
 DECLARE_EXTENDED_PHASE(REQ_ARBITRATION);
 DECLARE_EXTENDED_PHASE(RESP_ARBITRATION);
@@ -63,7 +63,7 @@ public:
     tlm_utils::multi_passthrough_target_socket<Arbiter> tSocket;
 
 protected:
-    Arbiter(const sc_core::sc_module_name &name, const Configuration& config,
+    Arbiter(const sc_core::sc_module_name& name, const Configuration& config,
             const AddressDecoder& addressDecoder);
     SC_HAS_PROCESS(Arbiter);
 
@@ -72,21 +72,21 @@ protected:
     const AddressDecoder& addressDecoder;
 
     tlm_utils::peq_with_cb_and_phase<Arbiter> payloadEventQueue;
-    virtual void peqCallback(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase) = 0;
+    virtual void peqCallback(tlm::tlm_generic_payload& payload, const tlm::tlm_phase& phase) = 0;
 
     std::vector<bool> threadIsBusy;
     std::vector<bool> channelIsBusy;
 
-    std::vector<std::queue<tlm::tlm_generic_payload *>> pendingRequests;
+    std::vector<std::queue<tlm::tlm_generic_payload*>> pendingRequests;
 
     std::vector<uint64_t> nextThreadPayloadIDToAppend;
     std::vector<uint64_t> nextChannelPayloadIDToAppend;
 
-    tlm::tlm_sync_enum nb_transport_fw(int id, tlm::tlm_generic_payload &payload,
-                                  tlm::tlm_phase &phase, sc_core::sc_time &fwDelay);
-    tlm::tlm_sync_enum nb_transport_bw(int, tlm::tlm_generic_payload &payload,
-                                  tlm::tlm_phase &phase, sc_core::sc_time &bwDelay);
-    unsigned int transport_dbg(int /*id*/, tlm::tlm_generic_payload &trans);
+    tlm::tlm_sync_enum nb_transport_fw(int id, tlm::tlm_generic_payload& trans,
+                                  tlm::tlm_phase& phase, sc_core::sc_time& fwDelay);
+    tlm::tlm_sync_enum nb_transport_bw(int, tlm::tlm_generic_payload& trans,
+                                  tlm::tlm_phase& phase, sc_core::sc_time& bwDelay);
+    unsigned int transport_dbg(int /*id*/, tlm::tlm_generic_payload& trans);
 
     const sc_core::sc_time tCK;
     const sc_core::sc_time arbitrationDelayFw;
@@ -99,33 +99,33 @@ protected:
 class ArbiterSimple final : public Arbiter
 {
 public:
-    ArbiterSimple(const sc_core::sc_module_name &name, const Configuration& config,
+    ArbiterSimple(const sc_core::sc_module_name& name, const Configuration& config,
                   const AddressDecoder& addressDecoder);
     SC_HAS_PROCESS(ArbiterSimple);
 
 private:
     void end_of_elaboration() override;
-    void peqCallback(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase) override;
+    void peqCallback(tlm::tlm_generic_payload& cbTrans, const tlm::tlm_phase& phase) override;
 
-    std::vector<std::queue<tlm::tlm_generic_payload *>> pendingResponses;
+    std::vector<std::queue<tlm::tlm_generic_payload*>> pendingResponses;
 };
 
 class ArbiterFifo final : public Arbiter
 {
 public:
-    ArbiterFifo(const sc_core::sc_module_name &name, const Configuration& config,
+    ArbiterFifo(const sc_core::sc_module_name& name, const Configuration& config,
                 const AddressDecoder& addressDecoder);
     SC_HAS_PROCESS(ArbiterFifo);
 
 private:
     void end_of_elaboration() override;
-    void peqCallback(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase) override;
+    void peqCallback(tlm::tlm_generic_payload& cbTrans, const tlm::tlm_phase& phase) override;
 
     std::vector<unsigned int> activeTransactions;
     const unsigned maxActiveTransactions;
 
-    std::vector<tlm::tlm_generic_payload *> outstandingEndReq;
-    std::vector<std::queue<tlm::tlm_generic_payload *>> pendingResponses;
+    std::vector<tlm::tlm_generic_payload*> outstandingEndReq;
+    std::vector<std::queue<tlm::tlm_generic_payload*>> pendingResponses;
 
     std::vector<sc_core::sc_time> lastEndReq;
     std::vector<sc_core::sc_time> lastEndResp;
@@ -134,26 +134,26 @@ private:
 class ArbiterReorder final : public Arbiter
 {
 public:
-    ArbiterReorder(const sc_core::sc_module_name &name, const Configuration& config,
+    ArbiterReorder(const sc_core::sc_module_name& name, const Configuration& config,
                    const AddressDecoder& addressDecoder);
     SC_HAS_PROCESS(ArbiterReorder);
 
 private:
     void end_of_elaboration() override;
-    void peqCallback(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase) override;
+    void peqCallback(tlm::tlm_generic_payload& cbTrans, const tlm::tlm_phase& phase) override;
 
     std::vector<unsigned int> activeTransactions;
     const unsigned maxActiveTransactions;
 
     struct ThreadPayloadIDCompare
     {
-        bool operator() (const tlm::tlm_generic_payload *lhs, const tlm::tlm_generic_payload *rhs) const
+        bool operator() (const tlm::tlm_generic_payload* lhs, const tlm::tlm_generic_payload* rhs) const
         {
             return ArbiterExtension::getThreadPayloadID(*lhs) < ArbiterExtension::getThreadPayloadID(*rhs);
         }
     };
 
-    std::vector<tlm::tlm_generic_payload *> outstandingEndReq;
+    std::vector<tlm::tlm_generic_payload*> outstandingEndReq;
     std::vector<std::set<tlm::tlm_generic_payload*, ThreadPayloadIDCompare>> pendingResponses;
 
     std::vector<sc_core::sc_time> lastEndReq;
diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/src/libdramsys/DRAMSys/simulation/DRAMSys.cpp
similarity index 72%
rename from DRAMSys/library/src/simulation/DRAMSys.cpp
rename to src/libdramsys/DRAMSys/simulation/DRAMSys.cpp
index 54567e88..0a1e92d5 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.cpp
+++ b/src/libdramsys/DRAMSys/simulation/DRAMSys.cpp
@@ -38,46 +38,47 @@
  *    Derek Christ
  */
 
+#include "DRAMSys.h"
+
+#include "DRAMSys/common/DebugManager.h"
+#include "DRAMSys/common/utils.h"
+#include "DRAMSys/controller/Controller.h"
+#include "DRAMSys/simulation/dram/DramDDR3.h"
+#include "DRAMSys/simulation/dram/DramDDR4.h"
+#include "DRAMSys/simulation/dram/DramWideIO.h"
+#include "DRAMSys/simulation/dram/DramLPDDR4.h"
+#include "DRAMSys/simulation/dram/DramWideIO2.h"
+#include "DRAMSys/simulation/dram/DramHBM2.h"
+#include "DRAMSys/simulation/dram/DramGDDR5.h"
+#include "DRAMSys/simulation/dram/DramGDDR5X.h"
+#include "DRAMSys/simulation/dram/DramGDDR6.h"
+#include "DRAMSys/simulation/dram/DramSTTMRAM.h"
+
+#ifdef DDR5_SIM
+#include "DRAMSys/simulation/dram/DramDDR5.h"
+#endif
+#ifdef LPDDR5_SIM
+#include "DRAMSys/simulation/dram/DramLPDDR5.h"
+#endif
+#ifdef HBM3_SIM
+#include "DRAMSys/simulation/dram/DramHBM3.h"
+#endif
+
 #include <cstdlib>
 #include <iostream>
 #include <memory>
 #include <vector>
 #include <stdexcept>
 
-#include "DRAMSys.h"
-#include "../common/DebugManager.h"
-#include "../common/utils.h"
-#include "../simulation/TemperatureController.h"
-#include "../error/ecchamming.h"
-#include "dram/DramDDR3.h"
-#include "dram/DramDDR4.h"
-#include "dram/DramWideIO.h"
-#include "dram/DramLPDDR4.h"
-#include "dram/DramWideIO2.h"
-#include "dram/DramHBM2.h"
-#include "dram/DramGDDR5.h"
-#include "dram/DramGDDR5X.h"
-#include "dram/DramGDDR6.h"
-#include "dram/DramSTTMRAM.h"
-#include "../controller/Controller.h"
+namespace DRAMSys {
 
-#ifdef DDR5_SIM
-#include "dram/DramDDR5.h"
-#endif
-#ifdef LPDDR5_SIM
-#include "dram/DramLPDDR5.h"
-#endif
-#ifdef HBM3_SIM
-#include "dram/DramHBM3.h"
-#endif
-
-DRAMSys::DRAMSys(const sc_core::sc_module_name &name,
-                 const DRAMSysConfiguration::Configuration &configLib)
+DRAMSys::DRAMSys(const sc_core::sc_module_name& name,
+                 const ::DRAMSys::Config::Configuration& configLib)
     : DRAMSys(name, configLib, true)
 {}
 
-DRAMSys::DRAMSys(const sc_core::sc_module_name &name,
-                 const DRAMSysConfiguration::Configuration &configLib,
+DRAMSys::DRAMSys(const sc_core::sc_module_name& name,
+                 const ::DRAMSys::Config::Configuration& configLib,
                  bool initAndBind)
     : sc_module(name), tSocket("DRAMSys_tSocket")
 {
@@ -89,9 +90,6 @@ DRAMSys::DRAMSys(const sc_core::sc_module_name &name,
     config.loadMCConfig(configLib.mcConfig);
     config.loadSimConfig(configLib.simConfig);
 
-    if (const auto &thermalConfig = configLib.thermalConfig)
-        config.loadTemperatureSimConfig(*thermalConfig);
-
     // Setup the debug manager:
     setupDebugManager(config.simulationName);
 
@@ -144,7 +142,7 @@ void DRAMSys::logo()
 #undef BOLDTXT
 }
 
-void DRAMSys::setupDebugManager(NDEBUG_UNUSED(const std::string &traceName)) const
+void DRAMSys::setupDebugManager(NDEBUG_UNUSED(const std::string& traceName)) const
 {
 #ifndef NDEBUG
     auto& dbg = DebugManager::getInstance();
@@ -157,10 +155,8 @@ void DRAMSys::setupDebugManager(NDEBUG_UNUSED(const std::string &traceName)) con
 #endif
 }
 
-void DRAMSys::instantiateModules(const DRAMSysConfiguration::AddressMapping& addressMapping)
+void DRAMSys::instantiateModules(const ::DRAMSys::Config::AddressMapping& addressMapping)
 {
-    temperatureController = std::make_unique<TemperatureController>("TemperatureController", config);
-
     addressDecoder = std::make_unique<AddressDecoder>(config, addressMapping);
     addressDecoder->print();
 
@@ -180,49 +176,36 @@ void DRAMSys::instantiateModules(const DRAMSysConfiguration::AddressMapping& add
                                                               *addressDecoder));
 
         if (memoryType == MemSpec::MemoryType::DDR3)
-            drams.emplace_back(std::make_unique<DramDDR3>(("dram" + std::to_string(i)).c_str(), config,
-                                                          *temperatureController));
+            drams.emplace_back(std::make_unique<DramDDR3>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::DDR4)
-            drams.emplace_back(std::make_unique<DramDDR4>(("dram" + std::to_string(i)).c_str(), config,
-                                                          *temperatureController));
+            drams.emplace_back(std::make_unique<DramDDR4>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::WideIO)
-            drams.emplace_back(std::make_unique<DramWideIO>(("dram" + std::to_string(i)).c_str(), config,
-                                                            *temperatureController));
+            drams.emplace_back(std::make_unique<DramWideIO>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::LPDDR4)
-            drams.emplace_back(std::make_unique<DramLPDDR4>(("dram" + std::to_string(i)).c_str(), config,
-                                                            *temperatureController));
+            drams.emplace_back(std::make_unique<DramLPDDR4>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::WideIO2)
-            drams.emplace_back(std::make_unique<DramWideIO2>(("dram" + std::to_string(i)).c_str(), config,
-                                                             *temperatureController));
+            drams.emplace_back(std::make_unique<DramWideIO2>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::HBM2)
-            drams.emplace_back(std::make_unique<DramHBM2>(("dram" + std::to_string(i)).c_str(), config,
-                                                          *temperatureController));
+            drams.emplace_back(std::make_unique<DramHBM2>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::GDDR5)
-            drams.emplace_back(std::make_unique<DramGDDR5>(("dram" + std::to_string(i)).c_str(), config,
-                                                           *temperatureController));
+            drams.emplace_back(std::make_unique<DramGDDR5>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::GDDR5X)
-            drams.emplace_back(std::make_unique<DramGDDR5X>(("dram" + std::to_string(i)).c_str(), config,
-                                                            *temperatureController));
+            drams.emplace_back(std::make_unique<DramGDDR5X>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::GDDR6)
-            drams.emplace_back(std::make_unique<DramGDDR6>(("dram" + std::to_string(i)).c_str(), config,
-                                                           *temperatureController));
+            drams.emplace_back(std::make_unique<DramGDDR6>(("dram" + std::to_string(i)).c_str(), config));
         else if (memoryType == MemSpec::MemoryType::STTMRAM)
-            drams.emplace_back(std::make_unique<DramSTTMRAM>(("dram" + std::to_string(i)).c_str(), config,
-                                                             *temperatureController));
+            drams.emplace_back(std::make_unique<DramSTTMRAM>(("dram" + std::to_string(i)).c_str(), config));
 #ifdef DDR5_SIM
         else if (memoryType == MemSpec::MemoryType::DDR5)
-            drams.emplace_back(std::make_unique<DramDDR5>(("dram" + std::to_string(i)).c_str(), config,
-                                                          *temperatureController));
+            drams.emplace_back(std::make_unique<DramDDR5>(("dram" + std::to_string(i)).c_str(), config));
 #endif
 #ifdef LPDDR5_SIM
         else if (memoryType == MemSpec::MemoryType::LPDDR5)
-            drams.emplace_back(std::make_unique<DramLPDDR5>(("dram" + std::to_string(i)).c_str(), config,
-                                                            *temperatureController));
+            drams.emplace_back(std::make_unique<DramLPDDR5>(("dram" + std::to_string(i)).c_str(), config));
 #endif
 #ifdef HBM3_SIM
         else if (memoryType == MemSpec::MemoryType::HBM3)
-            drams.emplace_back(std::make_unique<DramHBM3>(("dram" + std::to_string(i)).c_str(), config,
-                                                          *temperatureController));
+            drams.emplace_back(std::make_unique<DramHBM3>(("dram" + std::to_string(i)).c_str(), config));
 #endif
 
         if (config.checkTLM2Protocol)
@@ -250,8 +233,10 @@ void DRAMSys::bindSockets()
     }
 }
 
-void DRAMSys::report(const std::string &message)
+void DRAMSys::report(const std::string& message)
 {
     PRINTDEBUGMESSAGE(name(), message);
     std::cout << message << std::endl;
 }
+
+}
\ No newline at end of file
diff --git a/DRAMSys/library/src/simulation/DRAMSys.h b/src/libdramsys/DRAMSys/simulation/DRAMSys.h
similarity index 78%
rename from DRAMSys/library/src/simulation/DRAMSys.h
rename to src/libdramsys/DRAMSys/simulation/DRAMSys.h
index 7d354be6..94ca9388 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.h
+++ b/src/libdramsys/DRAMSys/simulation/DRAMSys.h
@@ -41,45 +41,45 @@
 #ifndef DRAMSYS_H
 #define DRAMSYS_H
 
-#include "dram/Dram.h"
-#include "Arbiter.h"
-#include "ReorderBuffer.h"
-#include "../common/tlm2_base_protocol_checker.h"
-#include "../error/eccbaseclass.h"
-#include "../controller/ControllerIF.h"
-#include "TemperatureController.h"
-#include "AddressDecoder.h"
+#include "DRAMSys/simulation/dram/Dram.h"
+#include "DRAMSys/simulation/Arbiter.h"
+#include "DRAMSys/simulation/ReorderBuffer.h"
+#include "DRAMSys/common/tlm2_base_protocol_checker.h"
+#include "DRAMSys/controller/ControllerIF.h"
+#include "DRAMSys/simulation/AddressDecoder.h"
+
+#include "DRAMSys/config/DRAMSysConfiguration.h"
 
-#include <DRAMSysConfiguration.h>
 #include <string>
-#include <systemc>
 #include <list>
 #include <memory>
+#include <systemc>
+#include <tlm>
 #include <tlm_utils/multi_passthrough_initiator_socket.h>
 #include <tlm_utils/multi_passthrough_target_socket.h>
 
+namespace DRAMSys {
+
 class DRAMSys : public sc_core::sc_module
 {
 public:
     tlm_utils::multi_passthrough_target_socket<DRAMSys> tSocket;
 
     SC_HAS_PROCESS(DRAMSys);
-    DRAMSys(const sc_core::sc_module_name &name,
-            const DRAMSysConfiguration::Configuration &configLib);
+    DRAMSys(const sc_core::sc_module_name& name,
+            const ::DRAMSys::Config::Configuration& configLib);
 
     const Configuration& getConfig();
 
 protected:
-    DRAMSys(const sc_core::sc_module_name &name,
-            const DRAMSysConfiguration::Configuration &configLib,
+    DRAMSys(const sc_core::sc_module_name& name,
+            const ::DRAMSys::Config::Configuration& configLib,
             bool initAndBind);
 
     void end_of_simulation() override;
 
     Configuration config;
 
-    std::unique_ptr<TemperatureController> temperatureController;
-
     //TLM 2.0 Protocol Checkers
     std::vector<std::unique_ptr<tlm_utils::tlm2_base_protocol_checker<>>> controllersTlmCheckers;
 
@@ -97,15 +97,15 @@ protected:
 
     std::unique_ptr<AddressDecoder> addressDecoder;
 
-    void report(const std::string &message);
+    void report(const std::string& message);
     void bindSockets();
 
 private:
     static void logo();
-
-    void instantiateModules(const DRAMSysConfiguration::AddressMapping &addressMapping);
-
-    void setupDebugManager(const std::string &traceName) const;
+    void instantiateModules(const ::DRAMSys::Config::AddressMapping& addressMapping);
+    void setupDebugManager(const std::string& traceName) const;
 };
 
+}
+
 #endif // DRAMSYS_H
diff --git a/DRAMSys/library/src/simulation/DRAMSysRecordable.cpp b/src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.cpp
similarity index 72%
rename from DRAMSys/library/src/simulation/DRAMSysRecordable.cpp
rename to src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.cpp
index 47f21d5e..744fd1df 100644
--- a/DRAMSys/library/src/simulation/DRAMSysRecordable.cpp
+++ b/src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.cpp
@@ -34,39 +34,38 @@
  *    Derek Christ
  */
 
-#include <memory>
-
 #include "DRAMSysRecordable.h"
-#include "../controller/ControllerRecordable.h"
-#include "dram/DramRecordable.h"
-#include "dram/DramDDR3.h"
-#include "dram/DramDDR4.h"
-#include "dram/DramWideIO.h"
-#include "dram/DramLPDDR4.h"
-#include "dram/DramWideIO2.h"
-#include "dram/DramHBM2.h"
-#include "dram/DramGDDR5.h"
-#include "dram/DramGDDR5X.h"
-#include "dram/DramGDDR6.h"
-#include "dram/DramSTTMRAM.h"
-#include "../common/TlmRecorder.h"
-#include "../simulation/TemperatureController.h"
-#include "../error/ecchamming.h"
+
+#include "DRAMSys/controller/ControllerRecordable.h"
+#include "DRAMSys/common/TlmRecorder.h"
+#include "DRAMSys/simulation/dram/DramRecordable.h"
+#include "DRAMSys/simulation/dram/DramDDR3.h"
+#include "DRAMSys/simulation/dram/DramDDR4.h"
+#include "DRAMSys/simulation/dram/DramWideIO.h"
+#include "DRAMSys/simulation/dram/DramLPDDR4.h"
+#include "DRAMSys/simulation/dram/DramWideIO2.h"
+#include "DRAMSys/simulation/dram/DramHBM2.h"
+#include "DRAMSys/simulation/dram/DramGDDR5.h"
+#include "DRAMSys/simulation/dram/DramGDDR5X.h"
+#include "DRAMSys/simulation/dram/DramGDDR6.h"
+#include "DRAMSys/simulation/dram/DramSTTMRAM.h"
 
 #ifdef DDR5_SIM
-#include "dram/DramDDR5.h"
+#include "DRAMSys/simulation/dram/DramDDR5.h"
 #endif
 #ifdef LPDDR5_SIM
-#include "dram/DramLPDDR5.h"
+#include "DRAMSys/simulation/dram/DramLPDDR5.h"
 #endif
 #ifdef HBM3_SIM
-#include "dram/DramHBM3.h"
+#include "DRAMSys/simulation/dram/DramHBM3.h"
 #endif
 
-using namespace sc_core;
+#include <memory>
 
-DRAMSysRecordable::DRAMSysRecordable(const sc_module_name& name, const DRAMSysConfiguration::Configuration& configLib)
-    : DRAMSys(name, configLib, false)
+namespace DRAMSys {
+
+DRAMSysRecordable::DRAMSysRecordable(const sc_core::sc_module_name& name, const ::DRAMSys::Config::Configuration& configLib)
+        : DRAMSys(name, configLib, false)
 {
     // If a simulation file is passed as argument to DRAMSys the simulation ID
     // is prepended to the simulation name if found.
@@ -90,15 +89,16 @@ void DRAMSysRecordable::end_of_simulation()
     // Report power before TLM recorders are finalized
     if (config.powerAnalysis)
     {
-        for (auto& dram : drams)
+        for (auto& dram: drams)
             dram->reportPower();
     }
 
-    for (auto& tlmRecorder : tlmRecorders)
+    for (auto& tlmRecorder: tlmRecorders)
         tlmRecorder.finalize();
 }
 
-void DRAMSysRecordable::setupTlmRecorders(const std::string& traceName, const DRAMSysConfiguration::Configuration& configLib)
+void DRAMSysRecordable::setupTlmRecorders(const std::string& traceName,
+                                          const ::DRAMSys::Config::Configuration& configLib)
 {
     // Create TLM Recorders, one per channel.
     // Reserve is required because the recorders use double buffers that are accessed with pointers.
@@ -111,17 +111,15 @@ void DRAMSysRecordable::setupTlmRecorders(const std::string& traceName, const DR
         std::string recorderName = "tlmRecorder" + std::to_string(i);
 
         tlmRecorders.emplace_back(recorderName, config, dbName);
-        tlmRecorders.back().recordMcConfig(DRAMSysConfiguration::dump(configLib.mcConfig));
-        tlmRecorders.back().recordMemspec(DRAMSysConfiguration::dump(configLib.memSpec));
+        tlmRecorders.back().recordMcConfig(::DRAMSys::Config::dump(configLib.mcConfig));
+        tlmRecorders.back().recordMemspec(::DRAMSys::Config::dump(configLib.memSpec));
         tlmRecorders.back().recordTraceNames(config.simulationName);
     }
 }
 
-void DRAMSysRecordable::instantiateModules(const std::string &traceName,
-                                           const DRAMSysConfiguration::Configuration &configLib)
+void DRAMSysRecordable::instantiateModules(const std::string& traceName,
+                                           const ::DRAMSys::Config::Configuration& configLib)
 {
-    temperatureController = std::make_unique<TemperatureController>("TemperatureController", config);
-
     addressDecoder = std::make_unique<AddressDecoder>(config, configLib.addressMapping);
     addressDecoder->print();
 
@@ -146,52 +144,54 @@ void DRAMSysRecordable::instantiateModules(const std::string &traceName,
 
         if (memoryType == MemSpec::MemoryType::DDR3)
             drams.emplace_back(std::make_unique<DramRecordable<DramDDR3>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                          config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::DDR4)
             drams.emplace_back(std::make_unique<DramRecordable<DramDDR4>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                          config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::WideIO)
             drams.emplace_back(std::make_unique<DramRecordable<DramWideIO>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                            config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::LPDDR4)
             drams.emplace_back(std::make_unique<DramRecordable<DramLPDDR4>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                            config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::WideIO2)
             drams.emplace_back(std::make_unique<DramRecordable<DramWideIO2>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                             config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::HBM2)
             drams.emplace_back(std::make_unique<DramRecordable<DramHBM2>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                          config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::GDDR5)
             drams.emplace_back(std::make_unique<DramRecordable<DramGDDR5>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                           config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::GDDR5X)
             drams.emplace_back(std::make_unique<DramRecordable<DramGDDR5X>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                            config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::GDDR6)
             drams.emplace_back(std::make_unique<DramRecordable<DramGDDR6>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                           config, tlmRecorders[i]));
         else if (memoryType == MemSpec::MemoryType::STTMRAM)
             drams.emplace_back(std::make_unique<DramRecordable<DramSTTMRAM>>(("dram" + std::to_string(i)).c_str(),
-                    config, *temperatureController, tlmRecorders[i]));
+                                                                             config, tlmRecorders[i]));
 #ifdef DDR5_SIM
         else if (memoryType == MemSpec::MemoryType::DDR5)
             drams.emplace_back(std::make_unique<DramRecordable<DramDDR5>>(("dram" + std::to_string(i)).c_str(),
-                                                                          config, *temperatureController, tlmRecorders[i]));
+                                                                          config, tlmRecorders[i]));
 #endif
 #ifdef LPDDR5_SIM
         else if (memoryType == MemSpec::MemoryType::LPDDR5)
             drams.emplace_back(std::make_unique<DramRecordable<DramLPDDR5>>(("dram" + std::to_string(i)).c_str(),
-                                                                            config, *temperatureController, tlmRecorders[i]));
+                                                                            config, tlmRecorders[i]));
 #endif
 #ifdef HBM3_SIM
         else if (memoryType == MemSpec::MemoryType::HBM3)
             drams.emplace_back(std::make_unique<DramRecordable<DramHBM3>>(("dram" + std::to_string(i)).c_str(),
-                                                                          config, *temperatureController, tlmRecorders[i]));
+                                                                          config, tlmRecorders[i]));
 #endif
 
         if (config.checkTLM2Protocol)
             controllersTlmCheckers.emplace_back(std::make_unique<tlm_utils::tlm2_base_protocol_checker<>>
-                    (("TLMCheckerController" + std::to_string(i)).c_str()));
+                                                        (("TLMCheckerController" + std::to_string(i)).c_str()));
     }
 }
+
+}
\ No newline at end of file
diff --git a/DRAMSys/library/src/simulation/DRAMSysRecordable.h b/src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.h
similarity index 80%
rename from DRAMSys/library/src/simulation/DRAMSysRecordable.h
rename to src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.h
index 6b76efb7..b22315f0 100644
--- a/DRAMSys/library/src/simulation/DRAMSysRecordable.h
+++ b/src/libdramsys/DRAMSys/simulation/DRAMSysRecordable.h
@@ -37,15 +37,17 @@
 #ifndef DRAMSYSRECORDABLE_H
 #define DRAMSYSRECORDABLE_H
 
-#include "DRAMSys.h"
-#include "../common/TlmRecorder.h"
+#include "DRAMSys/simulation/DRAMSys.h"
+#include "DRAMSys/common/TlmRecorder.h"
 
-#include <DRAMSysConfiguration.h>
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+
+namespace DRAMSys {
 
 class DRAMSysRecordable : public DRAMSys
 {
 public:
-    DRAMSysRecordable(const sc_core::sc_module_name &name, const DRAMSysConfiguration::Configuration &configLib);
+    DRAMSysRecordable(const sc_core::sc_module_name& name, const ::DRAMSys::Config::Configuration& configLib);
 
 protected:
     void end_of_simulation() override;
@@ -55,8 +57,11 @@ private:
     // They generate the output databases.
     std::vector<TlmRecorder> tlmRecorders;
 
-    void setupTlmRecorders(const std::string &traceName, const DRAMSysConfiguration::Configuration &configLib);
-    void instantiateModules(const std::string &traceName, const DRAMSysConfiguration::Configuration &configLib);
+    void setupTlmRecorders(const std::string& traceName, const ::DRAMSys::Config::Configuration& configLib);
+
+    void instantiateModules(const std::string& traceName, const ::DRAMSys::Config::Configuration& configLib);
 };
 
+}
+
 #endif // DRAMSYSRECORDABLE_H
diff --git a/DRAMSys/library/src/simulation/ReorderBuffer.h b/src/libdramsys/DRAMSys/simulation/ReorderBuffer.h
similarity index 75%
rename from DRAMSys/library/src/simulation/ReorderBuffer.h
rename to src/libdramsys/DRAMSys/simulation/ReorderBuffer.h
index 28e86492..a69bbaef 100644
--- a/DRAMSys/library/src/simulation/ReorderBuffer.h
+++ b/src/libdramsys/DRAMSys/simulation/ReorderBuffer.h
@@ -40,7 +40,6 @@
 
 #include <deque>
 #include <set>
-
 #include <systemc>
 #include <tlm>
 #include <tlm_utils/simple_initiator_socket.h>
@@ -63,55 +62,55 @@ public:
 
 private:
     tlm_utils::peq_with_cb_and_phase<ReorderBuffer> payloadEventQueue;
-    std::deque<tlm::tlm_generic_payload *> pendingRequestsInOrder;
-    std::set<tlm::tlm_generic_payload *>   receivedResponses;
+    std::deque<tlm::tlm_generic_payload*> pendingRequestsInOrder;
+    std::set<tlm::tlm_generic_payload*>   receivedResponses;
 
     bool responseIsPendingInInitator;
 
 
     // Initiated by dram side
-    tlm::tlm_sync_enum nb_transport_bw(tlm::tlm_generic_payload &payload, tlm::tlm_phase &phase,
-                                       sc_core::sc_time &bwDelay)
+    tlm::tlm_sync_enum nb_transport_bw(tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase,
+                                       sc_core::sc_time& bwDelay)
     {
-        payloadEventQueue.notify(payload, phase, bwDelay);
+        payloadEventQueue.notify(trans, phase, bwDelay);
         return tlm::TLM_ACCEPTED;
     }
 
     // Initiated by initator side (players)
-    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &payload, tlm::tlm_phase &phase,
-                                       sc_core::sc_time &fwDelay)
+    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase,
+                                       sc_core::sc_time& fwDelay)
     {
         if (phase == tlm::BEGIN_REQ) {
-            payload.acquire();
+            trans.acquire();
         } else if (phase == tlm::END_RESP) {
-            payload.release();
+            trans.release();
         }
 
-        payloadEventQueue.notify(payload, phase, fwDelay);
+        payloadEventQueue.notify(trans, phase, fwDelay);
         return tlm::TLM_ACCEPTED;
     }
 
-    void peqCallback(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase)
+    void peqCallback(tlm::tlm_generic_payload& trans, const tlm::tlm_phase& phase)
     {
         //Phases initiated by initiator side
         if (phase == tlm::BEGIN_REQ) {
-            pendingRequestsInOrder.push_back(&payload);
-            sendToTarget(payload, phase, sc_core::SC_ZERO_TIME);
+            pendingRequestsInOrder.push_back(&trans);
+            sendToTarget(trans, phase, sc_core::SC_ZERO_TIME);
         }
 
         else if (phase == tlm::END_RESP) {
             responseIsPendingInInitator = false;
             pendingRequestsInOrder.pop_front();
-            receivedResponses.erase(&payload);
+            receivedResponses.erase(&trans);
             sendNextResponse();
         }
 
         //Phases initiated by dram side
         else if (phase == tlm::END_REQ) {
-            sendToInitiator(payload, phase, sc_core::SC_ZERO_TIME);
+            sendToInitiator(trans, phase, sc_core::SC_ZERO_TIME);
         } else if (phase == tlm::BEGIN_RESP) {
-            sendToTarget(payload, tlm::END_RESP, sc_core::SC_ZERO_TIME);
-            receivedResponses.emplace(&payload);
+            sendToTarget(trans, tlm::END_RESP, sc_core::SC_ZERO_TIME);
+            receivedResponses.emplace(&trans);
             sendNextResponse();
         }
 
@@ -122,24 +121,24 @@ private:
         }
     }
 
-    void sendToTarget(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase, const sc_core::sc_time &delay)
+    void sendToTarget(tlm::tlm_generic_payload& trans, const tlm::tlm_phase& phase, const sc_core::sc_time& delay)
     {
         tlm::tlm_phase TPhase = phase;
         sc_core::sc_time TDelay = delay;
-        iSocket->nb_transport_fw(payload, TPhase, TDelay);
+        iSocket->nb_transport_fw(trans, TPhase, TDelay);
     }
 
-    void sendToInitiator(tlm::tlm_generic_payload &payload, const tlm::tlm_phase &phase, const sc_core::sc_time &delay)
+    void sendToInitiator(tlm::tlm_generic_payload& trans, const tlm::tlm_phase& phase, const sc_core::sc_time& delay)
     {
 
 
         sc_assert(phase == tlm::END_REQ ||
-                  (phase == tlm::BEGIN_RESP && pendingRequestsInOrder.front() == &payload
-                   && receivedResponses.count(&payload)));
+                  (phase == tlm::BEGIN_RESP && pendingRequestsInOrder.front() == &trans
+                   && receivedResponses.count(&trans)));
 
         tlm::tlm_phase TPhase = phase;
         sc_core::sc_time TDelay = delay;
-        tSocket->nb_transport_bw(payload, TPhase, TDelay);
+        tSocket->nb_transport_bw(trans, TPhase, TDelay);
     }
 
     void sendNextResponse()
diff --git a/DRAMSys/library/src/simulation/dram/Dram.cpp b/src/libdramsys/DRAMSys/simulation/dram/Dram.cpp
similarity index 94%
rename from DRAMSys/library/src/simulation/dram/Dram.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/Dram.cpp
index 189d7c97..315c2b3e 100644
--- a/DRAMSys/library/src/simulation/dram/Dram.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/Dram.cpp
@@ -37,31 +37,24 @@
  *    Felipe S. Prado
  */
 
+#include "Dram.h"
+
+#include "DRAMSys/common/DebugManager.h"
+
+#ifdef DRAMPOWER
+#include "LibDRAMPower.h"
+#endif
+
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+
 #ifdef _WIN32
     #include <windows.h>
 #else
     #include <sys/mman.h>
 #endif
 
-#include <vector>
-#include <array>
-#include <cassert>
-#include <cstdint>
-#include <cstdlib>
-#include <cmath>
-#include <iomanip>
-
-#include "Dram.h"
-#include "../../common/DebugManager.h"
-#include "../../common/dramExtensions.h"
-#include "../../common/utils.h"
-#include "../../controller/Command.h"
-
-#ifdef DRAMPOWER
-#include "../../common/third_party/DRAMPower/src/MemCommand.h"
-#include "../../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
-#endif
-
 using namespace sc_core;
 using namespace tlm;
 
@@ -131,15 +124,14 @@ tlm_sync_enum Dram::nb_transport_fw(tlm_generic_payload &payload,
 {
     assert(phase >= BEGIN_RD && phase <= END_SREF);
 
+#ifdef DRAMPOWER
     if (powerAnalysis)
     {
         int bank = static_cast<int>(ControllerExtension::getBank(payload).ID());
         int64_t cycle = std::lround((sc_time_stamp() + delay) / memSpec.tCK);
-
-#ifdef DRAMPOWER
         DRAMPower->doCommand(phaseToDRAMPowerCommand(phase), bank, cycle);
-#endif
     }
+#endif
 
     if (storeMode == Configuration::StoreMode::Store)
     {
diff --git a/DRAMSys/library/src/simulation/dram/Dram.h b/src/libdramsys/DRAMSys/simulation/dram/Dram.h
similarity index 86%
rename from DRAMSys/library/src/simulation/dram/Dram.h
rename to src/libdramsys/DRAMSys/simulation/dram/Dram.h
index 7b0f66df..f9b339ce 100644
--- a/DRAMSys/library/src/simulation/dram/Dram.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/Dram.h
@@ -40,20 +40,20 @@
 #ifndef DRAM_H
 #define DRAM_H
 
-#include <memory>
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/configuration/memspec/MemSpec.h"
 
+#include <memory>
 #include <systemc>
 #include <tlm>
 #include <tlm_utils/simple_target_socket.h>
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpec.h"
 
 class libDRAMPower;
 
 class Dram : public sc_core::sc_module
 {
 protected:
-    Dram(const sc_core::sc_module_name &name, const Configuration& config);
+    Dram(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(Dram);
 
     const MemSpec& memSpec;
@@ -61,17 +61,17 @@ protected:
     // Data Storage:
     const Configuration::StoreMode storeMode;
     const bool powerAnalysis;
-    unsigned char *memory;
+    unsigned char* memory;
     const bool useMalloc;
 
 #ifdef DRAMPOWER
     std::unique_ptr<libDRAMPower> DRAMPower;
 #endif
 
-    virtual tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &payload,
-                                               tlm::tlm_phase &phase, sc_core::sc_time &delay);
+    virtual tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload& payload,
+                                               tlm::tlm_phase& phase, sc_core::sc_time& delay);
 
-    virtual unsigned int transport_dbg(tlm::tlm_generic_payload &trans);
+    virtual unsigned int transport_dbg(tlm::tlm_generic_payload& trans);
 
 public:
     tlm_utils::simple_target_socket<Dram> tSocket;
diff --git a/DRAMSys/library/src/simulation/dram/DramDDR3.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramDDR3.cpp
similarity index 94%
rename from DRAMSys/library/src/simulation/dram/DramDDR3.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramDDR3.cpp
index 5ae93b05..9f88c94f 100644
--- a/DRAMSys/library/src/simulation/dram/DramDDR3.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramDDR3.cpp
@@ -35,31 +35,25 @@
 
 #include "DramDDR3.h"
 
-#include <memory>
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecDDR3.h"
+#include "DRAMSys/configuration/memspec/MemSpecDDR3.h"
 
 #ifdef DRAMPOWER
-#include "../../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
+#include "LibDRAMPower.h"
 using namespace DRAMPower;
 #endif
 
 using namespace sc_core;
 
-DramDDR3::DramDDR3(const sc_module_name& name, const Configuration& config,
-                   TemperatureController& temperatureController)
+DramDDR3::DramDDR3(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramDDR3", "Error Model not supported for DDR3");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
     {
         const auto *memSpecDDR3 = dynamic_cast<const MemSpecDDR3*>(config.memSpec.get());
         if (memSpecDDR3 == nullptr)
             SC_REPORT_FATAL("DramDDR3", "Wrong MemSpec chosen");
 
-#ifdef DRAMPOWER
         MemArchitectureSpec memArchSpec;
         memArchSpec.burstLength       = memSpecDDR3->defaultBurstLength;
         memArchSpec.dataRate          = memSpecDDR3->dataRate;
@@ -147,6 +141,6 @@ DramDDR3::DramDDR3(const sc_module_name& name, const Configuration& config,
         powerSpec.memArchSpec   = memArchSpec;
 
         DRAMPower = std::make_unique<libDRAMPower>(powerSpec, false);
-#endif
     }
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramDDR3.h b/src/libdramsys/DRAMSys/simulation/dram/DramDDR3.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramDDR3.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramDDR3.h
index bfd2c172..ee9e6cf9 100644
--- a/DRAMSys/library/src/simulation/dram/DramDDR3.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramDDR3.h
@@ -36,16 +36,14 @@
 #ifndef DRAMDDR3_H
 #define DRAMDDR3_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramDDR3 : public Dram
 {
 public:
-    DramDDR3(const sc_core::sc_module_name& name, const Configuration& config,
-             TemperatureController& temperatureController);
+    DramDDR3(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramDDR3);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramDDR4.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramDDR4.cpp
similarity index 94%
rename from DRAMSys/library/src/simulation/dram/DramDDR4.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramDDR4.cpp
index c358d0fe..3a9c6575 100644
--- a/DRAMSys/library/src/simulation/dram/DramDDR4.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramDDR4.cpp
@@ -35,31 +35,25 @@
 
 #include "DramDDR4.h"
 
-#include <memory>
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecDDR4.h"
+#include "DRAMSys/configuration/memspec/MemSpecDDR4.h"
 
 #ifdef DRAMPOWER
-#include "../../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
+#include "LibDRAMPower.h"
 using namespace DRAMPower;
 #endif
 
 using namespace sc_core;
 
-DramDDR4::DramDDR4(const sc_module_name& name, const Configuration& config,
-                   TemperatureController& temperatureController)
+DramDDR4::DramDDR4(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramDDR4", "Error Model not supported for DDR4");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
     {
         const auto *memSpecDDR4 = dynamic_cast<const MemSpecDDR4*>(config.memSpec.get());
         if (memSpecDDR4 == nullptr)
             SC_REPORT_FATAL("DramDDR4", "Wrong MemSpec chosen");
 
-#ifdef DRAMPOWER
         MemArchitectureSpec memArchSpec;
         memArchSpec.burstLength       = memSpecDDR4->defaultBurstLength;
         memArchSpec.dataRate          = memSpecDDR4->dataRate;
@@ -147,6 +141,6 @@ DramDDR4::DramDDR4(const sc_module_name& name, const Configuration& config,
         powerSpec.memArchSpec   = memArchSpec;
 
         DRAMPower = std::make_unique<libDRAMPower>(powerSpec, false);
-#endif
     }
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramDDR4.h b/src/libdramsys/DRAMSys/simulation/dram/DramDDR4.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramDDR4.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramDDR4.h
index eeca3d29..d51d71e9 100644
--- a/DRAMSys/library/src/simulation/dram/DramDDR4.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramDDR4.h
@@ -36,16 +36,14 @@
 #ifndef DRAMDDR4_H
 #define DRAMDDR4_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramDDR4 : public Dram
 {
 public:
-    DramDDR4(const sc_core::sc_module_name& name, const Configuration& config,
-             TemperatureController& temperatureController);
+    DramDDR4(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramDDR4);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramGDDR5.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5.cpp
similarity index 84%
rename from DRAMSys/library/src/simulation/dram/DramGDDR5.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramGDDR5.cpp
index 2f6301c4..515aa9a7 100644
--- a/DRAMSys/library/src/simulation/dram/DramGDDR5.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5.cpp
@@ -33,19 +33,15 @@
  *    Lukas Steiner
  */
 
-#include "DramGDDR5.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecGDDR5.h"
+#include "DRAMSys/simulation/dram/DramGDDR5.h"
 
 using namespace sc_core;
 
-DramGDDR5::DramGDDR5(const sc_module_name& name, const Configuration& config,
-                     TemperatureController& temperatureController)
+DramGDDR5::DramGDDR5(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramGDDR5", "Error Model not supported for GDDR5");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramGDDR5", "DRAMPower does not support GDDR5");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramGDDR5.h b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramGDDR5.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramGDDR5.h
index b5a12196..645dfbee 100644
--- a/DRAMSys/library/src/simulation/dram/DramGDDR5.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5.h
@@ -36,16 +36,14 @@
 #ifndef DRAMGDDR5_H
 #define DRAMGDDR5_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramGDDR5 : public Dram
 {
 public:
-    DramGDDR5(const sc_core::sc_module_name& name, const Configuration& config,
-              TemperatureController& temperatureController);
+    DramGDDR5(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramGDDR5);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramGDDR5X.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5X.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramGDDR5X.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramGDDR5X.cpp
index 377d515c..c1a3b334 100644
--- a/DRAMSys/library/src/simulation/dram/DramGDDR5X.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5X.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramGDDR5X.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecGDDR5X.h"
 
 using namespace sc_core;
 
-DramGDDR5X::DramGDDR5X(const sc_module_name& name, const Configuration& config,
-                       TemperatureController& temperatureController)
+DramGDDR5X::DramGDDR5X(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramGDDR5X", "Error Model not supported for GDDR5X");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramGDDR5X", "DRAMPower does not support GDDR5X");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramGDDR5X.h b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5X.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramGDDR5X.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramGDDR5X.h
index 5c8af942..bed8cc01 100644
--- a/DRAMSys/library/src/simulation/dram/DramGDDR5X.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR5X.h
@@ -36,16 +36,14 @@
 #ifndef DRAMGDDR5X_H
 #define DRAMGDDR5X_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramGDDR5X : public Dram
 {
 public:
-    DramGDDR5X(const sc_core::sc_module_name& name, const Configuration& config,
-               TemperatureController& temperatureController);
+    DramGDDR5X(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramGDDR5X);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramGDDR6.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR6.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramGDDR6.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramGDDR6.cpp
index 57b0df97..7a8d0a11 100644
--- a/DRAMSys/library/src/simulation/dram/DramGDDR6.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR6.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramGDDR6.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecGDDR6.h"
 
 using namespace sc_core;
 
-DramGDDR6::DramGDDR6(const sc_module_name& name, const Configuration& config,
-                     TemperatureController& temperatureController)
+DramGDDR6::DramGDDR6(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramGDDR6", "Error Model not supported for GDDR6");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramGDDR6", "DRAMPower does not support GDDR6");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramGDDR6.h b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR6.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramGDDR6.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramGDDR6.h
index cdffebee..f2c82249 100644
--- a/DRAMSys/library/src/simulation/dram/DramGDDR6.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramGDDR6.h
@@ -36,16 +36,14 @@
 #ifndef DRAMGDDR6_H
 #define DRAMGDDR6_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramGDDR6 : public Dram
 {
 public:
-    DramGDDR6(const sc_core::sc_module_name& name, const Configuration& config,
-              TemperatureController& temperatureController);
+    DramGDDR6(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramGDDR6);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramHBM2.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramHBM2.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramHBM2.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramHBM2.cpp
index 40f54d53..f5891399 100644
--- a/DRAMSys/library/src/simulation/dram/DramHBM2.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramHBM2.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramHBM2.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecHBM2.h"
 
 using namespace sc_core;
 
-DramHBM2::DramHBM2(const sc_module_name& name, const Configuration& config,
-                   TemperatureController& temperatureController)
+DramHBM2::DramHBM2(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramHBM2", "Error Model not supported for HBM2");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramHBM2", "DRAMPower does not support HBM2");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramHBM2.h b/src/libdramsys/DRAMSys/simulation/dram/DramHBM2.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramHBM2.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramHBM2.h
index f78746b2..2789a245 100644
--- a/DRAMSys/library/src/simulation/dram/DramHBM2.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramHBM2.h
@@ -36,16 +36,14 @@
 #ifndef DRAMHBM2_H
 #define DRAMHBM2_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramHBM2 : public Dram
 {
 public:
-    DramHBM2(const sc_core::sc_module_name &name, const Configuration& config,
-             TemperatureController& temperatureController);
+    DramHBM2(const sc_core::sc_module_name &name, const Configuration& config);
     SC_HAS_PROCESS(DramHBM2);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramLPDDR4.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramLPDDR4.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramLPDDR4.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramLPDDR4.cpp
index e55cfdb0..0134fcf3 100644
--- a/DRAMSys/library/src/simulation/dram/DramLPDDR4.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramLPDDR4.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramLPDDR4.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecLPDDR4.h"
 
 using namespace sc_core;
 
-DramLPDDR4::DramLPDDR4(const sc_module_name& name, const Configuration& config,
-                       TemperatureController& temperatureController)
+DramLPDDR4::DramLPDDR4(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramLPDDR4", "Error Model not supported for LPDDR4");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramLPDDR4", "DRAMPower does not support LPDDR4");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramLPDDR4.h b/src/libdramsys/DRAMSys/simulation/dram/DramLPDDR4.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramLPDDR4.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramLPDDR4.h
index 401c119b..94d93498 100644
--- a/DRAMSys/library/src/simulation/dram/DramLPDDR4.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramLPDDR4.h
@@ -36,16 +36,14 @@
 #ifndef DRAMLPDDR4_H
 #define DRAMLPDDR4_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramLPDDR4 : public Dram
 {
 public:
-    DramLPDDR4(const sc_core::sc_module_name& name, const Configuration& config,
-               TemperatureController& temperatureController);
+    DramLPDDR4(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramLPDDR4);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramRecordable.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramRecordable.cpp
similarity index 81%
rename from DRAMSys/library/src/simulation/dram/DramRecordable.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramRecordable.cpp
index 847fa8cb..27d25f41 100644
--- a/DRAMSys/library/src/simulation/dram/DramRecordable.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramRecordable.cpp
@@ -35,37 +35,37 @@
 
 #include "DramRecordable.h"
 
-#include <cmath>
-#include "../../common/TlmRecorder.h"
-#include "../../common/utils.h"
-#include "DramDDR3.h"
-#include "DramDDR4.h"
-#include "DramWideIO.h"
-#include "DramLPDDR4.h"
-#include "DramWideIO2.h"
-#include "DramHBM2.h"
-#include "DramGDDR5.h"
-#include "DramGDDR5X.h"
-#include "DramGDDR6.h"
-#include "DramSTTMRAM.h"
+#include "DRAMSys/common/TlmRecorder.h"
+#include "DRAMSys/common/utils.h"
+#include "DRAMSys/common/DebugManager.h"
+#include "DRAMSys/simulation/dram/DramDDR3.h"
+#include "DRAMSys/simulation/dram/DramDDR4.h"
+#include "DRAMSys/simulation/dram/DramWideIO.h"
+#include "DRAMSys/simulation/dram/DramLPDDR4.h"
+#include "DRAMSys/simulation/dram/DramWideIO2.h"
+#include "DRAMSys/simulation/dram/DramHBM2.h"
+#include "DRAMSys/simulation/dram/DramGDDR5.h"
+#include "DRAMSys/simulation/dram/DramGDDR5X.h"
+#include "DRAMSys/simulation/dram/DramGDDR6.h"
+#include "DRAMSys/simulation/dram/DramSTTMRAM.h"
 
 #ifdef DDR5_SIM
-#include "DramDDR5.h"
+#include "DRAMSys/simulation/dram/DramDDR5.h"
 #endif
 #ifdef LPDDR5_SIM
-#include "DramLPDDR5.h"
+#include "DRAMSys/simulation/dram/DramLPDDR5.h"
 #endif
 #ifdef HBM3_SIM
-#include "DramHBM3.h"
+#include "DRAMSys/simulation/dram/DramHBM3.h"
 #endif
 
 using namespace sc_core;
 using namespace tlm;
 
-template<class BaseDram>
+template<typename BaseDram>
 DramRecordable<BaseDram>::DramRecordable(const sc_module_name& name, const Configuration& config,
-                                         TemperatureController& temperatureController, TlmRecorder& tlmRecorder)
-    : BaseDram(name, config, temperatureController), tlmRecorder(tlmRecorder),
+                                         TlmRecorder& tlmRecorder)
+    : BaseDram(name, config), tlmRecorder(tlmRecorder),
     powerWindowSize(config.memSpec->tCK * config.windowSize)
 {
 #ifdef DRAMPOWER
@@ -76,7 +76,7 @@ DramRecordable<BaseDram>::DramRecordable(const sc_module_name& name, const Confi
 #endif
 }
 
-template<class BaseDram>
+template<typename BaseDram>
 void DramRecordable<BaseDram>::reportPower()
 {
     BaseDram::reportPower();
@@ -87,18 +87,18 @@ void DramRecordable<BaseDram>::reportPower()
 #endif                
 }
 
-template<class BaseDram>
-tlm_sync_enum DramRecordable<BaseDram>::nb_transport_fw(tlm_generic_payload &payload,
+template<typename BaseDram>
+tlm_sync_enum DramRecordable<BaseDram>::nb_transport_fw(tlm_generic_payload& trans,
                                           tlm_phase &phase, sc_time &delay)
 {
-    tlmRecorder.recordPhase(payload, phase, delay);
-    return BaseDram::nb_transport_fw(payload, phase, delay);
+    tlmRecorder.recordPhase(trans, phase, delay);
+    return BaseDram::nb_transport_fw(trans, phase, delay);
 }
 
 #ifdef DRAMPOWER
 // This Thread is only triggered when Power Simulation is enabled.
 // It estimates the current average power which will be stored in the trace database for visualization purposes.
-template<class BaseDram>
+template<typename BaseDram>
 void DramRecordable<BaseDram>::powerWindow()
 {
     int64_t clkCycles = 0;
diff --git a/DRAMSys/library/src/simulation/dram/DramRecordable.h b/src/libdramsys/DRAMSys/simulation/dram/DramRecordable.h
similarity index 83%
rename from DRAMSys/library/src/simulation/dram/DramRecordable.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramRecordable.h
index 517aedeb..3a2302c5 100644
--- a/DRAMSys/library/src/simulation/dram/DramRecordable.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramRecordable.h
@@ -36,29 +36,28 @@
 #ifndef DRAMRECORDABLE_H
 #define DRAMRECORDABLE_H
 
-#include <systemc>
-#include <tlm>
-#include "../../common/TlmRecorder.h"
-#include "../../configuration/Configuration.h"
-#include "../TemperatureController.h"
+#include "DRAMSys/common/TlmRecorder.h"
+#include "DRAMSys/configuration/Configuration.h"
 
 #ifdef DRAMPOWER
-#include "../../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
+#include "LibDRAMPower.h"
 #endif
 
-template<class BaseDram>
+#include <systemc>
+#include <tlm>
+
+template<typename BaseDram>
 class DramRecordable final : public BaseDram
 {
 public:
-    DramRecordable(const sc_core::sc_module_name& name, const Configuration& config,
-                   TemperatureController& temperatureController, TlmRecorder& tlmRecorder);
+    DramRecordable(const sc_core::sc_module_name& name, const Configuration& config, TlmRecorder& tlmRecorder);
     SC_HAS_PROCESS(DramRecordable);
 
     void reportPower() override;
 
 private:
-    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &payload,
-                                       tlm::tlm_phase &phase, sc_core::sc_time &delay) override;
+    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload& trans,
+                                       tlm::tlm_phase& phase, sc_core::sc_time& delay) override;
 
     TlmRecorder& tlmRecorder;
 
diff --git a/DRAMSys/library/src/simulation/dram/DramSTTMRAM.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramSTTMRAM.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramSTTMRAM.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramSTTMRAM.cpp
index c42de13e..d31c8fe1 100644
--- a/DRAMSys/library/src/simulation/dram/DramSTTMRAM.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramSTTMRAM.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramSTTMRAM.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecSTTMRAM.h"
 
 using namespace sc_core;
 
-DramSTTMRAM::DramSTTMRAM(const sc_module_name& name, const Configuration& config,
-                         TemperatureController& temperatureController)
+DramSTTMRAM::DramSTTMRAM(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramSTTMRAM", "Error Model not supported for STT-MRAM");
-
+#ifdef DRAMPOWER
     if (powerAnalysis)
         SC_REPORT_FATAL("DramSTTMRAM", "DRAMPower does not support STT-MRAM");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramSTTMRAM.h b/src/libdramsys/DRAMSys/simulation/dram/DramSTTMRAM.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramSTTMRAM.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramSTTMRAM.h
index 33d3b3ef..647db1a0 100644
--- a/DRAMSys/library/src/simulation/dram/DramSTTMRAM.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramSTTMRAM.h
@@ -36,16 +36,14 @@
 #ifndef DRAMSTTMRAM_H
 #define DRAMSTTMRAM_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramSTTMRAM : public Dram
 {
 public:
-    DramSTTMRAM(const sc_core::sc_module_name& name, const Configuration& config,
-                TemperatureController& temperatureController);
+    DramSTTMRAM(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramSTTMRAM);
 };
 
diff --git a/DRAMSys/library/src/simulation/dram/DramWideIO.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO.cpp
similarity index 71%
rename from DRAMSys/library/src/simulation/dram/DramWideIO.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramWideIO.cpp
index 38e15eaa..73daea18 100644
--- a/DRAMSys/library/src/simulation/dram/DramWideIO.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO.cpp
@@ -33,30 +33,26 @@
  *    Lukas Steiner
  */
 
-#include <cmath>
-#include <memory>
-
 #include "DramWideIO.h"
-#include "../../configuration/Configuration.h"
-#include "../../error/errormodel.h"
-#include "../../configuration/memspec/MemSpecWideIO.h"
 
+#include "DRAMSys/configuration/memspec/MemSpecWideIO.h"
 #ifdef DRAMPOWER
-#include "../../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
+#include "LibDRAMPower.h"
 using namespace DRAMPower;
 #endif
 
+#include <memory>
+
 using namespace sc_core;
 using namespace tlm;
 
 
-DramWideIO::DramWideIO(const sc_module_name& name, const Configuration& config,
-                       TemperatureController& temperatureController)
+DramWideIO::DramWideIO(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
+#ifdef DRAMPOWER
     if (powerAnalysis)
     {
-#ifdef DRAMPOWER
         const auto* memSpecWideIO = dynamic_cast<const MemSpecWideIO *>(config.memSpec.get());
         if (memSpecWideIO == nullptr)
             SC_REPORT_FATAL("DramWideIO", "Wrong MemSpec chosen");
@@ -148,75 +144,6 @@ DramWideIO::DramWideIO(const sc_module_name& name, const Configuration& config,
         powerSpec.memArchSpec   = memArchSpec;
 
         DRAMPower = std::make_unique<libDRAMPower>(powerSpec, false);
-
-
-        // For each bank in a channel a error Model is created:
-        if (storeMode == Configuration::StoreMode::ErrorModel)
-        {
-            for (unsigned i = 0; i < memSpec.banksPerChannel; i++)
-            {
-                std::string errorModelStr = "errorModel_bank" + std::to_string(i);
-                ememory.emplace_back(std::make_unique<errorModel>(errorModelStr.c_str(), config,
-                                                                  temperatureController, DRAMPower.get()));
-            }
-        }
-#endif
-    }
-    else
-    {
-        if (storeMode == Configuration::StoreMode::ErrorModel)
-        {
-            for (unsigned i = 0; i < memSpec.banksPerChannel; i++)
-            {
-                std::string errorModelStr = "errorModel_bank" + std::to_string(i);
-                ememory.emplace_back(std::make_unique<errorModel>(errorModelStr.c_str(), config,
-                                                                  temperatureController));
-            }
-        }
-    }
-}
-
-tlm_sync_enum DramWideIO::nb_transport_fw(tlm_generic_payload &payload,
-                                           tlm_phase &phase, sc_time &delay)
-{
-    assert(phase >= 5 && phase <= 19);
-
-#ifdef DRAMPOWER
-    if (powerAnalysis)
-    {
-        int bank = static_cast<int>(ControllerExtension::getBank(payload).ID());
-        int64_t cycle = std::lround((sc_time_stamp() + delay) / memSpec.tCK);
-        DRAMPower->doCommand(phaseToDRAMPowerCommand(phase), bank, cycle);
     }
 #endif
-
-    if (storeMode == Configuration::StoreMode::Store)
-    {
-        if (phase == BEGIN_RD || phase == BEGIN_RDA)
-        {
-            unsigned char *phyAddr = memory + payload.get_address();
-            memcpy(payload.get_data_ptr(), phyAddr, payload.get_data_length());
-        }
-        else if (phase == BEGIN_WR || phase == BEGIN_WRA)
-        {
-            unsigned char *phyAddr = memory + payload.get_address();
-            memcpy(phyAddr, payload.get_data_ptr(), payload.get_data_length());
-        }
-    }
-    else if (storeMode == Configuration::StoreMode::ErrorModel)
-    {
-        // TODO: delay should be considered here!
-        unsigned bank = ControllerExtension::getBank(payload).ID();
-
-        if (phase == BEGIN_ACT)
-            ememory[bank]->activate(ControllerExtension::getRow(payload).ID());
-        else if (phase == BEGIN_RD || phase == BEGIN_RDA)
-            ememory[bank]->load(payload);
-        else if (phase == BEGIN_WR || phase == BEGIN_WRA)
-            ememory[bank]->store(payload);
-        else if (phase == BEGIN_REFAB)
-            ememory[bank]->refresh(ControllerExtension::getRow(payload).ID());
-    }
-
-    return TLM_ACCEPTED;
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramWideIO.h b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO.h
similarity index 80%
rename from DRAMSys/library/src/simulation/dram/DramWideIO.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramWideIO.h
index 00985c0e..523d2e30 100644
--- a/DRAMSys/library/src/simulation/dram/DramWideIO.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO.h
@@ -36,28 +36,15 @@
 #ifndef DRAMWIDEIO_H
 #define DRAMWIDEIO_H
 
-#include <vector>
-#include <memory>
+#include "DRAMSys/simulation/dram/Dram.h"
 
 #include <systemc>
-#include <tlm>
-#include "Dram.h"
-#include "../../error/errormodel.h"
-#include "../TemperatureController.h"
 
 class DramWideIO : public Dram
 {
 public:
-    DramWideIO(const sc_core::sc_module_name& name, const Configuration& config,
-               TemperatureController& temperatureController);
+    DramWideIO(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramWideIO);
-
-protected:
-    tlm::tlm_sync_enum nb_transport_fw(tlm::tlm_generic_payload &payload,
-                                       tlm::tlm_phase &phase, sc_core::sc_time &delay) override;
-
-private:
-    std::vector<std::unique_ptr<errorModel>> ememory;
 };
 
 #endif // DRAMWIDEIO_H
diff --git a/DRAMSys/library/src/simulation/dram/DramWideIO2.cpp b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO2.cpp
similarity index 85%
rename from DRAMSys/library/src/simulation/dram/DramWideIO2.cpp
rename to src/libdramsys/DRAMSys/simulation/dram/DramWideIO2.cpp
index 80a02955..a2d85c70 100644
--- a/DRAMSys/library/src/simulation/dram/DramWideIO2.cpp
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO2.cpp
@@ -34,18 +34,14 @@
  */
 
 #include "DramWideIO2.h"
-#include "../../configuration/Configuration.h"
-#include "../../configuration/memspec/MemSpecWideIO2.h"
 
 using namespace sc_core;
 
-DramWideIO2::DramWideIO2(const sc_module_name& name, const Configuration& config,
-                         TemperatureController& temperatureController)
+DramWideIO2::DramWideIO2(const sc_module_name& name, const Configuration& config)
     : Dram(name, config)
 {
-    if (storeMode == Configuration::StoreMode::ErrorModel)
-        SC_REPORT_FATAL("DramWideIO2", "Error Model not supported for WideIO2");
-
+#ifdef DRAMPOWER
     if (config.powerAnalysis)
         SC_REPORT_FATAL("DramWideIO2", "DRAMPower does not support WideIO2");
+#endif
 }
diff --git a/DRAMSys/library/src/simulation/dram/DramWideIO2.h b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO2.h
similarity index 93%
rename from DRAMSys/library/src/simulation/dram/DramWideIO2.h
rename to src/libdramsys/DRAMSys/simulation/dram/DramWideIO2.h
index 524fb843..9ba5329a 100644
--- a/DRAMSys/library/src/simulation/dram/DramWideIO2.h
+++ b/src/libdramsys/DRAMSys/simulation/dram/DramWideIO2.h
@@ -36,16 +36,14 @@
 #ifndef DRAMWIDEIO2_H
 #define DRAMWIDEIO2_H
 
-#include <systemc>
+#include "DRAMSys/simulation/dram/Dram.h"
 
-#include "Dram.h"
-#include "../TemperatureController.h"
+#include <systemc>
 
 class DramWideIO2 : public Dram
 {
 public:
-    DramWideIO2(const sc_core::sc_module_name& name, const Configuration& config,
-                TemperatureController& temperatureController);
+    DramWideIO2(const sc_core::sc_module_name& name, const Configuration& config);
     SC_HAS_PROCESS(DramWideIO2);
 };
 
diff --git a/src/libdramsys/README.md b/src/libdramsys/README.md
new file mode 100644
index 00000000..9dd07852
--- /dev/null
+++ b/src/libdramsys/README.md
@@ -0,0 +1,14 @@
+## Architecture and Functionality
+
+A UML diagram of the software architecture is presented below; different component implementations are left out for simplicity. More information about the architecture and functionality can be found in the papers [1] [2] [3] and in the introduction video on [Youtube](https://www.youtube.com/watch?v=8EkC3mYWpQY).
+
+<img src="../../docs/images/dramsys_uml.png" alt="UML"  />
+
+[1] TLM Modelling of 3D Stacked Wide I/O DRAM Subsystems, A Virtual Platform for Memory Controller Design Space Exploration  
+M. Jung, C. Weis, N. Wehn, K. Chandrasekar. International Conference on High-Performance and Embedded Architectures and Compilers 2013 (HiPEAC), Workshop on: Rapid Simulation and Performance Evaluation: Methods and Tools (RAPIDO), January, 2013, Berlin.
+
+[2] DRAMSys: A flexible DRAM Subsystem Design Space Exploration Framework  
+M. Jung, C. Weis, N. Wehn. IPSJ Transactions on System LSI Design Methodology (T-SLDM), October, 2015.
+
+[3] DRAMSys4.0: A Fast and Cycle-Accurate SystemC/TLM-Based DRAM Simulator  
+L. Steiner, M. Jung, F. S. Prado, K. Bykov, N. Wehn. International Conference on Embedded Computer Systems: Architectures, Modeling, and Simulation (SAMOS), July, 2020, Samos Island, Greece.
\ No newline at end of file
diff --git a/DRAMSys/pct/SocketCoupler.h b/src/pct/SocketCoupler.h
similarity index 100%
rename from DRAMSys/pct/SocketCoupler.h
rename to src/pct/SocketCoupler.h
diff --git a/DRAMSys/pct/createPlatform.tcl b/src/pct/createPlatform.tcl
similarity index 100%
rename from DRAMSys/pct/createPlatform.tcl
rename to src/pct/createPlatform.tcl
diff --git a/DRAMSys/pct/createUltraPlatform.tcl b/src/pct/createUltraPlatform.tcl
similarity index 100%
rename from DRAMSys/pct/createUltraPlatform.tcl
rename to src/pct/createUltraPlatform.tcl
diff --git a/DRAMSys/pct/dummy.h b/src/pct/dummy.h
similarity index 100%
rename from DRAMSys/pct/dummy.h
rename to src/pct/dummy.h
diff --git a/DRAMSys/simulator/CMakeLists.txt b/src/simulator/CMakeLists.txt
similarity index 71%
rename from DRAMSys/simulator/CMakeLists.txt
rename to src/simulator/CMakeLists.txt
index 507d6a71..9c2f9032 100644
--- a/DRAMSys/simulator/CMakeLists.txt
+++ b/src/simulator/CMakeLists.txt
@@ -32,38 +32,26 @@
 #    Matthias Jung
 #    Lukas Steiner
 #    Derek Christ
+#    Thomas Psota
 
-cmake_minimum_required(VERSION 3.10)
+########################################
+###      DRAMSys::simulator          ###
+########################################
 
-# Project Name
-project(DRAMSysSimulator)
+project(DRAMSys_Simulator)
 
-# Configuration:
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Version")
-set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
 
-find_package(Threads REQUIRED)
-
-add_executable(DRAMSys
-    main.cpp
-    ExampleInitiator.h
-    MemoryManager.cpp
-    StlPlayer.cpp
-    TrafficGenerator.cpp
-    TrafficInitiator.cpp
-    TraceSetup.cpp
-    LengthConverter.cpp
-)
-
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/../library/src/simulation/DRAMSysRecordable.cpp)
-    target_compile_definitions(DRAMSys PRIVATE RECORDING)
-endif()
-
-target_include_directories(DRAMSys
-    PUBLIC ../library/src/
-)
+add_executable(DRAMSys ${SOURCE_FILES} ${HEADER_FILES})
+target_include_directories(DRAMSys PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(DRAMSys
-    PRIVATE DRAMSysLibrary
-    PRIVATE Threads::Threads
+    PRIVATE
+        Threads::Threads
+        SystemC::systemc
+		DRAMSys::libdramsys
 )
+
+build_source_group()
+diagnostics_print(DRAMSys)
\ No newline at end of file
diff --git a/DRAMSys/simulator/MemoryManager.cpp b/src/simulator/simulator/MemoryManager.cpp
similarity index 97%
rename from DRAMSys/simulator/MemoryManager.cpp
rename to src/simulator/simulator/MemoryManager.cpp
index 94e0da23..d83ba61d 100644
--- a/DRAMSys/simulator/MemoryManager.cpp
+++ b/src/simulator/simulator/MemoryManager.cpp
@@ -35,8 +35,8 @@
  */
 
 #include "MemoryManager.h"
-#include "common/DebugManager.h"
-#include "configuration/Configuration.h"
+
+#include "DRAMSys/common/DebugManager.h"
 
 using namespace tlm;
 
diff --git a/DRAMSys/simulator/MemoryManager.h b/src/simulator/simulator/MemoryManager.h
similarity index 97%
rename from DRAMSys/simulator/MemoryManager.h
rename to src/simulator/simulator/MemoryManager.h
index 8296d8b1..3edd23c3 100644
--- a/DRAMSys/simulator/MemoryManager.h
+++ b/src/simulator/simulator/MemoryManager.h
@@ -39,13 +39,12 @@
 
 #include <unordered_map>
 #include <stack>
-
 #include <tlm>
 
 class MemoryManager : public tlm::tlm_mm_interface
 {
 public:
-    MemoryManager(bool storageEnabled);
+    explicit MemoryManager(bool storageEnabled);
     ~MemoryManager() override;
     tlm::tlm_generic_payload& allocate(unsigned dataLength);
     void free(tlm::tlm_generic_payload* payload) override;
diff --git a/DRAMSys/simulator/StlPlayer.cpp b/src/simulator/simulator/StlPlayer.cpp
similarity index 99%
rename from DRAMSys/simulator/StlPlayer.cpp
rename to src/simulator/simulator/StlPlayer.cpp
index f02c703f..967206c5 100644
--- a/DRAMSys/simulator/StlPlayer.cpp
+++ b/src/simulator/simulator/StlPlayer.cpp
@@ -215,7 +215,7 @@ void StlPlayer::parseTraceFile()
     }
 }
 
-std::vector<LineContent>::const_iterator StlPlayer::swapBuffers()
+std::vector<StlPlayer::LineContent>::const_iterator StlPlayer::swapBuffers()
 {
     // Wait for parser to finish
     if (parserThread.joinable())
diff --git a/DRAMSys/simulator/StlPlayer.h b/src/simulator/simulator/StlPlayer.h
similarity index 91%
rename from DRAMSys/simulator/StlPlayer.h
rename to src/simulator/simulator/StlPlayer.h
index e2e995b8..35406468 100644
--- a/DRAMSys/simulator/StlPlayer.h
+++ b/src/simulator/simulator/StlPlayer.h
@@ -41,25 +41,16 @@
 #ifndef STLPLAYER_H
 #define STLPLAYER_H
 
+#include "simulator/TraceSetup.h"
+#include "simulator/TrafficInitiator.h"
+
 #include <sstream>
 #include <vector>
 #include <array>
 #include <thread>
 #include <fstream>
-
 #include <systemc>
 #include <tlm>
-#include "TraceSetup.h"
-#include "TrafficInitiator.h"
-
-struct LineContent
-{
-    sc_core::sc_time sendingTime;
-    unsigned dataLength;
-    tlm::tlm_command command;
-    uint64_t address;
-    std::vector<unsigned char> data;
-};
 
 class StlPlayer : public TrafficInitiator
 {
@@ -78,6 +69,15 @@ public:
     uint64_t getNumberOfLines() const;
 
 private:
+    struct LineContent
+    {
+        sc_core::sc_time sendingTime;
+        unsigned dataLength;
+        tlm::tlm_command command;
+        uint64_t address;
+        std::vector<unsigned char> data;
+    };
+
     void parseTraceFile();
     std::vector<LineContent>::const_iterator swapBuffers();
 
diff --git a/DRAMSys/simulator/TraceSetup.cpp b/src/simulator/simulator/TraceSetup.cpp
similarity index 93%
rename from DRAMSys/simulator/TraceSetup.cpp
rename to src/simulator/simulator/TraceSetup.cpp
index c294a1b7..2af57f0a 100644
--- a/DRAMSys/simulator/TraceSetup.cpp
+++ b/src/simulator/simulator/TraceSetup.cpp
@@ -36,8 +36,10 @@
  */
 
 #include "TraceSetup.h"
-#include "StlPlayer.h"
-#include "TrafficGenerator.h"
+
+#include "simulator/StlPlayer.h"
+#include "simulator/TrafficGenerator.h"
+
 #include <algorithm>
 #include <iomanip>
 #include <map>
@@ -46,7 +48,7 @@ using namespace sc_core;
 using namespace tlm;
 
 TraceSetup::TraceSetup(const Configuration& config,
-                       const DRAMSysConfiguration::TraceSetup& traceSetup,
+                       const DRAMSys::Config::TraceSetup& traceSetup,
                        const std::string& pathToResources,
                        std::vector<std::unique_ptr<TrafficInitiator>>& players)
     : memoryManager(config.storeMode != Configuration::StoreMode::NoStorage)
@@ -80,7 +82,7 @@ TraceSetup::TraceSetup(const Configuration& config,
                 }();
 
                 using T = std::decay_t<decltype(initiator)>;
-                if constexpr (std::is_same_v<T, DRAMSysConfiguration::TracePlayer>)
+                if constexpr (std::is_same_v<T, DRAMSys::Config::TracePlayer>)
                 {
                     size_t pos = name.rfind('.');
                     if (pos == std::string::npos)
@@ -111,14 +113,14 @@ TraceSetup::TraceSetup(const Configuration& config,
                     players.push_back(std::unique_ptr<TrafficInitiator>(player));
                     totalTransactions += player->getNumberOfLines();
                 }
-                else if constexpr (std::is_same_v<T, DRAMSysConfiguration::TraceGenerator>)
+                else if constexpr (std::is_same_v<T, DRAMSys::Config::TraceGenerator>)
                 {
-                    TrafficGenerator *trafficGenerator = new TrafficGenerator(name.c_str(), config, initiator, *this);
+                    auto* trafficGenerator = new TrafficGenerator(name.c_str(), config, initiator, *this);
                     players.push_back(std::unique_ptr<TrafficInitiator>(trafficGenerator));
 
                     totalTransactions += trafficGenerator->getTotalTransactions();
                 }
-                else // if constexpr (std::is_same_v<T, DRAMSysConfiguration::TraceHammer>)
+                else // if constexpr (std::is_same_v<T, DRAMSys::Config::TraceHammer>)
                 {
                     uint64_t numRequests = initiator.numRequests;
                     uint64_t rowIncrement = initiator.rowIncrement;
@@ -133,7 +135,7 @@ TraceSetup::TraceSetup(const Configuration& config,
 
     for (const auto &inititatorConf : traceSetup.initiators)
     {
-        if (auto generatorConf = std::get_if<DRAMSysConfiguration::TraceGenerator>(&inititatorConf))
+        if (auto generatorConf = std::get_if<DRAMSys::Config::TraceGenerator>(&inititatorConf))
         {
             if (const auto &idleUntil = generatorConf->idleUntil)
             {
diff --git a/DRAMSys/simulator/TraceSetup.h b/src/simulator/simulator/TraceSetup.h
similarity index 92%
rename from DRAMSys/simulator/TraceSetup.h
rename to src/simulator/simulator/TraceSetup.h
index d443c440..57913573 100644
--- a/DRAMSys/simulator/TraceSetup.h
+++ b/src/simulator/simulator/TraceSetup.h
@@ -37,22 +37,23 @@
 #ifndef TRACESETUP_H
 #define TRACESETUP_H
 
-#include <DRAMSysConfiguration.h>
+#include "simulator/MemoryManager.h"
+
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+#include "DRAMSys/configuration/Configuration.h"
+
 #include <vector>
 #include <string>
 #include <memory>
 #include <tlm>
 
-#include "MemoryManager.h"
-#include "configuration/Configuration.h"
-
 class TrafficInitiator;
 
 class TraceSetup
 {
 public:
     TraceSetup(const Configuration& config,
-               const DRAMSysConfiguration::TraceSetup &traceSetup,
+               const DRAMSys::Config::TraceSetup &traceSetup,
                const std::string &pathToResources,
                std::vector<std::unique_ptr<TrafficInitiator>> &devices);
 
diff --git a/DRAMSys/simulator/TrafficGenerator.cpp b/src/simulator/simulator/TrafficGenerator.cpp
similarity index 88%
rename from DRAMSys/simulator/TrafficGenerator.cpp
rename to src/simulator/simulator/TrafficGenerator.cpp
index 8b2c8d51..abcc5878 100644
--- a/DRAMSys/simulator/TrafficGenerator.cpp
+++ b/src/simulator/simulator/TrafficGenerator.cpp
@@ -37,7 +37,8 @@
  */
 
 #include "TrafficGenerator.h"
-#include "TraceSetup.h"
+
+#include "simulator/TraceSetup.h"
 
 #include <limits>
 
@@ -95,7 +96,7 @@ void TrafficGeneratorIf::sendNextPayload()
 }
 
 TrafficGenerator::TrafficGenerator(const sc_module_name& name, const Configuration& config,
-                                   const DRAMSysConfiguration::TraceGenerator& conf, TraceSetup& setup)
+                                   const DRAMSys::Config::TraceGenerator& conf, TraceSetup& setup)
     : TrafficGeneratorIf(name, config, setup, conf.maxPendingReadRequests.value_or(defaultMaxPendingReadRequests),
                          conf.maxPendingWriteRequests.value_or(defaultMaxPendingWriteRequests),
                          conf.dataLength.value_or(config.memSpec->defaultBytesPerBurst)),
@@ -107,7 +108,7 @@ TrafficGenerator::TrafficGenerator(const sc_module_name& name, const Configurati
     // Perform checks for all states
     for (const auto &state : conf.states)
     {
-        if (auto trafficState = std::get_if<DRAMSysConfiguration::TraceGeneratorTrafficState>(&state.second))
+        if (auto trafficState = std::get_if<DRAMSys::Config::TraceGeneratorTrafficState>(&state.second))
         {
             uint64_t minAddress = evaluateMinAddress(*trafficState);
             uint64_t maxAddress = evaluateMaxAddress(*trafficState, simMemSizeInBytes);
@@ -134,7 +135,7 @@ TrafficGenerator::TrafficGenerator(const sc_module_name& name, const Configurati
     }
 
     if (auto trafficState =
-            std::get_if<DRAMSysConfiguration::TraceGeneratorTrafficState>(&conf.states.at(currentState)))
+            std::get_if<DRAMSys::Config::TraceGeneratorTrafficState>(&conf.states.at(currentState)))
     {
         uint64_t minAddress = evaluateMinAddress(*trafficState);
         uint64_t maxAddress = evaluateMaxAddress(*trafficState, simMemSizeInBytes);
@@ -188,7 +189,7 @@ void TrafficGenerator::calculateTransitions()
         if (transitionFound)
         {
             if (auto trafficState =
-                    std::get_if<DRAMSysConfiguration::TraceGeneratorTrafficState>(&conf.states.at(state)))
+                    std::get_if<DRAMSys::Config::TraceGeneratorTrafficState>(&conf.states.at(state)))
                 totalTransactions += trafficState->numRequests;
 
             if (totalTransactions < maxTransactions)
@@ -227,7 +228,7 @@ uint64_t TrafficGenerator::getTotalTransactions() const
 
     for (auto state : stateSequence)
     {
-        if (auto trafficState = std::get_if<DRAMSysConfiguration::TraceGeneratorTrafficState>(&conf.states.at(state)))
+        if (auto trafficState = std::get_if<DRAMSys::Config::TraceGeneratorTrafficState>(&conf.states.at(state)))
             totalTransactions += trafficState->numRequests;
     }
 
@@ -262,14 +263,14 @@ void TrafficGenerator::transitionToNextState()
             it.second.event.notify();
     }
 
-    if (auto idleState = std::get_if<DRAMSysConfiguration::TraceGeneratorIdleState>(&conf.states.at(currentState)))
+    if (auto idleState = std::get_if<DRAMSys::Config::TraceGeneratorIdleState>(&conf.states.at(currentState)))
     {
         currentClksToIdle += idleState->idleClks;
         transitionToNextState();
         return;
     }
     else if (auto trafficState =
-                 std::get_if<DRAMSysConfiguration::TraceGeneratorTrafficState>(&conf.states.at(currentState)))
+                 std::get_if<DRAMSys::Config::TraceGeneratorTrafficState>(&conf.states.at(currentState)))
     {
         uint64_t minAddress = evaluateMinAddress(*trafficState);
         uint64_t maxAddress = evaluateMaxAddress(*trafficState, simMemSizeInBytes);
@@ -293,7 +294,7 @@ void TrafficGenerator::prepareNextPayload()
         wait(*startEvent);
 
     if (auto trafficState =
-            std::get_if<DRAMSysConfiguration::TraceGeneratorTrafficState>(&conf.states.at(currentState)))
+            std::get_if<DRAMSys::Config::TraceGeneratorTrafficState>(&conf.states.at(currentState)))
     {
         if (transactionsSentInCurrentState >= trafficState->numRequests)
             transitionToNextState();
@@ -302,7 +303,7 @@ void TrafficGenerator::prepareNextPayload()
     // In case we are in an idle state right at the beginning of the simulation,
     // set the clksToIdle and transition to the next state.
     if (auto idleState =
-        std::get_if<DRAMSysConfiguration::TraceGeneratorIdleState>(&conf.states.at(currentState)))
+        std::get_if<DRAMSys::Config::TraceGeneratorIdleState>(&conf.states.at(currentState)))
     {
         currentClksToIdle = idleState->idleClks;
         transitionToNextState();
@@ -320,7 +321,7 @@ void TrafficGenerator::payloadSent()
 tlm::tlm_command TrafficGenerator::getNextCommand()
 {
     // An idle state should never reach this method.
-    auto &state = std::get<DRAMSysConfiguration::TraceGeneratorTrafficState>(conf.states.at(currentState));
+    auto &state = std::get<DRAMSys::Config::TraceGeneratorTrafficState>(conf.states.at(currentState));
 
     tlm_command command;
     if (randomDistribution(randomGenerator) < state.rwRatio)
@@ -338,10 +339,10 @@ sc_core::sc_time TrafficGenerator::getGeneratorClk() const
 
 uint64_t TrafficGenerator::getNextAddress()
 {
-    using DRAMSysConfiguration::AddressDistribution;
+    using DRAMSys::Config::AddressDistribution;
 
     // An idle state should never reach this method.
-    auto &state = std::get<DRAMSysConfiguration::TraceGeneratorTrafficState>(conf.states.at(currentState));
+    auto &state = std::get<DRAMSys::Config::TraceGeneratorTrafficState>(conf.states.at(currentState));
 
     uint64_t minAddress = evaluateMinAddress(state);
     uint64_t maxAddress = evaluateMaxAddress(state, simMemSizeInBytes);
@@ -366,19 +367,19 @@ uint64_t TrafficGenerator::getNextAddress()
     }
 }
 
-uint64_t TrafficGenerator::evaluateMinAddress(const DRAMSysConfiguration::TraceGeneratorTrafficState &state)
+uint64_t TrafficGenerator::evaluateMinAddress(const DRAMSys::Config::TraceGeneratorTrafficState &state)
 {
     return state.minAddress.value_or(0x00);
 }
 
-uint64_t TrafficGenerator::evaluateMaxAddress(const DRAMSysConfiguration::TraceGeneratorTrafficState &state,
+uint64_t TrafficGenerator::evaluateMaxAddress(const DRAMSys::Config::TraceGeneratorTrafficState &state,
                                               uint64_t simMemSizeInBytes)
 {
     return state.maxAddress.value_or(simMemSizeInBytes - 1);
 }
 
 TrafficGeneratorHammer::TrafficGeneratorHammer(const sc_core::sc_module_name &name, const Configuration& config,
-                                               const DRAMSysConfiguration::TraceHammer &conf, TraceSetup& setup)
+                                               const DRAMSys::Config::TraceHammer &conf, TraceSetup& setup)
     : TrafficGeneratorIf(name, config, setup, 1, 1, config.memSpec->defaultBytesPerBurst),
       generatorClk(evaluateGeneratorClk(conf)), rowIncrement(conf.rowIncrement), numRequests(conf.numRequests)
 {
diff --git a/DRAMSys/simulator/TrafficGenerator.h b/src/simulator/simulator/TrafficGenerator.h
similarity index 91%
rename from DRAMSys/simulator/TrafficGenerator.h
rename to src/simulator/simulator/TrafficGenerator.h
index b5025d8c..7732fa9d 100644
--- a/DRAMSys/simulator/TrafficGenerator.h
+++ b/src/simulator/simulator/TrafficGenerator.h
@@ -39,8 +39,8 @@
 #ifndef TRAFFICGENERATOR_H
 #define TRAFFICGENERATOR_H
 
-#include "TrafficInitiator.h"
-#include "TraceSetup.h"
+#include "simulator/TrafficInitiator.h"
+#include "simulator/TraceSetup.h"
 
 #include <cstdint>
 #include <map>
@@ -68,7 +68,7 @@ class TrafficGenerator : public TrafficGeneratorIf
 {
 public:
     TrafficGenerator(const sc_core::sc_module_name &name, const Configuration& config,
-                     const DRAMSysConfiguration::TraceGenerator &conf, TraceSetup& setup);
+                     const DRAMSys::Config::TraceGenerator &conf, TraceSetup& setup);
 
     uint64_t getTotalTransactions() const;
     void waitUntil(const sc_core::sc_event *ev);
@@ -76,8 +76,8 @@ public:
     const sc_core::sc_event &getStateTransitionEvent(const std::string &eventName) const;
 
 private:
-    static uint64_t evaluateMinAddress(const DRAMSysConfiguration::TraceGeneratorTrafficState& state);
-    static uint64_t evaluateMaxAddress(const DRAMSysConfiguration::TraceGeneratorTrafficState& state,
+    static uint64_t evaluateMinAddress(const DRAMSys::Config::TraceGeneratorTrafficState& state);
+    static uint64_t evaluateMaxAddress(const DRAMSys::Config::TraceGeneratorTrafficState& state,
                                        uint64_t simMemSizeInBytes);
 
     void prepareNextPayload() override;
@@ -93,7 +93,7 @@ private:
 
     sc_core::sc_time generatorClk;
 
-    const DRAMSysConfiguration::TraceGenerator &conf;
+    const DRAMSys::Config::TraceGenerator &conf;
     unsigned int currentState = 0;
     uint64_t currentAddress = 0x00;
     uint64_t currentClksPerRequest = 1;
@@ -133,7 +133,7 @@ class TrafficGeneratorHammer final : public TrafficGeneratorIf
 {
 public:
     TrafficGeneratorHammer(const sc_core::sc_module_name &name, const Configuration& config,
-                           const DRAMSysConfiguration::TraceHammer &conf, TraceSetup& setup);
+                           const DRAMSys::Config::TraceHammer &conf, TraceSetup& setup);
 
 private:
     void prepareNextPayload() override;
diff --git a/DRAMSys/simulator/TrafficInitiator.cpp b/src/simulator/simulator/TrafficInitiator.cpp
similarity index 98%
rename from DRAMSys/simulator/TrafficInitiator.cpp
rename to src/simulator/simulator/TrafficInitiator.cpp
index 5155d7b1..70c4eeae 100644
--- a/DRAMSys/simulator/TrafficInitiator.cpp
+++ b/src/simulator/simulator/TrafficInitiator.cpp
@@ -38,7 +38,6 @@
  */
 
 #include "TrafficInitiator.h"
-#include "TraceSetup.h"
 
 using namespace sc_core;
 using namespace tlm;
@@ -130,7 +129,7 @@ bool TrafficInitiator::nextPayloadSendable() const
         return true;
 }
 
-sc_core::sc_time TrafficInitiator::evaluateGeneratorClk(const DRAMSysConfiguration::TrafficInitiator &conf)
+sc_core::sc_time TrafficInitiator::evaluateGeneratorClk(const DRAMSys::Config::TrafficInitiator& conf)
 {
     double frequencyMHz = conf.clkMhz;
     sc_time playerClk = sc_time(1.0 / frequencyMHz, SC_US);
diff --git a/DRAMSys/simulator/TrafficInitiator.h b/src/simulator/simulator/TrafficInitiator.h
similarity index 94%
rename from DRAMSys/simulator/TrafficInitiator.h
rename to src/simulator/simulator/TrafficInitiator.h
index 4464e423..ad3b00ca 100644
--- a/DRAMSys/simulator/TrafficInitiator.h
+++ b/src/simulator/simulator/TrafficInitiator.h
@@ -40,17 +40,18 @@
 #ifndef TRAFFICINITIATOR_H
 #define TRAFFICINITIATOR_H
 
+#include "simulator/TraceSetup.h"
+
+#include "DRAMSys/configuration/Configuration.h"
+#include "DRAMSys/common/DebugManager.h"
+
 #include <deque>
 #include <iostream>
 #include <string>
-
 #include <tlm>
 #include <systemc>
 #include <tlm_utils/simple_initiator_socket.h>
 #include <tlm_utils/peq_with_cb_and_phase.h>
-#include "configuration/Configuration.h"
-#include "common/DebugManager.h"
-#include "TraceSetup.h"
 
 class TrafficInitiator : public sc_core::sc_module
 {
@@ -62,7 +63,7 @@ public:
     virtual void sendNextPayload() = 0;
 
 protected:
-    static sc_core::sc_time evaluateGeneratorClk(const DRAMSysConfiguration::TrafficInitiator &conf);
+    static sc_core::sc_time evaluateGeneratorClk(const DRAMSys::Config::TrafficInitiator &conf);
 
     tlm_utils::peq_with_cb_and_phase<TrafficInitiator> payloadEventQueue;
     void terminate();
diff --git a/DRAMSys/simulator/main.cpp b/src/simulator/simulator/main.cpp
similarity index 79%
rename from DRAMSys/simulator/main.cpp
rename to src/simulator/simulator/main.cpp
index 9fc7d586..3f04a683 100644
--- a/DRAMSys/simulator/main.cpp
+++ b/src/simulator/simulator/main.cpp
@@ -37,25 +37,20 @@
  *    Derek Christ
  */
 
+#include "simulator/TraceSetup.h"
+#include "simulator/TrafficInitiator.h"
+
+#include "DRAMSys/simulation/DRAMSys.h"
+#include "DRAMSys/simulation/DRAMSysRecordable.h"
+#include "DRAMSys/config/DRAMSysConfiguration.h"
+
 #include <iostream>
 #include <memory>
 #include <string>
-#include <utility>
 #include <vector>
-#include <list>
 #include <chrono>
-#include <DRAMSysConfiguration.h>
-#include <memory>
 #include <systemc>
 
-#include "simulation/DRAMSys.h"
-#include "TraceSetup.h"
-#include "TrafficInitiator.h"
-
-#ifdef RECORDING
-#include "simulation/DRAMSysRecordable.h"
-#endif
-
 using namespace sc_core;
 
 std::string pathOfFile(const std::string &file)
@@ -79,18 +74,18 @@ int sc_main(int argc, char **argv)
     {
         // Get path of resources:
         resources = pathOfFile(argv[0])
-                    + std::string("/../../DRAMSys/library/resources/");
-        simulationJson = resources + "simulations/ddr5-example.json";
+                    + std::string("/../../configs/");
+        simulationJson = resources + "ddr4-example.json";
     }
     // Run with specific config but default resource folders:
     else if (argc == 2)
     {
         // Get path of resources:
         resources = pathOfFile(argv[0])
-                    + std::string("/../../DRAMSys/library/resources/");
+                    + std::string("/../../configs/");
         simulationJson = argv[1];
     }
-    // Run with spefific config and specific resource folder:
+    // Run with specific config and specific resource folder:
     else if (argc == 3)
     {
         simulationJson = argv[1];
@@ -99,20 +94,18 @@ int sc_main(int argc, char **argv)
 
     std::vector<std::unique_ptr<TrafficInitiator>> players;
 
-    DRAMSysConfiguration::Configuration configLib = DRAMSysConfiguration::from_path(simulationJson, resources);
+    DRAMSys::Config::Configuration configLib = DRAMSys::Config::from_path(simulationJson, resources);
 
     // Instantiate DRAMSys:
-    std::unique_ptr<DRAMSys> dramSys;
+    std::unique_ptr<DRAMSys::DRAMSys> dramSys;
 
-#ifdef RECORDING
     if (configLib.simConfig.databaseRecording.value_or(false))
-        dramSys = std::make_unique<DRAMSysRecordable>("DRAMSys", configLib);
+        dramSys = std::make_unique<DRAMSys::DRAMSysRecordable>("DRAMSys", configLib);
     else
-#endif
-        dramSys = std::make_unique<DRAMSys>("DRAMSys", configLib);
+        dramSys = std::make_unique<DRAMSys::DRAMSys>("DRAMSys", configLib);
 
     if (!configLib.traceSetup.has_value())
-        SC_REPORT_FATAL("sc_main", "No tracesetup section provided.");
+        SC_REPORT_FATAL("sc_main", "No trace setup section provided.");
 
     // Instantiate STL Players:
     TraceSetup setup(dramSys->getConfig(), configLib.traceSetup.value(), resources, players);
@@ -121,7 +114,7 @@ int sc_main(int argc, char **argv)
     for (auto& player : players)
             player->iSocket.bind(dramSys->tSocket);
 
-    // Store the starting of the simulation in wallclock time:
+    // Store the starting of the simulation in wall-clock time:
     auto start = std::chrono::high_resolution_clock::now();
 
     // Start SystemC Simulation:
diff --git a/DRAMSys/CMakeLists.txt b/src/util/CMakeLists.txt
similarity index 55%
rename from DRAMSys/CMakeLists.txt
rename to src/util/CMakeLists.txt
index e3d7f388..fe75bfc4 100644
--- a/DRAMSys/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Technische Universität Kaiserslautern
+# Copyright (c) 2021, Technische Universität Kaiserslautern
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,45 +28,35 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors: 
-#    Matthias Jung
-#    Lukas Steiner
+# Authors:
+#   Derek Christ
+#   Thomas Psota
 
-cmake_minimum_required(VERSION 3.10)
+########################################
+###           DRAMSys::util          ###
+########################################
 
-# Project Name:
-project(DRAMSys)
+project(DRAMSys_Util)
 
-option(DRAMSYS_COVERAGE_CHECK "Coverage check of DRAMSys")
-option(DRAMSYS_WITH_GEM5 "Build DRAMSys with gem5 coupling")
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
 
-# Configuration:
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Version")
-set(DCMAKE_SH "CMAKE_SH-NOTFOUND" CACHE STRING "Ignore sh.exe error on Windows")
+add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
 
-if(DRAMSYS_COVERAGE_CHECK)
-    message("== Coverage check enabled")
-    set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
-    set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-endif()
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-# Add DRAMSysLibrary:
-add_subdirectory(library)
+target_link_libraries(${PROJECT_NAME} 
+	PUBLIC 
+		nlohmann_json::nlohmann_json
+)
 
-# Add TraceAnalyzer:
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/traceAnalyzer)
-    message("== Trace Analyzer included")
-    add_subdirectory(traceAnalyzer)
-endif()
+target_compile_definitions(${PROJECT_NAME} 
+	PUBLIC 
+		DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
+)
 
-# Add DRAMSysSimulator:
-add_subdirectory(simulator)
+add_library(DRAMSys::util ALIAS ${PROJECT_NAME})
 
-# Add DRAMSysgem5
-if(DEFINED ENV{GEM5} AND DRAMSYS_WITH_GEM5)
-    message("== gem5 coupling included")
-    add_subdirectory(gem5)
-endif()
 
+build_source_group()
+diagnostics_print(${PROJECT_NAME})
diff --git a/DRAMSys/library/src/error/ECC/Bit.cpp b/src/util/DRAMSys/util/json.h
similarity index 68%
rename from DRAMSys/library/src/error/ECC/Bit.cpp
rename to src/util/DRAMSys/util/json.h
index ee012016..f184f8a1 100644
--- a/DRAMSys/library/src/error/ECC/Bit.cpp
+++ b/src/util/DRAMSys/util/json.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Technische Universität Kaiserslautern
+ * Copyright (c) 2021, Technische Universität Kaiserslautern
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,31 +30,42 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Authors:
- *    Johannes Feldmann
- *    Eder F. Zulian
+ *    Thomas Psota
  */
 
-#include "Bit.h"
 
-#include <iostream>
+#ifndef DRAMSYS_UTIL_JSON_H
+#define DRAMSYS_UTIL_JSON_H
 
-using std::cout;
+#include "nlohmann/json.hpp"
 
-CBit::CBit(VALUE nVal)
-{
-    m_nValue = nVal;
-}
+#include <optional>
 
+using json_t = nlohmann::json;
 
-CBit::~CBit()
-{
-}
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-void CBit::Print()
-{
-    if (m_nValue == ZERO) {
-        cout << "0";
-    } else {
-        cout << "1";
+template <typename T>
+struct adl_serializer<std::optional<T>> {
+    static void to_json(json_t& j, const std::optional<T>& opt) {
+        if (opt == std::nullopt) {
+            j = nullptr;
+        }
+        else {
+            j = *opt;
+        }
     }
-}
+
+    static void from_json(const json_t& j, std::optional<T>& opt) {
+        if (j.is_null()) {
+            opt = std::nullopt;
+        }
+        else {
+            opt = j.get<T>();
+        }
+    }
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif
\ No newline at end of file
diff --git a/DRAMSys/unitTests/main.cpp b/src/util/DRAMSys/util/util.cpp
similarity index 86%
rename from DRAMSys/unitTests/main.cpp
rename to src/util/DRAMSys/util/util.cpp
index 42f2dbbe..6e5d80ea 100644
--- a/DRAMSys/unitTests/main.cpp
+++ b/src/util/DRAMSys/util/util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Technische Universität Kaiserslautern
+ * Copyright (c) 2021, Technische Universität Kaiserslautern
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,15 +30,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Authors:
- *    Lukas Steiner
+ *    Thomas Psota
  */
 
-#include <gtest/gtest.h>
-#include <systemc>
-#include "Testfile.h"
+#include "util.h"
+
+namespace DRAMSys::util {
 
-int sc_main(int argc, char **argv)
-{
-    testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
 }
diff --git a/DRAMSys/unitTests/Testfile.h b/src/util/DRAMSys/util/util.h
similarity index 85%
rename from DRAMSys/unitTests/Testfile.h
rename to src/util/DRAMSys/util/util.h
index 3770a7e0..45d46ea0 100644
--- a/DRAMSys/unitTests/Testfile.h
+++ b/src/util/DRAMSys/util/util.h
@@ -1,42 +1,43 @@
-/*
- * Copyright (c) 2019, Technische Universität Kaiserslautern
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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.
- *
- * Authors:
- *    Lukas Steiner
- */
-
-#include <gtest/gtest.h>
-#include "../library/src/controller/Command.h"
-
-TEST(testsuite, test)
-{
-    EXPECT_EQ(commandToString(Command::ACT), "ACT");
-}
+/*
+ * Copyright (c) 2021, Technische Universität Kaiserslautern
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * 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.
+ *
+ * Authors:
+ *    Thomas Psota
+ */
+
+#ifndef DRAMSYS_UTIL_UTIL_H
+#define DRAMSYS_UTIL_UTIL_H
+
+namespace DRAMSys::util { 
+
+}
+
+#endif 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 00000000..b9cf95c9
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DRAMSYS_TEST_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
+
+add_subdirectory(tests_util)
+add_subdirectory(tests_dramsys)
\ No newline at end of file
diff --git a/tests/tests_configuration/CMakeLists.txt b/tests/tests_configuration/CMakeLists.txt
new file mode 100644
index 00000000..e1eee0f6
--- /dev/null
+++ b/tests/tests_configuration/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_executable(simpletest "${CMAKE_CURRENT_LIST_DIR}/simpletest.cpp")
+target_link_libraries(simpletest PRIVATE DRAMSys::config)
+set_target_properties(simpletest PROPERTIES FOLDER tests/configuration)
+
+
+add_executable(converter "${CMAKE_CURRENT_LIST_DIR}/converter.cpp")
+target_link_libraries(converter PRIVATE DRAMSys::config)
+set_target_properties(converter PROPERTIES FOLDER tests/configuration)
diff --git a/DRAMSys/library/src/common/configuration/tests/converter.cpp b/tests/tests_configuration/converter.cpp
similarity index 94%
rename from DRAMSys/library/src/common/configuration/tests/converter.cpp
rename to tests/tests_configuration/converter.cpp
index 647e3f5c..c7f4845d 100644
--- a/DRAMSys/library/src/common/configuration/tests/converter.cpp
+++ b/tests/tests_configuration/converter.cpp
@@ -36,7 +36,8 @@
 #include <nlohmann/json.hpp>
 #include <fstream>
 #include <iostream>
-#include <DRAMSysConfiguration.h>
+
+#include <DRAMSys/config/DRAMSysConfiguration.h>
 
 int main(int argc, char **argv)
 {
@@ -47,7 +48,7 @@ int main(int argc, char **argv)
     }
 
     std::string pathToJson = argv[1];
-    auto configuration = DRAMSysConfiguration::from_path(pathToJson);
+    auto configuration = DRAMSys::Config::from_path(pathToJson);
     nlohmann::json json;
     json["simulation"] = configuration;
 
diff --git a/tests/tests_configuration/simpletest.cpp b/tests/tests_configuration/simpletest.cpp
new file mode 100644
index 00000000..c4267240
--- /dev/null
+++ b/tests/tests_configuration/simpletest.cpp
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2021, Technische Universität Kaiserslautern
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * 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.
+ *
+ * Authors:
+ *    Derek Christ
+ */
+
+#include <DRAMSys/config/DRAMSysConfiguration.h>
+
+#include <DRAMSys/util/json.h>
+
+#include <fstream>
+#include <iostream>
+
+using namespace DRAMSys::Config;
+
+DRAMSys::Config::AddressMapping getAddressMapping()
+{
+    return DRAMSys::Config::AddressMapping{
+        {{0, 1}},
+        {{2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}},
+        {{16}},
+        {{13, 14, 15}},
+        {{17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}},
+        {{33}},
+        {{}},
+        {{}}
+    };
+}
+
+DRAMSys::Config::McConfig getMcConfig()
+{
+    return McConfig{
+        PagePolicy::Open,
+        Scheduler::FrFcfs,
+        0,
+        0,
+        SchedulerBuffer::Bankwise,
+        8,
+        CmdMux::Oldest,
+        RespQueue::Fifo,
+        RefreshPolicy::AllBank,
+        0,
+        0,
+        PowerDownPolicy::NoPowerDown,
+        Arbiter::Simple,
+        128,
+        {}
+    };
+}
+
+DRAMSys::Config::SimConfig getSimConfig()
+{
+    return DRAMSys::Config::SimConfig{
+        0,   false, true,     false, false, {"error.csv"},
+        42,  false, {"ddr5"}, true,  DRAMSys::Config::StoreMode::NoStorage,        false, false,
+        1000};
+}
+
+DRAMSys::Config::ThermalConfig getThermalConfig()
+{
+    std::vector<DRAMSys::Config::DramDieChannel> channels {
+        {"dram_die_channel0", 0.0, 1.0}, 
+        {"dram_die_channel1", 0.0, 1.0}, 
+        {"dram_die_channel2", 0.0, 1.0}, 
+        {"dram_die_channel3", 0.0, 1.0}
+    };
+
+    return DRAMSys::Config::ThermalConfig{
+        DRAMSys::Config::TemperatureScale::Celsius,
+        89,
+        100,
+        DRAMSys::Config::ThermalSimUnit::Microseconds,
+        DRAMSys::Config::PowerInfo{channels},
+        "127.0.0.1",
+        118800,
+        10,
+        5,
+        true,
+        true};
+}
+
+DRAMSys::Config::TracePlayer getTracePlayer()
+{
+    DRAMSys::Config::TracePlayer player;
+    player.clkMhz = 100;
+    player.name = "mytrace.stl";
+
+    return player;
+}
+
+DRAMSys::Config::TraceGenerator getTraceGeneratorOneState()
+{
+    DRAMSys::Config::TraceGenerator gen;
+    gen.clkMhz = 100;
+    gen.name = "MyTestGen";
+
+    DRAMSys::Config::TraceGeneratorTrafficState state0;
+    state0.numRequests = 1000;
+    state0.rwRatio = 0.5;
+    state0.addressDistribution = DRAMSys::Config::AddressDistribution::Random;
+    state0.addressIncrement = {};
+    state0.minAddress = {};
+    state0.maxAddress = {};
+    state0.clksPerRequest = {};
+
+    gen.states.emplace(0, state0);
+
+    return gen;
+}
+
+DRAMSys::Config::TraceGenerator getTraceGeneratorMultipleStates()
+{
+    DRAMSys::Config::TraceGenerator gen;
+
+    gen.clkMhz = 100;
+    gen.name = "MyTestGen";
+    gen.maxPendingReadRequests = 8;
+
+    DRAMSys::Config::TraceGeneratorTrafficState state0;
+    state0.numRequests = 1000;
+    state0.rwRatio = 0.5;
+    state0.addressDistribution = DRAMSys::Config::AddressDistribution::Sequential;
+    state0.addressIncrement = 256;
+    state0.minAddress = {};
+    state0.maxAddress = 1024;
+    state0.clksPerRequest = {};
+
+    DRAMSys::Config::TraceGeneratorTrafficState state1;
+    state1.numRequests = 100;
+    state1.rwRatio = 0.75;
+    state1.addressDistribution = DRAMSys::Config::AddressDistribution::Sequential;
+    state1.addressIncrement = 512;
+    state1.minAddress = 1024;
+    state1.maxAddress = 2048;
+    state1.clksPerRequest = {};
+
+    gen.states.emplace(0, state0);
+    gen.states.emplace(1, state1);
+
+    DRAMSys::Config::TraceGeneratorStateTransition transistion0{1, 1.0};
+
+    gen.transitions.emplace(0, transistion0);
+
+    return gen;
+}
+
+DRAMSys::Config::TraceHammer getTraceHammer()
+{
+    DRAMSys::Config::TraceHammer hammer;
+
+    hammer.clkMhz = 100;
+    hammer.name = "MyTestHammer";
+    hammer.numRequests = 4000;
+    hammer.rowIncrement = 2097152;
+
+    return hammer;
+}
+
+DRAMSys::Config::TraceSetup getTraceSetup()
+{
+    using namespace DRAMSys::Config;
+
+    std::vector<std::variant<TracePlayer, TraceGenerator, TraceHammer>> initiators;
+    initiators.emplace_back(getTracePlayer());
+    initiators.emplace_back(getTraceGeneratorOneState());
+    initiators.emplace_back(getTraceGeneratorMultipleStates());
+    initiators.emplace_back(getTraceHammer());
+
+    return DRAMSys::Config::TraceSetup{initiators};
+}
+
+DRAMSys::Config::Configuration getConfig(const DRAMSys::Config::MemSpec &memSpec)
+{
+    return DRAMSys::Config::Configuration{
+        getAddressMapping(),
+        getMcConfig(),
+        memSpec,
+        getSimConfig(),
+        "std::string_simulationId",
+        getThermalConfig(),
+        // {{}, false}, works too
+        getTraceSetup(),
+    };
+}
+
+int main()
+{
+    DRAMSys::Config::Configuration conf = DRAMSys::Config::from_path("ddr5.json");
+    std::ofstream fileout("myjson.json");
+    json_t j_my;
+    j_my["simulation"] = getConfig(conf.memSpec); // just copy memspec over
+    fileout << j_my.dump(4);
+
+    std::ifstream file2("hbm2.json");
+    json_t hbm2_j = json_t::parse(file2, nullptr, false);
+    json_t hbm2_config = hbm2_j.at("simulation");
+    DRAMSys::Config::Configuration hbm2conf = hbm2_config.get<DRAMSys::Config::Configuration>();
+    std::ofstream filehbm2("myhbm2.json");
+    json_t j_myhbm2;
+    j_myhbm2["simulation"] = hbm2conf;
+    filehbm2 << j_myhbm2.dump(4);
+
+    std::ifstream file3("myjson.json");
+    json_t ddr5_old = json_t::parse(file3, nullptr, false);
+    json_t ddr5_old_conf = ddr5_old.at("simulation");
+    DRAMSys::Config::Configuration ddr5_old_config = ddr5_old_conf.get<DRAMSys::Config::Configuration>();
+    std::ofstream fileoldout("myjson2.json");
+    json_t j_oldconfconv;
+    j_oldconfconv["simulation"] = ddr5_old_config;
+    fileoldout << j_oldconfconv.dump(4);
+}
diff --git a/tests/tests_dramsys/CMakeLists.txt b/tests/tests_dramsys/CMakeLists.txt
new file mode 100644
index 00000000..b200fcc9
--- /dev/null
+++ b/tests/tests_dramsys/CMakeLists.txt
@@ -0,0 +1,24 @@
+###############################################
+###              tests_dramsys              ###
+###############################################
+
+cmake_minimum_required(VERSION 3.1.0)
+
+project(tests_dramsys)
+
+file(GLOB_RECURSE SOURCE_FILES *.cpp)
+file(GLOB_RECURSE HEADER_FILES *.h)
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
+target_link_libraries(${PROJECT_NAME} 
+	DRAMSys::util
+	DRAMSys::libdramsys
+	gtest_main
+)
+
+gtest_discover_tests(${PROJECT_NAME})
+
+build_source_group()
\ No newline at end of file
diff --git a/tests/tests_dramsys/CommandMuxTests.cpp b/tests/tests_dramsys/CommandMuxTests.cpp
new file mode 100644
index 00000000..146cf86a
--- /dev/null
+++ b/tests/tests_dramsys/CommandMuxTests.cpp
@@ -0,0 +1,110 @@
+///*
+// * Copyright (c) 2019, Technische Universität Kaiserslautern
+// * All rights reserved.
+// *
+// * Redistribution and use in source and binary forms, with or without
+// * modification, are permitted provided that the following conditions are
+// * met:
+// *
+// * 1. Redistributions of source code must retain the above copyright notice,
+// *    this list of conditions and the following disclaimer.
+// *
+// * 2. 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.
+// *
+// * 3. Neither the name of the copyright holder nor the names of its
+// *    contributors may be used to endorse or promote products derived from
+// *    this software without specific prior written permission.
+// *
+// * 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.
+// *
+// * Authors:
+// *    Lukas Steiner
+// */
+//
+//#include <gtest/gtest.h>
+//#include <tlm.h>
+//#include <utility>
+//#include <vector>
+//
+//#include <DRAMSys/controller/cmdmux/CmdMuxOldest.h>
+//#include <DRAMSys/controller/Command.h>
+//
+//using namespace DRAMSys;
+//
+//class CommandMuxState
+//{
+//public:
+//    Command firstCommand;
+//    Command secondCommand;
+//    Command resultCommand;
+//};
+//
+//class CommandMuxTestBase : public testing::Test
+//{
+//public:
+//    CommandMux *commandMux;
+//
+//    tlm_generic_payload *firstPayload;
+//    tlm_generic_payload *secondPayload;
+//
+//    std::pair<Command, tlm_generic_payload *> firstPair;
+//    std::pair<Command, tlm_generic_payload *> secondPair;
+//
+//    std::vector<std::pair<Command, tlm_generic_payload *>> readyCommands;
+//
+//    std::pair<Command, tlm_generic_payload *> result;
+//
+//    CommandMuxTestBase()
+//    {
+//        commandMux = new CommandMux();
+//        firstPayload = new tlm_generic_payload();
+//        secondPayload = new tlm_generic_payload();
+//    }
+//
+//    ~CommandMuxTestBase()
+//    {
+//        delete commandMux;
+//        delete firstPayload;
+//        delete secondPayload;
+//    }
+//};
+//
+//class CommandMuxTestParam : public CommandMuxTestBase, public testing::WithParamInterface<CommandMuxState>
+//{
+//public:
+//    CommandMuxTestParam()
+//    {
+//        commandMux->insertPayload(firstPayload);
+//        commandMux->insertPayload(secondPayload);
+//
+//        firstPair.first = GetParam().firstCommand;
+//        firstPair.second = firstPayload;
+//        secondPair.first = GetParam().secondCommand;
+//        secondPair.second = secondPayload;
+//
+//        readyCommands.push_back(secondPair);
+//        readyCommands.push_back(firstPair);
+//        result = commandMux->selectCommand(readyCommands);
+//    }
+//};
+//
+//TEST_P(CommandMuxTestParam, satisfiesCommandOrder)
+//{
+//    EXPECT_EQ(result.first, GetParam().resultCommand);
+//}
+//
+//INSTANTIATE_TEST_CASE_P(Default, CommandMuxTestParam, testing::Values(
+//                            CommandMuxState{Command::RD, Command::WR, Command::RD},
+//                            CommandMuxState{Command::RD, Command::ACT, Command::ACT}));
diff --git a/tests/tests_dramsys/Testfile.h b/tests/tests_dramsys/Testfile.h
new file mode 100644
index 00000000..74835a7d
--- /dev/null
+++ b/tests/tests_dramsys/Testfile.h
@@ -0,0 +1,42 @@
+///*
+// * Copyright (c) 2019, Technische Universität Kaiserslautern
+// * All rights reserved.
+// *
+// * Redistribution and use in source and binary forms, with or without
+// * modification, are permitted provided that the following conditions are
+// * met:
+// *
+// * 1. Redistributions of source code must retain the above copyright notice,
+// *    this list of conditions and the following disclaimer.
+// *
+// * 2. 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.
+// *
+// * 3. Neither the name of the copyright holder nor the names of its
+// *    contributors may be used to endorse or promote products derived from
+// *    this software without specific prior written permission.
+// *
+// * 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.
+// *
+// * Authors:
+// *    Lukas Steiner
+// */
+//
+//#include <gtest/gtest.h>
+//#include "../library/src/controller/Command.h"
+//
+//TEST(testsuite, test)
+//{
+//    EXPECT_EQ(commandToString(Command::ACT), "ACT");
+//}
diff --git a/tests/tests_dramsys/test_misc.cpp b/tests/tests_dramsys/test_misc.cpp
new file mode 100644
index 00000000..5bca640d
--- /dev/null
+++ b/tests/tests_dramsys/test_misc.cpp
@@ -0,0 +1,21 @@
+#include <gtest/gtest.h>
+
+int sc_main(int argc, char** argv)
+{
+	return -1;
+};
+
+class MiscTest : public ::testing::Test {
+protected:
+	virtual void SetUp()
+	{
+	}
+
+	virtual void TearDown()
+	{
+	}
+};
+
+TEST_F(MiscTest, Test)
+{
+};
diff --git a/tests/tests_regression/DDR3/ci.yml b/tests/tests_regression/DDR3/ci.yml
new file mode 100644
index 00000000..903121f4
--- /dev/null
+++ b/tests/tests_regression/DDR3/ci.yml
@@ -0,0 +1,30 @@
+# DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp
+test_DDR3:
+    stage: test
+    needs:
+        - build
+    script:
+        - export GCOV_PREFIX=$(pwd)
+        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
+        - cd build/bin
+        - ./DRAMSys ../../tests/tests_regression/DDR3/ddr3-example.json ../../tests/tests_regression/DDR3/
+        - ls -lah
+        - ls -lah ../../tests/tests_regression/DDR3/expected/
+        - sqldiff ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb
+        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        # Run Code Coverage
+        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
+ 
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: pull
+
+    artifacts:
+        paths:
+          - build/bin/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb
+          - coverage/${CI_JOB_NAME}.out
+        expire_in: 2 days
diff --git a/tests/tests_regression/DDR3/ddr3-example.json b/tests/tests_regression/DDR3/ddr3-example.json
new file mode 100644
index 00000000..2f4f6f56
--- /dev/null
+++ b/tests/tests_regression/DDR3/ddr3-example.json
@@ -0,0 +1,148 @@
+{
+    "simulation": {
+        "addressmapping": {
+            "XOR": [
+                {
+                    "FIRST": 13,
+                    "SECOND": 16
+                }
+            ],
+            "BANK_BIT": [
+                13,
+                14,
+                15
+            ],
+            "BYTE_BIT": [
+                0,
+                1,
+                2
+            ],
+            "COLUMN_BIT": [
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12
+            ],
+            "ROW_BIT": [
+                16,
+                17,
+                18,
+                19,
+                20,
+                21,
+                22,
+                23,
+                24,
+                25,
+                26,
+                27,
+                28,
+                29
+            ],
+            "RANK_BIT": [
+                30
+            ]
+        },
+        "mcconfig": {
+            "PagePolicy": "Open",
+            "Scheduler": "FrFcfsGrp",
+            "RequestBufferSize": 8,
+            "CmdMux": "Oldest",
+            "RespQueue": "Fifo",
+            "RefreshPolicy": "Rankwise",
+            "RefreshMaxPostponed": 0,
+            "RefreshMaxPulledin": 0,
+            "PowerDownPolicy": "Staggered",
+            "PowerDownTimeout": 100
+        },
+        "memspec": {
+            "memarchitecturespec": {
+                "burstLength": 8,
+                "dataRate": 2,
+                "nbrOfBanks": 8,
+                "nbrOfColumns": 1024,
+                "nbrOfRanks": 2,
+                "nbrOfChannels": 1,
+                "nbrOfRows": 16384,
+                "width": 64,
+                "nbrOfDevices": 1
+            },
+            "memoryId": "MICRON_2GB_DDR3-1066_64bit_D_SODIMM",
+            "memoryType": "DDR3",
+            "mempowerspec": {
+                "idd0": 720.0,
+                "idd2n": 400.0,
+                "idd2p0": 80.0,
+                "idd2p1": 200.0,
+                "idd3n": 440.0,
+                "idd3p0": 240.0,
+                "idd3p1": 240.0,
+                "idd4r": 1200.0,
+                "idd4w": 1200.0,
+                "idd5": 1760.0,
+                "idd6": 48.0,
+                "vdd": 1.5
+            },
+            "memtimingspec": {
+                "AL": 0,
+                "CCD": 4,
+                "CKE": 3,
+                "CKESR": 4,
+                "CL": 7,
+                "DQSCK": 0,
+                "FAW": 20,
+                "RAS": 20,
+                "RC": 27,
+                "RCD": 7,
+                "REFI": 4160,
+                "RFC": 59,
+                "RL": 7,
+                "RP": 7,
+                "RRD": 4,
+                "RTP": 4,
+                "WL": 6,
+                "WR": 8,
+                "WTR": 4,
+                "XP": 4,
+                "XPDLL": 13,
+                "XS": 64,
+                "XSDLL": 512,
+                "ACTPDEN": 1,
+                "PRPDEN": 1,
+                "REFPDEN": 1,
+                "RTRS": 1,
+                "clkMhz": 533
+            }
+        },
+        "simconfig": {
+            "AddressOffset": 0,
+            "CheckTLM2Protocol": false,
+            "DatabaseRecording": true,
+            "Debug": false,
+            "ECCControllerMode": "Disabled",
+            "EnableWindowing": false,
+            "ErrorCSVFile": "",
+            "ErrorChipSeed": 42,
+            "PowerAnalysis": true,
+            "SimulationName": "ddr3",
+            "SimulationProgressBar": true,
+            "StoreMode": "NoStorage",
+            "ThermalSimulation": false,
+            "UseMalloc": false,
+            "WindowSize": 1000
+        },
+        "simulationid": "ddr3-dual-rank",
+        "tracesetup": [
+            {
+                "clkMhz": 533,
+                "name": "trace_test2.stl"
+            }
+        ]
+    }
+}
diff --git a/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb b/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb
new file mode 100644
index 00000000..10721241
--- /dev/null
+++ b/tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0d98d25f5d969ca88de71ed8a302ff5603ef74397659fa25559567c681340da
+size 143360
diff --git a/tests/tests_regression/DDR3/traces/trace_test2.stl b/tests/tests_regression/DDR3/traces/trace_test2.stl
new file mode 100644
index 00000000..d18c05d9
--- /dev/null
+++ b/tests/tests_regression/DDR3/traces/trace_test2.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24d4d45827a7b35debd3a2fe528f52481f6d7e365d582d65abc3827c9acd44de
+size 6486
diff --git a/tests/tests_regression/DDR4/ci.yml b/tests/tests_regression/DDR4/ci.yml
new file mode 100644
index 00000000..4d7dab12
--- /dev/null
+++ b/tests/tests_regression/DDR4/ci.yml
@@ -0,0 +1,30 @@
+# DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler:
+test_DDR4:
+    stage: test
+    needs:
+        - build
+    script:
+        - export GCOV_PREFIX=$(pwd)
+        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
+        - cd build/bin
+        - ./DRAMSys ../../tests/tests_regression/DDR4/ddr4-example.json ../../tests/tests_regression/DDR4/
+        - ls -lah
+        - ls -lah ../../tests/tests_regression/DDR4/expected/
+        - sqldiff ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb
+        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        # Run Code Coverage
+        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
+ 
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: pull
+
+    artifacts:
+        paths:
+          - build/bin/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb
+          - coverage/${CI_JOB_NAME}.out
+        expire_in: 2 days
diff --git a/tests/tests_regression/DDR4/ddr4-example.json b/tests/tests_regression/DDR4/ddr4-example.json
new file mode 100644
index 00000000..93e7a55e
--- /dev/null
+++ b/tests/tests_regression/DDR4/ddr4-example.json
@@ -0,0 +1,153 @@
+{
+    "simulation": {
+        "addressmapping": {
+            "BANKGROUP_BIT": [
+                30,
+                31
+            ],
+            "BANK_BIT": [
+                28,
+                29
+            ],
+            "BYTE_BIT": [
+                0,
+                1,
+                2
+            ],
+            "COLUMN_BIT": [
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12
+            ],
+            "ROW_BIT": [
+                13,
+                14,
+                15,
+                16,
+                17,
+                18,
+                19,
+                20,
+                21,
+                22,
+                23,
+                24,
+                25,
+                26,
+                27
+            ]
+        },
+        "mcconfig": {
+            "PagePolicy": "ClosedAdaptive",
+            "Scheduler": "FrFcfs",
+            "RequestBufferSize": 8,
+            "CmdMux": "Oldest",
+            "RespQueue": "Fifo",
+            "RefreshPolicy": "Rankwise",
+            "RefreshMaxPostponed": 8,
+            "RefreshMaxPulledin": 8,
+            "PowerDownPolicy": "NoPowerDown",
+            "PowerDownTimeout": 100
+        },
+        "memspec": {
+            "memarchitecturespec": {
+                "burstLength": 8,
+                "dataRate": 2,
+                "nbrOfBankGroups": 4,
+                "nbrOfBanks": 16,
+                "nbrOfColumns": 1024,
+                "nbrOfRanks": 1,
+                "nbrOfChannels": 1,
+                "nbrOfRows": 32768,
+                "width": 8,
+                "nbrOfDevices": 8
+            },
+            "memoryId": "MICRON_4Gb_DDR4-1866_8bit_A",
+            "memoryType": "DDR4",
+            "mempowerspec": {
+                "idd0": 56.25,
+                "idd02": 4.05,
+                "idd2n": 33.75,
+                "idd2p0": 17.0,
+                "idd2p1": 17.0,
+                "idd3n": 39.5,
+                "idd3p0": 22.5,
+                "idd3p1": 22.5,
+                "idd4r": 157.5,
+                "idd4w": 135.0,
+                "idd5": 118.0,
+                "idd6": 20.25,
+                "idd62": 2.6,
+                "vdd": 1.2,
+                "vdd2": 2.5
+            },
+            "memtimingspec": {
+                "AL": 0,
+                "CCD_L": 5,
+                "CCD_S": 4,
+                "CKE": 6,
+                "CKESR": 7,
+                "CL": 13,
+                "DQSCK": 2,
+                "FAW": 22,
+                "RAS": 32,
+                "RC": 45,
+                "RCD": 13,
+                "REFM": 1,
+                "REFI": 3644,
+                "RFC": 243,
+                "RL": 13,
+                "RPRE": 1,
+                "RP": 13,
+                "RRD_L": 5,
+                "RRD_S": 4,
+                "RTP": 8,
+                "WL": 12,
+                "WPRE": 1,
+                "WR": 14,
+                "WTR_L": 7,
+                "WTR_S": 3,
+                "XP": 8,
+                "XPDLL": 255,
+                "XS": 252,
+                "XSDLL": 512,
+                "ACTPDEN": 1,
+                "PRPDEN": 1,
+                "REFPDEN": 1,
+                "RTRS": 1,
+                "clkMhz": 933
+            }
+        },
+        "simconfig": {
+            "AddressOffset": 0,
+            "CheckTLM2Protocol": false,
+            "DatabaseRecording": true,
+            "Debug": false,
+            "ECCControllerMode": "Disabled",
+            "EnableWindowing": false,
+            "ErrorCSVFile": "",
+            "ErrorChipSeed": 42,
+            "PowerAnalysis": true,
+            "SimulationName": "ddr4",
+            "SimulationProgressBar": true,
+            "StoreMode": "NoStorage",
+            "ThermalSimulation": false,
+            "UseMalloc": false,
+            "WindowSize": 1000
+        },
+        "simulationid": "ddr4-bankgrp",
+        "tracesetup": [
+            {
+                "clkMhz": 933,
+                "name": "trace_test3.stl"
+            }
+        ]
+    }
+}
diff --git a/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb b/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb
new file mode 100644
index 00000000..95463ec1
--- /dev/null
+++ b/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa0b42d8faac2a076fbc434fdc47b5f722e6a640ee8b3ed45b8d4976c7debddd
+size 5025792
diff --git a/tests/tests_regression/DDR4/traces/trace_test3.stl b/tests/tests_regression/DDR4/traces/trace_test3.stl
new file mode 100644
index 00000000..9227758b
--- /dev/null
+++ b/tests/tests_regression/DDR4/traces/trace_test3.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4d7378afb7d050ffb7c99db95d66f2997e994ef4d41aab4e9e09fb15ff64a46
+size 433662
diff --git a/tests/tests_regression/HBM2/ci.yml b/tests/tests_regression/HBM2/ci.yml
new file mode 100644
index 00000000..8a604ca0
--- /dev/null
+++ b/tests/tests_regression/HBM2/ci.yml
@@ -0,0 +1,32 @@
+test_HBM2:
+    stage: test
+    needs:
+        - build
+    script: 
+        - export GCOV_PREFIX=$(pwd)
+        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
+        - cd build/bin
+        - ./DRAMSys ../../tests/tests_regression/HBM2/hbm2-example.json ../../tests/tests_regression/HBM2/
+        - ls -lah
+        - ls -lah ../../tests/tests_regression/HBM2/expected/
+        - sqldiff ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb
+        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - sqldiff ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb
+        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
+    cache: 
+        key: build
+        paths: 
+            - build/
+        policy: pull
+  
+    artifacts: 
+        paths: 
+            - build/bin/DRAMSys_hbm2-example_hbm2_ch0.tdb
+            - build/bin/DRAMSys_hbm2-example_hbm2_ch1.tdb
+            - coverage/${CI_JOB_NAME}.out
+        expire_in: 2 days
diff --git a/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb
new file mode 100644
index 00000000..db33da5a
--- /dev/null
+++ b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:356f3a4042e88412dd834add20f753a1b26d5743571cd799f3bd07362a4dfab4
+size 643072
diff --git a/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb
new file mode 100644
index 00000000..a9aedd34
--- /dev/null
+++ b/tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed3b44b05059fe6e8ff8006584c83f9f9f9682c8b6c30cc3ab922b70ef6b8ba5
+size 643072
diff --git a/tests/tests_regression/HBM2/hbm2-example.json b/tests/tests_regression/HBM2/hbm2-example.json
new file mode 100644
index 00000000..b17b6b48
--- /dev/null
+++ b/tests/tests_regression/HBM2/hbm2-example.json
@@ -0,0 +1,135 @@
+{
+    "simulation": {
+        "addressmapping": {
+            "CHANNEL_BIT": [
+                30
+            ],
+            "BANKGROUP_BIT": [
+                28,
+                29
+            ],
+            "BANK_BIT": [
+                26,
+                27
+            ],
+            "BYTE_BIT": [
+                0,
+                1,
+                2,
+                3
+            ],
+            "COLUMN_BIT": [
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10
+            ],
+            "ROW_BIT": [
+                11,
+                12,
+                13,
+                14,
+                15,
+                16,
+                17,
+                18,
+                19,
+                20,
+                21,
+                22,
+                23,
+                24,
+                25
+            ]
+        },
+        "mcconfig": {
+            "PagePolicy": "Closed",
+            "Scheduler": "Fifo",
+            "RequestBufferSize": 8,
+            "CmdMux": "Strict",
+            "RespQueue": "Fifo",
+            "RefreshPolicy": "NoRefresh",
+            "RefreshMaxPostponed": 0,
+            "RefreshMaxPulledin": 0,
+            "PowerDownPolicy": "NoPowerDown",
+            "PowerDownTimeout": 100
+        },
+        "memspec": {
+            "memarchitecturespec": {
+                "burstLength": 4,
+                "dataRate": 2,
+                "nbrOfBankGroups": 4,
+                "nbrOfBanks": 16,
+                "nbrOfColumns": 128,
+                "nbrOfPseudoChannels": 1,
+                "nbrOfChannels": 2,
+                "nbrOfDevices": 1,
+                "nbrOfRows": 32768,
+                "width": 128
+            },
+            "memoryId": "https://www.computerbase.de/2019-05/amd-memory-tweak-vram-oc/#bilder",
+            "memoryType": "HBM2",
+            "memtimingspec": {
+                "CCDL": 3,
+                "CCDS": 2,
+                "CKE": 8,
+                "DQSCK": 1,
+                "FAW": 16,
+                "PL": 0,
+                "RAS": 28,
+                "RC": 42,
+                "RCDRD": 12,
+                "RCDWR": 6,
+                "REFI": 3900,
+                "REFISB": 244,
+                "RFC": 220,
+                "RFCSB": 96,
+                "RL": 17,
+                "RP": 14,
+                "RRDL": 6,
+                "RRDS": 4,
+                "RREFD": 8,
+                "RTP": 5,
+                "RTW": 18,
+                "WL": 7,
+                "WR": 14,
+                "WTRL": 9,
+                "WTRS": 4,
+                "XP": 8,
+                "XS": 216,
+                "clkMhz": 1000
+            }
+        },
+        "simconfig": {
+            "AddressOffset": 0,
+            "CheckTLM2Protocol": false,
+            "DatabaseRecording": true,
+            "Debug": false,
+            "ECCControllerMode": "Disabled",
+            "EnableWindowing": false,
+            "ErrorCSVFile": "",
+            "ErrorChipSeed": 42,
+            "PowerAnalysis": false,
+            "SimulationName": "hbm2",
+            "SimulationProgressBar": true,
+            "StoreMode": "NoStorage",
+            "ThermalSimulation": false,
+            "UseMalloc": false,
+            "WindowSize": 1000
+        },
+        "simulationid": "hbm2-example",
+        "tracesetup": [
+            {
+                "clkMhz": 1000,
+                "name": "trace1_test4.stl"
+            },
+	    {
+                "clkMhz": 1000,
+                "name": "trace2_test4.stl"
+            }
+        ]
+    }
+}
diff --git a/tests/tests_regression/HBM2/traces/trace1_test4.stl b/tests/tests_regression/HBM2/traces/trace1_test4.stl
new file mode 100644
index 00000000..7a9997f6
--- /dev/null
+++ b/tests/tests_regression/HBM2/traces/trace1_test4.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71afd569906e35192e0709e3a754f68c4d51200e37ce55c6b0faff0711e6c1e4
+size 52137
diff --git a/tests/tests_regression/HBM2/traces/trace2_test4.stl b/tests/tests_regression/HBM2/traces/trace2_test4.stl
new file mode 100644
index 00000000..5a2d7ff4
--- /dev/null
+++ b/tests/tests_regression/HBM2/traces/trace2_test4.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6aafee02dedc1f89edcb335175064a9ecbcdef5eecc4c51dcd2154cfe85d6ea
+size 50089
diff --git a/tests/tests_regression/LPDDR4/ci.yml b/tests/tests_regression/LPDDR4/ci.yml
new file mode 100644
index 00000000..4c1d7261
--- /dev/null
+++ b/tests/tests_regression/LPDDR4/ci.yml
@@ -0,0 +1,30 @@
+# LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler:
+test_LPDDR4:
+    stage: test
+    needs:
+        - build
+    script:
+        - export GCOV_PREFIX=$(pwd)
+        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
+        - cd build/bin
+        - ./DRAMSys ../../tests/tests_regression/LPDDR4/lpddr4-example.json ../../tests/tests_regression/LPDDR4/
+        - ls -lah
+        - ls -lah ../../tests/tests_regression/LPDDR4/expected/
+        - sqldiff ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb
+        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
+        # Run Code Coverage
+        - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
+ 
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: pull
+
+    artifacts:
+        paths:
+          - build/bin/DRAMSys_lpddr4-example_lpddr4_ch0.tdb
+          - coverage/${CI_JOB_NAME}.out
+        expire_in: 2 days
diff --git a/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb b/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb
new file mode 100644
index 00000000..b2c11196
--- /dev/null
+++ b/tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64acfb8c773c65c91a3bcad996419de80cff7780378a663c9ead2e53da0030c2
+size 2826240
diff --git a/tests/tests_regression/LPDDR4/lpddr4-example.json b/tests/tests_regression/LPDDR4/lpddr4-example.json
new file mode 100644
index 00000000..5aa31ec2
--- /dev/null
+++ b/tests/tests_regression/LPDDR4/lpddr4-example.json
@@ -0,0 +1,129 @@
+{
+    "simulation": {
+        "addressmapping": {
+            "BANK_BIT": [
+                27,
+                28,
+                29
+            ],
+            "BYTE_BIT": [
+                0
+            ],
+            "COLUMN_BIT": [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10
+            ],
+            "ROW_BIT": [
+                11,
+                12,
+                13,
+                14,
+                15,
+                16,
+                17,
+                18,
+                19,
+                20,
+                21,
+                22,
+                23,
+                24,
+                25,
+                26
+            ]
+        },
+        "mcconfig": {
+            "PagePolicy": "OpenAdaptive",
+            "Scheduler": "Fifo",
+            "RequestBufferSize": 8,
+            "CmdMux": "Oldest",
+            "RespQueue": "Fifo",
+            "RefreshPolicy": "Bankwise",
+            "RefreshMaxPostponed": 8,
+            "RefreshMaxPulledin": 8,
+            "PowerDownPolicy": "NoPowerDown",
+            "PowerDownTimeout": 100
+        },
+        "memspec": {
+            "memarchitecturespec": {
+                "burstLength": 16,
+                "dataRate": 2,
+                "nbrOfBanks": 8,
+                "nbrOfColumns": 1024,
+                "nbrOfRanks": 1,
+                "nbrOfChannels": 1,
+                "nbrOfDevices": 1,
+                "nbrOfRows": 65536,
+                "width": 16
+            },
+            "memoryId": "JEDEC_8Gb_LPDDR4-3200_16bit",
+            "memoryType": "LPDDR4",
+            "memtimingspec": {
+                "CCD": 8,
+                "CKE": 12,
+                "CMDCKE": 3,
+                "DQS2DQ": 2,
+                "DQSCK": 6,
+                "DQSS": 1,
+                "ESCKE": 3,
+                "FAW": 64,
+                "PPD": 4,
+                "RAS": 68,
+                "RCD": 29,
+                "REFI": 6246,
+                "REFIPB": 780,
+                "RFCAB": 448,
+                "RFCPB": 224,
+                "RL": 28,
+                "RPAB": 34,
+                "RPPB": 29,
+                "RCAB": 102,
+                "RCPB": 97,
+                "RPST": 0,
+                "RRD": 16,
+                "RTP": 12,
+                "SR": 24,
+                "WL": 14,
+                "WPRE": 2,
+                "WR": 29,
+                "WTR": 16,
+                "XP": 12,
+                "XSR": 460,
+                "RTRS": 1,
+                "clkMhz": 1600
+            }
+        },
+        "simconfig": {
+            "AddressOffset": 0,
+            "CheckTLM2Protocol": false,
+            "DatabaseRecording": true,
+            "Debug": false,
+            "ECCControllerMode": "Disabled",
+            "EnableWindowing": false,
+            "ErrorCSVFile": "",
+            "ErrorChipSeed": 42,
+            "PowerAnalysis": false,
+            "SimulationName": "lpddr4",
+            "SimulationProgressBar": true,
+            "StoreMode": "NoStorage",
+            "ThermalSimulation": false,
+            "UseMalloc": false,
+            "WindowSize": 1000
+        },
+        "simulationid": "lpddr4-example",
+        "tracesetup": [
+            {
+                "clkMhz": 1600,
+                "name": "trace_lpddr4.stl"
+            }
+        ]
+    }
+}
diff --git a/tests/tests_regression/LPDDR4/traces/trace_lpddr4.stl b/tests/tests_regression/LPDDR4/traces/trace_lpddr4.stl
new file mode 100644
index 00000000..1b3f9958
--- /dev/null
+++ b/tests/tests_regression/LPDDR4/traces/trace_lpddr4.stl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69b0d83057ff4da0f60f8f66e2f253c94f6744efcd71ece8ee2e1eaa5111c634
+size 254470
diff --git a/DRAMSys/tests/dramsys-gem5/ci.yml b/tests/tests_regression/dramsys-gem5/ci.yml
similarity index 100%
rename from DRAMSys/tests/dramsys-gem5/ci.yml
rename to tests/tests_regression/dramsys-gem5/ci.yml
diff --git a/tests/tests_util/CMakeLists.txt b/tests/tests_util/CMakeLists.txt
new file mode 100644
index 00000000..24ec5e66
--- /dev/null
+++ b/tests/tests_util/CMakeLists.txt
@@ -0,0 +1,23 @@
+###############################################
+###              tests_util                 ###
+###############################################
+
+cmake_minimum_required(VERSION 3.1.0)
+
+project(tests_util)
+
+file(GLOB_RECURSE SOURCE_FILES *.cpp)
+file(GLOB_RECURSE HEADER_FILES *.h)
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
+target_link_libraries(${PROJECT_NAME} 
+	DRAMSys::util
+	gtest_main
+)
+
+gtest_discover_tests(${PROJECT_NAME})
+
+build_source_group()
\ No newline at end of file
diff --git a/tests/tests_util/test_json.cpp b/tests/tests_util/test_json.cpp
new file mode 100644
index 00000000..0e3d472a
--- /dev/null
+++ b/tests/tests_util/test_json.cpp
@@ -0,0 +1,38 @@
+#include <gtest/gtest.h>
+
+#include <DRAMSys/util/json.h>
+
+class JsonTest : public ::testing::Test {
+protected:
+	virtual void SetUp()
+	{
+	}
+
+	virtual void TearDown()
+	{
+	}
+};
+
+TEST_F(JsonTest, Test)
+{
+	auto in = json_t::parse(R"( 
+	{ 
+		"test": 5,
+		"null": null
+	} 
+)");
+
+	std::optional<int> opt_in;
+	std::optional<int> opt_null;
+	std::optional<int> opt_nil;
+
+	in["test"].get_to(opt_in);
+	in["null"].get_to(opt_null);
+	in["nil"].get_to(opt_nil);
+	
+	ASSERT_TRUE(opt_in.has_value());
+	ASSERT_EQ(*opt_in, 5);
+	
+	ASSERT_FALSE(opt_null.has_value());
+	ASSERT_FALSE(opt_nil.has_value());
+};