From 7c6d5ec9ca17988a0cdceb7ec7be920bc94700d2 Mon Sep 17 00:00:00 2001
From: BartolomeyKant <notevill@gmail.com>
Date: Thu, 18 Jun 2026 17:38:18 +0500
Subject: [PATCH 1/2] remove date and use new aether-miscpp lib

---
 CMakeLists.txt                                |  15 +-
 aether/actions/actions_queue.h                |   2 +-
 aether/actions/repeatable_task.h              |   4 +-
 .../check_access_for_send_message.h           |   2 +-
 aether/ae_actions/get_servers.h               |   2 +-
 aether/ae_actions/select_client.h             |   2 +-
 aether/ae_actions/telemetry.cpp               |   2 +-
 aether/ae_actions/time_sync.cpp               |   2 +-
 aether/aether_app.h                           |   2 +-
 aether/all.h                                  |   4 +-
 aether/api_protocol/api_class_impl.h          |   2 +-
 aether/api_protocol/api_promise.h             |   2 +-
 aether/api_protocol/protocol_context.h        |   2 +-
 aether/api_protocol/request_id.h              |   2 +-
 aether/api_protocol/sub_api.h                 |   8 +-
 aether/channels/channels_types.h              |   2 +-
 aether/cloud_connections/cloud_callbacks.h    |   2 +-
 aether/cloud_connections/cloud_request.cpp    |   2 +-
 .../connection_manager/client_cloud_manager.h |   2 +-
 aether/crc.h                                  | 216 --------
 aether/crypto/crypto_nonce.h                  |   2 +-
 aether/crypto/key.h                           |   2 +-
 aether/crypto/sign.h                          |   2 +-
 aether/crypto/signed_key.h                    |   2 +-
 aether/dns/dns_c_ares.cpp                     |   7 +-
 .../registrar_domain_storage.cpp              |   2 +-
 .../domain_storage/spifs_domain_storage.cpp   |   2 +-
 aether/events/event_handler.h                 |   2 +-
 aether/events/event_list.h                    |   2 +-
 aether/events/events.h                        |   2 +-
 aether/executors/any_waiter.h                 |   4 +-
 aether/executors/async_waiter.h               |   4 +-
 aether/executors/for_range.h                  |   2 +-
 aether/executors/sync_waiter.h                |   2 +-
 aether/executors/waiter_traits.h              |   4 +-
 aether/format/default_formatters.h            | 177 -------
 aether/format/format.h                        |  27 -
 aether/format/format_impl.h                   | 251 ----------
 aether/format/format_time.h                   |  63 ---
 aether/format/formatter.h                     |  45 --
 aether/gateway_api/server_endpoints.h         |   4 +-
 aether/lora_modules/dx_smart_lr02_lm.cpp      |   4 +-
 aether/lora_modules/ebyte_e22_lm.cpp          |   4 +-
 .../lora_modules/lora_module_driver_types.h   |   2 +-
 aether/meta/arg_at.h                          |  98 ----
 aether/meta/as_type.h                         |  70 ---
 aether/meta/function_signature.h              |  54 --
 aether/meta/ignore_t.h                        |  41 --
 aether/meta/index_sequence.h                  |  80 ---
 aether/meta/tag_invoke.h                      | 138 ------
 aether/meta/time_traits.h                     |  41 --
 aether/meta/type_list.h                       | 147 ------
 aether/misc/defer.h                           |  69 ---
 aether/misc/from_chars.h                      |  41 --
 aether/misc/override.h                        |  37 --
 aether/modems/bg95_at_modem.cpp               |   4 +-
 aether/modems/imodem_driver.h                 |   4 +-
 aether/modems/modem_driver_types.h            |   2 +-
 aether/modems/sim7070_at_modem.cpp            |   2 +-
 aether/modems/thingy91x_at_modem.cpp          |   4 +-
 aether/mstream.h                              |   4 +-
 aether/obj/component_factory.h                |   2 +-
 aether/obj/domain.h                           |   4 +-
 aether/obj/obj.h                              |   4 +-
 aether/obj/obj_ptr.h                          |   2 +-
 aether/obj/registrar.h                        |   2 +-
 aether/obj/registry.cpp                       |   2 +-
 aether/poller/freertos_poller.h               |   2 +-
 aether/poller/poller_types.h                  |   2 +-
 aether/poller/unix_poller.h                   |   2 +-
 aether/poller/win_poller.h                    |   2 +-
 aether/ptr/ptr.h                              |   2 +-
 aether/ptr/ptr_management.h                   |   4 +-
 aether/ptr/rc_ptr.h                           |   2 +-
 aether/reflect/container_node_visitor.h       | 138 ------
 aether/reflect/cycle_detector.h               |  67 ---
 aether/reflect/domain_visitor.h               |  31 --
 aether/reflect/domain_visitor_impl.h          |  82 ----
 aether/reflect/node_visitor.h                 |  92 ----
 aether/reflect/override_func.h                |  38 --
 aether/reflect/ptr_like_node_visitor.h        |  40 --
 aether/reflect/reflect.h                      |  27 -
 aether/reflect/reflect_impl.h                 | 277 -----------
 aether/reflect/reflect_node_visitor.h         |  64 ---
 aether/reflect/type_index.h                   |  91 ----
 .../registration/api/global_reg_server_api.h  |   2 +-
 .../api/server_registration_api.h             |   2 +-
 aether/registration/proof_of_work.cpp         |   2 +-
 aether/registration/registration.cpp          |   2 +-
 aether/registration/registration.h            |   2 +-
 aether/safe_stream/details/circular_buffer.h  |   2 +-
 .../details/receiving_chunk_list.h            |   1 +
 aether/serial_ports/at_support/at_listener.h  |   2 +-
 aether/serial_ports/at_support/at_support.h   |   4 +-
 aether/serial_ports/esp32_serial_port.cpp     |   2 +-
 aether/serial_ports/serial_port_types.h       |   2 +-
 aether/serial_ports/unix_serial_port.cpp      |   2 +-
 aether/serial_ports/win_serial_port.cpp       |   2 +-
 .../server_connections/channel_connection.cpp |   2 +-
 .../server_connections/channel_connection.h   |   2 +-
 aether/stream_api/gates_stream.h              |   2 +-
 aether/tasks/details/task_manager.h           |   2 +-
 aether/tele/collectors.h                      |   4 +-
 aether/tele/tags.h                            |   2 +-
 aether/tele/traps/io_stream_traps.cpp         |   2 +-
 aether/tele/traps/statistics_trap.h           |   2 +-
 aether/tele/traps/tele_statistics.h           |   2 +-
 .../system_sockets/sockets/get_sock_addr.cpp  |   2 +-
 .../system_sockets/sockets/isocket.h          |   2 +-
 .../sockets/lwip_cb_tcp_socket.cpp            |   2 +
 .../sockets/lwip_cb_udp_socket.cpp            |   2 +
 .../system_sockets/sockets/lwip_get_addr.cpp  |   2 +-
 .../sockets/lwip_tcp_socket.cpp               |   2 +-
 .../sockets/lwip_udp_socket.cpp               |   2 +-
 .../sockets/unix_tcp_socket.cpp               |   2 +-
 .../sockets/unix_udp_socket.cpp               |   2 +-
 .../system_sockets/sockets/win_socket.cpp     |   2 +
 .../system_sockets/sockets/win_tcp_socket.cpp |   2 +-
 .../system_sockets/sockets/win_udp_socket.cpp |   2 +-
 aether/type_traits.h                          |  48 +-
 aether/types/address.h                        |   4 +-
 aether/types/aligned_storage.h                | 271 -----------
 aether/types/client_config.h                  |   4 +-
 aether/types/nullable_type.h                  |   2 +-
 aether/types/result.h                         | 288 -----------
 aether/types/ring_index.h                     |   2 +-
 aether/types/server_config.h                  |   4 +-
 aether/types/small_function.h                 | 250 ----------
 aether/types/statistic_counter.h              |   2 +-
 aether/types/uid.h                            |   4 +-
 aether/types/variant_type.h                   |   2 +-
 aether/wifi/wifi_driver.h                     |   2 +-
 aether/wifi/wifi_driver_types.h               |   2 +-
 aether/work_cloud_api/ae_message.h            |   2 +-
 aether/work_cloud_api/telemetric.h            |   2 +-
 aether/write_action/buffer_write.h            |   2 +-
 .../benches/send_message_delays/receiver.cpp  |   2 +-
 .../send_message_delays_manager.h             |   2 +-
 .../send_message_delays/statistics_write.h    |   2 +-
 .../common/bandwidth.h                        |   2 +-
 .../common/test_action.h                      |   2 +-
 .../receiver/message_receiver.h               |   2 +-
 .../sender/message_sender.h                   |   2 +-
 examples/cloud/aether_construct_esp_wifi.h    |  11 +-
 tests/CMakeLists.txt                          |   3 -
 tests/test-actions/CMakeLists.txt             |   2 +-
 tests/test-events/CMakeLists.txt              |   2 +-
 tests/test-format/CMakeLists.txt              |  36 --
 tests/test-format/main.cpp                    |  32 --
 tests/test-format/test-format-str.cpp         |  57 ---
 tests/test-format/test-format-time.cpp        |  51 --
 tests/test-format/test-format-types.cpp       | 145 ------
 tests/test-meta/CMakeLists.txt                |  37 --
 tests/test-meta/main.cpp                      |  28 --
 tests/test-meta/test-type-list.cpp            | 132 -----
 tests/test-object-system/CMakeLists.txt       |   2 +-
 tests/test-ptr/CMakeLists.txt                 |   2 +-
 tests/test-ptr/pipe_there_they_are_sitting.h  |   2 +-
 tests/test-reflect/CMakeLists.txt             |  41 --
 tests/test-reflect/main.cpp                   |  30 --
 tests/test-reflect/test-domain-visitor.cpp    | 202 --------
 tests/test-reflect/test-reflect.cpp           | 116 -----
 tests/test-tasks/CMakeLists.txt               |   2 +-
 tests/test-tele/CMakeLists.txt                |   2 +-
 tests/test-tele/test-tele.cpp                 |   2 +-
 tests/test-types/CMakeLists.txt               |   4 +-
 tests/test-types/main.cpp                     |   4 -
 tests/test-types/test-aligned-storage.cpp     | 460 ------------------
 tests/test-types/test-small-function.cpp      | 264 ----------
 169 files changed, 167 insertions(+), 5188 deletions(-)
 delete mode 100644 aether/crc.h
 delete mode 100644 aether/format/default_formatters.h
 delete mode 100644 aether/format/format.h
 delete mode 100644 aether/format/format_impl.h
 delete mode 100644 aether/format/format_time.h
 delete mode 100644 aether/format/formatter.h
 delete mode 100644 aether/meta/arg_at.h
 delete mode 100644 aether/meta/as_type.h
 delete mode 100644 aether/meta/function_signature.h
 delete mode 100644 aether/meta/ignore_t.h
 delete mode 100644 aether/meta/index_sequence.h
 delete mode 100644 aether/meta/tag_invoke.h
 delete mode 100644 aether/meta/time_traits.h
 delete mode 100644 aether/meta/type_list.h
 delete mode 100644 aether/misc/defer.h
 delete mode 100644 aether/misc/from_chars.h
 delete mode 100644 aether/misc/override.h
 delete mode 100644 aether/reflect/container_node_visitor.h
 delete mode 100644 aether/reflect/cycle_detector.h
 delete mode 100644 aether/reflect/domain_visitor.h
 delete mode 100644 aether/reflect/domain_visitor_impl.h
 delete mode 100644 aether/reflect/node_visitor.h
 delete mode 100644 aether/reflect/override_func.h
 delete mode 100644 aether/reflect/ptr_like_node_visitor.h
 delete mode 100644 aether/reflect/reflect.h
 delete mode 100644 aether/reflect/reflect_impl.h
 delete mode 100644 aether/reflect/reflect_node_visitor.h
 delete mode 100644 aether/reflect/type_index.h
 delete mode 100644 aether/types/aligned_storage.h
 delete mode 100644 aether/types/result.h
 delete mode 100644 aether/types/small_function.h
 delete mode 100644 tests/test-format/CMakeLists.txt
 delete mode 100644 tests/test-format/main.cpp
 delete mode 100644 tests/test-format/test-format-str.cpp
 delete mode 100644 tests/test-format/test-format-time.cpp
 delete mode 100644 tests/test-format/test-format-types.cpp
 delete mode 100644 tests/test-meta/CMakeLists.txt
 delete mode 100644 tests/test-meta/main.cpp
 delete mode 100644 tests/test-meta/test-type-list.cpp
 delete mode 100644 tests/test-reflect/CMakeLists.txt
 delete mode 100644 tests/test-reflect/main.cpp
 delete mode 100644 tests/test-reflect/test-domain-visitor.cpp
 delete mode 100644 tests/test-reflect/test-reflect.cpp
 delete mode 100644 tests/test-types/test-aligned-storage.cpp
 delete mode 100644 tests/test-types/test-small-function.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df9cdeb7..a12bef95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,12 +105,6 @@ CPMAddPackage(
   GIT_TAG "master"
   EXCLUDE_FROM_ALL FALSE
 )
-# TODO: remove date
-CPMAddPackage(
-  URI "https://github.com/HowardHinnant/date.git#master"
-  OPTIONS "ENABLE_DATE_INSTALL ${AE_INSTALL}"
-  EXCLUDE_FROM_ALL FALSE
-)
 CPMAddPackage(
   NAME numeric
   GIT_REPOSITORY "https://github.com/aethernetio/aethernet-numeric.git"
@@ -118,6 +112,13 @@ CPMAddPackage(
   OPTIONS "AE_NUMERIC_INSTALL ${AE_INSTALL}"
   EXCLUDE_FROM_ALL FALSE
 )
+CPMAddPackage(
+  NAME aether-miscpp
+  GIT_REPOSITORY "https://github.com/aethernetio/aether-miscpp.git"
+  GIT_TAG "main"
+  OPTIONS "AE_INSTALL ${AE_INSTALL}" "AE_BUILD_TESTS ${AE_BUILD_TESTS}"
+  EXCLUDE_FROM_ALL FALSE
+)
 CPMAddPackage(
   NAME etl
   GIT_REPOSITORY "https://github.com/ETLCPP/etl.git"
@@ -152,7 +153,7 @@ target_link_libraries(${TARGET_NAME} PUBLIC
                                       etl
                                       stdexec
                                       numeric
-                                      date)
+                                      aether::miscpp)
 
 message(STATUS "Aether build for CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux"
diff --git a/aether/actions/actions_queue.h b/aether/actions/actions_queue.h
index b75a1b4b..74e712b0 100644
--- a/aether/actions/actions_queue.h
+++ b/aether/actions/actions_queue.h
@@ -22,7 +22,7 @@
 #include <utility>
 #include <functional>
 
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 #include "aether/events/event_subscription.h"
 
 namespace ae {
diff --git a/aether/actions/repeatable_task.h b/aether/actions/repeatable_task.h
index 484f684e..210b5351 100644
--- a/aether/actions/repeatable_task.h
+++ b/aether/actions/repeatable_task.h
@@ -21,8 +21,8 @@
 #include <functional>
 
 #include "aether/actions/action.h"
-#include "aether/meta/time_traits.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/meta/time_traits.h"
+#include "aether-miscpp/types/small_function.h"
 #include "aether/actions/action_context.h"
 
 namespace ae {
diff --git a/aether/ae_actions/check_access_for_send_message.h b/aether/ae_actions/check_access_for_send_message.h
index 0c46b69c..04ff648a 100644
--- a/aether/ae_actions/check_access_for_send_message.h
+++ b/aether/ae_actions/check_access_for_send_message.h
@@ -19,7 +19,7 @@
 
 #include "aether/common.h"
 #include "aether/types/uid.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 #include "aether/actions/action.h"
 #include "aether/cloud_connections/cloud_request.h"
diff --git a/aether/ae_actions/get_servers.h b/aether/ae_actions/get_servers.h
index 925360f6..b78aef5a 100644
--- a/aether/ae_actions/get_servers.h
+++ b/aether/ae_actions/get_servers.h
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "aether/ae_context.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 #include "aether/types/server_id.h"
 #include "aether/actions/action.h"
diff --git a/aether/ae_actions/select_client.h b/aether/ae_actions/select_client.h
index 53803463..9633df68 100644
--- a/aether/ae_actions/select_client.h
+++ b/aether/ae_actions/select_client.h
@@ -20,7 +20,7 @@
 #include "aether/config.h"
 #include "aether/ae_context.h"
 #include "aether/obj/obj_ptr.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 #include "aether/actions/action.h"
 #include "aether/events/event_subscription.h"
diff --git a/aether/ae_actions/telemetry.cpp b/aether/ae_actions/telemetry.cpp
index 04b179a5..0937d956 100644
--- a/aether/ae_actions/telemetry.cpp
+++ b/aether/ae_actions/telemetry.cpp
@@ -19,7 +19,7 @@
 #if defined TELEMETRY_ENABLED
 
 #  include "aether/aether.h"
-#  include "aether/format/format.h"
+#  include "aether-miscpp/format/format.h"
 #  include "aether/tele/tele.h"
 #  include "aether/tele/traps/tele_statistics.h"
 
diff --git a/aether/ae_actions/time_sync.cpp b/aether/ae_actions/time_sync.cpp
index 14020aaa..2f9827c7 100644
--- a/aether/ae_actions/time_sync.cpp
+++ b/aether/ae_actions/time_sync.cpp
@@ -23,7 +23,7 @@
 #  include "aether/client.h"
 #  include "aether/aether.h"
 #  include "aether/uap/uap.h"
-#  include "aether/misc/override.h"
+#  include "aether-miscpp/misc/override.h"
 #  include "aether/types/iterator.h"
 #  include "aether/executors/executors.h"
 #  include "aether/cloud_connections/cloud_visit.h"
diff --git a/aether/aether_app.h b/aether/aether_app.h
index 1511b6fa..e2acece3 100644
--- a/aether/aether_app.h
+++ b/aether/aether_app.h
@@ -27,7 +27,7 @@
 #include "aether/ptr/ptr.h"
 #include "aether/ptr/rc_ptr.h"
 #include "aether/obj/domain.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 
 #include "aether/events/events.h"   // IWYU pragma: keep
 #include "aether/actions/action.h"  // IWYU pragma: keep
diff --git a/aether/all.h b/aether/all.h
index 7e271de7..264735f5 100644
--- a/aether/all.h
+++ b/aether/all.h
@@ -32,8 +32,8 @@
 #include "aether/events/event_subscription.h"
 #include "aether/events/multi_subscription.h"
 
-#include "aether/format/format.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/format/format.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/ptr/ptr.h"
 #include "aether/ptr/rc_ptr.h"
 #include "aether/ptr/ptr_view.h"
diff --git a/aether/api_protocol/api_class_impl.h b/aether/api_protocol/api_class_impl.h
index 01a6de4f..d41e6f0f 100644
--- a/aether/api_protocol/api_class_impl.h
+++ b/aether/api_protocol/api_class_impl.h
@@ -17,7 +17,7 @@
 #ifndef AETHER_API_PROTOCOL_API_CLASS_IMPL_H_
 #define AETHER_API_PROTOCOL_API_CLASS_IMPL_H_
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/api_protocol/api_class.h"
 #include "aether/api_protocol/api_pack_parser.h"
 
diff --git a/aether/api_protocol/api_promise.h b/aether/api_protocol/api_promise.h
index bf672302..aa037b81 100644
--- a/aether/api_protocol/api_promise.h
+++ b/aether/api_protocol/api_promise.h
@@ -19,7 +19,7 @@
 
 #include <cstdint>
 
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 #include "aether/api_protocol/request_id.h"
 
diff --git a/aether/api_protocol/protocol_context.h b/aether/api_protocol/protocol_context.h
index 18315d9c..051935bf 100644
--- a/aether/api_protocol/protocol_context.h
+++ b/aether/api_protocol/protocol_context.h
@@ -21,7 +21,7 @@
 #include <stack>
 #include <cstdint>
 
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 #include "aether/api_protocol/request_id.h"
 
 namespace ae {
diff --git a/aether/api_protocol/request_id.h b/aether/api_protocol/request_id.h
index 45f34c92..bf5aa504 100644
--- a/aether/api_protocol/request_id.h
+++ b/aether/api_protocol/request_id.h
@@ -19,7 +19,7 @@
 
 #include <cstdint>
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 struct RequestId {
diff --git a/aether/api_protocol/sub_api.h b/aether/api_protocol/sub_api.h
index 70ff75e6..58922b78 100644
--- a/aether/api_protocol/sub_api.h
+++ b/aether/api_protocol/sub_api.h
@@ -19,10 +19,10 @@
 
 #include <vector>
 
-#include "aether/meta/type_list.h"
-#include "aether/reflect/reflect.h"
-#include "aether/types/small_function.h"
-#include "aether/meta/function_signature.h"
+#include "aether-miscpp/meta/type_list.h"
+#include "aether-miscpp/reflect/reflect.h"
+#include "aether-miscpp/types/small_function.h"
+#include "aether-miscpp/meta/function_signature.h"
 #include "aether/api_protocol/api_context.h"
 #include "aether/api_protocol/api_pack_parser.h"
 
diff --git a/aether/channels/channels_types.h b/aether/channels/channels_types.h
index 3ec204fc..fed6411a 100644
--- a/aether/channels/channels_types.h
+++ b/aether/channels/channels_types.h
@@ -20,7 +20,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 enum class ConnectionType : std::uint8_t {
diff --git a/aether/cloud_connections/cloud_callbacks.h b/aether/cloud_connections/cloud_callbacks.h
index e0e8135d..962734fc 100644
--- a/aether/cloud_connections/cloud_callbacks.h
+++ b/aether/cloud_connections/cloud_callbacks.h
@@ -17,7 +17,7 @@
 #ifndef AETHER_CLOUD_CONNECTIONS_CLOUD_CALLBACKS_H_
 #define AETHER_CLOUD_CONNECTIONS_CLOUD_CALLBACKS_H_
 
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 
 #include "aether/events/event_deleter.h"
 #include "aether/api_protocol/api_protocol.h"
diff --git a/aether/cloud_connections/cloud_request.cpp b/aether/cloud_connections/cloud_request.cpp
index e0fe029e..7e94a3c8 100644
--- a/aether/cloud_connections/cloud_request.cpp
+++ b/aether/cloud_connections/cloud_request.cpp
@@ -21,7 +21,7 @@
 
 #include "aether/server.h"
 #include "aether/aether.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/write_action/write_action.h"
 #include "aether/cloud_connections/cloud_visit.h"
 
diff --git a/aether/connection_manager/client_cloud_manager.h b/aether/connection_manager/client_cloud_manager.h
index 2e18c273..ca3f3169 100644
--- a/aether/connection_manager/client_cloud_manager.h
+++ b/aether/connection_manager/client_cloud_manager.h
@@ -28,7 +28,7 @@
 
 #include "aether/cloud.h"
 #include "aether/types/uid.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 
 #include "aether/ae_actions/get_servers.h"
diff --git a/aether/crc.h b/aether/crc.h
deleted file mode 100644
index e020a2f4..00000000
--- a/aether/crc.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_CRC_H_
-#define AETHER_CRC_H_
-
-#include <cstdint>
-#include <cstddef>
-#include <string_view>
-
-namespace crc32 {
-struct result_t {
-  std::uint32_t value;
-  constexpr result_t();
-  constexpr result_t(std::uint32_t);
-  explicit operator std::uint32_t() const;
-  auto operator==(const result_t&) const -> bool;
-};
-
-static const auto default_v = result_t();
-
-// compile-time versions
-
-template <unsigned LEN>
-constexpr auto from_literal(const char (&_str)[LEN]) -> result_t;
-constexpr auto from_string_view(std::string_view _str) -> result_t;
-template <unsigned LEN>
-constexpr auto checksum_from_literal(const char (&_str)[LEN]) -> std::uint32_t;
-
-// run-time versions
-
-auto from_string(char const* _str, result_t _curr = result_t()) -> result_t;
-auto from_buffer(const std::uint8_t* _buffer, size_t _cnt,
-                 result_t _curr = result_t()) -> result_t;
-
-// ==============
-// Implementation
-// ==============
-
-// helpers
-
-namespace details {
-
-static const auto INITIAL_VALUE = std::uint32_t{0xFFffFFff};
-static const auto XOR_VALUE = std::uint32_t{0xFFffFFff};
-
-template <unsigned LEN, unsigned INDEX>
-struct aux;
-
-constexpr std::uint32_t table[256] = {
-    // polynomial = 0x04C11DB7
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
-};
-
-template <>
-struct aux<1, 0> {
-  static constexpr auto exec(const char (&)[1], result_t, result_t)
-      -> result_t {
-    return result_t(XOR_VALUE);
-  }
-};  // Empty string case
-
-template <unsigned LEN, unsigned INDEX>
-struct aux {
-  static constexpr auto exec(const char (&_str)[LEN], result_t _curr, result_t)
-      -> result_t {
-    return aux<LEN, INDEX + 1>::exec(
-        // 1. String itself
-        _str,
-
-        // 2. Add '_str[INDEX]' to the current crc value
-        result_t{table[static_cast<uint8_t>(_curr.value) ^
-                       static_cast<uint8_t>(_str[INDEX])] ^
-                 (_curr.value >> 8)},
-
-        // 3. Pass through the unmodified current crc32 (special case of "end of
-        // string")
-        _curr);
-  }
-};  // General case
-
-template <unsigned LEN>
-struct aux<LEN, LEN> {
-  static constexpr auto exec(const char (&)[LEN], result_t, result_t _prev)
-      -> result_t {
-    return _prev;  // we don't want to include '\0' at the end of literal
-                   // strings
-  }
-};  // End of string case
-
-}  // namespace details
-
-// actual implementation
-
-template <unsigned LEN>
-constexpr auto from_literal(const char (&_str)[LEN]) -> result_t {
-  return details::aux<LEN, 0>::exec(_str, result_t(), result_t());
-}
-
-constexpr auto from_string_view(std::string_view _str) -> result_t {
-  auto _curr = result_t{};
-  for (auto const& _char : _str) {
-    _curr.value = (_curr.value >> 8) ^
-                  details::table[static_cast<std::uint8_t>(_curr.value) ^
-                                 static_cast<std::uint8_t>(_char)];
-  }
-  return _curr;
-}
-
-template <unsigned LEN>
-constexpr auto checksum_from_literal(const char (&_str)[LEN]) -> std::uint32_t {
-  return from_literal(_str).value ^ details::XOR_VALUE;
-}
-
-inline auto from_string(char const* _str, result_t _curr) -> result_t {
-  if (_str) {
-    while (*_str != 0) {
-      _curr.value =
-          (_curr.value >> 8) ^
-          details::table[uint8_t(_curr.value) ^ std::uint8_t(*_str++)];
-    }
-  }
-
-  return _curr;
-}
-
-inline auto from_buffer(const std::uint8_t* _buff, size_t _cnt, result_t _curr)
-    -> result_t {
-  if (_buff) {
-    for (auto i = 0u; i < _cnt; ++i) {
-      _curr.value =
-          (_curr.value >> 8) ^
-          details::table[uint8_t(_curr.value) ^ std::uint8_t(*(_buff + i))];
-    }
-  }
-
-  return _curr;
-}
-
-inline constexpr result_t::result_t() : value(details::INITIAL_VALUE) {}
-inline constexpr result_t::result_t(uint32_t _val) : value(_val) {}
-inline result_t::operator std::uint32_t() const {
-  return value ^ details::XOR_VALUE;
-}
-inline auto result_t::operator==(const result_t& _rhs) const -> bool {
-  return value == _rhs.value;
-}
-
-// ============
-// Unit testing
-// ============
-static_assert(checksum_from_literal("") == 0,
-              "crc32 unit test (empty string) failed!");
-static_assert(checksum_from_literal("A") == 0xD3D99E8B,
-              "crc32 unit test ('A') failed!");
-static_assert(checksum_from_literal("Hello world") == 0x8BD69E52,
-              "crc32 unit test ('Hello world') failed!");
-
-}  // namespace crc32
-
-#endif  // AETHER_CRC_H_ */
diff --git a/aether/crypto/crypto_nonce.h b/aether/crypto/crypto_nonce.h
index 45a3fc15..39975f59 100644
--- a/aether/crypto/crypto_nonce.h
+++ b/aether/crypto/crypto_nonce.h
@@ -21,7 +21,7 @@
 #include <cstdint>
 
 #include "aether/config.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 #if AE_CRYPTO_SYNC == AE_CHACHA20_POLY1305
 
diff --git a/aether/crypto/key.h b/aether/crypto/key.h
index e5e5e2ca..a0892f8d 100644
--- a/aether/crypto/key.h
+++ b/aether/crypto/key.h
@@ -46,7 +46,7 @@
 #    include <hydrogen.h>
 #  endif
 
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/types/variant_type.h"
 
 namespace ae {
diff --git a/aether/crypto/sign.h b/aether/crypto/sign.h
index 03ac77db..d071ad11 100644
--- a/aether/crypto/sign.h
+++ b/aether/crypto/sign.h
@@ -33,7 +33,7 @@
 #    include <hydrogen.h>
 #  endif
 
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/types/variant_type.h"
 
 namespace ae {
diff --git a/aether/crypto/signed_key.h b/aether/crypto/signed_key.h
index 223dcd2f..b01c9ab4 100644
--- a/aether/crypto/signed_key.h
+++ b/aether/crypto/signed_key.h
@@ -22,7 +22,7 @@
 #include "aether/crypto/key.h"
 #include "aether/crypto/sign.h"
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 #if AE_SIGNATURE != AE_NONE
diff --git a/aether/dns/dns_c_ares.cpp b/aether/dns/dns_c_ares.cpp
index 8693f5f4..41820cbd 100644
--- a/aether/dns/dns_c_ares.cpp
+++ b/aether/dns/dns_c_ares.cpp
@@ -24,10 +24,12 @@
 
 #  include "ares.h"
 
+#  include "aether-miscpp/misc/defer.h"
+#  include "aether-miscpp/types/result.h"
+
 #  include "aether/warning_disable.h"
 
 #  include "aether/aether.h"
-#  include "aether/types/result.h"
 #  include "aether/socket_initializer.h"
 #  include "aether/events/multi_subscription.h"
 
@@ -212,7 +214,8 @@ ResolveSender DnsResolverCares::Resolve(NamedAddr const& name_address,
   }
 
   return ares_impl_->Query(name_address, port_hint, protocol_hint) |
-         ex::continues_on(ex::SchedulerOnTasks{AeContext{*aether_.Load().as<Aether>()}});
+         ex::continues_on(
+             ex::SchedulerOnTasks{AeContext{*aether_.Load().as<Aether>()}});
 }
 
 }  // namespace ae
diff --git a/aether/domain_storage/registrar_domain_storage.cpp b/aether/domain_storage/registrar_domain_storage.cpp
index c73b9043..8b19c9ef 100644
--- a/aether/domain_storage/registrar_domain_storage.cpp
+++ b/aether/domain_storage/registrar_domain_storage.cpp
@@ -22,7 +22,7 @@
 #  include <string_view>
 #  include <system_error>
 
-#  include "aether/format/format.h"
+#  include "aether-miscpp/format/format.h"
 
 #  include "aether/tele/tele.h"
 
diff --git a/aether/domain_storage/spifs_domain_storage.cpp b/aether/domain_storage/spifs_domain_storage.cpp
index e65d6f00..9eee07b5 100644
--- a/aether/domain_storage/spifs_domain_storage.cpp
+++ b/aether/domain_storage/spifs_domain_storage.cpp
@@ -24,7 +24,7 @@
 #  include "esp_spiffs.h"
 #  include "spiffs_config.h"
 
-#  include "aether/crc.h"
+#  include "aether-miscpp/crc.h"
 #  include "aether/mstream.h"
 #  include "aether/mstream_buffers.h"
 
diff --git a/aether/events/event_handler.h b/aether/events/event_handler.h
index c2945088..5c0c52cc 100644
--- a/aether/events/event_handler.h
+++ b/aether/events/event_handler.h
@@ -21,7 +21,7 @@
 
 #include "aether/config.h"
 #include "aether/common.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 
diff --git a/aether/events/event_list.h b/aether/events/event_list.h
index 883d3569..f8899972 100644
--- a/aether/events/event_list.h
+++ b/aether/events/event_list.h
@@ -24,7 +24,7 @@
 #include <algorithm>
 
 #include "aether/events/event_handler.h"
-#include "aether/types/aligned_storage.h"
+#include "aether-miscpp/types/aligned_storage.h"
 
 namespace ae {
 class EventHandlersList {
diff --git a/aether/events/events.h b/aether/events/events.h
index 72224f63..4922c232 100644
--- a/aether/events/events.h
+++ b/aether/events/events.h
@@ -26,7 +26,7 @@
 #include "aether/events/event_list.h"
 #include "aether/events/event_handler.h"
 #include "aether/events/event_deleter.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 #include "aether/events/event_subscription.h"
 
 namespace ae {
diff --git a/aether/executors/any_waiter.h b/aether/executors/any_waiter.h
index 91b1a32e..912efdbc 100644
--- a/aether/executors/any_waiter.h
+++ b/aether/executors/any_waiter.h
@@ -25,8 +25,8 @@
 
 #include <stdexec/execution.hpp>
 
-#include "aether/types/result.h"
-#include "aether/meta/ignore_t.h"
+#include "aether-miscpp/types/result.h"
+#include "aether-miscpp/meta/ignore_t.h"
 #include "aether/executors/waiter_traits.h"
 #include "aether/executors/async_context.h"
 #include "aether/executors/scheduler_on_tasks.h"
diff --git a/aether/executors/async_waiter.h b/aether/executors/async_waiter.h
index d9aa19f7..82f3a0dd 100644
--- a/aether/executors/async_waiter.h
+++ b/aether/executors/async_waiter.h
@@ -29,8 +29,8 @@ IGNORE_IMPLICIT_CONVERSION()
 #include <stdexec/execution.hpp>
 DISABLE_WARNING_POP()
 
-#include "aether/types/result.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/result.h"
+#include "aether-miscpp/types/small_function.h"
 
 #include "aether/executors/waiter_traits.h"
 #include "aether/executors/async_context.h"
diff --git a/aether/executors/for_range.h b/aether/executors/for_range.h
index ae522989..a8e50250 100644
--- a/aether/executors/for_range.h
+++ b/aether/executors/for_range.h
@@ -24,7 +24,7 @@
 #include <stdexec/execution.hpp>
 
 #include "aether/types/iterator.h"
-#include "aether/meta/type_list.h"
+#include "aether-miscpp/meta/type_list.h"
 
 namespace ae::ex {
 namespace for_range_internal {
diff --git a/aether/executors/sync_waiter.h b/aether/executors/sync_waiter.h
index ed407971..c0758293 100644
--- a/aether/executors/sync_waiter.h
+++ b/aether/executors/sync_waiter.h
@@ -27,7 +27,7 @@ IGNORE_IMPLICIT_CONVERSION()
 #include <stdexec/execution.hpp>
 DISABLE_WARNING_POP()
 
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/executors/waiter_traits.h"
 
 namespace ae::ex {
diff --git a/aether/executors/waiter_traits.h b/aether/executors/waiter_traits.h
index d31a2262..852f2833 100644
--- a/aether/executors/waiter_traits.h
+++ b/aether/executors/waiter_traits.h
@@ -29,8 +29,8 @@ IGNORE_IMPLICIT_CONVERSION()
 #include <stdexec/execution.hpp>
 DISABLE_WARNING_POP()
 
-#include "aether/meta/ignore_t.h"
-#include "aether/meta/type_list.h"
+#include "aether-miscpp/meta/ignore_t.h"
+#include "aether-miscpp/meta/type_list.h"
 
 namespace ae::ex {
 template <template <typename> typename Filter, typename T>
diff --git a/aether/format/default_formatters.h b/aether/format/default_formatters.h
deleted file mode 100644
index b70c5023..00000000
--- a/aether/format/default_formatters.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_FORMAT_DEFAULT_FORMATTERS_H_
-#define AETHER_FORMAT_DEFAULT_FORMATTERS_H_
-
-#include <memory>
-#include <cassert>
-#include <cstdint>
-#include <optional>
-#include <iostream>
-#include <charconv>
-#include <type_traits>
-#include <string_view>
-
-#include "aether/type_traits.h"
-#include "aether/format/formatter.h"
-#include "aether/meta/time_traits.h"
-#include "aether/format/format_impl.h"
-
-namespace ae {
-using format_internal::FormatEntry;
-using format_internal::FormatScheme;
-
-template <typename T, typename _ = void>
-struct IsStreamOutputSpecified : std::false_type {};
-
-template <typename T>
-struct IsStreamOutputSpecified<
-    T, std::void_t<decltype(std::declval<std::ostream&>()
-                            << std::declval<T const&>())>> : std::true_type {};
-
-template <typename T, typename _ = void>
-struct IstextSpecified : std::false_type {};
-
-template <typename T>
-struct IstextSpecified<T,
-                       std::void_t<decltype(T::text(std::declval<T const&>()))>>
-    : std::true_type {};
-
-// for any with operator<< to std::ostream&
-template <typename T>
-struct Formatter<
-    T, std::enable_if_t<IsStreamOutputSpecified<T>::value &&
-                        !IstextSpecified<T>::value && !std::is_enum_v<T> &&
-                        !IsTimePoint<T>::value && !IsDuration<T>::value>> {
-  template <typename TStream>
-  void Format(T const& value, FormatContext<TStream>& ctx) const {
-    ctx.out().stream() << value;
-  }
-};
-
-// for any with text method
-template <typename T>
-struct Formatter<T, std::enable_if_t<IstextSpecified<T>::value>> {
-  template <typename TStream>
-  void Format(T const& value, FormatContext<TStream>& ctx) const {
-    ctx.out().write(T::text(value));
-  }
-};
-
-// for any enum
-template <typename T>
-struct Formatter<T, std::enable_if_t<std::is_enum_v<T>>>
-    : Formatter<std::uint64_t> {
-  template <typename TStream>
-  void Format(T const& value, FormatContext<TStream>& ctx) const {
-    Formatter<std::uint64_t>::Format(static_cast<std::uint64_t>(value), ctx);
-  }
-};
-
-// that can be iterated
-template <typename T>
-struct Formatter<T, std::enable_if_t<!(IsString<std::decay_t<T>>::value ||
-                                       IsStringView<std::decay_t<T>>::value) &&
-                                     IsContainer<std::decay_t<T>>::value>> {
-  template <typename TStream>
-  void Format(T const& value, FormatContext<TStream>& ctx) const {
-    if constexpr (std::is_same_v<std::uint8_t,
-                                 std::decay_t<typename T::value_type>> ||
-                  std::is_same_v<std::int8_t,
-                                 std::decay_t<typename T::value_type>>) {
-      FormatBuffer(value, ctx);
-    } else {
-      FormatContainer(value, ctx);
-    }
-  }
-
-  template <typename TStream>
-  void FormatContainer(T const& value, FormatContext<TStream>& ctx) const {
-    auto format = FormatScheme{std::array{
-        FormatEntry{ctx.options, 0, 0,
-                    static_cast<std::uint16_t>(ctx.options.size()), 0},
-        FormatEntry{{", "}, 2, 0, 0, 1},
-    }};
-    auto format_last = FormatScheme{std::array{
-        FormatEntry{ctx.options, 0, 0,
-                    static_cast<std::uint16_t>(ctx.options.size()), 0},
-    }};
-
-    for (auto it = std::begin(value); it != std::end(value); ++it) {
-      if (std::next(it) == std::end(value)) {
-        ae::Format(ctx.out(), format_last, *it);
-      } else {
-        ae::Format(ctx.out(), format, *it);
-      }
-    }
-  }
-
-  template <typename TStream>
-  void FormatBuffer(T const& value, FormatContext<TStream>& ctx) const {
-    static_assert(sizeof(typename T::value_type) == 1,
-                  "Print buffer only for one byte size values");
-
-    constexpr std::size_t kLocalBuffSize = 128;
-    constexpr std::size_t kTwoMinCharValue = 0x10;
-    constexpr int kPrintBase = 16;
-    std::size_t v_size = 2;  // 2 chars on byte
-    std::size_t buff_size = v_size * value.size();
-
-    std::array<char, kLocalBuffSize> local_buff;
-    std::unique_ptr<char[]> alloc_buff;  // NOLINT(*avoid-c-arrays)
-
-    char* buff;  // NOLINT(*init-variables)
-    if (buff_size > local_buff.size()) {
-      alloc_buff =
-          std::make_unique<char[]>(buff_size);  // NOLINT(*avoid-c-arrays)
-      buff = alloc_buff.get();
-    } else {
-      buff = local_buff.data();
-    }
-    std::size_t wp = 0;
-    for (auto const& v : value) {
-      // convert value with leading 0
-      if (v < kTwoMinCharValue) {
-        *(buff + wp) = '0';
-        std::to_chars(buff + wp + 1, buff + wp + v_size, v, kPrintBase);
-      } else {
-        std::to_chars(buff + wp, buff + wp + v_size, v, kPrintBase);
-      }
-      wp += v_size;
-    }
-    ctx.out().stream().write(buff, static_cast<std::streamsize>(wp));
-  }
-};
-
-// for std::optional
-template <typename T>
-struct Formatter<std::optional<T>> : Formatter<T> {
-  template <typename TStream>
-  void Format(std::optional<T> const& value,
-              FormatContext<TStream>& ctx) const {
-    if (!value) {
-      static constexpr std::string_view null_str = "nullopt";
-      ctx.out().stream().write(null_str.data(), null_str.size());
-    } else {
-      Formatter<T>::Format(value.value(), ctx);
-    }
-  }
-};
-
-}  // namespace ae
-
-#endif  // AETHER_FORMAT_DEFAULT_FORMATTERS_H_
diff --git a/aether/format/format.h b/aether/format/format.h
deleted file mode 100644
index 5c414936..00000000
--- a/aether/format/format.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_FORMAT_FORMAT_H_
-#define AETHER_FORMAT_FORMAT_H_
-
-// IWYU pragma: begin_exports
-#include "aether/format/formatter.h"
-#include "aether/format/format_impl.h"
-#include "aether/format/format_time.h"
-#include "aether/format/default_formatters.h"
-// IWYU pragma: end_exports
-
-#endif  // AETHER_FORMAT_FORMAT_H_
diff --git a/aether/format/format_impl.h b/aether/format/format_impl.h
deleted file mode 100644
index cd55cc34..00000000
--- a/aether/format/format_impl.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_FORMAT_FORMAT_IMPL_H_
-#define AETHER_FORMAT_FORMAT_IMPL_H_
-
-#include <tuple>
-#include <array>
-#include <string>
-#include <cstdlib>
-#include <ostream>
-#include <sstream>
-#include <algorithm>
-#include <string_view>
-#include <type_traits>
-
-#include "aether/mstream.h"
-
-#include "aether/format/formatter.h"
-
-namespace ae {
-namespace format_internal {
-template <typename T, typename Enable = void>
-struct IsStream : std::false_type {};
-
-template <typename T>
-struct IsStream<T, std::void_t<decltype(std::declval<T&>() << int{0})>>
-    : std::true_type {};
-
-template <typename TStream>
-struct FormatWriter;
-
-template <typename Ob>
-struct FormatWriter<omstream<Ob>> {
-  explicit FormatWriter(omstream<Ob>& stream) : ostr{&stream} {}
-
-  void write(std::uint8_t const* data, std::size_t size) {
-    ostr->write(data, size);
-  }
-
-  void write(std::string_view sv) { ostr->write(sv.data(), sv.size()); }
-
-  auto& stream() const { return *ostr; }
-
-  omstream<Ob>* ostr;
-};
-template <typename Ob>
-FormatWriter(omstream<Ob>& stream) -> FormatWriter<omstream<Ob>>;
-
-template <>
-struct FormatWriter<std::ostream> {
-  explicit FormatWriter(std::ostream& stream) : ostr{&stream} {}
-
-  void write(std::uint8_t const* data, std::size_t size) {
-    ostr->write(reinterpret_cast<char const*>(data),
-                static_cast<std::streamsize>(size));
-  }
-
-  void write(std::string_view str) {
-    ostr->write(str.data(), static_cast<std::streamsize>(str.size()));
-  }
-
-  auto& stream() const { return *ostr; }
-
-  std::ostream* ostr;
-};
-FormatWriter(std::ostream& stream) -> FormatWriter<std::ostream>;
-
-// list of args to format
-template <typename... T>
-struct FormatArgs {
-  constexpr explicit FormatArgs(T const&... args) : arguments{&args...} {}
-
-  template <std::size_t I, typename TFormatContext>
-  constexpr void Format(TFormatContext& ctx) {
-    using arg_type = std::decay_t<std::tuple_element_t<I, std::tuple<T...>>>;
-    auto const& arg = *std::get<I>(arguments);
-    Formatter<arg_type>{}.Format(arg, ctx);
-  }
-
-  std::tuple<T const*...> arguments;
-};
-
-struct FormatEntry {
-  constexpr std::string_view before_format() const {
-    if (entry_string.empty()) {
-      return {};
-    }
-    return entry_string.substr(0, before_format_size);
-  }
-  constexpr std::string_view options() const {
-    if (entry_string.empty()) {
-      return {};
-    }
-    return entry_string.substr(options_offset, options_size);
-  }
-
-  std::string_view entry_string;
-  std::uint16_t before_format_size;
-  std::uint16_t options_offset;
-  std::uint16_t options_size;
-  std::uint8_t index = std::numeric_limits<std::uint8_t>::max();
-};
-
-struct FormatScheme {
-  static constexpr std::size_t kCount = 10;
-
-  constexpr FormatScheme(char const* format)
-      : FormatScheme{std::string_view{format}} {}
-
-  template <std::size_t Size>
-  constexpr FormatScheme(char const (&format)[Size])
-      : FormatScheme{std::string_view{format, Size}} {}
-
-  FormatScheme(std::string const& format)
-      : FormatScheme{std::string_view{format}} {}
-
-  constexpr FormatScheme(std::string_view format) {
-    std::uint8_t index = 0;
-
-    while (!format.empty()) {
-      auto format_begin = FormatBegin(format);
-      if (format_begin == std::string_view::npos) {
-        break;
-      }
-      auto format_end = format.find_first_of('}', format_begin);
-      if (format_end == std::string_view::npos) {
-        break;
-      }
-      auto index_end = format.find_first_of(':', format_begin);
-      if (index_end > format_end) {
-        index_end = format_begin;
-      }
-
-      format_entries[index] = FormatEntry{
-          format.substr(0, format_end + 1),
-          static_cast<std::uint16_t>(format_begin),
-          static_cast<std::uint16_t>(index_end + 1),
-          static_cast<std::uint16_t>(format_end - index_end - 1),
-          index,
-      };
-      index += 1;
-      format = format.substr(format_end + 1, format.size() - format_end - 1);
-    }
-    if (!format.empty()) {
-      format_entries[index] = FormatEntry{
-          format, static_cast<std::uint16_t>(format.size()), 0,
-          0,      std::numeric_limits<std::uint8_t>::max(),
-      };
-    }
-  }
-
-  constexpr FormatScheme(FormatScheme const& format_string)
-      : FormatScheme{format_string.format_entries} {}
-
-  template <std::size_t Size>
-  constexpr explicit FormatScheme(std::array<FormatEntry, Size> const& fe_arr) {
-    std::copy_n(std::begin(fe_arr), std::min(kCount, Size),
-                std::begin(format_entries));
-  }
-
-  static constexpr std::size_t FormatBegin(std::string_view const format) {
-    std::size_t format_begin{};
-    format_begin = format.find_first_of('{', format_begin);
-    if ((format_begin != std::string_view::npos) &&
-        (format_begin + 1) != format.size() &&
-        (format[format_begin + 1] == '{')) {  // escaped '{'
-      format_begin += 1;
-    }
-    return format_begin;
-  }
-
-  std::array<FormatEntry, kCount> format_entries{};
-};
-
-template <std::size_t I>
-struct Index {
-  static constexpr auto value = I;
-};
-
-template <typename Func, std::size_t... Is>
-void DispatchImpl(std::size_t index, [[maybe_unused]] Func func,
-                  std::index_sequence<Is...> const& /* seq */) {
-  bool res = ((index == Is ? (func(Index<Is>{}), true) : false) || ...);
-  (void)(res);
-}
-
-// Dispatch runtime index to compile time Index<I>
-template <std::size_t Size, typename Func>
-void Dispatch(std::size_t index, Func&& func) {
-  DispatchImpl(index, std::forward<Func>(func),
-               std::make_index_sequence<Size>{});
-}
-
-template <typename TStream, typename... T>
-void FormatToStream(TStream& out, FormatScheme const& format_scheme,
-                    FormatArgs<T...> args) {
-  for (auto const& fmt : format_scheme.format_entries) {
-    if (auto before = fmt.before_format(); !before.empty()) {
-      out.write(before);
-    }
-    if (fmt.index < sizeof...(T)) {
-      Dispatch<sizeof...(T)>(fmt.index, [&](auto index) {
-        auto ctx = FormatContext{out, fmt.options()};
-        args.template Format<decltype(index)::value>(ctx);
-      });
-    }
-  }
-}
-
-}  // namespace format_internal
-
-template <typename TStream, typename... Args>
-void Format(format_internal::FormatWriter<TStream>& out_writer,
-            format_internal::FormatScheme const& format, Args&&... args) {
-  format_internal::FormatToStream(
-      out_writer, format,
-      format_internal::FormatArgs<std::decay_t<Args>...>{args...});
-}
-
-template <typename TStream, typename... Args>
-std::enable_if_t<format_internal::IsStream<TStream>::value> Format(
-    TStream& stream, format_internal::FormatScheme const& format,
-    Args&&... args) {
-  auto format_writer = format_internal::FormatWriter{stream};
-  Format(format_writer, format, std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-std::string Format(format_internal::FormatScheme const& format,
-                   Args&&... args) {
-  auto stream = std::stringstream{};
-  Format(stream, format, std::forward<Args>(args)...);
-  return stream.str();
-}
-}  // namespace ae
-
-#endif  // AETHER_FORMAT_FORMAT_IMPL_H_
diff --git a/aether/format/format_time.h b/aether/format/format_time.h
deleted file mode 100644
index 2429d3de..00000000
--- a/aether/format/format_time.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef AETHER_FORMAT_FORMAT_TIME_H_
-#define AETHER_FORMAT_FORMAT_TIME_H_
-
-#include <chrono>
-#include <string>
-#include <sstream>
-
-#include "aether/clock.h"
-#include "aether/format/formatter.h"
-
-#include <date/date.h>
-
-namespace ae {
-/**
- * \brief Format TimePoint to string.
- * \see https://howardhinnant.github.io/date/date.html#to_stream_formatting
- */
-template <typename C, typename D>
-struct Formatter<std::chrono::time_point<C, D>> {
-  template <typename TStream>
-  void Format(std::chrono::time_point<C, D> const& value,
-              FormatContext<TStream>& ctx) const {
-    auto ymd = date::year_month_day{
-        date::floor<date::days>(date::sys_time<D>{value.time_since_epoch()})};
-
-    auto micro_time = std::chrono::duration_cast<std::chrono::microseconds>(
-        value.time_since_epoch());
-    auto today_micro_time = micro_time % std::chrono::hours{24};
-
-    auto tod = date::hh_mm_ss{today_micro_time};
-    auto fields = date::fields<std::chrono::microseconds>{ymd, tod};
-    auto fmt_str = std::string{ctx.options};
-    date::to_stream(ctx.out().stream(), fmt_str.c_str(), fields);
-  }
-};
-
-template <typename Rep, typename Per>
-struct Formatter<std::chrono::duration<Rep, Per>> {
-  template <typename TStream>
-  void Format(std::chrono::duration<Rep, Per> const& value,
-              FormatContext<TStream>& ctx) const {
-    auto fmt_str = std::string{ctx.options};
-    date::to_stream(ctx.out().stream(), fmt_str.data(), value);
-  }
-};
-
-}  // namespace ae
-#endif  // AETHER_FORMAT_FORMAT_TIME_H_
diff --git a/aether/format/formatter.h b/aether/format/formatter.h
deleted file mode 100644
index 05c3805d..00000000
--- a/aether/format/formatter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_FORMAT_FORMATTER_H_
-#define AETHER_FORMAT_FORMATTER_H_
-
-#include <string_view>
-
-namespace ae {
-// Format context for each variable
-template <typename TStream>
-class FormatContext {
- public:
-  constexpr FormatContext(TStream& out, std::string_view opt_string)
-      : options{opt_string}, out_{&out} {}
-
-  constexpr auto& out() { return *out_; }
-
-  std::string_view options;
-
- private:
-  TStream* out_;
-};
-
-template <typename T, typename Enable = void>
-struct Formatter {
-  // provide Format method for your type
-};
-
-}  // namespace ae
-
-#endif  // AETHER_FORMAT_FORMATTER_H_
diff --git a/aether/gateway_api/server_endpoints.h b/aether/gateway_api/server_endpoints.h
index fcb8ff5c..c29fba42 100644
--- a/aether/gateway_api/server_endpoints.h
+++ b/aether/gateway_api/server_endpoints.h
@@ -20,11 +20,11 @@
 #include <vector>
 #include <functional>
 
-#include "aether/crc.h"
+#include "aether-miscpp/crc.h"
 #include "aether/mstream.h"
 #include "aether/types/address.h"
 #include "aether/mstream_buffers.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 struct ServerEndpoints {
diff --git a/aether/lora_modules/dx_smart_lr02_lm.cpp b/aether/lora_modules/dx_smart_lr02_lm.cpp
index ca6d64e1..0256abe2 100644
--- a/aether/lora_modules/dx_smart_lr02_lm.cpp
+++ b/aether/lora_modules/dx_smart_lr02_lm.cpp
@@ -20,8 +20,8 @@
 #  include <bitset>
 #  include <string_view>
 
-#  include "aether/misc/defer.h"
-#  include "aether/misc/from_chars.h"
+#  include "aether-miscpp/misc/defer.h"
+#  include "aether-miscpp/misc/from_chars.h"
 #  include "aether/actions/pipeline.h"
 #  include "aether/actions/gen_action.h"
 #  include "aether/mstream_buffers.h"
diff --git a/aether/lora_modules/ebyte_e22_lm.cpp b/aether/lora_modules/ebyte_e22_lm.cpp
index c260cdb4..bce93a53 100644
--- a/aether/lora_modules/ebyte_e22_lm.cpp
+++ b/aether/lora_modules/ebyte_e22_lm.cpp
@@ -20,8 +20,8 @@
 #  include <bitset>
 #  include <string_view>
 
-#  include "aether/misc/defer.h"
-#  include "aether/misc/from_chars.h"
+#  include "aether-miscpp/misc/defer.h"
+#  include "aether-miscpp/misc/from_chars.h"
 #  include "aether/actions/pipeline.h"
 #  include "aether/actions/gen_action.h"
 #  include "aether/mstream_buffers.h"
diff --git a/aether/lora_modules/lora_module_driver_types.h b/aether/lora_modules/lora_module_driver_types.h
index 5b59b322..a4732c19 100644
--- a/aether/lora_modules/lora_module_driver_types.h
+++ b/aether/lora_modules/lora_module_driver_types.h
@@ -25,7 +25,7 @@
 #  include <vector>
 
 #  include "aether/types/address.h"
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/serial_ports/serial_port_types.h"
 
 namespace ae {
diff --git a/aether/meta/arg_at.h b/aether/meta/arg_at.h
deleted file mode 100644
index a7e4ec11..00000000
--- a/aether/meta/arg_at.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_ARG_AT_H_
-#define AETHER_META_ARG_AT_H_
-
-#include <cstddef>
-#include <utility>
-
-namespace ae {
-/**
- * \brief Get I'th argument in args list.
- */
-template <std::size_t I, typename T, typename... TArgs>
-constexpr decltype(auto) VarAt([[maybe_unused]] T&& arg,
-                               [[maybe_unused]] TArgs&&... args) {
-  static_assert(I <= sizeof...(args), "Index out of bounds");
-  if constexpr (I == 0) {
-    return std::forward<T>(arg);
-  } else {
-    return VarAt<I - 1>(std::forward<TArgs>(args)...);
-  }
-}
-
-template <std::size_t I, auto Arg, auto... Args>
-struct ArgAt {
-  static_assert(I <= sizeof...(Args), "Index out of bounds");
-  static constexpr auto value = ArgAt<I - 1, Args...>::value;
-};
-
-template <auto Arg, auto... Args>
-struct ArgAt<0, Arg, Args...> {
-  static constexpr auto value = Arg;
-};
-
-template <std::size_t I, auto... Args>
-static inline constexpr auto ArgAt_v = ArgAt<I, Args...>::value;
-
-}  // namespace ae
-
-#if AE_TESTS
-#  include "tests/inline.h"
-
-namespace test::arg_at_h {
-AE_TEST_INLINE(test_VarAt) {
-  constexpr int x = 42;
-  constexpr double y = 3.14;
-  constexpr bool z = true;
-
-  static_assert(ae::VarAt<0>(x, y, z) == 42);
-  static_assert(ae::VarAt<1>(x, y, z) == 3.14);
-  static_assert(ae::VarAt<2>(x, y, z));
-
-  int a = 10;
-  float b = 3.14F;
-  bool c = true;
-
-  TEST_ASSERT_EQUAL(10, ae::VarAt<0>(a, b, c));
-  TEST_ASSERT_EQUAL_FLOAT(3.14F, ae::VarAt<1>(a, b, c));
-  TEST_ASSERT_EQUAL(true, ae::VarAt<2>(a, b, c));
-}
-
-template <auto... Args>
-inline void testTemplateArgs() {
-  TEST_ASSERT_EQUAL(10, (ae::ArgAt_v<0, Args...>));
-  TEST_ASSERT_EQUAL_FLOAT(3.14F, (ae::ArgAt_v<1, Args...>));
-  TEST_ASSERT_EQUAL(true, (ae::ArgAt_v<2, Args...>));
-}
-
-AE_TEST_INLINE(test_ArgAt) {
-  constexpr int x = 42;
-  constexpr double y = 3.14;
-  constexpr bool z = true;
-
-  static_assert(ae::ArgAt_v<0, x, y, z> == 42);
-  static_assert(ae::ArgAt_v<1, x, y, z> == 3.14);
-  static_assert(ae::ArgAt_v<2, x, y, z>);
-
-  testTemplateArgs<10, 3.14F, true>();
-}
-
-}  // namespace test::arg_at_h
-#endif
-
-#endif  // AETHER_META_ARG_AT_H_
diff --git a/aether/meta/as_type.h b/aether/meta/as_type.h
deleted file mode 100644
index 368ad8cd..00000000
--- a/aether/meta/as_type.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_AS_TYPE_H_
-#define AETHER_META_AS_TYPE_H_
-
-#include <utility>
-#include <type_traits>
-
-namespace ae {
-// AS rvalue
-template <typename T, typename U>
-T&& as_type(U&& u)
-  requires std::is_same_v<U&&, decltype(u)>
-{
-  return static_cast<T&&>(std::forward<U>(u));
-}
-
-// AS lvalue
-template <typename T, typename U>
-T& as_type(U& u) {
-  return static_cast<T&>(u);
-}
-
-// AS const lvalue
-template <typename T, typename U>
-T const& as_type(U const& u) {
-  return static_cast<T const&>(u);
-}
-}  // namespace ae
-
-#ifdef AE_TESTS
-
-#  include "tests/inline.h"
-
-namespace test::as_type_h {
-using ae::as_type;
-
-struct Base {};
-struct Derived : Base {};
-
-AE_TEST_INLINE(test_AsType) {
-  Derived d;
-  decltype(auto) b1 = as_type<Base>(d);
-  static_assert(std::is_same_v<Base&, decltype(b1)>);
-
-  decltype(auto) b2 = as_type<Base>(std::as_const(d));
-  static_assert(std::is_same_v<Base const&, decltype(b2)>);
-
-  decltype(auto) b3 = as_type<Base>(std::move(d));
-  static_assert(std::is_same_v<Base&&, decltype(b3)>);
-
-  TEST_PASS();
-};
-}  // namespace test::as_type_h
-#endif
-#endif  // AETHER_META_AS_TYPE_H_
diff --git a/aether/meta/function_signature.h b/aether/meta/function_signature.h
deleted file mode 100644
index 849f90f7..00000000
--- a/aether/meta/function_signature.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_FUNCTION_SIGNATURE_H_
-#define AETHER_META_FUNCTION_SIGNATURE_H_
-
-#include <utility>
-
-#include "aether/meta/type_list.h"
-
-namespace ae {
-template <typename Ret, typename... Args>
-struct FunctionSignatureImpl {
-  using ret = Ret;
-  using args = TypeList<Args...>;
-  using signature = ret(args, ...);
-  using func_ptr = ret (*)(args, ...);
-};
-
-template <typename R, typename... Args>
-auto GetFunctionSignature(R (*)(Args...)) -> FunctionSignatureImpl<R, Args...>;
-
-template <typename R, typename C, typename... Args>
-auto GetFunctionSignature(R (C::*)(Args...))
-    -> FunctionSignatureImpl<R, Args...>;
-
-template <typename R, typename C, typename... Args>
-auto GetFunctionSignature(R (C::*)(Args...) const)
-    -> FunctionSignatureImpl<R, Args...>;
-
-template <typename Callable>
-auto GetFunctionSignature(Callable)
-    -> decltype(GetFunctionSignature(&Callable::operator()));
-
-template <typename Func>
-struct FunctionSignature
-    : decltype(GetFunctionSignature(std::declval<Func>())){};
-
-}  // namespace ae
-
-#endif  // AETHER_META_FUNCTION_SIGNATURE_H_
diff --git a/aether/meta/ignore_t.h b/aether/meta/ignore_t.h
deleted file mode 100644
index aa0c467a..00000000
--- a/aether/meta/ignore_t.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_IGNORE_T_H_
-#define AETHER_META_IGNORE_T_H_
-
-#include <type_traits>
-
-namespace ae {
-struct Ignore {
-  template <typename... Us>
-  constexpr explicit Ignore(Us&&...) noexcept {}
-  constexpr Ignore(Ignore const&) noexcept = default;
-};
-
-static constexpr inline auto kIgnore = Ignore{};
-
-template <typename T>
-struct IsIgnore : std::false_type {};
-
-template <>
-struct IsIgnore<Ignore> : std::true_type {};
-template <typename T>
-static constexpr inline bool IsIgnore_v = IsIgnore<T>::value;
-
-}  // namespace ae
-
-#endif  // AETHER_META_IGNORE_T_H_
diff --git a/aether/meta/index_sequence.h b/aether/meta/index_sequence.h
deleted file mode 100644
index 42464305..00000000
--- a/aether/meta/index_sequence.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_INDEX_SEQUENCE_H_
-#define AETHER_META_INDEX_SEQUENCE_H_
-
-#include <array>
-#include <cstddef>
-#include <utility>
-
-namespace ae {
-namespace index_sequence_internal {
-template <typename T, T... N, std::size_t... Indices>
-constexpr auto reverse_sequence_helper(std::integer_sequence<T, N...>,
-                                       std::index_sequence<Indices...>) {
-  constexpr auto array = std::array<T, sizeof...(N)>{N...};
-  return std::integer_sequence<T, array[sizeof...(Indices) - Indices - 1]...>();
-}
-
-template <typename T, T min, T... N>
-constexpr auto make_range_sequence_helper(std::integer_sequence<T, N...>) {
-  return std::integer_sequence<T, (N + min)...>();
-}
-}  // namespace index_sequence_internal
-
-template <typename T, T... N>
-constexpr auto reverse_sequence(std::integer_sequence<T, N...> sequence) {
-  return index_sequence_internal::reverse_sequence_helper(
-      sequence, std::make_index_sequence<sizeof...(N)>());
-}
-
-template <typename T, T from, T to>
-constexpr auto make_range_sequence() {
-  if constexpr (from <= to) {
-    return index_sequence_internal::make_range_sequence_helper<T, from>(
-        std::make_integer_sequence<T, to - from + 1>());
-  } else {
-    // make reverse sequence from bigger to lesser
-    return reverse_sequence(
-        index_sequence_internal::make_range_sequence_helper<T, to>(
-            std::make_integer_sequence<T, from - to + 1>()));
-  }
-}
-
-}  // namespace ae
-
-#if AE_TESTS
-#  include "tests/inline.h"
-
-namespace tests::index_sequence_h {
-AE_TEST_INLINE(test_ReverseSequence) {
-  constexpr auto rev_indices =
-      ae::reverse_sequence(std::make_index_sequence<10>());
-  static_assert(
-      std::is_same_v<std::index_sequence<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>,
-                     std::decay_t<decltype(rev_indices)>>);
-
-  constexpr auto types_rev_indices =
-      ae::reverse_sequence(std::index_sequence_for<int, float, bool, double>());
-  static_assert(std::is_same_v<std::index_sequence<3, 2, 1, 0>,
-                               std::decay_t<decltype(types_rev_indices)>>);
-  TEST_PASS();
-}
-}  // namespace tests::index_sequence_h
-#endif
-
-#endif  // AETHER_META_INDEX_SEQUENCE_H_
diff --git a/aether/meta/tag_invoke.h b/aether/meta/tag_invoke.h
deleted file mode 100644
index b1002f69..00000000
--- a/aether/meta/tag_invoke.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_TAG_INVOKE_H_
-#define AETHER_META_TAG_INVOKE_H_
-
-#include <utility>
-
-namespace ae {
-
-namespace _tag_invoke {
-void tag_invoke();
-
-struct fn_ {
-  template <typename Cpo, typename... Args>
-  constexpr auto operator()(Cpo&& cpo, Args&&... args) const
-      noexcept(noexcept(tag_invoke(std::forward<Cpo>(cpo),
-                                   std::forward<Args>(args)...)))
-          -> decltype(tag_invoke(std::forward<Cpo>(cpo),
-                                 std::forward<Args>(args)...)) {
-    return tag_invoke(std::forward<Cpo>(cpo), std::forward<Args>(args)...);
-  }
-};
-
-template <typename Cpo, typename... Args>
-using tag_invoke_result_t =
-    decltype(tag_invoke(std::declval<Cpo&&>(), std::declval<Args&&>()...));
-
-template <typename Cpo, typename... Args,
-          typename = tag_invoke_result_t<Cpo, Args...>>
-std::true_type TestTagInvocable(int) noexcept(
-    noexcept(tag_invoke(std::declval<Cpo&&>(), std::declval<Args&&>()...)));
-
-template <typename Cpo, typename... Args>
-std::false_type TestTagInvocable(...);
-
-}  // namespace _tag_invoke
-inline constexpr auto tag_invoke = _tag_invoke::fn_{};
-
-using _tag_invoke::tag_invoke_result_t;
-using _tag_invoke::TestTagInvocable;
-
-template <typename Cpo, typename... Args>
-inline constexpr bool TagInvocable_v =
-    decltype(TestTagInvocable<Cpo, Args...>(0))::value;
-
-template <typename T, typename Cpo, typename... Args>
-concept TagInvocable =
-    TagInvocable_v<Cpo, T, Args...> || TagInvocable_v<Cpo, T&, Args...> ||
-    TagInvocable_v<Cpo, T const&, Args...> || TagInvocable_v<Cpo, T&&, Args...>;
-
-/**
- * \brief Helper struct to define cpo tag
- */
-template <auto Cpo>
-using tag_t = std::decay_t<decltype(Cpo)>;
-
-}  // namespace ae
-
-#ifdef AE_TESTS
-#  include "tests/inline.h"
-
-namespace test::tag_invoke_h {
-inline constexpr struct TestCpo {
-  void operator()(ae::TagInvocable<TestCpo> auto& t) const {
-    ae::tag_invoke(*this, t);
-  }
-} test_cpo{};
-
-inline constexpr struct TestGetInt {
-  int operator()(ae::TagInvocable<TestGetInt> auto& t) const {
-    return ae::tag_invoke(*this, t);
-  }
-} test_get_int{};
-
-struct Foo {
-  bool& invoked;
-
-  friend void tag_invoke(ae::tag_t<test_cpo>, Foo& foo) noexcept {
-    foo.invoked = true;
-  }
-};
-
-struct Bar {
-  int value;
-
-  friend int tag_invoke(ae::tag_t<test_get_int>, Bar const& bar) noexcept {
-    return bar.value;
-  }
-};
-
-AE_TEST_INLINE(test_TagInvoke) {
-  using TestCpoType = ae::tag_t<test_cpo>;
-  static_assert(std::is_same_v<TestCpo, TestCpoType>);
-  using TestGetIntType = ae::tag_t<test_get_int>;
-  static_assert(std::is_same_v<TestGetInt, TestGetIntType>);
-
-  using foo_res = ae::tag_invoke_result_t<ae::tag_t<test_cpo>, Foo&>;
-  static_assert(std::is_void_v<foo_res>);
-  static_assert(ae::TagInvocable_v<ae::tag_t<test_cpo>, Foo&>);
-  static_assert(!ae::TagInvocable_v<ae::tag_t<test_get_int>, Foo&>);
-
-  using bar_res = ae::tag_invoke_result_t<ae::tag_t<test_get_int>, Bar const&>;
-  static_assert(std::is_same_v<int, bar_res>);
-  static_assert(ae::TagInvocable_v<ae::tag_t<test_get_int>, Bar const&>);
-  static_assert(!ae::TagInvocable_v<ae::tag_t<test_cpo>, Bar const&>);
-
-  static_assert(ae::TagInvocable<Foo, ae::tag_t<test_cpo>>);
-  static_assert(!ae::TagInvocable<Foo, ae::tag_t<test_get_int>>);
-  static_assert(ae::TagInvocable<Bar, ae::tag_t<test_get_int>>);
-  static_assert(!ae::TagInvocable<Bar, ae::tag_t<test_cpo>>);
-
-  bool invoked{};
-  Foo foo{invoked};
-  test_cpo(foo);
-  TEST_ASSERT_TRUE(invoked);
-
-  Bar bar{42};
-  auto value = test_get_int(bar);
-  TEST_ASSERT_EQUAL(42, value);
-}
-}  // namespace test::tag_invoke_h
-#endif
-
-#endif  // AETHER_META_TAG_INVOKE_H_
diff --git a/aether/meta/time_traits.h b/aether/meta/time_traits.h
deleted file mode 100644
index 82d1dda6..00000000
--- a/aether/meta/time_traits.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_TIME_TRAITS_H_
-#define AETHER_META_TIME_TRAITS_H_
-
-#include <chrono>
-#include <type_traits>
-
-namespace ae {
-template <typename T>
-struct IsDuration : std::false_type {};
-template <typename Rep, typename Period>
-struct IsDuration<std::chrono::duration<Rep, Period>> : std::true_type {};
-template <typename T>
-static constexpr inline auto IsDuration_v = IsDuration<T>::value;
-
-template <typename T>
-struct IsTimePoint : std::false_type {};
-template <typename Clock, typename Duration>
-struct IsTimePoint<std::chrono::time_point<Clock, Duration>> : std::true_type {
-};
-template <typename T>
-static constexpr inline auto IsTimePoint_v = IsTimePoint<T>::value;
-
-}  // namespace ae
-
-#endif  // AETHER_META_TIME_TRAITS_H_
diff --git a/aether/meta/type_list.h b/aether/meta/type_list.h
deleted file mode 100644
index c4e212ef..00000000
--- a/aether/meta/type_list.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_META_TYPE_LIST_H_
-#define AETHER_META_TYPE_LIST_H_
-
-#include <cstddef>
-#include <utility>
-#include <type_traits>
-
-#include "aether/meta/index_sequence.h"
-
-namespace ae {
-template <typename... T>
-struct TypeList {};
-
-template <typename... T>
-struct TypeListMaker {
-  using type = TypeList<std::decay_t<T>...>;
-
-  template <typename... U>
-  explicit constexpr TypeListMaker(U&&...) {}
-};
-
-template <typename... T>
-TypeListMaker(T&&...) -> TypeListMaker<T...>;
-
-namespace type_list_internal {
-template <std::size_t I>
-using index_constant = std::integral_constant<std::size_t, I>;
-
-template <std::size_t I, typename U>
-struct NType {
-  static auto get(index_constant<I>) -> U;
-};
-
-template <typename... Ts>
-struct NTypeSelector {
-  template <typename Indices>
-  struct Selector;
-
-  template <std::size_t... Is>
-  struct Selector<std::index_sequence<Is...>> : NType<Is, Ts>... {
-    using NType<Is, Ts>::get...;
-  };
-
-  template <std::size_t I>
-  static auto get()
-      -> decltype(Selector<decltype(std::index_sequence_for<Ts...>())>::get(
-          index_constant<I>{}));
-
-  template <std::size_t I>
-  using type = decltype(get<I>());
-};
-
-}  // namespace type_list_internal
-
-template <std::size_t I, typename TList>
-struct TypeAt;
-
-template <std::size_t I, typename... Ts>
-struct TypeAt<I, TypeList<Ts...>> {
-  using type =
-      typename type_list_internal::NTypeSelector<Ts...>::template type<I>;
-};
-
-template <std::size_t I, typename TList>
-using TypeAt_t = typename TypeAt<I, TList>::type;
-
-template <typename... Ts>
-struct TypeListSize;
-
-template <typename... Ts>
-struct TypeListSize<TypeList<Ts...>> {
-  static constexpr std::size_t value = sizeof...(Ts);
-};
-
-template <typename TList>
-static inline constexpr std::size_t TypeListSize_v = TypeListSize<TList>::value;
-
-/**
- * \brief Join two type lists.
- */
-template <typename T1, typename T2>
-struct JoinedTypeList;
-
-template <typename... T1, typename... T2>
-struct JoinedTypeList<TypeList<T1...>, TypeList<T2...>> {
-  using type = TypeList<T1..., T2...>;
-};
-
-template <typename List1, typename List2>
-using JoinedTypeList_t =
-    typename JoinedTypeList<std::decay_t<List1>, std::decay_t<List2>>::type;
-
-/**
- * \brief Pass type list as template parameters to template T
- */
-template <template <typename...> typename T, typename TList>
-struct TypeListToTemplate;
-
-template <template <typename...> typename T, typename... Ts>
-struct TypeListToTemplate<T, TypeList<Ts...>> {
-  using type = T<Ts...>;
-};
-
-template <template <typename...> typename T, typename TList>
-using TypeListToTemplate_t = typename TypeListToTemplate<T, TList>::type;
-
-/**
- * \brief Revers type list
- */
-template <typename T>
-struct ReversTypeList;
-
-template <typename... Ts>
-struct ReversTypeList<TypeList<Ts...>> {
-  using n_type_selector = type_list_internal::NTypeSelector<Ts...>;
-
-  template <std::size_t... Is>
-  static auto ReselectTypes(std::index_sequence<Is...>)
-      -> TypeList<typename n_type_selector::template type<Is>...>;
-
-  using type = decltype(ReselectTypes(
-      reverse_sequence(std::index_sequence_for<Ts...>{})));
-};
-
-template <typename T>
-struct ReversTypeList<TypeList<T>> {
-  using type = TypeList<T>;
-};
-
-}  // namespace ae
-#endif  // AETHER_META_TYPE_LIST_H_
diff --git a/aether/misc/defer.h b/aether/misc/defer.h
deleted file mode 100644
index c94abf62..00000000
--- a/aether/misc/defer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_MISC_DEFER_H_
-#define AETHER_MISC_DEFER_H_
-
-#include <utility>
-#include <optional>
-#include <type_traits>
-
-#include "aether/common.h"
-
-namespace ae {
-/**
- * \brief Defers the call of callable to the end of scope
- */
-template <typename T, AE_REQUIRERS((std::is_invocable<T>))>
-class ScopeExit {
- public:
-  constexpr explicit ScopeExit(T const& cb) noexcept(
-      std::is_nothrow_copy_constructible_v<T>)
-      : callable_{cb} {}
-  constexpr explicit ScopeExit(T&& cb) noexcept(
-      std::is_nothrow_move_constructible_v<T>)
-      : callable_{std::move(cb)} {}
-
-  ~ScopeExit() noexcept(std::is_nothrow_invocable_v<T>) {
-    if (!callable_) {
-      return;
-    }
-    (*callable_)();
-  }
-
-  AE_CLASS_NO_COPY_MOVE(ScopeExit)
-
-  void Reset() noexcept { callable_.reset(); }
-
- private:
-  std::optional<T> callable_;
-};
-
-template <typename T>
-ScopeExit(T&&) -> ScopeExit<T>;
-
-struct MakeScopeExit {};
-
-template <typename TCallable>
-constexpr auto operator<<(MakeScopeExit, TCallable&& cb) {
-  return ScopeExit(std::forward<TCallable>(cb));
-}
-}  // namespace ae
-
-#define ae_defer_at MakeScopeExit{} <<
-#define ae_defer auto AE_UNIQUE_NAME(SCOPE_GUARD) = ae_defer_at
-
-#endif  // AETHER_MISC_DEFER_H_
diff --git a/aether/misc/from_chars.h b/aether/misc/from_chars.h
deleted file mode 100644
index 38b05d02..00000000
--- a/aether/misc/from_chars.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef AETHER_MISC_FROM_CHARS_H_
-#define AETHER_MISC_FROM_CHARS_H_
-
-#include <charconv>
-#include <optional>
-#include <string_view>
-
-namespace ae {
-template <typename T>
-std::optional<T> FromChars(std::string_view str, int base = 10) {
-  T value;
-  // skip 0x if present
-  auto skip_pos = str.find("0x");
-  if (skip_pos != std::string_view::npos) {
-    str.remove_prefix(skip_pos + 2);
-  }
-  auto [ptr, ec] =
-      std::from_chars(str.data(), str.data() + str.size(), value, base);
-  if (ec == std::errc()) {
-    return value;
-  }
-  return std::nullopt;
-}
-}  // namespace ae
-
-#endif  // AETHER_MISC_FROM_CHARS_H_
diff --git a/aether/misc/override.h b/aether/misc/override.h
deleted file mode 100644
index 877c3abb..00000000
--- a/aether/misc/override.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_MISC_OVERRIDE_H_
-#define AETHER_MISC_OVERRIDE_H_
-
-#include <utility>
-
-namespace ae {
-/**
- * \brief Functor overridable with many other functors.
- * Has a cumulative operator() of all Fs functors.
- */
-template <typename... Fs>
-struct Override : Fs... {
-  explicit Override(Fs... funcs) noexcept : Fs{std::forward<Fs>(funcs)}... {}
-
-  using Fs::operator()...;
-};
-template <typename... U>
-Override(U&&...) -> Override<U...>;
-}  // namespace ae
-
-#endif  // AETHER_MISC_OVERRIDE_H_
diff --git a/aether/modems/bg95_at_modem.cpp b/aether/modems/bg95_at_modem.cpp
index a7ee81d6..1307de11 100644
--- a/aether/modems/bg95_at_modem.cpp
+++ b/aether/modems/bg95_at_modem.cpp
@@ -19,7 +19,7 @@
 
 #  include <string_view>
 
-#  include "aether/misc/override.h"
+#  include "aether-miscpp/misc/override.h"
 #  include "aether/executors/executors.h"
 #  include "aether/serial_ports/at_support/at_stage.h"
 #  include "aether/serial_ports/at_support/at_request.h"
@@ -701,4 +701,4 @@ void Bg95AtModem::PollEvent(std::int32_t handle) {
 }
 
 } /* namespace ae */
-#endif
\ No newline at end of file
+#endif
diff --git a/aether/modems/imodem_driver.h b/aether/modems/imodem_driver.h
index fb0fed12..e265daee 100644
--- a/aether/modems/imodem_driver.h
+++ b/aether/modems/imodem_driver.h
@@ -25,10 +25,10 @@
 #  include <cstdint>
 #  include <optional>
 
-#  include "aether/types/result.h"
+#  include "aether-miscpp/types/result.h"
 #  include "aether/events/events.h"
 #  include "aether/types/address.h"
-#  include "aether/meta/ignore_t.h"
+#  include "aether-miscpp/meta/ignore_t.h"
 #  include "aether/actions/action.h"
 #  include "aether/types/data_buffer.h"
 #  include "aether/modems/modem_driver_types.h"
diff --git a/aether/modems/modem_driver_types.h b/aether/modems/modem_driver_types.h
index 514ced94..e53cc65d 100644
--- a/aether/modems/modem_driver_types.h
+++ b/aether/modems/modem_driver_types.h
@@ -22,7 +22,7 @@
 #  include <string>
 #  include <vector>
 
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/serial_ports/serial_port_types.h"
 
 namespace ae {
diff --git a/aether/modems/sim7070_at_modem.cpp b/aether/modems/sim7070_at_modem.cpp
index 50f440d1..6721c575 100644
--- a/aether/modems/sim7070_at_modem.cpp
+++ b/aether/modems/sim7070_at_modem.cpp
@@ -19,7 +19,7 @@
 
 #  include <string_view>
 
-#  include "aether/misc/override.h"
+#  include "aether-miscpp/misc/override.h"
 #  include "aether/executors/executors.h"
 #  include "aether/serial_ports/at_support/at_stage.h"
 #  include "aether/serial_ports/at_support/at_request.h"
diff --git a/aether/modems/thingy91x_at_modem.cpp b/aether/modems/thingy91x_at_modem.cpp
index 83922ea5..7027712e 100644
--- a/aether/modems/thingy91x_at_modem.cpp
+++ b/aether/modems/thingy91x_at_modem.cpp
@@ -20,8 +20,8 @@
 #  include <bitset>
 #  include <string_view>
 
-#  include "aether/misc/override.h"
-#  include "aether/misc/from_chars.h"
+#  include "aether-miscpp/misc/override.h"
+#  include "aether-miscpp/misc/from_chars.h"
 #  include "aether/executors/executors.h"
 #  include "aether/serial_ports/at_support/at_stage.h"
 #  include "aether/serial_ports/serial_port_factory.h"
diff --git a/aether/mstream.h b/aether/mstream.h
index a3c7455f..ca412381 100644
--- a/aether/mstream.h
+++ b/aether/mstream.h
@@ -44,9 +44,9 @@
 #include <unordered_map>
 
 #include "aether/clock.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/types/nullable_type.h"
-#include "aether/reflect/domain_visitor.h"  // IWYU pragma: keep
+#include "aether-miscpp/reflect/domain_visitor.h"  // IWYU pragma: keep
 
 namespace ae {
 
diff --git a/aether/obj/component_factory.h b/aether/obj/component_factory.h
index ea5f8e39..996b134e 100644
--- a/aether/obj/component_factory.h
+++ b/aether/obj/component_factory.h
@@ -20,7 +20,7 @@
 #include <optional>
 #include <type_traits>
 
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 template <typename... T>
diff --git a/aether/obj/domain.h b/aether/obj/domain.h
index f52baa9c..ec06cf75 100644
--- a/aether/obj/domain.h
+++ b/aether/obj/domain.h
@@ -29,8 +29,8 @@
 #include "aether/mstream.h"
 
 #include "aether/ptr/ptr_view.h"
-#include "aether/reflect/reflect.h"
-#include "aether/reflect/domain_visitor.h"
+#include "aether-miscpp/reflect/reflect.h"
+#include "aether-miscpp/reflect/domain_visitor.h"
 
 #include "aether/obj/obj_id.h"
 #include "aether/obj/registry.h"
diff --git a/aether/obj/obj.h b/aether/obj/obj.h
index 015338a4..6b622d24 100644
--- a/aether/obj/obj.h
+++ b/aether/obj/obj.h
@@ -31,13 +31,13 @@
 
 #include "aether/config.h"
 
-#include "aether/crc.h"
+#include "aether-miscpp/crc.h"
 #include "aether/obj/obj_id.h"
 #include "aether/obj/obj_ptr.h"
 #include "aether/obj/domain.h"
 #include "aether/obj/registry.h"
 #include "aether/obj/registrar.h"  // IWYU pragma:  export
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 /**
diff --git a/aether/obj/obj_ptr.h b/aether/obj/obj_ptr.h
index c3c87894..82cc6f9b 100644
--- a/aether/obj/obj_ptr.h
+++ b/aether/obj/obj_ptr.h
@@ -27,7 +27,7 @@
 #include "aether/obj/domain.h"
 #include "aether/obj/registry.h"
 #include "aether/obj/obj_ptr_base.h"
-#include "aether/reflect/domain_visitor.h"  // IWYU pragma: keep
+#include "aether-miscpp/reflect/domain_visitor.h"  // IWYU pragma: keep
 
 namespace ae {
 
diff --git a/aether/obj/registrar.h b/aether/obj/registrar.h
index e5323b75..7a06ad10 100644
--- a/aether/obj/registrar.h
+++ b/aether/obj/registrar.h
@@ -22,7 +22,7 @@
 #include "aether/ptr/ptr.h"
 #include "aether/obj/domain.h"
 #include "aether/obj/registry.h"
-#include "aether/reflect/type_index.h"
+#include "aether-miscpp/reflect/type_index.h"
 
 namespace ae {
 template <class T>
diff --git a/aether/obj/registry.cpp b/aether/obj/registry.cpp
index 1d154032..792edc3c 100644
--- a/aether/obj/registry.cpp
+++ b/aether/obj/registry.cpp
@@ -18,7 +18,7 @@
 
 #include <utility>
 
-#include "aether/crc.h"
+#include "aether-miscpp/crc.h"
 #include "aether/obj/obj_tele.h"
 
 namespace ae {
diff --git a/aether/poller/freertos_poller.h b/aether/poller/freertos_poller.h
index f044b0e1..5d6749cd 100644
--- a/aether/poller/freertos_poller.h
+++ b/aether/poller/freertos_poller.h
@@ -32,7 +32,7 @@
 #  include "aether/config.h"
 #  include "aether/poller/poller.h"
 #  include "aether/poller/poller_types.h"
-#  include "aether/types/small_function.h"
+#  include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 class FreeRtosLwipPollerImpl : public NativePoller {
diff --git a/aether/poller/poller_types.h b/aether/poller/poller_types.h
index 99ed0a55..7e4131b5 100644
--- a/aether/poller/poller_types.h
+++ b/aether/poller/poller_types.h
@@ -19,7 +19,7 @@
 
 #include <cstdint>
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 namespace ae {
 struct EventType {
diff --git a/aether/poller/unix_poller.h b/aether/poller/unix_poller.h
index d43e0129..f03e7c6b 100644
--- a/aether/poller/unix_poller.h
+++ b/aether/poller/unix_poller.h
@@ -25,7 +25,7 @@
 
 #  include "aether/poller/poller.h"
 #  include "aether/poller/poller_types.h"
-#  include "aether/types/small_function.h"
+#  include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 /**
diff --git a/aether/poller/win_poller.h b/aether/poller/win_poller.h
index 692ece84..550a40d6 100644
--- a/aether/poller/win_poller.h
+++ b/aether/poller/win_poller.h
@@ -35,7 +35,7 @@
 
 #  include "aether/poller/poller.h"
 #  include "aether/poller/poller_types.h"
-#  include "aether/types/small_function.h"
+#  include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 class IoCpPoller final : public NativePoller {
diff --git a/aether/ptr/ptr.h b/aether/ptr/ptr.h
index 8cd45115..789872eb 100644
--- a/aether/ptr/ptr.h
+++ b/aether/ptr/ptr.h
@@ -27,7 +27,7 @@
 #include "aether/ptr/rc_ptr.h"
 #include "aether/ptr/ref_tree.h"
 #include "aether/ptr/ptr_management.h"
-#include "aether/reflect/domain_visitor.h"
+#include "aether-miscpp/reflect/domain_visitor.h"
 // IWYU pragma: end_keeps
 
 namespace ae {
diff --git a/aether/ptr/ptr_management.h b/aether/ptr/ptr_management.h
index 24c2e12e..bc0215af 100644
--- a/aether/ptr/ptr_management.h
+++ b/aether/ptr/ptr_management.h
@@ -21,8 +21,8 @@
 #include <cassert>
 #include <type_traits>
 
-#include "aether/types/aligned_storage.h"
-#include "aether/reflect/domain_visitor.h"
+#include "aether-miscpp/types/aligned_storage.h"
+#include "aether-miscpp/reflect/domain_visitor.h"
 
 namespace ae {
 struct PtrRefcounters {
diff --git a/aether/ptr/rc_ptr.h b/aether/ptr/rc_ptr.h
index a8a8a56d..d5cb12f7 100644
--- a/aether/ptr/rc_ptr.h
+++ b/aether/ptr/rc_ptr.h
@@ -24,7 +24,7 @@
 #include <atomic>
 
 #include "aether/mstream.h"
-#include "aether/types/aligned_storage.h"
+#include "aether-miscpp/types/aligned_storage.h"
 
 namespace ae {
 // for most cases 2*uint8_t should be more than enough
diff --git a/aether/reflect/container_node_visitor.h b/aether/reflect/container_node_visitor.h
deleted file mode 100644
index 9e8ca84c..00000000
--- a/aether/reflect/container_node_visitor.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_CONTAINER_NODE_VISITOR_H_
-#define AETHER_REFLECT_CONTAINER_NODE_VISITOR_H_
-
-#include <utility>
-#include <type_traits>
-
-#include "aether/type_traits.h"
-#include "aether/reflect/node_visitor.h"
-#include "aether/reflect/cycle_detector.h"
-
-namespace ae::reflect {
-namespace container_node_visitor_internal {
-template <typename T, typename Enabled = void>
-struct IsValueTypeIntegral : std::false_type {};
-
-template <typename T>
-struct IsValueTypeIntegral<
-    T, std::enable_if_t<IsAssociatedContainer<T>::value &&
-                        std::is_integral_v<typename T::mapped_type>>>
-    : std::true_type {};
-
-template <typename T>
-struct IsValueTypeIntegral<
-    T, std::enable_if_t<IsContainer<T>::value &&
-                        std::is_integral_v<typename T::value_type>>>
-    : std::true_type {};
-}  // namespace container_node_visitor_internal
-
-// Container types
-// For non integral values
-template <typename T>
-struct NodeVisitor<
-    T, std::enable_if_t<
-           IsContainer<T>::value &&
-           !container_node_visitor_internal::IsValueTypeIntegral<T>::value>> {
-  using Policy = PolicyMatch<VisitPolicy::kDeep>;
-
-  // for non const
-  template <typename Visitor>
-  void Visit(T& obj, CycleDetector& cycle_detector, Visitor&& visitor) const {
-    VisitImpl(obj, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  // for const
-  template <typename Visitor>
-  void Visit(T const& obj, CycleDetector& cycle_detector,
-             Visitor&& visitor) const {
-    VisitImpl(obj, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  template <typename U, typename Visitor>
-  void VisitImpl(U&& obj, CycleDetector& cycle_detector,
-                 Visitor&& visitor) const {
-    for (auto& v : obj) {
-      ApplyVisit(v, cycle_detector, std::forward<Visitor>(visitor));
-    }
-  }
-
-  template <typename U, typename Visitor>
-  void ApplyVisit(U&& obj, CycleDetector& cycle_detector,
-                  Visitor&& visitor) const {
-    reflect::ApplyVisitor(std::forward<U>(obj), cycle_detector,
-                          std::forward<Visitor>(visitor));
-  }
-};
-
-// For integral values
-template <typename T>
-struct NodeVisitor<
-    T, std::enable_if_t<
-           IsContainer<T>::value &&
-           container_node_visitor_internal::IsValueTypeIntegral<T>::value>> {
-  using Policy = PolicyMatch<VisitPolicy::kDeep>;
-
-  // for non const
-  template <typename Visitor>
-  void Visit(T& obj, CycleDetector& cycle_detector, Visitor&& visitor) const {
-    reflect::ApplyVisitor(obj, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  // for const
-  template <typename Visitor>
-  void Visit(T const& obj, CycleDetector& cycle_detector,
-             Visitor&& visitor) const {
-    reflect::ApplyVisitor(obj, cycle_detector, std::forward<Visitor>(visitor));
-  }
-};
-
-// for pairs, used in map
-template <typename K, typename V>
-struct NodeVisitor<std::pair<K, V>> {
-  using Policy = PolicyMatch<VisitPolicy::kDeep>;
-
-  // for non const
-  template <typename Visitor>
-  void Visit(std::pair<K, V>& obj, CycleDetector& cycle_detector,
-             Visitor&& visitor) const {
-    // TODO: should we apply to the first ?
-    // apply to the second
-    ApplyVisit(obj.second, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  // for const
-  template <typename Visitor>
-  void Visit(std::pair<K, V> const& obj, CycleDetector& cycle_detector,
-             Visitor&& visitor) const {
-    // TODO: should we apply to the first ?
-    // apply to the second
-    ApplyVisit(obj.second, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  template <typename U, typename Visitor>
-  void ApplyVisit(U&& obj, CycleDetector& cycle_detector,
-                  Visitor&& visitor) const {
-    reflect::ApplyVisitor(std::forward<U>(obj), cycle_detector,
-                          std::forward<Visitor>(visitor));
-  }
-};
-
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_CONTAINER_NODE_VISITOR_H_
diff --git a/aether/reflect/cycle_detector.h b/aether/reflect/cycle_detector.h
deleted file mode 100644
index 011ca882..00000000
--- a/aether/reflect/cycle_detector.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_CYCLE_DETECTOR_H_
-#define AETHER_REFLECT_CYCLE_DETECTOR_H_
-
-#include <set>
-#include <array>
-#include <cstddef>
-#include <cstdint>
-
-#include "aether/crc.h"
-#include "aether/reflect/type_index.h"
-
-namespace ae::reflect {
-
-inline std::size_t GetIndexFromTypeIdAndAddress(void const* obj,
-                                                std::uint32_t type_index) {
-  std::array<std::uint8_t, sizeof(std::uintptr_t) + sizeof(type_index)> buffer;
-  // Concatenate the object's address and type index into one buffer
-  *reinterpret_cast<std::uintptr_t*>(buffer.data()) =
-      reinterpret_cast<std::uintptr_t>(obj);
-  *reinterpret_cast<std::uint32_t*>(buffer.data() + sizeof(std::uintptr_t)) =
-      type_index;
-  // get the crc32 hash of the buffer
-  return crc32::from_buffer(buffer.data(), buffer.size()).value;
-}
-
-template <typename T, typename Enable = void>
-struct ObjectIndex {
-  static constexpr auto TypeIndex = GetTypeIndex<T>();
-
-  static std::size_t GetIndex(T const* obj) {
-    return GetIndexFromTypeIdAndAddress(obj, TypeIndex);
-  }
-};
-
-struct CycleDetector {
-  /**
-   * \brief Add an object to the cycle detector. If the object is already in the
-   * cycle detector, return false. Otherwise, add the object and return true.
-   */
-  template <typename T>
-  bool Add(T const* ptr) {
-    auto entry = ObjectIndex<T>::GetIndex(ptr);
-    auto [it, ok] = visited_objects.insert(entry);
-    return ok;
-  }
-
-  std::set<std::size_t> visited_objects;
-};
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_CYCLE_DETECTOR_H_
diff --git a/aether/reflect/domain_visitor.h b/aether/reflect/domain_visitor.h
deleted file mode 100644
index be2ae6b9..00000000
--- a/aether/reflect/domain_visitor.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * One header to include for DomainVisitor
- */
-#ifndef AETHER_REFLECT_DOMAIN_VISITOR_H_
-#define AETHER_REFLECT_DOMAIN_VISITOR_H_
-
-// IWYU pragma: begin_exports
-#include "aether/reflect/override_func.h"
-#include "aether/reflect/domain_visitor_impl.h"
-#include "aether/reflect/reflect_node_visitor.h"
-#include "aether/reflect/ptr_like_node_visitor.h"
-#include "aether/reflect/container_node_visitor.h"
-// IWYU pragma: end_exports
-
-#endif  // AETHER_REFLECT_DOMAIN_VISITOR_H_
diff --git a/aether/reflect/domain_visitor_impl.h b/aether/reflect/domain_visitor_impl.h
deleted file mode 100644
index 6353a3f1..00000000
--- a/aether/reflect/domain_visitor_impl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_DOMAIN_VISITOR_IMPL_H_
-#define AETHER_REFLECT_DOMAIN_VISITOR_IMPL_H_
-
-#include <utility>
-#include <type_traits>
-
-#include "aether/reflect/node_visitor.h"
-#include "aether/reflect/cycle_detector.h"
-
-namespace ae::reflect {
-
-template <typename Visitor, int policy>
-struct DomainNodeVisitor {
-  static constexpr auto kPolicy = policy;
-
-  explicit constexpr DomainNodeVisitor(Visitor vis)
-      : visitor{std::forward<Visitor>(vis)} {}
-
-  template <typename U>
-  auto operator()(U&& val) {
-    return std::invoke(std::forward<Visitor>(visitor), std::forward<U>(val));
-  }
-
-  Visitor visitor;
-};
-
-template <typename T>
-struct IsDomainNodeVisitor : std::false_type {};
-
-template <typename V, int policy>
-struct IsDomainNodeVisitor<DomainNodeVisitor<V, policy>> : std::true_type {};
-
-template <typename T, typename Visitor, int policy = VisitPolicy::kShallow,
-          std ::enable_if_t<!IsDomainNodeVisitor<Visitor>::value, int> = 0>
-void DomainVisit(T&& obj, Visitor&& visitor) {
-  auto cycle_detector = CycleDetector{};
-  DomainVisit(
-      cycle_detector, std::forward<T>(obj),
-      DomainNodeVisitor<Visitor, policy>{std::forward<Visitor>(visitor)});
-}
-
-template <typename T, typename Visitor, int policy = VisitPolicy::kShallow>
-void DomainVisit(T&& obj, DomainNodeVisitor<Visitor, policy> visitor) {
-  auto cycle_detector = CycleDetector{};
-  DomainVisit(cycle_detector, std::forward<T>(obj), std::move(visitor));
-}
-
-template <typename T, typename Visitor, int policy = VisitPolicy::kShallow>
-void DomainVisit(CycleDetector& cycle_detector, T&& obj,
-                 DomainNodeVisitor<Visitor, policy>&& visitor) {
-  if constexpr (HasNodeVisitor<std::decay_t<T>>::value) {
-    using Nv = NodeVisitor<std::decay_t<T>>;
-    if constexpr (Nv::Policy::Match(policy)) {
-      if (!cycle_detector.Add(&obj)) {
-        return;
-      }
-      auto node_visitor = Nv{};
-      std::as_const(node_visitor)
-          .Visit(std::forward<T>(obj), cycle_detector, std::move(visitor));
-    }
-  }
-}
-
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_DOMAIN_VISITOR_IMPL_H_
diff --git a/aether/reflect/node_visitor.h b/aether/reflect/node_visitor.h
deleted file mode 100644
index 4d0a1a27..00000000
--- a/aether/reflect/node_visitor.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_NODE_VISITOR_H_
-#define AETHER_REFLECT_NODE_VISITOR_H_
-
-#include <utility>
-#include <type_traits>
-#include <functional>
-
-#include "aether/reflect/cycle_detector.h"
-
-namespace ae::reflect {
-enum VisitPolicy {
-  kNone = 0,
-  kShallow = 1,          // go only by first levels
-  kReflection = 1 << 1,  // go deeper by reflections
-  kDeep = 1 << 2,        // go deep as possible
-  kAny = 0xfffffff,
-};
-
-template <VisitPolicy policy>
-struct PolicyMatch {
-  static constexpr bool Match(int val) { return (val & policy) > 0; }
-};
-
-template <>
-struct PolicyMatch<VisitPolicy::kAny> {
-  static constexpr bool Match(int /* val */) { return true; }
-};
-
-using AnyPolicyMatch = PolicyMatch<VisitPolicy::kAny>;
-
-template <typename T, typename Enable = void>
-struct NodeVisitor;
-
-/**
- * \brief Call visitor with obj.
- * If Visitor returns bool, propagate further visiting if true.
- */
-template <typename U, typename Visitor>
-bool CallVisitor(U&& obj, Visitor&& visitor) {
-  if constexpr (std::is_same_v<bool, std::invoke_result_t<Visitor, U>>) {
-    // do not propagate on false
-    return std::invoke(std::forward<Visitor>(visitor), std::forward<U>(obj));
-  } else {
-    std::invoke(std::forward<Visitor>(visitor), std::forward<U>(obj));
-    return true;
-  }
-}
-
-template <typename T, typename Visitor>
-void DomainVisit(CycleDetector& cycle_detector, T&& obj, Visitor&& visitor);
-
-template <typename U, typename Visitor>
-void ApplyVisitor(U&& obj, CycleDetector& cycle_detector, Visitor&& visitor) {
-  if constexpr ((Visitor::kPolicy != VisitPolicy::kAny) &&
-                PolicyMatch<VisitPolicy::kShallow>::Match(Visitor::kPolicy)) {
-    // Call visitor only on current node
-    CallVisitor(std::forward<U>(obj), std::forward<Visitor>(visitor));
-  } else {
-    // Call visitor on current node and go deeper with new DomainVisit
-    if (CallVisitor(std::forward<U>(obj), std::forward<Visitor>(visitor))) {
-      DomainVisit(cycle_detector, std::forward<U>(obj),
-                  std::forward<Visitor>(visitor));
-    }
-  }
-}
-
-template <typename T, typename Enable = void>
-struct HasNodeVisitor : std::false_type {};
-
-template <typename T>
-struct HasNodeVisitor<T, std::void_t<decltype(NodeVisitor<T>{})>>
-    : std::true_type {};
-
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_NODE_VISITOR_H_
diff --git a/aether/reflect/override_func.h b/aether/reflect/override_func.h
deleted file mode 100644
index ffb54a19..00000000
--- a/aether/reflect/override_func.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_OVERRIDE_FUNC_H_
-#define AETHER_REFLECT_OVERRIDE_FUNC_H_
-
-#include <utility>
-
-namespace ae::reflect {
-/**
- * \brief Functor overridable with many other functors.
- * Has a cumulative operator() of all Fs functors.
- */
-template <typename... Fs>
-struct OverrideFunc : Fs... {
-  explicit OverrideFunc(Fs... funcs) : Fs{std::forward<Fs>(funcs)}... {}
-
-  using Fs::operator()...;
-};
-template <typename... U>
-OverrideFunc(U&&...) -> OverrideFunc<U...>;
-
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_OVERRIDE_FUNC_H_
diff --git a/aether/reflect/ptr_like_node_visitor.h b/aether/reflect/ptr_like_node_visitor.h
deleted file mode 100644
index 3a3d5512..00000000
--- a/aether/reflect/ptr_like_node_visitor.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_PTR_LIKE_NODE_VISITOR_H_
-#define AETHER_REFLECT_PTR_LIKE_NODE_VISITOR_H_
-
-#include "aether/reflect/node_visitor.h"
-#include "aether/reflect/cycle_detector.h"
-#include "aether/reflect/domain_visitor_impl.h"
-
-namespace ae::reflect {
-// for raw pointers
-template <typename T>
-struct NodeVisitor<T*, std::enable_if_t<HasNodeVisitor<T>::value>> {
-  using Policy = AnyPolicyMatch;
-
-  // for non const
-  template <typename Visitor>
-  void Visit(T* obj, CycleDetector& cycle_detector, Visitor&& visitor) const {
-    if (obj != nullptr) {
-      DomainVisit(cycle_detector, *obj, std::forward<Visitor>(visitor));
-    }
-  }
-};
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_PTR_LIKE_NODE_VISITOR_H_
diff --git a/aether/reflect/reflect.h b/aether/reflect/reflect.h
deleted file mode 100644
index 753fe850..00000000
--- a/aether/reflect/reflect.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_REFLECT_H_
-#define AETHER_REFLECT_REFLECT_H_
-
-// IWYU pragma: begin_exports
-#include "aether/reflect/type_index.h"
-#include "aether/reflect/reflect_impl.h"
-#include "aether/reflect/node_visitor.h"
-#include "aether/reflect/domain_visitor.h"
-// IWYU pragma: end_exports
-
-#endif  // AETHER_REFLECT_REFLECT_H_
diff --git a/aether/reflect/reflect_impl.h b/aether/reflect/reflect_impl.h
deleted file mode 100644
index a4011612..00000000
--- a/aether/reflect/reflect_impl.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_REFLECT_IMPL_H_
-#define AETHER_REFLECT_REFLECT_IMPL_H_
-
-#include <cstddef>
-#include <utility>
-#include <type_traits>
-
-#include "aether/common.h"
-#include "aether/meta/type_list.h"  // IWYU pragma: keep
-
-namespace ae::reflect {
-namespace reflect_internal {
-template <typename T, auto val>
-struct FieldPtr;
-
-/**
- * \brief Pointer to class member field.
- */
-template <typename T, typename M, M T::* val>
-struct FieldPtr<T, val> {
-  using class_type = T;
-  using type = M;
-  static constexpr auto kValue = val;
-
-  template <typename U, AE_REQUIRERS((std::is_same<T, std::decay_t<U>>))>
-  static constexpr decltype(auto) get(U&& obj) {
-    return std::forward<U>(obj).*kValue;
-  }
-};
-
-/**
- * \brief Field getter from getter type
- */
-template <typename T, typename TGetter>
-struct FieldGetter {
-  using class_type = T;
-  using getter = TGetter;
-  using type = std::remove_pointer_t<
-      std::decay_t<decltype(getter::get(std::declval<class_type*>()))>>;
-
-  template <typename U,
-            AE_REQUIRERS((std::is_same<class_type, std::decay_t<U>>))>
-  static constexpr decltype(auto) get(U&& obj) {
-    if constexpr (std::is_const_v<std::remove_reference_t<U>>) {
-      return const_cast<type const&>(
-          *getter::get(const_cast<class_type*>(&std::forward<U>(obj))));
-    } else {
-      return *getter::get(&std::forward<U>(obj));
-    }
-  }
-};
-
-/**
- * \brief class T's member fields list
- */
-template <typename T, typename... TFields>
-struct FieldList {
-  using Type = T;
-  using FieldsTypeList = TypeList<TFields...>;
-  static constexpr std::size_t kSize = sizeof...(TFields);
-
-  /**
-   * \brief Apply func to obj fields
-   */
-  template <typename U, typename Func>
-  static constexpr decltype(auto) Apply(U&& obj, Func&& func) {
-    // apply to each field
-    return std::forward<Func>(func)(TFields::get(std::forward<U>(obj))...);
-  }
-
-  /**
-   * \brief Get field
-   */
-  template <std::size_t I, typename U>
-  static constexpr decltype(auto) get(U&& obj) {
-    return TypeAt_t<I, FieldsTypeList>::get(std::forward<U>(obj));
-  }
-};
-
-template <typename T, typename FieldList>
-class ReflectionImpl {
- public:
-  using FieldListType = typename FieldList::Type;
-
-  constexpr explicit ReflectionImpl(T obj) : obj_{std::forward<T>(obj)} {}
-
-  template <typename Func>
-  constexpr decltype(auto) Apply(Func&& func) {
-    return FieldList::Apply(obj_, std::forward<Func>(func));
-  }
-
-  template <std::size_t I>
-  constexpr auto& get() {
-    return FieldList::template get<I>(obj_);
-  }
-
-  static constexpr std::size_t size() { return FieldList::kSize; }
-
- private:
-  T obj_;
-};
-}  // namespace reflect_internal
-
-template <typename T, typename Enable = void>
-class Reflection;
-
-template <typename T>
-class Reflection<T, std::void_t<decltype(std::declval<T>().FieldList())>>
-    : reflect_internal::ReflectionImpl<
-          T, decltype(std::declval<T>().FieldList())> {
- public:
-  using Impl =
-      reflect_internal::ReflectionImpl<T,
-                                       decltype(std::declval<T>().FieldList())>;
-  static_assert(std::is_same_v<std::decay_t<T>, typename Impl::FieldListType>,
-                "Reflection should not be derived");
-
-  constexpr explicit Reflection(T obj) : Impl{std::forward<T>(obj)} {}
-
-  using Impl::Apply;
-  using Impl::get;
-  using Impl::size;
-};
-
-template <typename T>
-Reflection(T&&) -> Reflection<T>;
-
-template <typename T, typename Enable = void>
-struct IsReflectable : std::false_type {};
-
-template <typename T>
-struct IsReflectable<T,
-                     std::void_t<decltype(Reflection<T&>{std::declval<T&>()})>>
-    : std::true_type {};
-
-}  // namespace ae::reflect
-
-#define _AE_APPLY_MACRO_0(MACRO, ...)
-#define _AE_APPLY_MACRO_1(MACRO, ARG, ...) \
-  MACRO(ARG) _AE_APPLY_MACRO_0(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_2(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_1(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_3(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_2(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_4(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_3(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_5(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_4(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_6(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_5(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_7(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_6(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_8(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_7(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_9(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_8(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_10(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_9(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_11(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_10(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_12(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_11(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_13(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_12(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_14(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_13(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_15(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_14(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_16(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_15(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_17(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_16(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_18(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_17(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_19(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_18(MACRO, __VA_ARGS__)
-#define _AE_APPLY_MACRO_20(MACRO, ARG, ...) \
-  MACRO(ARG), _AE_APPLY_MACRO_19(MACRO, __VA_ARGS__)
-
-#define _AE_APPLY_MACRO_N(MACRO, _20, _19, _18, _17, _16, _15, _14, _13, _12, \
-                          _11, _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, X,    \
-                          ...)                                                \
-  _AE_APPLY_MACRO##X(MACRO, _20, _19, _18, _17, _16, _15, _14, _13, _12, _11, \
-                     _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, _0)
-
-#define _AE_APPLY_MACRO(MACRO, ...)                                         \
-  _AE_APPLY_MACRO_N(MACRO, __VA_ARGS__, _20, _19, _18, _17, _16, _15, _14,  \
-                    _13, _12, _11, _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, \
-                    _0)
-
-/**
- * \brief Provide access to regular class member through pointer to member.
- */
-#define AE_MMBR(MEMBER) \
-  ::ae::reflect::reflect_internal::FieldPtr<SelfType, &SelfType::MEMBER> {}
-
-/**
- * \brief Provide access to regular class member through pointer to member.
- */
-#define AE_MMBRS(...) _AE_APPLY_MACRO(AE_MMBR, __VA_ARGS__)
-
-/**
- * \brief Provide access to reference type member.
- * c++ forbids create pointers to members if it's reference type.
- */
-#define AE_REF(MEMBER)                                                       \
-  []() constexpr {                                                           \
-    struct Getter {                                                          \
-      static decltype(auto) get(SelfType* obj) { return &obj->MEMBER; }      \
-    };                                                                       \
-    return ::ae::reflect::reflect_internal::FieldGetter<SelfType, Getter>{}; \
-  }()
-
-/**
- * \brief Provide a member as reference to Base class.
- */
-#define AE_REF_BASE(Base)                                                    \
-  []() constexpr {                                                           \
-    struct Getter {                                                          \
-      static decltype(auto) get(SelfType* obj) {                             \
-        return static_cast<Base*>(obj);                                      \
-      }                                                                      \
-    };                                                                       \
-    return ::ae::reflect::reflect_internal::FieldGetter<SelfType, Getter>{}; \
-  }()
-
-/**
- * \brief Make type reflectable with manual members marking.
- * Use AE_MMBR, AE_REF, AE_REF_BASE to mark members.
- */
-#define AE_REFLECT(...)                                                       \
-  constexpr auto FieldList() const {                                          \
-    using SelfType = std::decay_t<decltype(*this)>;                           \
-    static_assert(sizeof(SelfType) != 0);                                     \
-    auto fields = ::ae::TypeListMaker{__VA_ARGS__};                           \
-    using TypeFieldTypeList =                                                 \
-        ::ae::JoinedTypeList_t<::ae::TypeList<SelfType>,                      \
-                               typename decltype(fields)::type>;              \
-    using FL = typename ::ae::TypeListToTemplate<                             \
-        ::ae::reflect::reflect_internal::FieldList, TypeFieldTypeList>::type; \
-    return FL{};                                                              \
-  }
-
-/**
- * \brief Make type reflectable with each listed member marked automatically as
- * class member.
- */
-#define AE_REFLECT_MEMBERS(...)                                               \
-  constexpr auto FieldList() const {                                          \
-    using SelfType = std::decay_t<decltype(*this)>;                           \
-    static_assert(sizeof(SelfType) != 0);                                     \
-    auto fields = ::ae::TypeListMaker{_AE_APPLY_MACRO(AE_MMBR, __VA_ARGS__)}; \
-    using TypeFieldTypeList =                                                 \
-        ::ae::JoinedTypeList_t<::ae::TypeList<SelfType>,                      \
-                               typename decltype(fields)::type>;              \
-    using FL = typename ::ae::TypeListToTemplate<                             \
-        ::ae::reflect::reflect_internal::FieldList, TypeFieldTypeList>::type; \
-    return FL{};                                                              \
-  }
-
-#endif  // AETHER_REFLECT_REFLECT_IMPL_H_
diff --git a/aether/reflect/reflect_node_visitor.h b/aether/reflect/reflect_node_visitor.h
deleted file mode 100644
index f4d43724..00000000
--- a/aether/reflect/reflect_node_visitor.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_REFLECT_NODE_VISITOR_H_
-#define AETHER_REFLECT_REFLECT_NODE_VISITOR_H_
-
-#include <utility>
-
-#include "aether/reflect/reflect_impl.h"
-#include "aether/reflect/node_visitor.h"
-#include "aether/reflect/cycle_detector.h"
-
-namespace ae::reflect {
-// For reflectable classes
-template <typename T>
-struct NodeVisitor<T, std::enable_if_t<IsReflectable<T>::value>> {
-  using Policy = AnyPolicyMatch;
-
-  // for non const
-  template <typename Visitor>
-  void Visit(T& obj, CycleDetector& cycle_detector, Visitor&& visitor) const {
-    VisitImpl(obj, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  // for const
-  template <typename Visitor>
-  void Visit(T const& obj, CycleDetector& cycle_detector,
-             Visitor&& visitor) const {
-    VisitImpl(obj, cycle_detector, std::forward<Visitor>(visitor));
-  }
-
-  // universal
-  template <typename U, typename Visitor>
-  void VisitImpl(U&& obj, CycleDetector& cycle_detector,
-                 Visitor&& visitor) const {
-    auto reflection = Reflection{std::forward<U>(obj)};
-    reflection.Apply([&](auto&... fields) {
-      (ApplyVisit(fields, cycle_detector, std::forward<Visitor>(visitor)), ...);
-    });
-  }
-
-  template <typename U, typename Visitor>
-  void ApplyVisit(U&& obj, CycleDetector& cycle_detector,
-                  Visitor&& visitor) const {
-    reflect::ApplyVisitor(std::forward<U>(obj), cycle_detector,
-                          std::forward<Visitor>(visitor));
-  }
-};
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_REFLECT_NODE_VISITOR_H_
diff --git a/aether/reflect/type_index.h b/aether/reflect/type_index.h
deleted file mode 100644
index 39eaf25b..00000000
--- a/aether/reflect/type_index.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_REFLECT_TYPE_INDEX_H_
-#define AETHER_REFLECT_TYPE_INDEX_H_
-
-#include <array>
-#include <cstddef>
-#include <utility>
-#include <string_view>
-
-#include "aether/crc.h"
-
-namespace ae::reflect {
-/**
- * \brief Hold T's human readable name.
- * !This is not cross platform compatible, so use it for local or debugging
- * only
- */
-template <typename T>
-struct TypeNameHolder {
-  template <std::size_t... Is>
-  static constexpr auto NameArray(std::string_view str,
-                                  std::index_sequence<Is...>) {
-    return std::array{str[Is]...};
-  }
-
-  static constexpr auto GetTypeNameArray() {
-#if defined __clang__
-    constexpr std::string_view func_name = __PRETTY_FUNCTION__;
-    constexpr std::string_view pre = "[T = ";
-    constexpr std::string_view post = "]";
-#elif defined __GNUC__
-    constexpr std::string_view func_name = __PRETTY_FUNCTION__;
-    constexpr std::string_view pre = "[with T = ";
-    constexpr std::string_view post = "]";
-#elif defined _MSC_VER
-    constexpr std::string_view func_name = __FUNCSIG__;
-    constexpr std::string_view pre = "TypeNameHolder<";
-    constexpr std::string_view post = ">::GetTypeNameArray(void)";
-#else
-    constexpr std::string_view func_name =
-        "compiler_not_supported" __FUNCTION__;
-    constexpr std::string_view pre = "";
-    constexpr std::string_view post = "";
-#endif
-
-    constexpr auto begin = func_name.find(pre) + pre.size();
-    constexpr auto end = func_name.rfind(post);
-
-    static_assert(begin < end);
-
-    return NameArray(func_name.substr(begin, end),
-                     std::make_index_sequence<end - begin>());
-  }
-
-  static constexpr auto kNameArray = GetTypeNameArray();
-};
-
-/**
- * \brief Get human readable compile time type name
- */
-template <typename T>
-constexpr auto GetTypeName() {
-  constexpr auto& value = TypeNameHolder<T>::kNameArray;
-  return std::string_view{value.data(), value.size()};
-}
-
-/**
- * \brief Get a unique type index.
- */
-template <typename T>
-constexpr auto GetTypeIndex() {
-  return crc32::from_string_view(GetTypeName<T>()).value;
-}
-}  // namespace ae::reflect
-
-#endif  // AETHER_REFLECT_TYPE_INDEX_H_
diff --git a/aether/registration/api/global_reg_server_api.h b/aether/registration/api/global_reg_server_api.h
index 718f948e..bff611ff 100644
--- a/aether/registration/api/global_reg_server_api.h
+++ b/aether/registration/api/global_reg_server_api.h
@@ -25,7 +25,7 @@
 #  include "aether/types/uid.h"
 #  include "aether/crypto/key.h"
 #  include "aether/types/server_id.h"
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/api_protocol/api_protocol.h"
 
 namespace ae {
diff --git a/aether/registration/api/server_registration_api.h b/aether/registration/api/server_registration_api.h
index 02e76e9c..18c6f630 100644
--- a/aether/registration/api/server_registration_api.h
+++ b/aether/registration/api/server_registration_api.h
@@ -29,7 +29,7 @@
 #  include "aether/types/server_id.h"
 #  include "aether/crypto/crypto_definitions.h"
 
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/crypto/signed_key.h"
 #  include "aether/types/data_buffer.h"
 #  include "aether/crypto/icrypto_provider.h"
diff --git a/aether/registration/proof_of_work.cpp b/aether/registration/proof_of_work.cpp
index 534c7a27..7721eaa3 100644
--- a/aether/registration/proof_of_work.cpp
+++ b/aether/registration/proof_of_work.cpp
@@ -23,7 +23,7 @@
 
 #  include <bcrypt.h>
 
-#  include "aether/crc.h"
+#  include "aether-miscpp/crc.h"
 
 namespace ae {
 
diff --git a/aether/registration/registration.cpp b/aether/registration/registration.cpp
index 58a12382..28853e4f 100644
--- a/aether/registration/registration.cpp
+++ b/aether/registration/registration.cpp
@@ -23,7 +23,7 @@
 #  include "aether/aether.h"
 #  include "aether/crypto.h"
 #  include "aether/crypto/sign.h"
-#  include "aether/misc/override.h"
+#  include "aether-miscpp/misc/override.h"
 #  include "aether/executors/executors.h"
 #  include "aether/api_protocol/api_context.h"
 #  include "aether/crypto/crypto_definitions.h"
diff --git a/aether/registration/registration.h b/aether/registration/registration.h
index a77642a2..6b65fa9a 100644
--- a/aether/registration/registration.h
+++ b/aether/registration/registration.h
@@ -30,7 +30,7 @@
 #  include "aether/types/server_id.h"
 #  include "aether/types/client_config.h"
 #  include "aether/executors/executors.h"
-#  include "aether/types/small_function.h"
+#  include "aether-miscpp/types/small_function.h"
 
 #  include "aether/registration_cloud.h"
 #  include "aether/registration/api/client_reg_api_unsafe.h"
diff --git a/aether/safe_stream/details/circular_buffer.h b/aether/safe_stream/details/circular_buffer.h
index cc27deb6..d1e63384 100644
--- a/aether/safe_stream/details/circular_buffer.h
+++ b/aether/safe_stream/details/circular_buffer.h
@@ -22,7 +22,7 @@
 #include <cstddef>
 #include <algorithm>
 
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/types/ring_index.h"
 
 namespace ae {
diff --git a/aether/safe_stream/details/receiving_chunk_list.h b/aether/safe_stream/details/receiving_chunk_list.h
index 55e8cbe4..195c3c32 100644
--- a/aether/safe_stream/details/receiving_chunk_list.h
+++ b/aether/safe_stream/details/receiving_chunk_list.h
@@ -17,6 +17,7 @@
 #ifndef AETHER_SAFE_STREAM_DETAILS_RECEIVING_CHUNK_LIST_H_
 #define AETHER_SAFE_STREAM_DETAILS_RECEIVING_CHUNK_LIST_H_
 
+#include <map>
 #include <vector>
 #include <optional>
 #include <algorithm>
diff --git a/aether/serial_ports/at_support/at_listener.h b/aether/serial_ports/at_support/at_listener.h
index 3e978133..687604ff 100644
--- a/aether/serial_ports/at_support/at_listener.h
+++ b/aether/serial_ports/at_support/at_listener.h
@@ -19,7 +19,7 @@
 
 #include "aether/common.h"
 
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 #include "aether/serial_ports/at_support/at_buffer.h"
 #include "aether/serial_ports/at_support/at_dispatcher.h"
 
diff --git a/aether/serial_ports/at_support/at_support.h b/aether/serial_ports/at_support/at_support.h
index c140af3d..e05b8751 100644
--- a/aether/serial_ports/at_support/at_support.h
+++ b/aether/serial_ports/at_support/at_support.h
@@ -22,8 +22,8 @@
 #include <optional>
 #include <string_view>
 
-#include "aether/types/result.h"
-#include "aether/misc/from_chars.h"
+#include "aether-miscpp/types/result.h"
+#include "aether-miscpp/misc/from_chars.h"
 
 #include "aether/serial_ports/iserial_port.h"
 
diff --git a/aether/serial_ports/esp32_serial_port.cpp b/aether/serial_ports/esp32_serial_port.cpp
index 58ea8a9a..f74db575 100644
--- a/aether/serial_ports/esp32_serial_port.cpp
+++ b/aether/serial_ports/esp32_serial_port.cpp
@@ -18,7 +18,7 @@
 
 #if ESP32_SERIAL_PORT_ENABLED == 1
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/serial_ports/serial_ports_tele.h"
 
 namespace ae {
diff --git a/aether/serial_ports/serial_port_types.h b/aether/serial_ports/serial_port_types.h
index e413cf9c..0ac73190 100644
--- a/aether/serial_ports/serial_port_types.h
+++ b/aether/serial_ports/serial_port_types.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <cstdint>
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 enum class kBaudRate : std::uint32_t {
diff --git a/aether/serial_ports/unix_serial_port.cpp b/aether/serial_ports/unix_serial_port.cpp
index c532b435..3f4bb917 100644
--- a/aether/serial_ports/unix_serial_port.cpp
+++ b/aether/serial_ports/unix_serial_port.cpp
@@ -22,7 +22,7 @@
 #  include <unistd.h>
 #  include <termios.h>
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/serial_ports/serial_ports_tele.h"
 
 namespace ae {
diff --git a/aether/serial_ports/win_serial_port.cpp b/aether/serial_ports/win_serial_port.cpp
index f4eb6e2d..4c73b007 100644
--- a/aether/serial_ports/win_serial_port.cpp
+++ b/aether/serial_ports/win_serial_port.cpp
@@ -18,7 +18,7 @@
 
 #if WIN_SERIAL_PORT_ENABLED == 1
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/serial_ports/serial_ports_tele.h"
 
 namespace ae {
diff --git a/aether/server_connections/channel_connection.cpp b/aether/server_connections/channel_connection.cpp
index 02ca4e7f..5a6a008e 100644
--- a/aether/server_connections/channel_connection.cpp
+++ b/aether/server_connections/channel_connection.cpp
@@ -19,7 +19,7 @@
 #include <utility>
 #include <variant>
 
-#include "aether/misc/override.h"
+#include "aether-miscpp/misc/override.h"
 
 #include "aether/tele/tele.h"
 
diff --git a/aether/server_connections/channel_connection.h b/aether/server_connections/channel_connection.h
index 7c6339b2..ba305049 100644
--- a/aether/server_connections/channel_connection.h
+++ b/aether/server_connections/channel_connection.h
@@ -23,7 +23,7 @@
 #include "aether/channels/channel.h"
 #include "aether/stream_api/istream.h"
 #include "aether/executors/executors.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 class Channel;
diff --git a/aether/stream_api/gates_stream.h b/aether/stream_api/gates_stream.h
index 2aacada6..0ea6e91b 100644
--- a/aether/stream_api/gates_stream.h
+++ b/aether/stream_api/gates_stream.h
@@ -21,7 +21,7 @@
 #include <utility>
 #include <type_traits>
 
-#include "aether/meta/type_list.h"
+#include "aether-miscpp/meta/type_list.h"
 #include "aether/stream_api/istream.h"
 #include "aether/stream_api/gate_trait.h"
 #include "aether/stream_api/tied_gates.h"
diff --git a/aether/tasks/details/task_manager.h b/aether/tasks/details/task_manager.h
index f2ccc20d..4d186b7f 100644
--- a/aether/tasks/details/task_manager.h
+++ b/aether/tasks/details/task_manager.h
@@ -21,7 +21,7 @@
 #include <utility>
 #include <concepts>
 
-#include "aether/meta/time_traits.h"
+#include "aether-miscpp/meta/time_traits.h"
 #include "aether/tasks/details/task_queues.h"
 #include "aether/tasks/details/generic_task.h"
 
diff --git a/aether/tele/collectors.h b/aether/tele/collectors.h
index 45e05226..f9c078df 100644
--- a/aether/tele/collectors.h
+++ b/aether/tele/collectors.h
@@ -25,11 +25,11 @@
 #include <chrono>
 #include <cstdint>
 #include <utility>
+#include <functional>
 #include <type_traits>
 
 #include "aether/clock.h"
-#include "aether/misc/defer.h"
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 #include "aether/tele/tags.h"
 #include "aether/tele/itrap.h"
diff --git a/aether/tele/tags.h b/aether/tele/tags.h
index 67a22a3b..8b1b9814 100644
--- a/aether/tele/tags.h
+++ b/aether/tele/tags.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <string_view>
 
-#include "aether/crc.h"
+#include "aether-miscpp/crc.h"
 #include "aether/tele/modules.h"
 
 namespace ae::tele {
diff --git a/aether/tele/traps/io_stream_traps.cpp b/aether/tele/traps/io_stream_traps.cpp
index 5b0f59a1..74ab9185 100644
--- a/aether/tele/traps/io_stream_traps.cpp
+++ b/aether/tele/traps/io_stream_traps.cpp
@@ -22,7 +22,7 @@
 #include <iomanip>
 #include <algorithm>
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 namespace ae::tele {
 
diff --git a/aether/tele/traps/statistics_trap.h b/aether/tele/traps/statistics_trap.h
index bd6bc7c4..48f093cf 100644
--- a/aether/tele/traps/statistics_trap.h
+++ b/aether/tele/traps/statistics_trap.h
@@ -33,7 +33,7 @@
 #include "aether/ptr/rc_ptr.h"
 #include "aether/tele/itrap.h"
 #include "aether/mstream_buffers.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae::tele {
 namespace statistics {
diff --git a/aether/tele/traps/tele_statistics.h b/aether/tele/traps/tele_statistics.h
index 2f3f5af6..e449f00a 100644
--- a/aether/tele/traps/tele_statistics.h
+++ b/aether/tele/traps/tele_statistics.h
@@ -19,7 +19,7 @@
 
 #include "aether/obj/obj.h"
 #include "aether/ptr/rc_ptr.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 #include "aether/tele/tele.h"
 #include "aether/tele/traps/statistics_trap.h"
diff --git a/aether/transport/system_sockets/sockets/get_sock_addr.cpp b/aether/transport/system_sockets/sockets/get_sock_addr.cpp
index 074dd7ef..f6ccf085 100644
--- a/aether/transport/system_sockets/sockets/get_sock_addr.cpp
+++ b/aether/transport/system_sockets/sockets/get_sock_addr.cpp
@@ -21,7 +21,7 @@
 #  include <cstring>
 
 #  include "aether/env.h"
-#  include "aether/reflect/override_func.h"
+#  include "aether-miscpp/reflect/override_func.h"
 
 namespace ae {
 
diff --git a/aether/transport/system_sockets/sockets/isocket.h b/aether/transport/system_sockets/sockets/isocket.h
index 02cb7621..7d36b6ee 100644
--- a/aether/transport/system_sockets/sockets/isocket.h
+++ b/aether/transport/system_sockets/sockets/isocket.h
@@ -22,7 +22,7 @@
 
 #include "aether/types/span.h"
 #include "aether/types/address.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 
 namespace ae {
 /**
diff --git a/aether/transport/system_sockets/sockets/lwip_cb_tcp_socket.cpp b/aether/transport/system_sockets/sockets/lwip_cb_tcp_socket.cpp
index 6df50987..18e778e2 100644
--- a/aether/transport/system_sockets/sockets/lwip_cb_tcp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/lwip_cb_tcp_socket.cpp
@@ -19,6 +19,8 @@
 #if LWIP_CB_TCP_SOCKET_ENABLED
 #  include "lwip/tcpip.h"
 
+#  include "aether-miscpp/misc/defer.h"
+
 #  include "aether/transport/system_sockets/sockets/lwip_get_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/lwip_cb_udp_socket.cpp b/aether/transport/system_sockets/sockets/lwip_cb_udp_socket.cpp
index 906d77d5..28425dd7 100644
--- a/aether/transport/system_sockets/sockets/lwip_cb_udp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/lwip_cb_udp_socket.cpp
@@ -19,6 +19,8 @@
 #if LWIP_CB_UDP_SOCKET_ENABLED
 #  include "lwip/tcpip.h"
 
+#  include "aether-miscpp/misc/defer.h"
+
 #  include "aether/transport/system_sockets/sockets/lwip_get_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/lwip_get_addr.cpp b/aether/transport/system_sockets/sockets/lwip_get_addr.cpp
index 4e1f92fc..89fc53d5 100644
--- a/aether/transport/system_sockets/sockets/lwip_get_addr.cpp
+++ b/aether/transport/system_sockets/sockets/lwip_get_addr.cpp
@@ -21,7 +21,7 @@
 #  include <variant>
 #  include <cassert>
 
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 std::optional<ip_addr_t> LwipGetAddr(const AddressPort& addr_port) {
diff --git a/aether/transport/system_sockets/sockets/lwip_tcp_socket.cpp b/aether/transport/system_sockets/sockets/lwip_tcp_socket.cpp
index 0de0b195..381c9f2e 100644
--- a/aether/transport/system_sockets/sockets/lwip_tcp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/lwip_tcp_socket.cpp
@@ -20,7 +20,7 @@
 
 #  include "lwip/sockets.h"
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/transport/system_sockets/sockets/get_sock_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/lwip_udp_socket.cpp b/aether/transport/system_sockets/sockets/lwip_udp_socket.cpp
index cf9a9c69..55ef5c8b 100644
--- a/aether/transport/system_sockets/sockets/lwip_udp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/lwip_udp_socket.cpp
@@ -20,7 +20,7 @@
 
 #  include "lwip/sockets.h"
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/transport/system_sockets/sockets/get_sock_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/unix_tcp_socket.cpp b/aether/transport/system_sockets/sockets/unix_tcp_socket.cpp
index b4302b50..2a774779 100644
--- a/aether/transport/system_sockets/sockets/unix_tcp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/unix_tcp_socket.cpp
@@ -28,7 +28,7 @@
 
 #  include <cerrno>
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/transport/system_sockets/sockets/get_sock_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/unix_udp_socket.cpp b/aether/transport/system_sockets/sockets/unix_udp_socket.cpp
index 5fb07b30..4fa0786c 100644
--- a/aether/transport/system_sockets/sockets/unix_udp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/unix_udp_socket.cpp
@@ -25,7 +25,7 @@
 #  include <netinet/in.h>
 #  include <netinet/udp.h>
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/transport/system_sockets/sockets/get_sock_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/win_socket.cpp b/aether/transport/system_sockets/sockets/win_socket.cpp
index 8bf19064..fcc6988a 100644
--- a/aether/transport/system_sockets/sockets/win_socket.cpp
+++ b/aether/transport/system_sockets/sockets/win_socket.cpp
@@ -24,6 +24,8 @@
 
 #  include <algorithm>
 
+#  include "aether-miscpp/misc/defer.h"
+
 #  include "aether/transport/transport_tele.h"
 
 namespace ae {
diff --git a/aether/transport/system_sockets/sockets/win_tcp_socket.cpp b/aether/transport/system_sockets/sockets/win_tcp_socket.cpp
index 41ddb6fd..7fbc9d75 100644
--- a/aether/transport/system_sockets/sockets/win_tcp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/win_tcp_socket.cpp
@@ -23,7 +23,7 @@
 #  include <ws2ipdef.h>
 #  include <mswsock.h>
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/transport/system_sockets/sockets/get_sock_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/transport/system_sockets/sockets/win_udp_socket.cpp b/aether/transport/system_sockets/sockets/win_udp_socket.cpp
index 99c8e1c1..292f5332 100644
--- a/aether/transport/system_sockets/sockets/win_udp_socket.cpp
+++ b/aether/transport/system_sockets/sockets/win_udp_socket.cpp
@@ -21,7 +21,7 @@
 #  include <ws2def.h>
 #  include <ws2ipdef.h>
 
-#  include "aether/misc/defer.h"
+#  include "aether-miscpp/misc/defer.h"
 #  include "aether/transport/system_sockets/sockets/get_sock_addr.h"
 
 #  include "aether/tele/tele.h"
diff --git a/aether/type_traits.h b/aether/type_traits.h
index a9327bd1..14af7b05 100644
--- a/aether/type_traits.h
+++ b/aether/type_traits.h
@@ -23,9 +23,9 @@
 #include <optional>
 #include <type_traits>
 
-#include "aether/meta/arg_at.h"
-#include "aether/meta/type_list.h"
-#include "aether/meta/index_sequence.h"
+#include "aether-miscpp/meta/arg_at.h"
+#include "aether-miscpp/meta/type_list.h"
+#include "aether-miscpp/meta/index_sequence.h"
 
 namespace ae {
 
@@ -46,48 +46,6 @@ decltype(auto) ApplyRerverse(TFunc&& func, T&&... args) {
       std::forward<T>(args)...);
 }
 
-template <typename T>
-struct IsString : std::false_type {};
-
-template <>
-struct IsString<std::string> : std::true_type {};
-
-template <typename T>
-struct IsStringView : std::false_type {};
-
-template <>
-struct IsStringView<std::string_view> : std::true_type {};
-
-template <typename T, typename _ = void>
-struct IsContainer : std::false_type {};
-
-template <typename T>
-struct IsContainer<
-    T, std::conditional_t<
-           false,
-           std::void_t<typename T::value_type, typename T::size_type,
-                       typename T::iterator, decltype(std::declval<T>().size()),
-                       decltype(std::declval<T>().begin()),
-                       decltype(std::declval<T>().end())>,
-           void>> : public std::true_type {};
-
-template <typename T, typename _ = void>
-struct IsAssociatedContainer : std::false_type {};
-
-template <typename T>
-struct IsAssociatedContainer<
-    T, std::conditional_t<
-           false,
-           std::void_t<typename T::key_type, typename T::mapped_type,
-                       typename T::value_type, typename T::size_type,
-                       typename T::iterator, typename T::const_iterator,
-                       decltype(std::declval<T>().size()),
-                       decltype(std::declval<T>().begin()),
-                       decltype(std::declval<T>().end()),
-                       decltype(std::declval<T>().cbegin()),
-                       decltype(std::declval<T>().cend())>,
-           void>> : public std::true_type {};
-
 template <typename T1, typename T2>
 struct IsAbleToCast {
   static constexpr bool value =
diff --git a/aether/types/address.h b/aether/types/address.h
index f8cf2e8e..a60bbc41 100644
--- a/aether/types/address.h
+++ b/aether/types/address.h
@@ -21,10 +21,10 @@
 #include <string>
 
 #include "aether/config.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/types/variant_type.h"
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 namespace ae {
 
diff --git a/aether/types/aligned_storage.h b/aether/types/aligned_storage.h
deleted file mode 100644
index 8ed7e92f..00000000
--- a/aether/types/aligned_storage.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_TYPES_ALIGNED_STORAGE_H_
-#define AETHER_TYPES_ALIGNED_STORAGE_H_
-
-#include <new>
-#include <cassert>
-#include <cstdint>
-#include <utility>
-#include <cstring>
-#include <type_traits>
-
-#include "aether/common.h"
-
-namespace ae {
-/**
- * \brief The storage with specified alignment in stack.
- */
-template <std::size_t Size, std::size_t Align>
-class AlignedStorage {
- public:
-  static constexpr auto kSize = Size;
-  static constexpr auto kAlign = Align;
-
-  AlignedStorage() noexcept = default;
-
-  template <typename T>
-  [[nodiscard]] T const* ptr() const noexcept {
-    static_assert(sizeof(T) <= Size, "T should fit into storage");
-    static_assert(Align % alignof(T) == 0, "T should be aligned like Align");
-    return std::launder(reinterpret_cast<T const*>(data_));
-  }
-
-  template <typename T>
-  [[nodiscard]] T* ptr() noexcept {
-    static_assert(sizeof(T) <= Size, "T should fit into storage");
-    static_assert(Align % alignof(T) == 0, "T should be aligned like Align");
-    return std::launder(reinterpret_cast<T*>(data_));
-  }
-
-  std::uint8_t* data() noexcept { return data_; }
-  std::uint8_t const* data() const noexcept { return data_; }
-
- private:
-  alignas(Align) std::uint8_t data_[Size];
-};
-
-using DataPointerType = std::uint8_t*;
-
-enum class Operation : std::uint8_t {
-  kCopy,
-  kMove,
-  kDestroy,
-};
-
-struct ManagedStorageVtable {
-  void (*manage)(DataPointerType a, DataPointerType b, Operation op);
-};
-
-template <typename T>
-static void ManageFunc([[maybe_unused]] DataPointerType a,
-                       [[maybe_unused]] DataPointerType b,
-                       Operation op) noexcept {
-  switch (op) {
-    case Operation::kCopy: {
-      if constexpr (std::is_trivially_copy_constructible_v<T>) {
-        std::memcpy(b, a, sizeof(T));
-      } else if constexpr (std::is_copy_constructible_v<T>) {
-        new (b) T(*std::launder(reinterpret_cast<const T*>(a)));
-      } else {
-        assert(false && "For copy operation, T must be copy constructible");
-      }
-      break;
-    }
-    case Operation::kMove: {
-      if constexpr (std::is_trivially_move_constructible_v<T>) {
-        std::memcpy(b, a, sizeof(T));
-      } else if constexpr (std::is_move_constructible_v<T>) {
-        new (b) T(std::move(*std::launder(reinterpret_cast<T*>(a))));
-      } else {
-        assert(false && "For move operation, T must be move constructible");
-      }
-      break;
-    }
-    case Operation::kDestroy: {
-      if constexpr (!std::is_trivially_destructible_v<T>) {
-        std::launder(reinterpret_cast<T*>(a))->~T();
-      }
-      break;
-    }
-  }
-}
-
-template <typename T>
-static constexpr ManagedStorageVtable MSVTableForT = ManagedStorageVtable{
-    ManageFunc<T>,
-};
-
-template <typename T>
-struct InPlace {};
-
-/**
- * \brief Managed storage with specified alignment in stack.
- * Maybe initialized with particular type T and erases it with custom vtable
- * for manage copy, move and destruction.
- */
-template <std::size_t Size, std::size_t Align>
-class ManagedStorage {
-  using StorageType = AlignedStorage<Size, Align>;
-
- public:
-  ManagedStorage() = default;
-
-  // Create from instance of T
-  template <typename T,
-            AE_REQUIRERS_NOT((std::is_same<ManagedStorage, std::decay_t<T>>))>
-  explicit ManagedStorage(T&& value) : vtable_{&MSVTableForT<std::decay_t<T>>} {
-    static_assert(sizeof(T) <= Size, "T should fit into storage");
-    static_assert(Align % alignof(T) == 0, "T should be aligned like Align");
-    auto* p = storage_.data();
-    new (p) T{std::forward<T>(value)};
-  }
-
-  // Create instance of T with arguments in place
-  template <typename T, typename... TArgs>
-  explicit ManagedStorage(InPlace<T>, TArgs&&... args)
-      : vtable_{&MSVTableForT<T>} {
-    static_assert(sizeof(T) <= Size, "T should fit into storage");
-    static_assert(Align % alignof(T) == 0, "T should be aligned like Align");
-    auto* p = storage_.data();
-    new (p) T{std::forward<TArgs>(args)...};
-  }
-
-  // assign instance of T
-  template <typename T,
-            AE_REQUIRERS_NOT((std::is_same<ManagedStorage, std::decay_t<T>>))>
-  ManagedStorage& operator=(T&& value) {
-    static_assert(sizeof(T) <= Size, "T should fit into storage");
-    static_assert(Align % alignof(T) == 0, "T should be aligned like Align");
-    if (vtable_ != nullptr) {
-      Destroy();
-    }
-    vtable_ = &MSVTableForT<std::decay_t<T>>;
-    new (storage_.data()) T{std::forward<T>(value)};
-    return *this;
-  }
-
-  ManagedStorage(ManagedStorage const& other) noexcept
-      : vtable_{other.vtable_} {
-    if (vtable_ != nullptr) {
-      Copy(other.storage_, storage_);
-    }
-  }
-
-  ManagedStorage(ManagedStorage&& other) noexcept : vtable_{other.vtable_} {
-    if (vtable_ != nullptr) {
-      Move(other.storage_, storage_);
-      other.Destroy();
-    }
-    other.vtable_ = nullptr;
-  }
-
-  ~ManagedStorage() {
-    if (vtable_ != nullptr) {
-      Destroy();
-    }
-  }
-
-  ManagedStorage& operator=(ManagedStorage const& other) noexcept {
-    if (this != &other) {
-      if (vtable_ != nullptr) {
-        Destroy();
-      }
-      vtable_ = other.vtable_;
-      if (vtable_ != nullptr) {
-        Copy(other.storage_, storage_);
-      }
-    }
-    return *this;
-  }
-
-  ManagedStorage& operator=(ManagedStorage&& other) noexcept {
-    if (this != &other) {
-      if (vtable_ != nullptr) {
-        Destroy();
-      }
-      vtable_ = other.vtable_;
-      if (vtable_ != nullptr) {
-        Move(other.storage_, storage_);
-        other.Destroy();
-      }
-      other.vtable_ = nullptr;
-    }
-    return *this;
-  }
-
-  template <typename T, typename... TArgs>
-  void Emplace(TArgs&&... args) noexcept {
-    static_assert(sizeof(T) <= Size, "T should fit into storage");
-    static_assert(Align % alignof(T) == 0, "T should be aligned like Align");
-    // destroy existing object if any
-    if (vtable_ != nullptr) {
-      Destroy();
-    }
-    vtable_ = &MSVTableForT<T>;
-    new (storage_.data()) T{std::forward<TArgs>(args)...};
-  }
-
-  template <typename T>
-  T* ptr() noexcept {
-    return storage_.template ptr<T>();
-  }
-
-  template <typename T>
-  T const* ptr() const noexcept {
-    return storage_.template ptr<T>();
-  }
-
- private:
-  void Destroy() noexcept {
-    vtable_->manage(storage_.data(), nullptr, Operation::kDestroy);
-  }
-
-  void Copy(StorageType const& src, StorageType& dst) noexcept {
-    vtable_->manage(const_cast<std::uint8_t*>(src.data()), dst.data(),
-                    Operation::kCopy);
-  }
-
-  void Move(StorageType& src, StorageType& dst) noexcept {
-    vtable_->manage(src.data(), dst.data(), Operation::kMove);
-  }
-
-  ManagedStorageVtable const* vtable_{};
-  StorageType storage_{};
-};
-
-/**
- * \brief Stack storage to fit specified type.
- */
-template <typename T>
-class Storage {
- public:
-  Storage() noexcept = default;
-
-  AE_CLASS_NO_COPY_MOVE(Storage);
-
-  [[nodiscard]] T const* ptr() const noexcept {
-    return aligned_storage_.template ptr<T>();
-  }
-  [[nodiscard]] T* ptr() noexcept { return aligned_storage_.template ptr<T>(); }
-
- private:
-  AlignedStorage<sizeof(T), alignof(T)> aligned_storage_;
-};
-}  // namespace ae
-
-#endif  // AETHER_TYPES_ALIGNED_STORAGE_H_
diff --git a/aether/types/client_config.h b/aether/types/client_config.h
index be5fcb0f..a53ab7a8 100644
--- a/aether/types/client_config.h
+++ b/aether/types/client_config.h
@@ -21,8 +21,8 @@
 
 #include "aether/types/uid.h"
 #include "aether/crypto/key.h"
-#include "aether/format/format.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/format/format.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/types/server_config.h"
 
 namespace ae {
diff --git a/aether/types/nullable_type.h b/aether/types/nullable_type.h
index 8a434833..aa7d7b1b 100644
--- a/aether/types/nullable_type.h
+++ b/aether/types/nullable_type.h
@@ -24,7 +24,7 @@
 #include <functional>
 
 #include "aether/type_traits.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 template <typename... TArgs>
diff --git a/aether/types/result.h b/aether/types/result.h
deleted file mode 100644
index 31b85b9e..00000000
--- a/aether/types/result.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_TYPES_RESULT_H_
-#define AETHER_TYPES_RESULT_H_
-
-#include <variant>
-#include <cassert>
-#include <utility>
-#include <functional>
-#include <type_traits>
-
-namespace ae {
-template <typename T, typename E>
-class Result;
-
-template <typename T>
-struct IsResultType : std::false_type {};
-template <typename V, typename E>
-struct IsResultType<Result<V, E>> : std::true_type {};
-template <typename T>
-static inline constexpr bool IsResultType_v = IsResultType<T>::value;
-
-template <typename T, typename V, typename E>
-concept ResultType = requires(T t) {
-  { IsResultType_v<T> };
-  { std::same_as<V, typename T::value_type> };
-  { std::same_as<E, typename T::error_type> };
-};
-
-template <typename T>
-struct Ok {
-  explicit Ok(T v) : value{std::move(v)} {}
-  [[no_unique_address]] T value;
-};
-
-template <typename T>
-struct Ok<T&> {
-  explicit Ok(T& v) : value{v} {}
-  [[no_unique_address]] T& value;
-};
-
-template <typename E>
-struct Error {
-  explicit Error(E v) : error{std::move(v)} {}
-  [[no_unique_address]] E error;
-};
-
-template <typename T, typename E>
-class Result {
- public:
-  using value_type = T;
-  using error_type = E;
-
-  using store_value_type =
-      std::conditional_t<std::is_reference_v<T>,
-                         std::reference_wrapper<std::remove_reference_t<T>>, T>;
-  using store_error_type =
-      std::conditional_t<std::is_reference_v<E>,
-                         std::reference_wrapper<std::remove_reference_t<E>>, E>;
-
-  template <typename U>
-    requires(std::is_same_v<T, U>)
-  explicit Result(U&& value) : storage_{std::forward<U>(value)} {}
-
-  template <typename EU>
-    requires(std::is_same_v<E, EU>)
-  explicit Result(EU&& error) : storage_{std::forward<EU>(error)} {}
-
-  // made implicit intentionally
-  constexpr Result(Ok<T>&& ok)  // NOLINT(*explicit-constructor)
-      : storage_{std::move(ok).value} {}
-  // made implicit intentionally
-  constexpr Result(Error<E>&& error)  // NOLINT(*explicit-constructor)
-      : storage_{std::move(error).error} {}
-
-  constexpr bool IsOk() const noexcept { return storage_.index() == 0; }
-  constexpr bool IsErr() const noexcept { return storage_.index() == 1; }
-  constexpr explicit operator bool() const noexcept {
-    return storage_.index() == 0;
-  }
-
-  auto& value() & noexcept {
-    assert(IsOk());
-    return static_cast<value_type&>(*get_value());
-  }
-  auto const& value() const& noexcept {
-    assert(IsOk());
-    return static_cast<value_type const&>(*get_value());
-  }
-  auto&& value() && noexcept {
-    assert(IsOk());
-    return std::move(static_cast<value_type&>(*get_value()));
-  }
-
-  auto& error() & noexcept {
-    assert(IsErr());
-    return static_cast<error_type&>(*get_error());
-  }
-  auto const& error() const& noexcept {
-    assert(IsErr());
-    return static_cast<error_type const&>(*get_error());
-  }
-  auto&& error() && noexcept {
-    assert(IsErr());
-    return std::move(static_cast<error_type&>(*get_error()));
-  }
-
-  template <typename F, typename R = std::invoke_result_t<F, value_type&&>>
-    requires(requires {
-      // F must return result type
-      { IsResultType_v<R> };
-      { ResultType<R, typename R::value_type, error_type> };
-    })
-  auto Then(F&& f) && -> std::invoke_result_t<F, value_type&&> {
-    if (IsOk()) {
-      return std::invoke(std::forward<F>(f), std::move(*this).value());
-    }
-    return Error{std::move(*this).error()};
-  }
-
-  template <typename F, typename R = std::invoke_result_t<F>>
-    requires(requires {
-      // F must return result type
-      { IsResultType_v<R> };
-      { ResultType<R, typename R::value_type, error_type> };
-    })
-  auto Then(F&& f) && -> std::invoke_result_t<F> {
-    if (IsOk()) {
-      return std::invoke(std::forward<F>(f));
-    }
-    return Error{std::move(*this).error()};
-  }
-
-  template <typename FE, typename R = std::invoke_result_t<FE, error_type&&>>
-    requires(requires {
-      // FE must return result type
-      { IsResultType_v<R> };
-      { ResultType<R, value_type, typename R::error_type> };
-    })
-  auto Else(FE&& f) && -> std::invoke_result_t<FE, error_type&&> {
-    if (IsErr()) {
-      return std::invoke(std::forward<FE>(f), std::move(*this).error());
-    }
-    return Ok{std::move(*this).value()};
-  }
-
-  template <typename FE, typename R = std::invoke_result_t<FE>>
-    requires(requires {
-      // FE must return result type
-      { IsResultType_v<R> };
-      { ResultType<R, value_type, typename R::error_type> };
-    })
-  auto Else(FE&& f) && -> std::invoke_result_t<FE> {
-    if (IsErr()) {
-      return std::invoke(std::forward<FE>(f));
-    }
-    return Ok{std::move(*this).value()};
-  }
-
- private:
-  // dereference and take address to get value from reference wrapper
-  store_value_type* get_value() & { return std::get_if<0>(&storage_); }
-  store_value_type const* get_value() const& {
-    return std::get_if<0>(&storage_);
-  }
-  store_error_type* get_error() & { return std::get_if<1>(&storage_); }
-  store_error_type const* get_error() const& {
-    return std::get_if<1>(&storage_);
-  }
-
-  std::variant<store_value_type, store_error_type> storage_;
-};
-}  // namespace ae
-
-#define TRY_VALUE(VAR_NAME, ...)                            \
-  auto _RES_##VAR_NAME = __VA_ARGS__;                       \
-  if (_RES_##VAR_NAME.IsErr()) {                            \
-    return ::ae::Error{std::move(_RES_##VAR_NAME).error()}; \
-  }                                                         \
-  auto VAR_NAME = _RES_##VAR_NAME.value()
-
-#define TRY_RESULT(...)                             \
-  {                                                 \
-    auto _RES_ = __VA_ARGS__;                       \
-    if (_RES_.IsErr()) {                            \
-      return ::ae::Error{std::move(_RES_).error()}; \
-    }                                               \
-  }
-
-#if AE_TESTS
-
-#  include "tests/inline.h"
-
-namespace test::result_h_ {
-using ae::Error;
-using ae::Ok;
-using ae::Result;
-
-struct G {};
-struct E {};
-
-AE_TEST_INLINE(test_Result) {
-  auto res = Result<G, E>{G{}};
-  // check if concept works
-  static_assert(ae::ResultType<decltype(res), G, E>);
-  TEST_ASSERT_TRUE(res.IsOk());
-
-  auto res_e = Result<G, E>{E{}};
-  TEST_ASSERT_TRUE(res_e.IsErr());
-}
-
-AE_TEST_INLINE(test_Monadic) {
-  auto ret_good = []() -> Result<G, E> { return Ok{G{}}; };
-  auto ret_bad = []() -> Result<G, E> { return Error{E{}}; };
-
-  auto res_g = ret_good().Then(ret_good);
-  TEST_ASSERT_TRUE(res_g.IsOk());
-
-  auto res_e = ret_good().Then(ret_bad);
-  TEST_ASSERT_TRUE(res_e.IsErr());
-
-  auto res_g2 = ret_bad().Else(ret_good);
-  TEST_ASSERT_TRUE(res_g2.IsOk());
-  auto res_e2 = ret_bad().Else(ret_bad);
-  TEST_ASSERT_TRUE(res_e2.IsErr());
-
-  auto res_cg = ret_good().Then(ret_good).Else(ret_bad);
-  TEST_ASSERT_TRUE(res_cg.IsOk());
-  auto res_cg2 = ret_good().Then(ret_bad).Else(ret_good);
-  TEST_ASSERT_TRUE(res_cg2.IsOk());
-
-  auto res_ce = ret_bad().Then(ret_good).Else(ret_bad);
-  TEST_ASSERT_TRUE(res_ce.IsErr());
-  auto res_ce2 = ret_bad().Else(ret_good).Else(ret_bad);
-  TEST_ASSERT_TRUE(res_ce2.IsOk());
-}
-
-AE_TEST_INLINE(test_Macros) {
-  auto try_value = [](int v, int n) -> Result<G, E> {
-    if (v > n) {
-      return Ok{G{}};
-    }
-    return Error{E{}};
-  };
-
-  auto test_good = [&]() -> Result<G, E> {
-    TRY_VALUE(rg, try_value(12, 10));
-    return Ok{rg};
-  }();
-  TEST_ASSERT_TRUE(test_good.IsOk());
-
-  auto test_bad = [&]() -> Result<G, E> {
-    TRY_VALUE(rg, try_value(10, 12));
-    return Ok{rg};
-  }();
-  TEST_ASSERT_TRUE(test_bad.IsErr());
-
-  auto test_good_res = [&]() -> Result<G, E> {
-    TRY_RESULT(try_value(42, 5));
-    return Ok{G{}};
-  }();
-  TEST_ASSERT_TRUE(test_good_res.IsOk());
-
-  auto test_bad_res = [&]() -> Result<G, E> {
-    TRY_RESULT(try_value(1, 105));
-    return Ok{G{}};
-  }();
-  TEST_ASSERT_TRUE(test_bad_res.IsErr());
-}
-
-}  // namespace test::result_h_
-
-#endif
-#endif  // AETHER_TYPES_RESULT_H_
diff --git a/aether/types/ring_index.h b/aether/types/ring_index.h
index d1d8bb2b..7dba8c97 100644
--- a/aether/types/ring_index.h
+++ b/aether/types/ring_index.h
@@ -20,7 +20,7 @@
 #include <limits>
 #include <cstdlib>
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 namespace ae {
 template <typename Index>
diff --git a/aether/types/server_config.h b/aether/types/server_config.h
index a87740ab..945b7615 100644
--- a/aether/types/server_config.h
+++ b/aether/types/server_config.h
@@ -19,10 +19,10 @@
 
 #include <vector>
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 #include "aether/types/address.h"
 #include "aether/types/server_id.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 struct ServerConfig {
diff --git a/aether/types/small_function.h b/aether/types/small_function.h
deleted file mode 100644
index b23d945a..00000000
--- a/aether/types/small_function.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef AETHER_TYPES_SMALL_FUNCTION_H_
-#define AETHER_TYPES_SMALL_FUNCTION_H_
-
-#include <memory>
-#include <cstddef>
-#include <concepts>
-#include <type_traits>
-
-#include "aether/types/aligned_storage.h"
-#include "aether/meta/function_signature.h"
-
-namespace ae {
-namespace small_function_internal {
-enum class Operation : std::uint8_t {
-  kMove,
-  kDestroy,
-};
-
-template <typename TRet, typename... TArgs>
-struct VTable {
-  TRet (*invoke)(void*, TArgs&&...);
-  void (*manage)(void*, void*, Operation);
-};
-
-template <typename TRet, typename... TArgs>
-struct Invoker {
-  // Invoke for callable objects
-  template <typename TCallable>
-  static TRet InvokeCallable(void* self, TArgs&&... args) {
-    if constexpr (std::is_void_v<TRet>) {
-      std::launder(static_cast<TCallable*>(self))
-          ->operator()(std::forward<TArgs>(args)...);
-    } else {
-      return std::launder(static_cast<TCallable*>(self))
-          ->operator()(std::forward<TArgs>(args)...);
-    }
-  }
-
-  // Invoke for member functions
-  template <typename T, auto Method>
-  static TRet InvokeMemberFunction(void* self, TArgs&&... args) {
-    auto* instance = reinterpret_cast<T*>(*static_cast<std::uintptr_t*>(self));
-    return (instance->*Method)(std::forward<TArgs>(args)...);
-  }
-
-  // Invoke for free functions
-  static TRet InvokeFreeFunction(void* self, TArgs&&... args) {
-    auto method = reinterpret_cast<TRet (*)(TArgs...)>(
-        *static_cast<std::uintptr_t*>(self));
-    return method(std::forward<TArgs>(args)...);
-  }
-};
-
-template <typename TCallable>
-static void Manage(void* a, void* b, Operation op) noexcept {
-  switch (op) {
-    case Operation::kMove: {
-      {
-        if constexpr (std::is_trivially_move_constructible_v<TCallable>) {
-          std::memcpy(b, a, sizeof(TCallable));
-        } else {
-          new (b)
-              TCallable{std::move(*std::launder(static_cast<TCallable*>(a)))};
-        }
-        break;
-      }
-      case Operation::kDestroy: {
-        if constexpr (!std::is_trivially_destructible_v<TCallable>) {
-          std::destroy_at(std::launder(static_cast<TCallable*>(a)));
-        }
-        break;
-      }
-    }
-  }
-}
-
-template <typename TCallable, typename TRet, typename... TArgs>
-static constexpr auto VTableForT = VTable<TRet, TArgs...>{
-    Invoker<TRet, TArgs...>::template InvokeCallable<TCallable>,
-    Manage<TCallable>,
-};
-
-template <typename T, auto Method, typename TRet, typename... TArgs>
-static constexpr auto VTableForClassMember = VTable<TRet, TArgs...>{
-    Invoker<TRet, TArgs...>::template InvokeMemberFunction<T, Method>,
-    Manage<T*>,
-};
-
-template <typename TRet, typename... TArgs>
-static constexpr auto VTableForFreeFunction = VTable<TRet, TArgs...>{
-    Invoker<TRet, TArgs...>::InvokeFreeFunction,
-    Manage<TRet (*)(TArgs...)>,
-};
-}  // namespace small_function_internal
-
-template <auto Method>
-struct MethodPtr;
-
-// class member function pointer
-template <typename T, typename TRet, typename... TArgs,
-          TRet (T::*Method)(TArgs...)>
-struct MethodPtr<Method> {
-  static constexpr auto kMethod = Method;
-  T* instance;
-};
-
-// class member function pointer const
-template <typename T, typename TRet, typename... TArgs,
-          TRet (T::*Method)(TArgs...) const>
-struct MethodPtr<Method> {
-  static constexpr auto kMethod = Method;
-  T* instance;
-};
-
-static constexpr std::size_t kDefaultSize = sizeof(void*) * 4;
-static constexpr std::size_t kDefaultAlignment = alignof(void*);
-
-template <typename Signature, std::size_t Size = kDefaultSize,
-          std::size_t Alignment = kDefaultAlignment>
-class SmallFunction;
-
-template <typename TRet, typename... TArgs, std::size_t Size,
-          std::size_t Alignment>
-class SmallFunction<TRet(TArgs...), Size, Alignment> {
- public:
-  using Storage = AlignedStorage<Size, Alignment>;
-  using VTable = small_function_internal::VTable<TRet, TArgs...>;
-  using Operation = small_function_internal::Operation;
-
-  SmallFunction() = default;
-
-  ~SmallFunction() noexcept {
-    if (vtable_ != nullptr) {
-      Destroy();
-    }
-  }
-
-  template <typename TFunctor>
-    requires(requires {
-      { std::invocable<TFunctor, TArgs...> };
-      { std::same_as<std::invoke_result_t<TFunctor, TArgs...>, TRet> };
-      { !std::same_as<std::decay_t<TFunctor>, SmallFunction> };
-    })
-  SmallFunction(TFunctor&& functor) noexcept
-      : vtable_{&small_function_internal::VTableForT<std::decay_t<TFunctor>,
-                                                     TRet, TArgs...>} {
-    using Type = std::decay_t<TFunctor>;
-    static_assert(sizeof(Type) <= Size, "TFunctor must fit into storage");
-
-    new (storage_.data()) Type{std::forward<TFunctor>(functor)};
-  }
-
-  SmallFunction(TRet (*func_ptr)(TArgs...)) noexcept
-      : vtable_{
-            &small_function_internal::VTableForFreeFunction<TRet, TArgs...>} {
-    using FuncType = decltype(func_ptr);
-    static_assert(sizeof(FuncType) <= Size, "pointer must fit into storage");
-    new (storage_.data()) FuncType{func_ptr};
-  }
-
-  template <typename T, typename... UArgs, TRet (T::*Method)(UArgs...)>
-  SmallFunction(MethodPtr<Method> func_ptr) noexcept
-      : vtable_{&small_function_internal::VTableForClassMember<T, Method, TRet,
-                                                               TArgs...>} {
-    static_assert(Size >= sizeof(T*), "pointer must fit into storage");
-    new (storage_.data()) T* {func_ptr.instance};
-  }
-
-  template <typename T, typename... UArgs, TRet (T::*Method)(UArgs...) const>
-  SmallFunction(MethodPtr<Method> func_ptr) noexcept
-      : vtable_{&small_function_internal::VTableForClassMember<T, Method, TRet,
-                                                               TArgs...>} {
-    static_assert(Size >= sizeof(T*), "pointer must fit into storage");
-    new (storage_.data()) T* {func_ptr.instance};
-  }
-
-  SmallFunction(SmallFunction const& other) = delete;
-
-  SmallFunction(SmallFunction&& other) noexcept : vtable_{other.vtable_} {
-    if (vtable_ != nullptr) {
-      Move(other.storage_, storage_);
-      other.Destroy();
-    }
-    other.vtable_ = nullptr;
-  }
-
-  SmallFunction& operator=(SmallFunction const& other) = delete;
-
-  SmallFunction& operator=(SmallFunction&& other) noexcept {
-    if (this != &other) {
-      if (vtable_ != nullptr) {
-        Destroy();
-      }
-      vtable_ = other.vtable_;
-      if (vtable_ != nullptr) {
-        Move(other.storage_, storage_);
-        other.Destroy();
-      }
-      other.vtable_ = nullptr;
-    }
-    return *this;
-  }
-
-  /**
-   * \brief Call operator
-   */
-  TRet operator()(TArgs... args) const {
-    assert(vtable_ != nullptr && "SmallFunction is not initialized");
-    return vtable_->invoke(const_cast<std::uint8_t*>(storage_.data()),
-                           std::forward<TArgs>(args)...);
-  }
-
-  explicit operator bool() const noexcept { return vtable_ != nullptr; }
-
- private:
-  void Destroy() noexcept {
-    vtable_->manage(storage_.data(), nullptr, Operation::kDestroy);
-  }
-
-  void Move(Storage& src, Storage& dst) noexcept {
-    vtable_->manage(src.data(), dst.data(), Operation::kMove);
-  }
-
-  VTable const* vtable_{};
-  Storage storage_{};
-};
-
-template <typename TFunction>
-SmallFunction(TFunction&&)
-    -> SmallFunction<typename FunctionSignature<TFunction>::Signature>;
-
-}  // namespace ae
-
-#endif  // AETHER_TYPES_SMALL_FUNCTION_H_
diff --git a/aether/types/statistic_counter.h b/aether/types/statistic_counter.h
index 15be1e3a..3fc5b2af 100644
--- a/aether/types/statistic_counter.h
+++ b/aether/types/statistic_counter.h
@@ -32,7 +32,7 @@ DISABLE_WARNING_POP()
 
 #include "aether/common.h"
 #include "aether/mstream.h"
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 namespace ae {
 template <typename TValue, std::size_t Capacity,
diff --git a/aether/types/uid.h b/aether/types/uid.h
index 0d42e091..85bdaa3c 100644
--- a/aether/types/uid.h
+++ b/aether/types/uid.h
@@ -26,8 +26,8 @@
 #include <string_view>
 
 #include "aether/type_traits.h"
-#include "aether/format/format.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/format/format.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/types/literal_array.h"
 
 namespace ae {
diff --git a/aether/types/variant_type.h b/aether/types/variant_type.h
index dba9a6a0..5c93ce5f 100644
--- a/aether/types/variant_type.h
+++ b/aether/types/variant_type.h
@@ -24,7 +24,7 @@
 #include <functional>
 
 #include "aether/mstream.h"
-#include "aether/meta/type_list.h"
+#include "aether-miscpp/meta/type_list.h"
 
 namespace ae {
 template <auto I, typename T>
diff --git a/aether/wifi/wifi_driver.h b/aether/wifi/wifi_driver.h
index 43fb8852..411f15c9 100644
--- a/aether/wifi/wifi_driver.h
+++ b/aether/wifi/wifi_driver.h
@@ -20,7 +20,7 @@
 #include "aether/config.h"
 
 #if AE_SUPPORT_WIFIS
-#  include "aether/types/result.h"
+#  include "aether-miscpp/types/result.h"
 #  include "aether/events/events.h"
 #  include "aether/wifi/wifi_driver_types.h"
 
diff --git a/aether/wifi/wifi_driver_types.h b/aether/wifi/wifi_driver_types.h
index af741096..2e6607ff 100644
--- a/aether/wifi/wifi_driver_types.h
+++ b/aether/wifi/wifi_driver_types.h
@@ -24,7 +24,7 @@
 #  include <string>
 #  include <vector>
 
-#  include "aether/reflect/reflect.h"
+#  include "aether-miscpp/reflect/reflect.h"
 #  include "aether/types/address.h"
 #  include "aether/types/variant_type.h"
 
diff --git a/aether/work_cloud_api/ae_message.h b/aether/work_cloud_api/ae_message.h
index 00deba02..b7fb2dc2 100644
--- a/aether/work_cloud_api/ae_message.h
+++ b/aether/work_cloud_api/ae_message.h
@@ -18,7 +18,7 @@
 #define AETHER_WORK_CLOUD_API_AE_MESSAGE_H_
 
 #include "aether/types/uid.h"
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 #include "aether/types/data_buffer.h"
 
 namespace ae {
diff --git a/aether/work_cloud_api/telemetric.h b/aether/work_cloud_api/telemetric.h
index c87dffe5..fda0ebc5 100644
--- a/aether/work_cloud_api/telemetric.h
+++ b/aether/work_cloud_api/telemetric.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <cstdint>
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae {
 struct Telemetric {
diff --git a/aether/write_action/buffer_write.h b/aether/write_action/buffer_write.h
index 1005b419..3a18370e 100644
--- a/aether/write_action/buffer_write.h
+++ b/aether/write_action/buffer_write.h
@@ -25,7 +25,7 @@ IGNORE_IMPLICIT_CONVERSION()
 DISABLE_WARNING_POP()
 
 #include "aether/ae_context.h"
-#include "aether/types/small_function.h"
+#include "aether-miscpp/types/small_function.h"
 #include "aether/events/multi_subscription.h"
 #include "aether/write_action/write_action.h"
 #include "aether/write_action/failed_write_action.h"
diff --git a/examples/benches/send_message_delays/receiver.cpp b/examples/benches/send_message_delays/receiver.cpp
index 15610e47..826538a4 100644
--- a/examples/benches/send_message_delays/receiver.cpp
+++ b/examples/benches/send_message_delays/receiver.cpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <utility>
 
-#include "aether/meta/arg_at.h"
+#include "aether-miscpp/meta/arg_at.h"
 #include "aether/client_messages/p2p_safe_message_stream.h"
 
 #include "send_message_delays/api/bench_delays_api.h"
diff --git a/examples/benches/send_message_delays/send_message_delays_manager.h b/examples/benches/send_message_delays/send_message_delays_manager.h
index 5122d355..8b971b6a 100644
--- a/examples/benches/send_message_delays/send_message_delays_manager.h
+++ b/examples/benches/send_message_delays/send_message_delays_manager.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "aether/clock.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/executors/executors.h"
 #include "aether/events/cumulative_event.h"
 #include "aether/events/multi_subscription.h"
diff --git a/examples/benches/send_message_delays/statistics_write.h b/examples/benches/send_message_delays/statistics_write.h
index 9832acce..fb7db7cd 100644
--- a/examples/benches/send_message_delays/statistics_write.h
+++ b/examples/benches/send_message_delays/statistics_write.h
@@ -20,7 +20,7 @@
 #include <vector>
 #include <utility>
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 #include "send_message_delays/delay_statistics.h"
 
diff --git a/examples/benches/send_messages_bandwidth/common/bandwidth.h b/examples/benches/send_messages_bandwidth/common/bandwidth.h
index df53a461..c00d230b 100644
--- a/examples/benches/send_messages_bandwidth/common/bandwidth.h
+++ b/examples/benches/send_messages_bandwidth/common/bandwidth.h
@@ -20,7 +20,7 @@
 #include <chrono>
 #include <cstddef>
 
-#include "aether/format/format.h"
+#include "aether-miscpp/format/format.h"
 
 namespace ae::bench {
 using HighResTimePoint =
diff --git a/examples/benches/send_messages_bandwidth/common/test_action.h b/examples/benches/send_messages_bandwidth/common/test_action.h
index 592a9784..e5d58d74 100644
--- a/examples/benches/send_messages_bandwidth/common/test_action.h
+++ b/examples/benches/send_messages_bandwidth/common/test_action.h
@@ -21,7 +21,7 @@
 #include <cstdint>
 
 #include "aether/ae_context.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 #include "aether/executors/executors.h"
 #include "aether/events/event_subscription.h"
diff --git a/examples/benches/send_messages_bandwidth/receiver/message_receiver.h b/examples/benches/send_messages_bandwidth/receiver/message_receiver.h
index 7e92da36..4117691d 100644
--- a/examples/benches/send_messages_bandwidth/receiver/message_receiver.h
+++ b/examples/benches/send_messages_bandwidth/receiver/message_receiver.h
@@ -19,7 +19,7 @@
 
 #include "aether/clock.h"
 #include "aether/ae_context.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 
 #include "send_messages_bandwidth/common/bandwidth.h"
diff --git a/examples/benches/send_messages_bandwidth/sender/message_sender.h b/examples/benches/send_messages_bandwidth/sender/message_sender.h
index d49e5c97..81728074 100644
--- a/examples/benches/send_messages_bandwidth/sender/message_sender.h
+++ b/examples/benches/send_messages_bandwidth/sender/message_sender.h
@@ -21,7 +21,7 @@
 
 #include "aether/clock.h"
 #include "aether/ae_context.h"
-#include "aether/types/result.h"
+#include "aether-miscpp/types/result.h"
 #include "aether/events/events.h"
 #include "aether/events/multi_subscription.h"
 #include "aether/write_action/write_action.h"
diff --git a/examples/cloud/aether_construct_esp_wifi.h b/examples/cloud/aether_construct_esp_wifi.h
index 363e19fa..3aff8e19 100644
--- a/examples/cloud/aether_construct_esp_wifi.h
+++ b/examples/cloud/aether_construct_esp_wifi.h
@@ -22,8 +22,8 @@
 #if CLOUD_TEST_ESP_WIFI
 
 namespace ae::cloud_test {
-static const std::string kWifi1Ssid = "Test1234";
-static const std::string kWifi1Pass = "Test1234";
+static const std::string kWifi1Ssid = "noname_5G";
+static const std::string kWifi1Pass = "Grubiy321";
 
 static const std::string kWifi2Ssid = "Test2345";
 static const std::string kWifi2Pass = "Test2345";
@@ -48,8 +48,8 @@ WiFiIP wifi_ip{
 static WifiCreds my_wifi1{kWifi1Ssid, kWifi1Pass};
 static WifiCreds my_wifi2{kWifi2Ssid, kWifi2Pass};
 
-ae::WiFiAp wifi1_ap{my_wifi1, wifi_ip};
-ae::WiFiAp wifi2_ap{my_wifi2, wifi_ip};
+ae::WiFiAp wifi1_ap{my_wifi1, {} /*wifi_ip*/};
+ae::WiFiAp wifi2_ap{my_wifi2, {} /*wifi_ip*/};
 
 std::vector<ae::WiFiAp> wifi_ap_vec{wifi1_ap, wifi2_ap};
 
@@ -67,7 +67,8 @@ static WiFiPowerSaveParam wifi_psp{
 
 WiFiInit wifi_init{
     wifi_ap_vec,  // Wi-Fi access points
-    wifi_psp,     // Power save parameters
+    {}
+    // wifi_psp,     // Power save parameters
 };
 
 RcPtr<AetherApp> construct_aether_app() {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f5e4040f..21fae1e6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -34,7 +34,6 @@ generate_inline_tests(${CMAKE_CURRENT_LIST_DIR}/../aether aether)
 add_subdirectory(test-tele)
 add_subdirectory(test-tele-statistics)
 add_subdirectory(test-types)
-add_subdirectory(test-meta)
 add_subdirectory(test-object-system)
 add_subdirectory(test-api-protocol)
 add_subdirectory(test-actions)
@@ -43,8 +42,6 @@ add_subdirectory(test-transport)
 add_subdirectory(test-stream)
 add_subdirectory(test-safe-stream)
 add_subdirectory(test-ptr)
-add_subdirectory(test-format)
-add_subdirectory(test-reflect)
 add_subdirectory(test-domain-storage)
 add_subdirectory(test-serial-port)
 add_subdirectory(test-tasks)
diff --git a/tests/test-actions/CMakeLists.txt b/tests/test-actions/CMakeLists.txt
index fcdd5df9..92b145ec 100644
--- a/tests/test-actions/CMakeLists.txt
+++ b/tests/test-actions/CMakeLists.txt
@@ -34,7 +34,7 @@ if(NOT CM_PLATFORM)
   target_sources(${PROJECT_NAME} PRIVATE ${action_srcs} ${test_srcs})
   # for aether
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl aether::miscpp)
 
   add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
 else()
diff --git a/tests/test-events/CMakeLists.txt b/tests/test-events/CMakeLists.txt
index 961a09f9..34466e3a 100644
--- a/tests/test-events/CMakeLists.txt
+++ b/tests/test-events/CMakeLists.txt
@@ -31,7 +31,7 @@ if(NOT CM_PLATFORM)
   add_executable(${PROJECT_NAME})
   target_sources(${PROJECT_NAME} PRIVATE ${test_events_srcs})
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl aether::miscpp)
 
   add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
 else()
diff --git a/tests/test-format/CMakeLists.txt b/tests/test-format/CMakeLists.txt
deleted file mode 100644
index 8982f42d..00000000
--- a/tests/test-format/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2024 Aethernet Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-cmake_minimum_required( VERSION 3.16 )
-
-list(APPEND test_srcs
-    main.cpp
-    test-format-types.cpp
-    test-format-time.cpp
-    test-format-str.cpp
-)
-
-if(NOT CM_PLATFORM)
-  project(test-format LANGUAGES CXX)
-
-  add_executable(${PROJECT_NAME})
-  target_sources(${PROJECT_NAME} PRIVATE ${test_srcs})
-  # for aether
-  target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity date)
-
-  add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
-else()
-  message(WARNING "Not implemented for ${CM_PLATFORM}")
-endif()
diff --git a/tests/test-format/main.cpp b/tests/test-format/main.cpp
deleted file mode 100644
index 39bed4d7..00000000
--- a/tests/test-format/main.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-void setUp() {}
-void tearDown() {}
-
-extern int test_format_types();
-extern int test_format_time();
-extern int test_format_str();
-
-int main() {
-  int res = 0;
-  res += test_format_types();
-  res += test_format_time();
-  res += test_format_str();
-  return res;
-}
diff --git a/tests/test-format/test-format-str.cpp b/tests/test-format/test-format-str.cpp
deleted file mode 100644
index 288833c7..00000000
--- a/tests/test-format/test-format-str.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include "aether/format/format.h"
-
-namespace ae::test_format_str {
-void test_BracketInTheBegin() {
-  auto str1 = Format("{ kek");
-  TEST_ASSERT_EQUAL_STRING("{ kek", str1.c_str());
-  auto str2 = Format("{} kek");
-  TEST_ASSERT_EQUAL_STRING(" kek", str2.c_str());
-
-  auto str3 = Format("} kek {");
-  TEST_ASSERT_EQUAL_STRING("} kek {", str3.c_str());
-}
-
-void test_BracketInTheEnd() {
-  auto str1 = Format("kek {");
-  TEST_ASSERT_EQUAL_STRING("kek {", str1.c_str());
-  auto str2 = Format("kek {}");
-  TEST_ASSERT_EQUAL_STRING("kek ", str2.c_str());
-}
-
-void test_BracketEscape() {
-  auto str1 = Format("kek {{}}");
-  TEST_ASSERT_EQUAL_STRING("kek {}", str1.c_str());
-
-  auto str2 = Format("{} kek {{}}");
-  TEST_ASSERT_EQUAL_STRING(" kek {}", str2.c_str());
-
-  auto str3 = Format("{} kek {{}}", 12, 42);
-  TEST_ASSERT_EQUAL_STRING("12 kek {42}", str3.c_str());
-}
-}  // namespace ae::test_format_str
-
-int test_format_str() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::test_format_str::test_BracketInTheBegin);
-  RUN_TEST(ae::test_format_str::test_BracketInTheEnd);
-  RUN_TEST(ae::test_format_str::test_BracketEscape);
-  return UNITY_END();
-}
diff --git a/tests/test-format/test-format-time.cpp b/tests/test-format/test-format-time.cpp
deleted file mode 100644
index 74bdaaee..00000000
--- a/tests/test-format/test-format-time.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <list>
-#include <chrono>
-
-#include "aether/common.h"
-#include "aether/format/format.h"
-
-namespace ae::test_format_time {
-void test_FormatTimePoint() {
-  auto tp = TimePoint{std::chrono::milliseconds{9913675}};
-  auto tp_str = Format("=:-{:%H:%M:%S}", tp);
-  TEST_ASSERT_EQUAL_STRING("=:-02:45:13.675000", tp_str.data());
-
-  auto tp2 = TimePoint{std::chrono::milliseconds{9913675}};
-  auto tp2_str = Format("[{:%H:%M:%S}]", tp2);
-  TEST_ASSERT_EQUAL_STRING("[02:45:13.675000]", tp2_str.data());
-}
-
-void test_FormatListOfTimePoint() {
-  auto tp_list = std::list{TimePoint{std::chrono::milliseconds{13675}},
-                           TimePoint{std::chrono::milliseconds{14000}},
-                           TimePoint{std::chrono::milliseconds{15888}}};
-  auto tp_list_str = Format("{:o=%S}", tp_list);
-  TEST_ASSERT_EQUAL_STRING("o=13.675000, o=14.000000, o=15.888000",
-                           tp_list_str.data());
-}
-}  // namespace ae::test_format_time
-
-int test_format_time() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::test_format_time::test_FormatTimePoint);
-  RUN_TEST(ae::test_format_time::test_FormatListOfTimePoint);
-  return UNITY_END();
-}
diff --git a/tests/test-format/test-format-types.cpp b/tests/test-format/test-format-types.cpp
deleted file mode 100644
index 1f562fb4..00000000
--- a/tests/test-format/test-format-types.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <list>
-#include <array>
-#include <vector>
-#include <string>
-#include <cstdint>
-#include <optional>
-#include <string_view>
-
-#include "aether/format/format.h"
-
-namespace ae::test_format_types {
-void test_FormatNumbers() {
-  auto int8 = Format("{}", static_cast<int>(std::int8_t{42}));
-  auto int16 = Format("{}", std::int16_t{42});
-  auto int32 = Format("{}", std::int32_t{42});
-  auto int64 = Format("{}", std::int64_t{42});
-
-  TEST_ASSERT_EQUAL_STRING("42", int8.data());
-  TEST_ASSERT_EQUAL_STRING("42", int16.data());
-  TEST_ASSERT_EQUAL_STRING("42", int32.data());
-  TEST_ASSERT_EQUAL_STRING("42", int64.data());
-
-  auto uint8 = Format("{}", static_cast<int>(std::uint8_t{42}));
-  auto uint16 = Format("{}", std::uint16_t{42});
-  auto uint32 = Format("{}", std::uint32_t{42});
-  auto uint64 = Format("{}", std::uint64_t{42});
-
-  TEST_ASSERT_EQUAL_STRING("42", uint8.data());
-  TEST_ASSERT_EQUAL_STRING("42", uint16.data());
-  TEST_ASSERT_EQUAL_STRING("42", uint32.data());
-  TEST_ASSERT_EQUAL_STRING("42", uint64.data());
-}
-
-void test_FormatFloats() {
-  auto float_42 = Format("{}", 4.2F);
-  auto float_354 = Format("{}", 35.4F);
-  auto double_42 = Format("{}", 4.2);
-  auto double_354 = Format("{}", 35.4);
-
-  TEST_ASSERT_EQUAL_STRING("4.2", float_42.data());
-  TEST_ASSERT_EQUAL_STRING("35.4", float_354.data());
-  TEST_ASSERT_EQUAL_STRING("4.2", double_42.data());
-  TEST_ASSERT_EQUAL_STRING("35.4", double_354.data());
-}
-
-enum class Int8EnumType : std::int8_t {
-  kOne = 1,
-  kFortyTwo = 42,
-};
-
-enum class Int16EnumType : std::int16_t {
-  kOne = 1,
-  kFortyTwoAndALittle = 4200,
-};
-
-void test_FormatEnums() {
-  auto one_8 = Format("{}", Int8EnumType::kOne);
-  auto forty_two_8 = Format("{}", Int8EnumType::kFortyTwo);
-
-  TEST_ASSERT_EQUAL_STRING("1", one_8.data());
-  TEST_ASSERT_EQUAL_STRING("42", forty_two_8.data());
-
-  auto one_16 = Format("{}", Int16EnumType::kOne);
-  auto forty_two_16 = Format("{}", Int16EnumType::kFortyTwoAndALittle);
-
-  TEST_ASSERT_EQUAL_STRING("1", one_16.data());
-  TEST_ASSERT_EQUAL_STRING("4200", forty_two_16.data());
-}
-
-void test_FormatStrings() {
-  auto hello = Format("{}", std::string_view{"hello"});
-  auto world = Format("{}", std::string{"world"});
-
-  TEST_ASSERT_EQUAL_STRING("hello", hello.data());
-  TEST_ASSERT_EQUAL_STRING("world", world.data());
-}
-
-void test_Containers() {
-  std::vector<std::int8_t> vec_data = {0x7f, 0x01, 0x42};
-  auto vec_data_str = Format("{}", vec_data);
-  TEST_ASSERT_EQUAL_STRING("7f0142", vec_data_str.data());
-
-  std::vector<std::string_view> vec_messages = {"hello", "beautiful", "world"};
-  auto vec_messages_str = Format("[{}]", vec_messages);
-  TEST_ASSERT_EQUAL_STRING("[hello, beautiful, world]",
-                           vec_messages_str.data());
-
-  std::list<std::uint8_t> list_data = {0xff, 0x01, 0x42};
-  auto list_data_str = Format("{}", list_data);
-  TEST_ASSERT_EQUAL_STRING("ff0142", list_data_str.data());
-
-  std::list<Int8EnumType> list_enum = {
-      Int8EnumType::kOne, Int8EnumType::kFortyTwo, Int8EnumType::kOne};
-  auto list_enum_str = Format("[{}]", list_enum);
-  TEST_ASSERT_EQUAL_STRING("[1, 42, 1]", list_enum_str.data());
-
-  auto arr_data = std::array{0xff, 0x01, 0x42};
-  auto arr_data_str = Format("{}", arr_data);
-  TEST_ASSERT_EQUAL_STRING("255, 1, 66", arr_data_str.data());
-
-  auto arr_floats = std::array{25.5F, 4.2F, 35.4F};
-  auto arr_floats_str = Format("{}", arr_floats);
-  TEST_ASSERT_EQUAL_STRING("25.5, 4.2, 35.4", arr_floats_str.data());
-}
-
-void test_Optional() {
-  auto opt_value = std::optional{42};
-  auto opt_value_str = Format("{}", opt_value);
-  TEST_ASSERT_EQUAL_STRING("42", opt_value_str.data());
-
-  auto opt_no_value = std::optional<std::string>{};
-  auto opt_no_value_str = Format("{}", opt_no_value);
-  TEST_ASSERT_EQUAL_STRING("nullopt", opt_no_value_str.data());
-}
-
-}  // namespace ae::test_format_types
-
-int test_format_types() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::test_format_types::test_FormatNumbers);
-  RUN_TEST(ae::test_format_types::test_FormatFloats);
-  RUN_TEST(ae::test_format_types::test_FormatEnums);
-  RUN_TEST(ae::test_format_types::test_FormatStrings);
-  RUN_TEST(ae::test_format_types::test_Containers);
-  RUN_TEST(ae::test_format_types::test_Optional);
-  return UNITY_END();
-}
diff --git a/tests/test-meta/CMakeLists.txt b/tests/test-meta/CMakeLists.txt
deleted file mode 100644
index e0e94a80..00000000
--- a/tests/test-meta/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2026 Aethernet Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-cmake_minimum_required( VERSION 3.16 )
-
-list(APPEND test_srcs
-   main.cpp
-   test-type-list.cpp
-)
-
-if(NOT CM_PLATFORM)
-  project(test-meta LANGUAGES CXX)
-
-  add_executable(${PROJECT_NAME})
-  target_sources(${PROJECT_NAME} PRIVATE ${test_srcs})
-  # for aether
-  target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    target_compile_options(${PROJECT_NAME} PUBLIC /Zc:preprocessor)
-  endif()
-
-  add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
-else()
-  message(WARNING "Not implemented for ${CM_PLATFORM}")
-endif()
diff --git a/tests/test-meta/main.cpp b/tests/test-meta/main.cpp
deleted file mode 100644
index d157ef4c..00000000
--- a/tests/test-meta/main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2026 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-void setUp() {}
-void tearDown() {}
-
-extern int test_type_list();
-
-int main() {
-  int res{};
-  res += test_type_list();
-  return res;
-}
diff --git a/tests/test-meta/test-type-list.cpp b/tests/test-meta/test-type-list.cpp
deleted file mode 100644
index d8a5fe2f..00000000
--- a/tests/test-meta/test-type-list.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <utility>
-#include "aether/meta/type_list.h"
-
-#if defined __GNUC__
-#  define AE_FUNC_NAME __PRETTY_FUNCTION__
-#elif defined _MSC_VER
-#  define AE_FUNC_NAME __FUNCSIG__
-#endif
-
-namespace ae::test_type_list {
-template <std::size_t Step, std::size_t... Is>
-constexpr auto MakeIndexSequenceWithStepImpl(std::index_sequence<Is...>) {
-  return std::index_sequence<(Is * Step)...>{};
-}
-
-template <std::size_t Count, std::size_t Step>
-constexpr auto MakeIndexSequenceWithStep() {
-  return MakeIndexSequenceWithStepImpl<Step>(std::make_index_sequence<Count>());
-}
-
-template <std::size_t I>
-struct NType {};
-
-template <std::size_t... Is>
-static constexpr auto MakeTypeListImpl(std::index_sequence<Is...>)
-    -> TypeList<NType<Is>...> {
-  return {};
-}
-
-template <std::size_t N>
-static constexpr auto MakeTypeList() {
-  return MakeTypeListImpl(std::make_index_sequence<N>{});
-}
-
-template <typename TWorker, std::size_t... Is>
-void ForTypesImpl(TWorker&& worker, std::index_sequence<Is...>) {
-  (..., std::forward<TWorker>(worker).template work<Is>());
-}
-
-template <std::size_t IndexStep, typename TWorker, typename... Ts>
-void ForTypes(TWorker&& worker, TypeList<Ts...>) {
-  ForTypesImpl(
-      std::forward<TWorker>(worker),
-      MakeIndexSequenceWithStep<sizeof...(Ts) / IndexStep, IndexStep>());
-}
-
-template <typename TL>
-struct Worker {
-  template <std::size_t I>
-  void work() {
-    auto const* old_test_name = Unity.CurrentTestName;
-    Unity.CurrentTestName = AE_FUNC_NAME;
-    using type_at = TypeAt_t<I, TL>;
-    TEST_ASSERT_TRUE((std::is_same_v<NType<I>, type_at>));
-
-    Unity.CurrentTestName = old_test_name;
-  }
-};
-
-template <typename TL>
-struct WorkerReverse {
-  template <std::size_t I>
-  void work() {
-    auto const* old_test_name = Unity.CurrentTestName;
-    Unity.CurrentTestName = AE_FUNC_NAME;
-    constexpr auto kLastN = TypeListSize_v<TL> - 1;
-    using type_at = TypeAt_t<I, TL>;
-    TEST_ASSERT_TRUE((std::is_same_v<NType<kLastN - I>, type_at>));
-
-    Unity.CurrentTestName = old_test_name;
-  }
-};
-
-template <std::size_t N>
-void TestNTypes() {
-  auto type_list = MakeTypeList<N>();
-  using TL = decltype(type_list);
-
-  TEST_ASSERT_EQUAL(N, TypeListSize_v<TL>);
-  ForTypes<(N / 20) + 1>(Worker<TL>{}, type_list);
-  Worker<TL>{}.template work<N - 1>();
-}
-
-template <std::size_t N>
-void TestNTypesReverse() {
-  auto type_list = MakeTypeList<N>();
-  using TL = decltype(type_list);
-  using RTL = typename ReversTypeList<TL>::type;
-
-  TEST_ASSERT_EQUAL(N, TypeListSize_v<RTL>);
-  ForTypes<(N / 20) + 1>(WorkerReverse<RTL>{}, type_list);
-  Worker<TL>{}.template work<N - 1>();
-}
-
-void test_Ntypes() {
-  RUN_TEST(TestNTypes<1>);
-  RUN_TEST(TestNTypes<10>);
-
-  RUN_TEST(TestNTypes<100>);
-  RUN_TEST(TestNTypes<450>);
-
-  RUN_TEST(TestNTypesReverse<1>);
-  RUN_TEST(TestNTypesReverse<10>);
-  RUN_TEST(TestNTypesReverse<100>);
-  RUN_TEST(TestNTypesReverse<300>);  // MSVC has lower recursion limit
-}
-
-}  // namespace ae::test_type_list
-
-int test_type_list() {
-  UNITY_BEGIN();
-  ae::test_type_list::test_Ntypes();
-  return UNITY_END();
-}
diff --git a/tests/test-object-system/CMakeLists.txt b/tests/test-object-system/CMakeLists.txt
index f588fd44..1c184126 100644
--- a/tests/test-object-system/CMakeLists.txt
+++ b/tests/test-object-system/CMakeLists.txt
@@ -52,7 +52,7 @@ if(NOT CM_PLATFORM)
   # for aether
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
   target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity date etl numeric)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl numeric aether::miscpp)
   target_compile_definitions(${PROJECT_NAME} PRIVATE "AE_DISTILLATION=1")
   target_compile_definitions(${PROJECT_NAME} PRIVATE "AE_PROJECT_VERSION=\"0.0.0\"")
 
diff --git a/tests/test-ptr/CMakeLists.txt b/tests/test-ptr/CMakeLists.txt
index cedc8396..5a30c01f 100644
--- a/tests/test-ptr/CMakeLists.txt
+++ b/tests/test-ptr/CMakeLists.txt
@@ -38,7 +38,7 @@ if(NOT CM_PLATFORM)
   target_sources(${PROJECT_NAME} PRIVATE ${test_srcs})
   # for aether
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity aether::miscpp)
 
   add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
 
diff --git a/tests/test-ptr/pipe_there_they_are_sitting.h b/tests/test-ptr/pipe_there_they_are_sitting.h
index ba21b478..63a999fb 100644
--- a/tests/test-ptr/pipe_there_they_are_sitting.h
+++ b/tests/test-ptr/pipe_there_they_are_sitting.h
@@ -17,7 +17,7 @@
 #ifndef TESTS_TEST_PTR_PIPE_THERE_THEY_ARE_SITTING_H_
 #define TESTS_TEST_PTR_PIPE_THERE_THEY_ARE_SITTING_H_
 
-#include "aether/reflect/reflect.h"
+#include "aether-miscpp/reflect/reflect.h"
 
 namespace ae::test_ptr {
 struct A {
diff --git a/tests/test-reflect/CMakeLists.txt b/tests/test-reflect/CMakeLists.txt
deleted file mode 100644
index 92f79904..00000000
--- a/tests/test-reflect/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2024 Aethernet Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-cmake_minimum_required( VERSION 3.16 )
-
-list(APPEND test_srcs
-    main.cpp
-    test-reflect.cpp
-    test-domain-visitor.cpp
-)
-
-if(NOT CM_PLATFORM)
-  project(test-reflect LANGUAGES CXX)
-
-  add_executable(${PROJECT_NAME})
-  target_sources(${PROJECT_NAME} PRIVATE  ${test_srcs})
-  # for aether
-  target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity)
-
-  add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
-
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    target_compile_options(${PROJECT_NAME} PUBLIC /Zc:preprocessor)
-  endif()
-else()
-  message(WARNING "Not implemented for ${CM_PLATFORM}")
-endif()
-
-# target_compile_options(${PROJECT_NAME} PRIVATE "-save-temps=obj")
diff --git a/tests/test-reflect/main.cpp b/tests/test-reflect/main.cpp
deleted file mode 100644
index ca58ce3e..00000000
--- a/tests/test-reflect/main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-void setUp() {}
-void tearDown() {}
-
-extern int test_reflect();
-extern int test_domain_visitor();
-
-int main() {
-  int res = 0;
-  res += test_reflect();
-  res += test_domain_visitor();
-  return res;
-}
diff --git a/tests/test-reflect/test-domain-visitor.cpp b/tests/test-reflect/test-domain-visitor.cpp
deleted file mode 100644
index cd38ddca..00000000
--- a/tests/test-reflect/test-domain-visitor.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <map>
-#include <list>
-#include <vector>
-
-#include "aether/reflect/override_func.h"
-#include "aether/reflect/domain_visitor.h"
-
-namespace ae::reflect::test_domain_visitor {
-struct Foo {
-  int int_val;
-  float float_val;
-  char const* hello;
-
-  AE_REFLECT_MEMBERS(int_val, float_val, hello);
-};
-
-struct NoReflect {
-  int int_val;
-};
-
-struct FooContainers {
-  std::vector<Foo> vec_foos;
-  std::list<Foo> list_foos;
-  std::map<int, Foo> map_foos;
-
-  AE_REFLECT_MEMBERS(vec_foos, list_foos, map_foos);
-};
-
-struct BCycle;
-struct ACycle {
-  int int_val;
-  BCycle* b_ptr;
-  AE_REFLECT_MEMBERS(int_val, b_ptr)
-};
-
-struct BCycle {
-  float float_val;
-  ACycle* a_ptr;
-  AE_REFLECT_MEMBERS(float_val, a_ptr)
-};
-
-void test_VisitFoo() {
-  auto foo = Foo{42, 42.3F, "Hello"};
-  bool visited_int = false;
-  bool visited_float = false;
-  bool visited_str = false;
-  DomainVisit(foo, OverrideFunc{
-                       [&](int v) {
-                         TEST_ASSERT_EQUAL(42, v);
-                         visited_int = true;
-                       },
-                       [&](float v) {
-                         TEST_ASSERT_EQUAL_FLOAT(42.3F, v);
-                         visited_float = true;
-                       },
-                       [&](char const* v) {
-                         TEST_ASSERT_EQUAL_STRING("Hello", v);
-                         visited_str = true;
-                       },
-                   });
-  TEST_ASSERT(visited_int);
-  TEST_ASSERT(visited_float);
-  TEST_ASSERT(visited_str);
-}
-
-void test_NoReflect() {
-  auto no_reflect = NoReflect{42};
-  bool visited = false;
-  DomainVisit(no_reflect, [&](auto v) { visited = true; });
-  TEST_ASSERT(!visited);
-}
-
-void test_FooContainers() {
-  auto foo = Foo{42, 42.12F, "World"};
-  auto foo_containers = FooContainers{
-      {foo, foo, foo},
-      {foo, foo, foo, foo},
-      {{1, foo}, {2, foo}, {3, foo}},
-  };
-
-  int visited_int = 0;
-  int visited_float = 0;
-  int visited_str = 0;
-
-  auto visitor = OverrideFunc{[&](int v) {
-                                TEST_ASSERT_EQUAL(42, v);
-                                ++visited_int;
-                              },
-                              [&](float v) {
-                                TEST_ASSERT_EQUAL_FLOAT(42.12F, v);
-                                ++visited_float;
-                              },
-                              [&](char const* v) {
-                                TEST_ASSERT_EQUAL_STRING("World", v);
-                                ++visited_str;
-                              },
-                              [&](auto const& v) {}};
-
-  DomainVisit(
-      foo_containers,
-      DomainNodeVisitor<decltype(visitor)&, VisitPolicy::kDeep>{visitor});
-
-  constexpr auto b = NodeVisitor<std::vector<int>>::Policy::Match(
-      VisitPolicy::kDeep | VisitPolicy::kAny);
-
-  TEST_ASSERT_EQUAL(10, visited_int);
-  TEST_ASSERT_EQUAL(10, visited_float);
-  TEST_ASSERT_EQUAL(10, visited_str);
-}
-
-void test_NotPropagateInMapAndList() {
-  auto foo = Foo{42, 42.12F, "World"};
-  auto foo_containers = FooContainers{
-      {foo, foo, foo},
-      {foo, foo, foo, foo},
-      {{1, foo}, {2, foo}, {3, foo}},
-  };
-
-  int visited_int = 0;
-  int visited_float = 0;
-  int visited_str = 0;
-
-  auto visitor = OverrideFunc{
-      [&](int v) {
-        TEST_ASSERT_EQUAL(42, v);
-        ++visited_int;
-      },
-      [&](float v) {
-        TEST_ASSERT_EQUAL_FLOAT(42.12F, v);
-        ++visited_float;
-      },
-      [&](char const* v) {
-        TEST_ASSERT_EQUAL_STRING("World", v);
-        ++visited_str;
-      },
-      [&](auto const& v) {
-        return !std::is_same_v<std::map<int, Foo> const&, decltype(v)> &&
-               !std::is_same_v<std::list<Foo> const&, decltype(v)>;
-      }};
-
-  DomainVisit(
-      foo_containers,
-      DomainNodeVisitor<decltype(visitor)&, VisitPolicy::kAny>{visitor});
-
-  TEST_ASSERT_EQUAL(3, visited_int);
-  TEST_ASSERT_EQUAL(3, visited_float);
-  TEST_ASSERT_EQUAL(3, visited_str);
-}
-
-void test_CycleDetection() {
-  auto a_val = ACycle{12, {}};
-  auto b_val = BCycle{12.42F, {}};
-  a_val.b_ptr = &b_val;
-  b_val.a_ptr = &a_val;
-
-  int a_visited = 0;
-  int int_visited = 0;
-  int b_visited = 0;
-  int float_visited = 0;
-
-  auto visitor = OverrideFunc{[&](ACycle const* val) { ++a_visited; },
-                              [&](BCycle const* val) { ++b_visited; },
-                              [&](int) { ++int_visited; },
-                              [&](float) { ++float_visited; }};
-
-  DomainVisit(
-      a_val, DomainNodeVisitor<decltype(visitor)&, VisitPolicy::kAny>{visitor});
-
-  TEST_ASSERT_EQUAL(1, a_visited);
-  TEST_ASSERT_EQUAL(1, b_visited);
-  TEST_ASSERT_EQUAL(1, int_visited);
-  TEST_ASSERT_EQUAL(1, float_visited);
-}
-}  // namespace ae::reflect::test_domain_visitor
-
-int test_domain_visitor() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::reflect::test_domain_visitor::test_VisitFoo);
-  RUN_TEST(ae::reflect::test_domain_visitor::test_NoReflect);
-  RUN_TEST(ae::reflect::test_domain_visitor::test_FooContainers);
-  RUN_TEST(ae::reflect::test_domain_visitor::test_NotPropagateInMapAndList);
-  RUN_TEST(ae::reflect::test_domain_visitor::test_CycleDetection);
-  return UNITY_END();
-}
diff --git a/tests/test-reflect/test-reflect.cpp b/tests/test-reflect/test-reflect.cpp
deleted file mode 100644
index 5a87a0e7..00000000
--- a/tests/test-reflect/test-reflect.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2024 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <string>
-
-#include "aether/meta/arg_at.h"
-#include "aether/reflect/reflect.h"
-
-namespace ae::test_reflect {
-struct Foo {
-  int int_val;
-  float float_val;
-  std::string hello;
-
-  AE_REFLECT(AE_MMBR(int_val), AE_MMBR(float_val), AE_MMBR(hello));
-};
-
-struct Empty {
-  AE_REFLECT();
-};
-
-struct NonReflectable {
-  int a;
-};
-
-struct TwoLevelReflectable {
-  int int_val;
-  Foo foo;
-
-  AE_REFLECT_MEMBERS(int_val, foo);
-};
-
-void test_IsReflectable() {
-  constexpr bool must_be_true = reflect::IsReflectable<Foo>::value;
-  constexpr bool must_be_false = reflect::IsReflectable<NonReflectable>::value;
-  TEST_ASSERT(must_be_true);
-  TEST_ASSERT(!must_be_false);
-}
-
-void test_EmptyReflect() {
-  auto empty = Empty{};
-  auto empty_reflect = reflect::Reflection{empty};
-  TEST_ASSERT_EQUAL(0, empty_reflect.size());
-  bool applied = false;
-  empty_reflect.Apply([&](auto const&... fields) {
-    TEST_ASSERT_EQUAL(0, sizeof...(fields));
-    applied = true;
-  });
-  TEST_ASSERT(applied);
-}
-
-void test_FooReflection() {
-  Foo foo{1, 12.42f, "Hello"};
-  auto foo_reflect = reflect::Reflection{foo};
-  TEST_ASSERT_EQUAL(3, foo_reflect.size());
-  TEST_ASSERT_EQUAL(1, foo_reflect.get<0>());
-  TEST_ASSERT_EQUAL_FLOAT(12.42F, foo_reflect.get<1>());
-  TEST_ASSERT_EQUAL_STRING("Hello", foo_reflect.get<2>().c_str());
-}
-
-void test_FooApply() {
-  Foo foo{1, 12.42f, "Hello"};
-  auto foo_reflect = reflect::Reflection{foo};
-  bool applied = false;
-  foo_reflect.Apply([&](auto const&... fields) {
-    TEST_ASSERT_EQUAL(1, VarAt<0>(fields...));
-    TEST_ASSERT_EQUAL_FLOAT(12.42f, VarAt<1>(fields...));
-    TEST_ASSERT_EQUAL_STRING("Hello", VarAt<2>(fields...).c_str());
-    applied = true;
-  });
-  TEST_ASSERT(applied);
-}
-
-void test_TwoLevelReflectable() {
-  TwoLevelReflectable tlr{12, {42, 65.13F, "World"}};
-  auto tlr_reflect = reflect::Reflection{tlr};
-
-  TEST_ASSERT_EQUAL(2, tlr_reflect.size());
-  TEST_ASSERT_EQUAL(12, tlr_reflect.get<0>());
-
-  tlr_reflect.Apply([](auto const&... fields) {
-    TEST_ASSERT_EQUAL(12, VarAt<0>(fields...));
-    auto foo_refl = reflect::Reflection(VarAt<1>(fields...));
-    foo_refl.Apply([](auto const&... foo_fields) {
-      TEST_ASSERT_EQUAL(42, VarAt<0>(foo_fields...));
-      TEST_ASSERT_EQUAL_FLOAT(65.13F, VarAt<1>(foo_fields...));
-      TEST_ASSERT_EQUAL_STRING("World", VarAt<2>(foo_fields...).c_str());
-    });
-  });
-}
-}  // namespace ae::test_reflect
-
-int test_reflect() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::test_reflect::test_IsReflectable);
-  RUN_TEST(ae::test_reflect::test_EmptyReflect);
-  RUN_TEST(ae::test_reflect::test_FooReflection);
-  RUN_TEST(ae::test_reflect::test_FooApply);
-  RUN_TEST(ae::test_reflect::test_TwoLevelReflectable);
-  return UNITY_END();
-}
diff --git a/tests/test-tasks/CMakeLists.txt b/tests/test-tasks/CMakeLists.txt
index 7bf7dbf7..a43bfcc0 100644
--- a/tests/test-tasks/CMakeLists.txt
+++ b/tests/test-tasks/CMakeLists.txt
@@ -29,7 +29,7 @@ if(NOT CM_PLATFORM)
   target_sources(${PROJECT_NAME} PRIVATE ${test_srcs})
   # for aether
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity etl aether::miscpp)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(${PROJECT_NAME} PUBLIC /Zc:preprocessor)
   endif()
diff --git a/tests/test-tele/CMakeLists.txt b/tests/test-tele/CMakeLists.txt
index f61bb711..188459de 100644
--- a/tests/test-tele/CMakeLists.txt
+++ b/tests/test-tele/CMakeLists.txt
@@ -33,7 +33,7 @@ if(NOT CM_PLATFORM)
   target_sources(${PROJECT_NAME} PRIVATE ${test_tele_srcs} ${test_srcs})
   # for aether
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity date numeric)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity numeric aether::miscpp)
   target_compile_definitions(${PROJECT_NAME} PRIVATE AE_PROJECT_VERSION="0.0.0")
 
   add_test(NAME ${PROJECT_NAME} COMMAND $<TARGET_FILE:${PROJECT_NAME}>)
diff --git a/tests/test-tele/test-tele.cpp b/tests/test-tele/test-tele.cpp
index eb223be6..c31698e7 100644
--- a/tests/test-tele/test-tele.cpp
+++ b/tests/test-tele/test-tele.cpp
@@ -43,7 +43,7 @@
 
 #define AETHER_TELE_TELE_H_
 
-#include "aether/meta/type_list.h"
+#include "aether-miscpp/meta/type_list.h"
 
 #include "aether/tele/sink.h"
 #include "aether/tele/tags.h"
diff --git a/tests/test-types/CMakeLists.txt b/tests/test-types/CMakeLists.txt
index ba27a266..9ffa42a0 100644
--- a/tests/test-types/CMakeLists.txt
+++ b/tests/test-types/CMakeLists.txt
@@ -22,9 +22,7 @@ list(APPEND test_srcs
     test-span.cpp
     test-static-map.cpp
     test-statistics-counter.cpp
-    test-aligned-storage.cpp
     test-uid.cpp
-    test-small-function.cpp
     test-nullable-type.cpp
     test-address-parser.cpp
 )
@@ -37,7 +35,7 @@ if(NOT CM_PLATFORM)
   target_sources(${PROJECT_NAME} PRIVATE ${test_srcs})
   # for aether
   target_include_directories(${PROJECT_NAME} PRIVATE ${ROOT_DIR})
-  target_link_libraries(${PROJECT_NAME} PRIVATE unity gcem etl date numeric)
+  target_link_libraries(${PROJECT_NAME} PRIVATE unity gcem etl numeric aether::miscpp)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(${PROJECT_NAME} PUBLIC /Zc:preprocessor)
   endif()
diff --git a/tests/test-types/main.cpp b/tests/test-types/main.cpp
index f53a97d8..172b5455 100644
--- a/tests/test-types/main.cpp
+++ b/tests/test-types/main.cpp
@@ -25,9 +25,7 @@ extern int test_concat_arrays();
 extern int test_span();
 extern int test_static_map();
 extern int test_statistics_counter();
-extern int test_aligned_storage();
 extern int test_uid();
-extern int test_small_function();
 extern int test_nullable_type();
 extern int test_address_parser();
 
@@ -39,9 +37,7 @@ int main() {
   res += test_span();
   res += test_static_map();
   res += test_statistics_counter();
-  res += test_aligned_storage();
   res += test_uid();
-  res += test_small_function();
   res += test_nullable_type();
   res += test_address_parser();
   return res;
diff --git a/tests/test-types/test-aligned-storage.cpp b/tests/test-types/test-aligned-storage.cpp
deleted file mode 100644
index 400585ce..00000000
--- a/tests/test-types/test-aligned-storage.cpp
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <cstddef>
-
-#include "aether/types/aligned_storage.h"
-
-namespace ae::test_aligned_storage {
-
-void test_AlignedStorage() {
-  // Test basic size and alignment properties
-  {
-    using TestStorage = AlignedStorage<64, 16>;
-    TestStorage storage;
-
-    // Verify size matches
-    TEST_ASSERT_EQUAL(64, sizeof(storage));
-
-    // Verify alignment
-    auto address = reinterpret_cast<uintptr_t>(storage.data());
-    TEST_ASSERT_TRUE_MESSAGE(address % 16 == 0, "Alignment not satisfied");
-  }
-
-  // Test struct with alignment requirements
-  {
-    struct alignas(32) AlignedStruct {
-      int data[4];
-    };
-
-    using AlignedStructStorage =
-        AlignedStorage<sizeof(AlignedStruct), alignof(AlignedStruct)>;
-    AlignedStructStorage aligned_struct_storage;
-
-    // Test that the storage doesn't add extra padding
-    TEST_ASSERT_EQUAL(sizeof(AlignedStruct), sizeof(aligned_struct_storage));
-
-    auto* struct_ptr = aligned_struct_storage.ptr<AlignedStruct>();
-    struct_ptr->data[0] = 1.0;
-    TEST_ASSERT_EQUAL_DOUBLE(1.0, struct_ptr->data[0]);
-
-    // Verify alignment of custom struct
-    auto struct_address = reinterpret_cast<uintptr_t>(struct_ptr);
-    TEST_ASSERT_TRUE_MESSAGE(struct_address % 32 == 0,
-                             "Custom alignment not satisfied");
-  }
-}
-
-struct CopyMoveCounter {
-  static inline int delete_count = 0;
-
-  CopyMoveCounter() = default;
-  ~CopyMoveCounter() {
-    if (!moved) {
-      delete_count++;
-    }
-  }
-
-  CopyMoveCounter(CopyMoveCounter const& other)
-      : copy_count{other.copy_count + 1}, move_count{other.move_count} {}
-  CopyMoveCounter(CopyMoveCounter&& other) noexcept
-      : copy_count{other.copy_count}, move_count{other.move_count + 1} {
-    other.moved = true;
-  }
-
-  CopyMoveCounter& operator=(CopyMoveCounter const& other) {
-    if (this != &other) {
-      copy_count = other.copy_count + 1;
-      move_count = other.move_count;
-    }
-    return *this;
-  }
-
-  CopyMoveCounter& operator=(CopyMoveCounter&& other) noexcept {
-    if (this != &other) {
-      copy_count = other.copy_count;
-      move_count = other.move_count + 1;
-      other.moved = true;
-    }
-    return *this;
-  }
-
-  int copy_count{};
-  int move_count{};
-  bool moved{};
-};
-
-void test_ManagedStorage() {
-  CopyMoveCounter::delete_count = 0;
-
-  {
-    using Storage =
-        ManagedStorage<sizeof(CopyMoveCounter), alignof(CopyMoveCounter)>;
-
-    Storage s{InPlace<CopyMoveCounter>{}};
-    TEST_ASSERT_EQUAL(0, s.ptr<CopyMoveCounter>()->move_count);
-    TEST_ASSERT_EQUAL(0, s.ptr<CopyMoveCounter>()->copy_count);
-
-    // make copy
-    auto s1 = s;
-    TEST_ASSERT_EQUAL(1, s1.ptr<CopyMoveCounter>()->copy_count);
-    TEST_ASSERT_EQUAL(0, s1.ptr<CopyMoveCounter>()->move_count);
-    // make copy 2
-    auto s2 = s1;
-    TEST_ASSERT_EQUAL(2, s2.ptr<CopyMoveCounter>()->copy_count);
-    TEST_ASSERT_EQUAL(0, s2.ptr<CopyMoveCounter>()->move_count);
-    // move to new storage
-    auto s3 = std::move(s2);
-    TEST_ASSERT_EQUAL(2, s3.ptr<CopyMoveCounter>()->copy_count);
-    TEST_ASSERT_EQUAL(1, s3.ptr<CopyMoveCounter>()->move_count);
-    // move to existing storage
-    s2 = std::move(s3);
-    TEST_ASSERT_EQUAL(2, s2.ptr<CopyMoveCounter>()->copy_count);
-    TEST_ASSERT_EQUAL(2, s2.ptr<CopyMoveCounter>()->move_count);
-  }
-
-  TEST_ASSERT_EQUAL(3, CopyMoveCounter::delete_count);
-}
-
-struct NonCopyable {
-  inline static int delete_count = 0;
-
-  explicit NonCopyable(int v) : value(v) {}
-  ~NonCopyable() {
-    if (!moved) {
-      delete_count++;
-    }
-  }
-
-  // Delete copy operations
-  NonCopyable(const NonCopyable&) = delete;
-  NonCopyable& operator=(const NonCopyable&) = delete;
-
-  // Allow move operations
-  NonCopyable(NonCopyable&& other) noexcept : value(other.value) {
-    other.value = -1;
-    other.moved = true;
-  }
-
-  NonCopyable& operator=(NonCopyable&& other) noexcept {
-    value = other.value;
-    other.value = -1;
-    other.moved = true;
-    return *this;
-  }
-
-  int value;
-  bool moved{};
-};
-
-void test_ManagedStorageNonCopyable() {
-  NonCopyable::delete_count = 0;
-
-  // Test in-place construction
-  {
-    auto storage = ManagedStorage<sizeof(NonCopyable), alignof(NonCopyable)>{
-        InPlace<NonCopyable>{}, 42};
-    auto* ptr = storage.ptr<NonCopyable>();
-    TEST_ASSERT_EQUAL(42, ptr->value);
-
-    // Test move construction
-    auto moved = std::move(storage);
-    auto moved_ptr = moved.ptr<NonCopyable>();
-    TEST_ASSERT_EQUAL(42, moved_ptr->value);
-
-    // Original should be in moved-from state
-    TEST_ASSERT_EQUAL(-1, storage.ptr<NonCopyable>()->value);
-  }
-  TEST_ASSERT_EQUAL(
-      1, NonCopyable::delete_count);  // Both storage and moved destroyed
-
-  // Test move assignment
-  NonCopyable::delete_count = 0;
-  {
-    ManagedStorage<sizeof(NonCopyable), alignof(NonCopyable)> source{
-        InPlace<NonCopyable>{}, 100};
-    ManagedStorage<sizeof(NonCopyable), alignof(NonCopyable)> target;
-
-    target = std::move(source);
-    auto* target_ptr = target.ptr<NonCopyable>();
-    TEST_ASSERT_EQUAL(100, target_ptr->value);
-    TEST_ASSERT_EQUAL(-1, source.ptr<NonCopyable>()->value);
-  }
-  TEST_ASSERT_EQUAL(
-      1, NonCopyable::delete_count);  // Both source and target destroyed
-
-  // Test self-move assignment (should be safe)
-  NonCopyable::delete_count = 0;
-  {
-    ManagedStorage<sizeof(NonCopyable), alignof(NonCopyable)> storage{
-        InPlace<NonCopyable>{}, 200};
-
-    // Self-move assignment
-    storage = std::move(storage);
-
-    // Should still be valid
-    auto* ptr = storage.ptr<NonCopyable>();
-    TEST_ASSERT_EQUAL(200, ptr->value);
-  }
-  TEST_ASSERT_EQUAL(1, NonCopyable::delete_count);
-}
-
-// Common polymorphic types for tests
-struct TestBase {
-  virtual ~TestBase() = default;
-  virtual int id() const = 0;
-  virtual const char* name() const = 0;
-};
-
-struct TestDerived : TestBase {
-  TestDerived(int id, const char* name) : id_(id), name_(name) {}
-  int id() const override { return id_; }
-  const char* name() const override { return name_; }
-  int id_;
-  const char* name_;
-};
-
-void test_ManagedStorageAdvanced() {
-  // Test polymorphic type support
-  {
-    // Store derived type
-    ManagedStorage<sizeof(TestDerived), alignof(TestDerived)> storage{
-        InPlace<TestDerived>{}, 42, "42"};
-
-    // Access via base pointer
-    auto* base_ptr = storage.ptr<TestBase>();
-    TEST_ASSERT_EQUAL(42, base_ptr->id());
-
-    // Verify vtable preservation through moves
-    auto moved = std::move(storage);
-    auto* moved_base = moved.ptr<TestBase>();
-    TEST_ASSERT_EQUAL(42, moved_base->id());
-  }
-
-  // Test trivially copyable type
-  {
-    struct PodType {
-      int id;
-      char const* name;
-    };
-
-    ManagedStorage<sizeof(PodType), alignof(PodType)> storage{
-        InPlace<PodType>{}, PodType{1, "Test Pod"}};
-    auto* ptr = storage.ptr<PodType>();
-    TEST_ASSERT_EQUAL(1, ptr->id);
-    TEST_ASSERT_EQUAL_STRING("Test Pod", ptr->name);
-
-    // Test copy assignment
-    auto copy = storage;
-    auto* copy_ptr = copy.ptr<PodType>();
-    TEST_ASSERT_EQUAL(1, copy_ptr->id);
-    TEST_ASSERT_EQUAL_STRING("Test Pod", copy_ptr->name);
-
-    // Modify original and verify copy unchanged
-    ptr->id = 2;
-    ptr->name = "Modified";
-    TEST_ASSERT_EQUAL(2, ptr->id);
-    TEST_ASSERT_EQUAL_STRING("Modified", ptr->name);
-    TEST_ASSERT_EQUAL(1, copy_ptr->id);
-    TEST_ASSERT_EQUAL_STRING("Test Pod", copy_ptr->name);
-  }
-
-  // Test assignment to non-empty storage
-  {
-    ManagedStorage<sizeof(int), alignof(int)> storage{InPlace<int>{}, 42};
-    ManagedStorage<sizeof(int), alignof(int)> other{InPlace<int>{}, 100};
-
-    // Assign to non-empty storage
-    storage = other;
-    TEST_ASSERT_EQUAL(100, *storage.ptr<int>());
-
-    // Self-assignment
-    storage = storage;
-    TEST_ASSERT_EQUAL(100, *storage.ptr<int>());
-
-    // Move assignment to non-empty
-    storage = ManagedStorage<sizeof(int), alignof(int)>{InPlace<int>{}, 200};
-    TEST_ASSERT_EQUAL(200, *storage.ptr<int>());
-  }
-
-  // Test type with larger alignment
-  {
-    struct alignas(64) OverAligned {
-      const char* data;
-    };
-
-    ManagedStorage<sizeof(OverAligned), alignof(OverAligned)> storage{
-        InPlace<OverAligned>{}, OverAligned{"Aligned Data"}};
-    auto* ptr = storage.ptr<OverAligned>();
-    auto address = reinterpret_cast<uintptr_t>(ptr);
-    TEST_ASSERT_TRUE_MESSAGE(address % 64 == 0,
-                             "64-byte alignment not satisfied");
-    TEST_ASSERT_EQUAL_STRING("Aligned Data", ptr->data);
-  }
-}
-
-void test_ManagedStorageEmplace() {
-  // Test basic Emplace
-  {
-    struct ValueType {
-      int a;
-      const char* b;
-
-      ValueType(int x, const char* y) : a(x), b(y) {}
-    };
-
-    ManagedStorage<sizeof(ValueType), alignof(ValueType)> storage;
-    storage.Emplace<ValueType>(42, "Emplace Test");
-
-    auto* ptr = storage.ptr<ValueType>();
-    TEST_ASSERT_EQUAL(42, ptr->a);
-    TEST_ASSERT_EQUAL_STRING("Emplace Test", ptr->b);
-  }
-
-  // Test Emplace with movable-only type
-  {
-    ManagedStorage<sizeof(NonCopyable), alignof(NonCopyable)> storage;
-    storage.Emplace<NonCopyable>(100);
-
-    auto* ptr = storage.ptr<NonCopyable>();
-    TEST_ASSERT_EQUAL(100, ptr->value);
-  }
-
-  // Test Emplace overwrite
-  {
-    ManagedStorage<sizeof(int), alignof(int)> storage{InPlace<int>{}, 42};
-    storage.Emplace<int>(100);
-
-    auto* ptr = storage.ptr<int>();
-    TEST_ASSERT_EQUAL(100, *ptr);
-  }
-
-  // Test Emplace with polymorphic type
-  {
-    ManagedStorage<sizeof(TestDerived), alignof(TestDerived)> storage;
-    storage.Emplace<TestDerived>(123, "Polymorphic Emplace");
-
-    auto* base_ptr = storage.ptr<TestBase>();
-    TEST_ASSERT_EQUAL(123, base_ptr->id());
-    TEST_ASSERT_EQUAL_STRING("Polymorphic Emplace", base_ptr->name());
-  }
-
-  // Test Emplace with different constructor
-  {
-    struct MultiArg {
-      int a;
-      int b;
-      const char* c;
-      MultiArg(int x, int y, const char* z) : a(x), b(y), c(z) {}
-    };
-
-    ManagedStorage<sizeof(MultiArg), alignof(MultiArg)> storage;
-    storage.Emplace<MultiArg>(1, 2, "Three");
-
-    auto* ptr = storage.ptr<MultiArg>();
-    TEST_ASSERT_EQUAL(1, ptr->a);
-    TEST_ASSERT_EQUAL(2, ptr->b);
-    TEST_ASSERT_EQUAL_STRING("Three", ptr->c);
-  }
-}
-
-void test_ManagedStorageEdgeCases() {
-  // Test minimal size storage
-  {
-    struct Empty {};
-    static_assert(sizeof(Empty) == 1, "Empty struct must be 1 byte");
-
-    // AlignedStorage with minimal size
-    AlignedStorage<1, 1> minimal_storage;
-    auto* empty_ptr = minimal_storage.ptr<Empty>();
-    TEST_ASSERT_NOT_NULL(empty_ptr);  // Should be valid pointer
-
-    // ManagedStorage with minimal size
-    ManagedStorage<1, 1> managed_minimal{InPlace<Empty>{}};
-    auto* managed_minimal_ptr = managed_minimal.ptr<Empty>();
-    TEST_ASSERT_NOT_NULL(managed_minimal_ptr);
-
-    // Test move operations
-    auto moved_minimal = std::move(managed_minimal);
-    TEST_ASSERT_NOT_NULL(moved_minimal.ptr<Empty>());
-  }
-
-  // Test nested storage
-  {
-    using InnerStorage = AlignedStorage<sizeof(int), alignof(int)>;
-    using OuterStorage =
-        AlignedStorage<sizeof(InnerStorage), alignof(InnerStorage)>;
-
-    // Test with ManagedStorage
-    ManagedStorage<sizeof(OuterStorage), alignof(OuterStorage)> managed_outer{
-        InPlace<OuterStorage>{}};
-    auto* managed_inner_ptr =
-        managed_outer.ptr<OuterStorage>()->ptr<InnerStorage>();
-    int const* managed_value_ptr = managed_inner_ptr->ptr<int>();
-    TEST_ASSERT_NOT_NULL(managed_value_ptr);
-  }
-
-  // Test storage with maximum alignment
-  {
-    constexpr size_t max_align = alignof(std::max_align_t);
-    struct MaxAligned {
-      char data;
-    };
-
-    AlignedStorage<sizeof(MaxAligned), max_align> storage;
-    auto* ptr = storage.ptr<MaxAligned>();
-    auto address = reinterpret_cast<uintptr_t>(ptr);
-    TEST_ASSERT_TRUE_MESSAGE(address % max_align == 0,
-                             "Max alignment not satisfied");
-  }
-}
-
-void test_Storage() {
-  // Test with primitive type
-  using IntStorage = Storage<int>;
-  IntStorage int_storage;
-  new (int_storage.ptr()) int{42};
-  TEST_ASSERT_EQUAL(42, *int_storage.ptr());
-
-  // Test with custom type
-  struct TestStruct {
-    int a;
-    const char* b;
-  };
-  using StructStorage = Storage<TestStruct>;
-  StructStorage struct_storage;
-  new (struct_storage.ptr()) TestStruct();
-  struct_storage.ptr()->a = 10;
-  struct_storage.ptr()->b = "Hello";
-  TEST_ASSERT_EQUAL(10, struct_storage.ptr()->a);
-  TEST_ASSERT_EQUAL_STRING("Hello", struct_storage.ptr()->b);
-}
-
-}  // namespace ae::test_aligned_storage
-
-int test_aligned_storage() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::test_aligned_storage::test_AlignedStorage);
-  RUN_TEST(ae::test_aligned_storage::test_ManagedStorage);
-  RUN_TEST(ae::test_aligned_storage::test_ManagedStorageNonCopyable);
-  RUN_TEST(ae::test_aligned_storage::test_ManagedStorageAdvanced);
-  RUN_TEST(ae::test_aligned_storage::test_ManagedStorageEmplace);
-  RUN_TEST(ae::test_aligned_storage::test_ManagedStorageEdgeCases);
-  RUN_TEST(ae::test_aligned_storage::test_Storage);
-  return UNITY_END();
-}
diff --git a/tests/test-types/test-small-function.cpp b/tests/test-types/test-small-function.cpp
deleted file mode 100644
index 2b4491fd..00000000
--- a/tests/test-types/test-small-function.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright 2025 Aethernet Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unity.h>
-
-#include <vector>
-
-#include "aether/types/small_function.h"
-
-namespace ae::test_small_function {
-void test_CallALambdas() {
-  using Func = SmallFunction<void(int)>;
-  auto f1_called = false;
-  // Create inplace
-  auto f1 = Func{[&](int x) {
-    f1_called = true;
-    TEST_ASSERT_EQUAL(1, x);
-  }};
-
-  f1(1);
-  TEST_ASSERT_TRUE(f1_called);
-
-  auto f2_called = false;
-  auto l2 = [&](int x) {
-    f2_called = true;
-    TEST_ASSERT_EQUAL(2, x);
-  };
-  // Create by move
-  auto f2 = Func{std::move(l2)};
-
-  f2(2);
-  TEST_ASSERT_TRUE(f2_called);
-
-  auto f3_called = false;
-  auto l3 = [&](int x) {
-    f3_called = true;
-    TEST_ASSERT_EQUAL(3, x);
-  };
-  // Create by copy
-  auto f3 = Func{l3};
-
-  f3(3);
-  TEST_ASSERT_TRUE(f3_called);
-}
-
-void test_FunctionsInVector() {
-  using Func = SmallFunction<void(int)>;
-  std::vector<Func> funcs;
-  std::size_t invoke_count = 0;
-  for (int i = 0; i < 255; i++) {
-    // each emplace back should grow the vector, make all the elements remove to
-    // new data buffer
-    funcs.emplace_back([&invoke_count, i](int x) {
-      invoke_count++;
-      TEST_ASSERT_EQUAL(i, x);
-    });
-    // make it grow each time
-    funcs.shrink_to_fit();
-  }
-
-  for (std::size_t i = 0; i < 255; i++) {
-    funcs[i](static_cast<int>(i));
-  }
-
-  TEST_ASSERT_EQUAL(255, invoke_count);
-}
-
-struct DestructableCallable {
-  static inline int destroyed_count;
-  static inline int move_count;
-  static inline int invoke_count;
-
-  ~DestructableCallable() {
-    if (!moved) {
-      destroyed_count++;
-    }
-  }
-
-  DestructableCallable() = default;
-
-  DestructableCallable(DestructableCallable&& other) noexcept {
-    other.moved = true;
-    move_count++;
-  }
-
-  void operator()() const noexcept { invoke_count++; }
-
-  bool moved = false;
-};
-
-void test_DestructableCallable() {
-  DestructableCallable::destroyed_count = 0;
-  DestructableCallable::move_count = 0;
-  DestructableCallable::invoke_count = 0;
-
-  {
-    using Func = SmallFunction<void()>;
-
-    // 1 move while creation
-    auto f1 = Func{DestructableCallable{}};
-    // 1st invocation
-    f1();
-    // 2 move
-    auto f2 = std::move(f1);
-    // 2nd invocation
-    f2();
-    // actually destroyed only one DestructableCallable
-  }
-  TEST_ASSERT_EQUAL(1, DestructableCallable::destroyed_count);
-  TEST_ASSERT_EQUAL(2, DestructableCallable::move_count);
-  TEST_ASSERT_EQUAL(2, DestructableCallable::invoke_count);
-}
-
-void test_DestructableCallableInVector() {
-  DestructableCallable::destroyed_count = 0;
-  DestructableCallable::move_count = 0;
-  DestructableCallable::invoke_count = 0;
-
-  {
-    using Func = SmallFunction<void()>;
-    std::vector<Func> funcs;
-
-    for (std::size_t i = 0; i < 255; ++i) {
-      // each emplace should make vector grow and reallocate elements
-      funcs.emplace_back(DestructableCallable{});
-    }
-
-    for (auto const& func : funcs) {
-      func();
-    }
-  }
-  TEST_ASSERT_EQUAL(255, DestructableCallable::destroyed_count);
-  TEST_ASSERT_EQUAL(255, DestructableCallable::invoke_count);
-}
-
-class Worker {
- public:
-  static inline int invoke_count;
-  static inline int const_invoke_count;
-
-  explicit Worker(int expected) : expected(expected) {}
-
-  void Foo(int x) {
-    invoke_count++;
-    TEST_ASSERT_EQUAL(expected, x);
-  }
-
-  void FooConst(int x) const {
-    const_invoke_count++;
-    TEST_ASSERT_EQUAL(expected, x);
-  }
-
-  void FooRef(int const& x) {
-    invoke_count++;
-    TEST_ASSERT_EQUAL(expected, x);
-  }
-
-  void FooConstRef(int const& x) const {
-    const_invoke_count++;
-    TEST_ASSERT_EQUAL(expected, x);
-  }
-
-  int expected;
-};
-
-void test_ClassMemberFunction() {
-  using Func = SmallFunction<void(int x)>;
-  Worker::invoke_count = 0;
-  Worker::const_invoke_count = 0;
-
-  auto worker = Worker{12};
-  auto f1 = Func{MethodPtr<&Worker::Foo>{&worker}};
-  auto f2 = Func{MethodPtr<&Worker::FooConst>{&worker}};
-  f1(12);
-  f2(12);
-  TEST_ASSERT_EQUAL(1, Worker::invoke_count);
-  TEST_ASSERT_EQUAL(1, Worker::const_invoke_count);
-
-  auto f1_1 = std::move(f1);
-  auto f2_1 = std::move(f2);
-  f1_1(12);
-  f2_1(12);
-  TEST_ASSERT_EQUAL(2, Worker::invoke_count);
-  TEST_ASSERT_EQUAL(2, Worker::const_invoke_count);
-}
-
-void test_ClassMemberFunctionRef() {
-  using Func = SmallFunction<void(int x)>;
-  Worker::invoke_count = 0;
-  Worker::const_invoke_count = 0;
-
-  auto worker = Worker{12};
-  auto f1 = Func{MethodPtr<&Worker::FooRef>{&worker}};
-  auto f2 = Func{MethodPtr<&Worker::FooConstRef>{&worker}};
-  f1(12);
-  f2(12);
-  TEST_ASSERT_EQUAL(1, Worker::invoke_count);
-  TEST_ASSERT_EQUAL(1, Worker::const_invoke_count);
-
-  auto f1_1 = std::move(f1);
-  auto f2_1 = std::move(f2);
-  f1_1(12);
-  f2_1(12);
-  TEST_ASSERT_EQUAL(2, Worker::invoke_count);
-  TEST_ASSERT_EQUAL(2, Worker::const_invoke_count);
-}
-
-static inline int test_invoke_expected;
-static inline int test_invoke_count;
-static void TestInvoke(int x) {
-  test_invoke_count++;
-  TEST_ASSERT_EQUAL(test_invoke_expected, x);
-}
-
-void test_FreeFunction() {
-  using Func = SmallFunction<void(int x)>;
-  test_invoke_expected = 12;
-  test_invoke_count = 0;
-
-  printf("TestInvoke addr %p\n", TestInvoke);
-
-  auto f1 = Func{TestInvoke};
-  f1(12);
-  TEST_ASSERT_EQUAL(1, test_invoke_count);
-
-  auto f1_1 = std::move(f1);
-  f1_1(12);
-  TEST_ASSERT_EQUAL(2, test_invoke_count);
-
-  auto fl1 = Func{+[](int x) {
-    test_invoke_count++;
-    TEST_ASSERT_EQUAL(test_invoke_expected, x);
-  }};
-
-  fl1(12);
-  TEST_ASSERT_EQUAL(3, test_invoke_count);
-}
-
-}  // namespace ae::test_small_function
-
-int test_small_function() {
-  UNITY_BEGIN();
-  RUN_TEST(ae::test_small_function::test_CallALambdas);
-  RUN_TEST(ae::test_small_function::test_FunctionsInVector);
-  RUN_TEST(ae::test_small_function::test_DestructableCallable);
-  RUN_TEST(ae::test_small_function::test_DestructableCallableInVector);
-  RUN_TEST(ae::test_small_function::test_ClassMemberFunction);
-  RUN_TEST(ae::test_small_function::test_ClassMemberFunctionRef);
-  RUN_TEST(ae::test_small_function::test_FreeFunction);
-  return UNITY_END();
-}

From c32ff45ed036b8c727476bfaa2210dff2287a304 Mon Sep 17 00:00:00 2001
From: BartolomeyKant <notevill@gmail.com>
Date: Thu, 18 Jun 2026 17:38:28 +0500
Subject: [PATCH 2/2] add opencode and AGENTS.md config

---
 AGENTS.md     | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
 opencode.json | 68 +++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 AGENTS.md
 create mode 100644 opencode.json

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000..6b89e4c3
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,99 @@
+# Aethernet Agent Rules
+
+## Coding Style
+
+- Follow **Google C++ Style Guide**.
+- **Exception to IWYU:** 
+    - If `foo.cpp` implements `foo.h`, and `foo.h` already includes a header, do NOT re-include it in `foo.cpp`.
+    - If `base.h` includes a header, `derived.h` should NOT re-include it.
+- Always wrap `if` and `for` bodies in `{}` even if it's short one-line statement.
+- Initialize variables and objects using `{}` to distinguish from function call.
+  - *Exception vector initialization*: In case vector must be created with size use `()` initialization to distinguish from initializer_list constructor.
+- Always there is possible use `auto` for variables with respect for references `auto&` and pointers `auto*`.
+- Check if pointer is null by comparing it to `nullptr` instead of using implicit conversion to `bool`.
+- If function arguments is not used, there are two options. If it's never used, just ommit the argument name. If it's used on some configurations use `[[maybe_unused]]` attribute.
+- Immediate lambda call pattern should be implemented by using `std::invoke`.
+
+## Architecture & Object System
+
+- **Core Objects (`Obj`):** Main entities (`Aether`, `Client`, `Server`, `Channel`) must inherit from `ae::Obj` and use the `AE_OBJECT` macro.
+- **Smart Pointers:** Use `ae::ObjPtr<T>` for `Obj`-based classes. Use `ae::PtrView<T>` or raw pointers for weak references from runtime logic to `Obj` instances.
+- **Persistence:** Use `Load`/`Save` methods and `AE_OBJECT_REFLECT` for persistent state in `Obj` classes.
+- **Business Logic:** Async logic, streams, and drivers must NOT be `Obj`-based. They are "runtime" classes.
+
+## Events and Callbacks
+
+- Use events and callbacks to notify external code about state changes.
+- If possible use callbacks set up by the constructor. If not, use event-based notifications.
+- Try to pass callbacks as template parameters for better optimization.
+- If not possible use SmallFunction.
+- If not possible use std::function. Notice std::function makes heap allocation we trying to avoid.
+- Events uses SmallFunction as a callback storage.
+- Prefer setup SmallFunction by MethodPtr<&Class::method>{this} instead of lambda.
+- Event subscriptions should be stored in Subscription or MultiSubscriptions class members to control subscription lifetime.
+- If the class makes subscription controls lifetime of the object with event, subscription objects maybe ommited.
+
+## Asynchrony & Tasks
+
+### Task System
+
+- Use task system to run tasks asynchronously.
+- There is a `ManualTaskScheduler` with methods to define a single `Task` and `DelayedTask` with duration after which the task will be executed.
+- To access this scheduler use `ae_context.scheduler()` method.
+- Tasks should be lightweight as possible because it stored in fixed-size object pool.
+- To control task lifetime use `TaskSubscription` a RAII object which automatically resets task if subscribers die.
+- In rare cases class can guarantee its lifetime, subscription may be omitted.
+
+### Stdexec
+
+- `stdexec` library is used for chaining low-level async operations.
+- whole library connected through one header `aether/executors/executors.h` and defines ex namespace alias.
+- all senders should be scheduled on our Task System though ex::SchedulerOnTasks if required.
+- there is three types of objects in stdexec: constructors, adapters and consumers.
+- constructors are `ex::just()`, `ex::create()` or some custom senders created for specific logic.
+- adapters are `ex::then()`, `ex::let_value()`, `ex::let_error()`, `ex::upon_error()` and others that transform or combine senders.
+- consumers are `ex::sync_wait`, but preferred to use `ex::AnyWaiter` or `ex:AsyncWaiter`.
+- se `ex::create` to create a sender from a functor to integrate c-style callbacks or other non sender logic into the executor.
+- use `ex::create` if logic must test the value and set either error or value during runtime
+- use `ex::variant_sender` to conditionally return either on or another sender based on some value.
+- use `ex::then` `ex::upon_error` to transform from one value to another or from error to value.
+- use `ex::let_value` to run new sender in chain in case of set_value.
+- use `ex::let_error` to run new sender in chain in case of set_error.
+- `ex::for_range` to iterate over a range of values. Internal sender must return a value, an error or stopped to end loop. To cont
+- `ex::with_timeout` to add timeout to a sender chain.
+- senders and adapters chained together by `|` operator.
+
+### Actions
+
+- Use actions to encapsulate high-level async operations.
+- The `Action` maybe inherited from `Action` class which adds `is_finished()` and `finished_event()` methods.
+- Each action should provide events to notify about operation progress and completion. Usually just `result_event()`.
+- Actions may use senders inside to define their logic or just subscribe to another action's events.
+- Actions should be managed by the class that creates them and returned by reference or pointers in case of possible null.
+- If action `is_finished()` or after `finished_event()` is emitted non should have access to the action except the owner.
+- Actions may be created as class members with optional or `ActionPool` or `std::unique_ptr`. But prefer to avoid allocations.
+
+
+## Specific modules implementation
+
+### AT Commands
+
+- `at::MakeRequest(at_support, cmd, waits)` returns a pipeable adaptor — use mid-chain.
+- `at::MakeRequest(ex::just(), at_support, cmd, waits)` returns a sender — use as first element or inside `ex::let_value`.
+- `at::Wait("<expected>")` — build waits for the string.
+- `at::Wait("<trigger>", [](auto& buffer, auto pos) { Handlers for response, must return bool })` — build waits for the string and custom handler.
+- Timeouts should be implemented using `ex::with_timeout`.
+
+## Build & Testing
+
+ Project uses cmake, tests run with `ctest`.
+ Project build configured in `build-clang` (`<build-dir>`) with ninja.
+ To build the project go into `<build-dir>/` and run `cmake --build . --parallel` or `ninja`.
+
+ To run tests, go into `<build-dir>` and run `ctest . --progress -j -E "((sodium)|(hydro)|(bcrypt)).*" --output-on-failure`.
+ Or run specific test by name from `<build-dir>/tests/run/<test-name>`.
+
+ To run smoke test, run `<build-dir>/aether-client-cpp-cloud`.
+
+## Operational Rules
+- Do not analyze logs until everything is working fine.
diff --git a/opencode.json b/opencode.json
new file mode 100644
index 00000000..819eeeef
--- /dev/null
+++ b/opencode.json
@@ -0,0 +1,68 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "agent": {
+    "builder_cpp": {
+      "mode": "subagent",
+      "description": "Validate project build and analyze compiler logs",
+      "prompt": "You are c++ code builder specialists. You know how to configure cmake build, run ninja, understand compiler logs for clang and gcc. Your task is to run project build, either full (`ninja`), or for specific target (`ninja <target name>`). If build succeeds report succeed, if fails analyze build errors and make a report for other agents to fix the issues. Do not try to fix the issues yourself.",
+      "permission": {
+        "edit": "deny",
+        "bash": {
+          "*": "deny",
+          "ninja*": "allow",
+          "cmake*": "allow"
+        }
+      },
+      "temperature": 0.1,
+      "steps": 10
+    },
+    "tester": {
+      "mode": "subagent",
+      "description": "Run tests and analyze results",
+      "prompt": "You are highly qualified quality assurance specialist. Your task is to run unit tests and smoke tests. If unit test fails, analyze the log and point the cases are failed. If smoke test fails, analyze the log and make a report. Do not try to fix the issues yourself or provide solutions. There are other agents to fix them.",
+      "permission": {
+        "edit": "deny",
+        "bash": {
+          "*": "deny",
+          "ninja test": "allow",
+          "ctest *": "allow"
+        }
+      },
+      "temperature": 0.1,
+      "steps": 10
+    },
+    "coder": {
+      "mode": "subagent",
+      "description": "Write c++ code",
+      "prompt": "You are a highly qualified c++ developer. Your task is to write c++ code that solves the given problem. You get instruction from the team lead/architect. You only implement the ideas in code.",
+      "permission": {
+        "edit": "allow",
+        "bash": "ask",
+        "external_directory": "deny",
+        "repo_clone": "deny"
+      }
+    },
+    "code-reviewer": {
+      "mode": "all",
+      "description": "Review code and validate if it solves the problem",
+      "prompt": "You are trained as a code reviewer. Your task is to review the code written by the other agents and validate if it solves the problem. Notice we are working on a cross-platform project for desktop and IoT devices, so pay attention to platform-specific, performance, and security concerns. Never try to fix the issues yourself, just report.",
+      "permission": {
+        "edit": "deny",
+        "bash": {
+          "git log*": "allow",
+          "git diff*": "allow"
+        }
+      },
+      "temperature": 0.1
+    },
+    "team-lead-architect": {
+      "mode": "primary",
+      "description": "The main agent to rule the others on the way to work on code.",
+      "prompt": "You are team-lead architect. You don't write code, you don't build, you don't test. You manage agent team and architect solutions. You have @coder - to write actual code by your detailed instructions; @builder_cpp to validate builds, analyze compiler errors; @tester to run tests and analyze test logs; @code-reviewer to work in pair with @coder and check if everything made as it's intended.",
+      "permission": {
+        "edit": "deny",
+        "bash": "deny"
+      }
+    }
+  }
+}