feat build: move the sources from 'shared' to 'universal' directory

Tests: протестировано CI
userver-framework · Jul 7, 2023 · 3e9d8f7 · 3e9d8f7
1 parent 4fea138
commit 3e9d8f7
Show file tree

Hide file tree

Showing 436 changed files with 10 additions and 23 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -183,7 +183,7 @@ set_property(
 
 target_include_directories(${PROJECT_NAME}
  PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/src/
+ ${CMAKE_CURRENT_SOURCE_DIR}/../universal/src/
  ${CMAKE_CURRENT_SOURCE_DIR}/src/
  ${CMAKE_CURRENT_BINARY_DIR}
 )
@@ -194,7 +194,7 @@ if (USERVER_IS_THE_ROOT_PROJECT OR USERVER_FEATURE_UTEST)
  target_include_directories(userver-core-internal PUBLIC
  $<TARGET_PROPERTY:${PROJECT_NAME},INCLUDE_DIRECTORIES>
  ${CMAKE_CURRENT_SOURCE_DIR}/internal/include
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/internal/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../universal/internal/include
  )
  target_link_libraries(userver-core-internal
  PUBLIC

diff --git a/core/src/logging/log_message_test.cpp b/core/src/logging/log_message_test.cpp
@@ -95,9 +95,8 @@ TEST_F(LoggingTest, LogFormat) {
  utils::regex_match(GetStreamString(), utils::regex(kExpectedPattern)))
  << GetStreamString();
 
- EXPECT_TRUE(GetStreamString().find(" ( /") == std::string::npos)
- << "Path shortening for logs stopped working. The log: "
- << GetStreamString();
+ EXPECT_THAT(GetStreamString(), testing::Not(testing::HasSubstr(" ( /")))
+ << "Path shortening for logs stopped working.";
 }
 
 TEST_F(LoggingTest, FloatingPoint) {

diff --git a/shared/README.md b/shared/README.md
diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
@@ -15,23 +15,19 @@ if (TARGET userver-core)
 endif()
 
 file(GLOB_RECURSE SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/*.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/*.hpp
  ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
 )
 
 file(GLOB_RECURSE UNIT_TEST_SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/*_test.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/*_test.cpp
 )
 file(GLOB_RECURSE BENCH_SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/*_benchmark.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/*_benchmark.cpp
 )
 file(GLOB_RECURSE INTERNAL_SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/internal/*.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/internal/*.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/internal/*.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/internal/*.hpp
 )
 list(REMOVE_ITEM SOURCES ${UNIT_TEST_SOURCES} ${BENCH_SOURCES} ${INTERNAL_SOURCES})
 
@@ -141,11 +137,9 @@ endif()
 
 target_include_directories(${PROJECT_NAME}
  PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/include
  ${CMAKE_CURRENT_SOURCE_DIR}/include
  ${USERVER_THIRD_PARTY_DIRS}/date/include
  PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/src/
  ${CMAKE_CURRENT_SOURCE_DIR}/src/
  ${CMAKE_CURRENT_BINARY_DIR}
 )
@@ -191,7 +185,7 @@ if (USERVER_IS_THE_ROOT_PROJECT)
  target_compile_definitions(${PROJECT_NAME}-internal PUBLIC $<TARGET_PROPERTY:${PROJECT_NAME},COMPILE_DEFINITIONS>)
  target_include_directories(${PROJECT_NAME}-internal PUBLIC
  $<TARGET_PROPERTY:${PROJECT_NAME},INCLUDE_DIRECTORIES>
- ${CMAKE_CURRENT_SOURCE_DIR}/../shared/internal/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/internal/include
  )
  target_link_libraries(${PROJECT_NAME}-internal
  PUBLIC

diff --git a/universal/README.md b/universal/README.md
@@ -1,8 +1,7 @@
 # userver: Universal Functionality
 
-This folder takes `../shared` and creates a separate CMake target out of it.
-
 `userver-universal` target can be used by projects that want to reuse some
-userver utils without including the asynchronous engine.
+userver utils without including the asynchronous engine and coroutines.
 
-It should NOT be used alongside `../core`.
+All the functions and types that do not depend on asynchronous engine
+should go here.
diff --git a/shared/include/userver/cache/impl/lru.hpp → universal/include/userver/cache/impl/lru.hpp b/shared/include/userver/cache/impl/lru.hpp → universal/include/userver/cache/impl/lru.hpp
diff --git a/shared/include/userver/cache/impl/slru.hpp → ...ersal/include/userver/cache/impl/slru.hpp b/shared/include/userver/cache/impl/slru.hpp → ...ersal/include/userver/cache/impl/slru.hpp
diff --git a/shared/include/userver/cache/lru_map.hpp → universal/include/userver/cache/lru_map.hpp b/shared/include/userver/cache/lru_map.hpp → universal/include/userver/cache/lru_map.hpp
diff --git a/shared/include/userver/cache/lru_set.hpp → universal/include/userver/cache/lru_set.hpp b/shared/include/userver/cache/lru_set.hpp → universal/include/userver/cache/lru_set.hpp
diff --git a/shared/include/userver/compiler/demangle.hpp → ...sal/include/userver/compiler/demangle.hpp b/shared/include/userver/compiler/demangle.hpp → ...sal/include/userver/compiler/demangle.hpp
diff --git a/...clude/userver/compiler/impl/consteval.hpp → ...clude/userver/compiler/impl/consteval.hpp b/...clude/userver/compiler/impl/consteval.hpp → ...clude/userver/compiler/impl/consteval.hpp
diff --git a/shared/include/userver/compiler/select.hpp → ...ersal/include/userver/compiler/select.hpp b/shared/include/userver/compiler/select.hpp → ...ersal/include/userver/compiler/select.hpp
diff --git a/shared/include/userver/crypto/algorithm.hpp → ...rsal/include/userver/crypto/algorithm.hpp b/shared/include/userver/crypto/algorithm.hpp → ...rsal/include/userver/crypto/algorithm.hpp
diff --git a/shared/include/userver/crypto/base64.hpp → universal/include/userver/crypto/base64.hpp b/shared/include/userver/crypto/base64.hpp → universal/include/userver/crypto/base64.hpp
diff --git a/...ed/include/userver/crypto/basic_types.hpp → ...al/include/userver/crypto/basic_types.hpp b/...ed/include/userver/crypto/basic_types.hpp → ...al/include/userver/crypto/basic_types.hpp
diff --git a/...ed/include/userver/crypto/certificate.hpp → ...al/include/userver/crypto/certificate.hpp b/...ed/include/userver/crypto/certificate.hpp → ...al/include/userver/crypto/certificate.hpp
diff --git a/shared/include/userver/crypto/crypto.hpp → universal/include/userver/crypto/crypto.hpp b/shared/include/userver/crypto/crypto.hpp → universal/include/userver/crypto/crypto.hpp
diff --git a/shared/include/userver/crypto/exception.hpp → ...rsal/include/userver/crypto/exception.hpp b/shared/include/userver/crypto/exception.hpp → ...rsal/include/userver/crypto/exception.hpp
diff --git a/shared/include/userver/crypto/hash.hpp → universal/include/userver/crypto/hash.hpp b/shared/include/userver/crypto/hash.hpp → universal/include/userver/crypto/hash.hpp
diff --git a/...ed/include/userver/crypto/private_key.hpp → ...al/include/userver/crypto/private_key.hpp b/...ed/include/userver/crypto/private_key.hpp → ...al/include/userver/crypto/private_key.hpp
diff --git a/shared/include/userver/crypto/public_key.hpp → ...sal/include/userver/crypto/public_key.hpp b/shared/include/userver/crypto/public_key.hpp → ...sal/include/userver/crypto/public_key.hpp
diff --git a/shared/include/userver/crypto/signers.hpp → universal/include/userver/crypto/signers.hpp b/shared/include/userver/crypto/signers.hpp → universal/include/userver/crypto/signers.hpp
diff --git a/shared/include/userver/crypto/verifiers.hpp → ...rsal/include/userver/crypto/verifiers.hpp b/shared/include/userver/crypto/verifiers.hpp → ...rsal/include/userver/crypto/verifiers.hpp
diff --git a/...d/include/userver/decimal64/decimal64.hpp → ...l/include/userver/decimal64/decimal64.hpp b/...d/include/userver/decimal64/decimal64.hpp → ...l/include/userver/decimal64/decimal64.hpp
diff --git a/...lude/userver/decimal64/format_options.hpp → ...lude/userver/decimal64/format_options.hpp b/...lude/userver/decimal64/format_options.hpp → ...lude/userver/decimal64/format_options.hpp
diff --git a/.../include/userver/formats/common/items.hpp → .../include/userver/formats/common/items.hpp b/.../include/userver/formats/common/items.hpp → .../include/userver/formats/common/items.hpp
diff --git a/...ver/formats/common/iterator_direction.hpp → ...ver/formats/common/iterator_direction.hpp b/...ver/formats/common/iterator_direction.hpp → ...ver/formats/common/iterator_direction.hpp
diff --git a/.../include/userver/formats/common/merge.hpp → .../include/userver/formats/common/merge.hpp b/.../include/userver/formats/common/merge.hpp → .../include/userver/formats/common/merge.hpp
diff --git a/...d/include/userver/formats/common/meta.hpp → ...l/include/userver/formats/common/meta.hpp b/...d/include/userver/formats/common/meta.hpp → ...l/include/userver/formats/common/meta.hpp
diff --git a/...d/include/userver/formats/common/path.hpp → ...l/include/userver/formats/common/path.hpp b/...d/include/userver/formats/common/path.hpp → ...l/include/userver/formats/common/path.hpp
diff --git a/...e/userver/formats/common/transfer_tag.hpp → ...e/userver/formats/common/transfer_tag.hpp b/...e/userver/formats/common/transfer_tag.hpp → ...e/userver/formats/common/transfer_tag.hpp
diff --git a/...d/include/userver/formats/common/type.hpp → ...l/include/userver/formats/common/type.hpp b/...d/include/userver/formats/common/type.hpp → ...l/include/userver/formats/common/type.hpp
diff --git a/.../include/userver/formats/common/utils.hpp → .../include/userver/formats/common/utils.hpp b/.../include/userver/formats/common/utils.hpp → .../include/userver/formats/common/utils.hpp
diff --git a/shared/include/userver/formats/json.hpp → universal/include/userver/formats/json.hpp b/shared/include/userver/formats/json.hpp → universal/include/userver/formats/json.hpp
diff --git a/...nclude/userver/formats/json/exception.hpp → ...nclude/userver/formats/json/exception.hpp b/...nclude/userver/formats/json/exception.hpp → ...nclude/userver/formats/json/exception.hpp
diff --git a/...rmats/json/impl/mutable_value_wrapper.hpp → ...rmats/json/impl/mutable_value_wrapper.hpp b/...rmats/json/impl/mutable_value_wrapper.hpp → ...rmats/json/impl/mutable_value_wrapper.hpp
diff --git a/...clude/userver/formats/json/impl/types.hpp → ...clude/userver/formats/json/impl/types.hpp b/...clude/userver/formats/json/impl/types.hpp → ...clude/userver/formats/json/impl/types.hpp
diff --git a/...d/include/userver/formats/json/inline.hpp → ...l/include/userver/formats/json/inline.hpp b/...d/include/userver/formats/json/inline.hpp → ...l/include/userver/formats/json/inline.hpp
diff --git a/...include/userver/formats/json/iterator.hpp → ...include/userver/formats/json/iterator.hpp b/...include/userver/formats/json/iterator.hpp → ...include/userver/formats/json/iterator.hpp
diff --git a/...rver/formats/json/parser/array_parser.hpp → ...rver/formats/json/parser/array_parser.hpp b/...rver/formats/json/parser/array_parser.hpp → ...rver/formats/json/parser/array_parser.hpp
diff --git a/...erver/formats/json/parser/base_parser.hpp → ...erver/formats/json/parser/base_parser.hpp b/...erver/formats/json/parser/base_parser.hpp → ...erver/formats/json/parser/base_parser.hpp
diff --git a/...erver/formats/json/parser/bool_parser.hpp → ...erver/formats/json/parser/bool_parser.hpp b/...erver/formats/json/parser/bool_parser.hpp → ...erver/formats/json/parser/bool_parser.hpp
diff --git a/...userver/formats/json/parser/exception.hpp → ...userver/formats/json/parser/exception.hpp b/...userver/formats/json/parser/exception.hpp → ...userver/formats/json/parser/exception.hpp
diff --git a/...server/formats/json/parser/int_parser.hpp → ...server/formats/json/parser/int_parser.hpp b/...server/formats/json/parser/int_parser.hpp → ...server/formats/json/parser/int_parser.hpp
diff --git a/...server/formats/json/parser/map_parser.hpp → ...server/formats/json/parser/map_parser.hpp b/...server/formats/json/parser/map_parser.hpp → ...server/formats/json/parser/map_parser.hpp
diff --git a/...ver/formats/json/parser/number_parser.hpp → ...ver/formats/json/parser/number_parser.hpp b/...ver/formats/json/parser/number_parser.hpp → ...ver/formats/json/parser/number_parser.hpp
diff --git a/...de/userver/formats/json/parser/parser.hpp → ...de/userver/formats/json/parser/parser.hpp b/...de/userver/formats/json/parser/parser.hpp → ...de/userver/formats/json/parser/parser.hpp
diff --git a/...er/formats/json/parser/parser_handler.hpp → ...er/formats/json/parser/parser_handler.hpp b/...er/formats/json/parser/parser_handler.hpp → ...er/formats/json/parser/parser_handler.hpp
diff --git a/...erver/formats/json/parser/parser_json.hpp → ...erver/formats/json/parser/parser_json.hpp b/...erver/formats/json/parser/parser_json.hpp → ...erver/formats/json/parser/parser_json.hpp
diff --git a/...rver/formats/json/parser/parser_state.hpp → ...rver/formats/json/parser/parser_state.hpp b/...rver/formats/json/parser/parser_state.hpp → ...rver/formats/json/parser/parser_state.hpp
diff --git a/...ver/formats/json/parser/string_parser.hpp → ...ver/formats/json/parser/string_parser.hpp b/...ver/formats/json/parser/string_parser.hpp → ...ver/formats/json/parser/string_parser.hpp
diff --git a/...rver/formats/json/parser/typed_parser.hpp → ...rver/formats/json/parser/typed_parser.hpp b/...rver/formats/json/parser/typed_parser.hpp → ...rver/formats/json/parser/typed_parser.hpp
diff --git a/...userver/formats/json/parser/validator.hpp → ...userver/formats/json/parser/validator.hpp b/...userver/formats/json/parser/validator.hpp → ...userver/formats/json/parser/validator.hpp
diff --git a/...nclude/userver/formats/json/serialize.hpp → ...nclude/userver/formats/json/serialize.hpp b/...nclude/userver/formats/json/serialize.hpp → ...nclude/userver/formats/json/serialize.hpp
diff --git a/.../formats/json/serialize_boost_variant.hpp → .../formats/json/serialize_boost_variant.hpp b/.../formats/json/serialize_boost_variant.hpp → .../formats/json/serialize_boost_variant.hpp
diff --git a/...rver/formats/json/serialize_container.hpp → ...rver/formats/json/serialize_container.hpp b/...rver/formats/json/serialize_container.hpp → ...rver/formats/json/serialize_container.hpp
diff --git a/...erver/formats/json/serialize_duration.hpp → ...erver/formats/json/serialize_duration.hpp b/...erver/formats/json/serialize_duration.hpp → ...erver/formats/json/serialize_duration.hpp
diff --git a/...server/formats/json/serialize_variant.hpp → ...server/formats/json/serialize_variant.hpp b/...server/formats/json/serialize_variant.hpp → ...server/formats/json/serialize_variant.hpp
diff --git a/...e/userver/formats/json/string_builder.hpp → ...e/userver/formats/json/string_builder.hpp b/...e/userver/formats/json/string_builder.hpp → ...e/userver/formats/json/string_builder.hpp
diff --git a/...erver/formats/json/string_builder_fwd.hpp → ...erver/formats/json/string_builder_fwd.hpp b/...erver/formats/json/string_builder_fwd.hpp → ...erver/formats/json/string_builder_fwd.hpp
diff --git a/...ed/include/userver/formats/json/value.hpp → ...al/include/userver/formats/json/value.hpp b/...ed/include/userver/formats/json/value.hpp → ...al/include/userver/formats/json/value.hpp
diff --git a/...de/userver/formats/json/value_builder.hpp → ...de/userver/formats/json/value_builder.hpp b/...de/userver/formats/json/value_builder.hpp → ...de/userver/formats/json/value_builder.hpp
diff --git a/shared/include/userver/formats/json_fwd.hpp → ...rsal/include/userver/formats/json_fwd.hpp b/shared/include/userver/formats/json_fwd.hpp → ...rsal/include/userver/formats/json_fwd.hpp
diff --git a/...r/formats/parse/boost_flat_containers.hpp → ...r/formats/parse/boost_flat_containers.hpp b/...r/formats/parse/boost_flat_containers.hpp → ...r/formats/parse/boost_flat_containers.hpp
diff --git a/.../userver/formats/parse/boost_optional.hpp → .../userver/formats/parse/boost_optional.hpp b/.../userver/formats/parse/boost_optional.hpp → .../userver/formats/parse/boost_optional.hpp
diff --git a/...lude/userver/formats/parse/boost_uuid.hpp → ...lude/userver/formats/parse/boost_uuid.hpp b/...lude/userver/formats/parse/boost_uuid.hpp → ...lude/userver/formats/parse/boost_uuid.hpp
diff --git a/...e/userver/formats/parse/boost_variant.hpp → ...e/userver/formats/parse/boost_variant.hpp b/...e/userver/formats/parse/boost_variant.hpp → ...e/userver/formats/parse/boost_variant.hpp
diff --git a/.../include/userver/formats/parse/common.hpp → .../include/userver/formats/parse/common.hpp b/.../include/userver/formats/parse/common.hpp → .../include/userver/formats/parse/common.hpp
diff --git a/...erver/formats/parse/common_containers.hpp → ...erver/formats/parse/common_containers.hpp b/...erver/formats/parse/common_containers.hpp → ...erver/formats/parse/common_containers.hpp
diff --git a/...ude/userver/formats/parse/time_of_day.hpp → ...ude/userver/formats/parse/time_of_day.hpp b/...ude/userver/formats/parse/time_of_day.hpp → ...ude/userver/formats/parse/time_of_day.hpp
diff --git a/shared/include/userver/formats/parse/to.hpp → ...rsal/include/userver/formats/parse/to.hpp b/shared/include/userver/formats/parse/to.hpp → ...rsal/include/userver/formats/parse/to.hpp
diff --git a/...include/userver/formats/parse/variant.hpp → ...include/userver/formats/parse/variant.hpp b/...include/userver/formats/parse/variant.hpp → ...include/userver/formats/parse/variant.hpp
diff --git a/...rver/formats/serialize/boost_optional.hpp → ...rver/formats/serialize/boost_optional.hpp b/...rver/formats/serialize/boost_optional.hpp → ...rver/formats/serialize/boost_optional.hpp
diff --git a/.../userver/formats/serialize/boost_uuid.hpp → .../userver/formats/serialize/boost_uuid.hpp b/.../userver/formats/serialize/boost_uuid.hpp → .../userver/formats/serialize/boost_uuid.hpp
diff --git a/...r/formats/serialize/common_containers.hpp → ...r/formats/serialize/common_containers.hpp b/...r/formats/serialize/common_containers.hpp → ...r/formats/serialize/common_containers.hpp
diff --git a/...userver/formats/serialize/time_of_day.hpp → ...userver/formats/serialize/time_of_day.hpp b/...userver/formats/serialize/time_of_day.hpp → ...userver/formats/serialize/time_of_day.hpp
diff --git a/.../include/userver/formats/serialize/to.hpp → .../include/userver/formats/serialize/to.hpp b/.../include/userver/formats/serialize/to.hpp → .../include/userver/formats/serialize/to.hpp
diff --git a/...ver/formats/serialize/write_to_stream.hpp → ...ver/formats/serialize/write_to_stream.hpp b/...ver/formats/serialize/write_to_stream.hpp → ...ver/formats/serialize/write_to_stream.hpp
diff --git a/shared/include/userver/formats/yaml.hpp → universal/include/userver/formats/yaml.hpp b/shared/include/userver/formats/yaml.hpp → universal/include/userver/formats/yaml.hpp
diff --git a/...nclude/userver/formats/yaml/exception.hpp → ...nclude/userver/formats/yaml/exception.hpp b/...nclude/userver/formats/yaml/exception.hpp → ...nclude/userver/formats/yaml/exception.hpp
diff --git a/...include/userver/formats/yaml/iterator.hpp → ...include/userver/formats/yaml/iterator.hpp b/...include/userver/formats/yaml/iterator.hpp → ...include/userver/formats/yaml/iterator.hpp
diff --git a/...nclude/userver/formats/yaml/serialize.hpp → ...nclude/userver/formats/yaml/serialize.hpp b/...nclude/userver/formats/yaml/serialize.hpp → ...nclude/userver/formats/yaml/serialize.hpp
diff --git a/...rver/formats/yaml/serialize_container.hpp → ...rver/formats/yaml/serialize_container.hpp b/...rver/formats/yaml/serialize_container.hpp → ...rver/formats/yaml/serialize_container.hpp
diff --git a/...ed/include/userver/formats/yaml/types.hpp → ...al/include/userver/formats/yaml/types.hpp b/...ed/include/userver/formats/yaml/types.hpp → ...al/include/userver/formats/yaml/types.hpp
diff --git a/...ed/include/userver/formats/yaml/value.hpp → ...al/include/userver/formats/yaml/value.hpp b/...ed/include/userver/formats/yaml/value.hpp → ...al/include/userver/formats/yaml/value.hpp
diff --git a/...de/userver/formats/yaml/value_builder.hpp → ...de/userver/formats/yaml/value_builder.hpp b/...de/userver/formats/yaml/value_builder.hpp → ...de/userver/formats/yaml/value_builder.hpp
diff --git a/...nclude/userver/formats/yaml/value_fwd.hpp → ...nclude/userver/formats/yaml/value_fwd.hpp b/...nclude/userver/formats/yaml/value_fwd.hpp → ...nclude/userver/formats/yaml/value_fwd.hpp
diff --git a/shared/include/userver/formats/yaml_fwd.hpp → ...rsal/include/userver/formats/yaml_fwd.hpp b/shared/include/userver/formats/yaml_fwd.hpp → ...rsal/include/userver/formats/yaml_fwd.hpp
diff --git a/...ed/include/userver/fs/blocking/c_file.hpp → ...al/include/userver/fs/blocking/c_file.hpp b/...ed/include/userver/fs/blocking/c_file.hpp → ...al/include/userver/fs/blocking/c_file.hpp
diff --git a/...e/userver/fs/blocking/file_descriptor.hpp → ...e/userver/fs/blocking/file_descriptor.hpp b/...e/userver/fs/blocking/file_descriptor.hpp → ...e/userver/fs/blocking/file_descriptor.hpp
diff --git a/...include/userver/fs/blocking/open_mode.hpp → ...include/userver/fs/blocking/open_mode.hpp b/...include/userver/fs/blocking/open_mode.hpp → ...include/userver/fs/blocking/open_mode.hpp
diff --git a/shared/include/userver/fs/blocking/read.hpp → ...rsal/include/userver/fs/blocking/read.hpp b/shared/include/userver/fs/blocking/read.hpp → ...rsal/include/userver/fs/blocking/read.hpp
diff --git a/...de/userver/fs/blocking/temp_directory.hpp → ...de/userver/fs/blocking/temp_directory.hpp b/...de/userver/fs/blocking/temp_directory.hpp → ...de/userver/fs/blocking/temp_directory.hpp
diff --git a/...include/userver/fs/blocking/temp_file.hpp → ...include/userver/fs/blocking/temp_file.hpp b/...include/userver/fs/blocking/temp_file.hpp → ...include/userver/fs/blocking/temp_file.hpp
diff --git a/shared/include/userver/fs/blocking/write.hpp → ...sal/include/userver/fs/blocking/write.hpp b/shared/include/userver/fs/blocking/write.hpp → ...sal/include/userver/fs/blocking/write.hpp
diff --git a/...server/hostinfo/blocking/get_hostname.hpp → ...server/hostinfo/blocking/get_hostname.hpp b/...server/hostinfo/blocking/get_hostname.hpp → ...server/hostinfo/blocking/get_hostname.hpp
diff --git a/...userver/hostinfo/blocking/read_groups.hpp → ...userver/hostinfo/blocking/read_groups.hpp b/...userver/hostinfo/blocking/read_groups.hpp → ...userver/hostinfo/blocking/read_groups.hpp
diff --git a/...ed/include/userver/hostinfo/cpu_limit.hpp → ...al/include/userver/hostinfo/cpu_limit.hpp b/...ed/include/userver/hostinfo/cpu_limit.hpp → ...al/include/userver/hostinfo/cpu_limit.hpp
diff --git a/...d/include/userver/http/common_headers.hpp → ...l/include/userver/http/common_headers.hpp b/...d/include/userver/http/common_headers.hpp → ...l/include/userver/http/common_headers.hpp
diff --git a/shared/include/userver/http/content_type.hpp → ...sal/include/userver/http/content_type.hpp b/shared/include/userver/http/content_type.hpp → ...sal/include/userver/http/content_type.hpp
diff --git a/shared/include/userver/http/header_map.hpp → ...ersal/include/userver/http/header_map.hpp b/shared/include/userver/http/header_map.hpp → ...ersal/include/userver/http/header_map.hpp
diff --git a/...r/http/parser/http_request_parse_args.hpp → ...r/http/parser/http_request_parse_args.hpp b/...r/http/parser/http_request_parse_args.hpp → ...r/http/parser/http_request_parse_args.hpp
diff --git a/...nclude/userver/http/predefined_header.hpp → ...nclude/userver/http/predefined_header.hpp b/...nclude/userver/http/predefined_header.hpp → ...nclude/userver/http/predefined_header.hpp
diff --git a/shared/include/userver/http/url.hpp → universal/include/userver/http/url.hpp b/shared/include/userver/http/url.hpp → universal/include/userver/http/url.hpp
diff --git a/shared/include/userver/logging/format.hpp → universal/include/userver/logging/format.hpp b/shared/include/userver/logging/format.hpp → universal/include/userver/logging/format.hpp
diff --git a/shared/include/userver/logging/fwd.hpp → universal/include/userver/logging/fwd.hpp b/shared/include/userver/logging/fwd.hpp → universal/include/userver/logging/fwd.hpp
diff --git a/...lude/userver/logging/impl/logger_base.hpp → ...lude/userver/logging/impl/logger_base.hpp b/...lude/userver/logging/impl/logger_base.hpp → ...lude/userver/logging/impl/logger_base.hpp
diff --git a/...clude/userver/logging/impl/tag_writer.hpp → ...clude/userver/logging/impl/tag_writer.hpp b/...clude/userver/logging/impl/tag_writer.hpp → ...clude/userver/logging/impl/tag_writer.hpp
diff --git a/shared/include/userver/logging/level.hpp → universal/include/userver/logging/level.hpp b/shared/include/userver/logging/level.hpp → universal/include/userver/logging/level.hpp
diff --git a/shared/include/userver/logging/log.hpp → universal/include/userver/logging/log.hpp b/shared/include/userver/logging/log.hpp → universal/include/userver/logging/log.hpp
diff --git a/shared/include/userver/logging/log_extra.hpp → ...sal/include/userver/logging/log_extra.hpp b/shared/include/userver/logging/log_extra.hpp → ...sal/include/userver/logging/log_extra.hpp
diff --git a/.../include/userver/logging/log_filepath.hpp → .../include/userver/logging/log_filepath.hpp b/.../include/userver/logging/log_filepath.hpp → .../include/userver/logging/log_filepath.hpp
diff --git a/...ed/include/userver/logging/log_helper.hpp → ...al/include/userver/logging/log_helper.hpp b/...ed/include/userver/logging/log_helper.hpp → ...al/include/userver/logging/log_helper.hpp
diff --git a/...nclude/userver/logging/log_helper_fwd.hpp → ...nclude/userver/logging/log_helper_fwd.hpp b/...nclude/userver/logging/log_helper_fwd.hpp → ...nclude/userver/logging/log_helper_fwd.hpp
diff --git a/...d/include/userver/logging/null_logger.hpp → ...l/include/userver/logging/null_logger.hpp b/...d/include/userver/logging/null_logger.hpp → ...l/include/userver/logging/null_logger.hpp
diff --git a/...lude/userver/logging/stacktrace_cache.hpp → ...lude/userver/logging/stacktrace_cache.hpp b/...lude/userver/logging/stacktrace_cache.hpp → ...lude/userver/logging/stacktrace_cache.hpp
diff --git a/shared/include/userver/utest/death_tests.hpp → ...sal/include/userver/utest/death_tests.hpp b/shared/include/userver/utest/death_tests.hpp → ...sal/include/userver/utest/death_tests.hpp
diff --git a/shared/include/userver/utest/literals.hpp → universal/include/userver/utest/literals.hpp b/shared/include/userver/utest/literals.hpp → universal/include/userver/utest/literals.hpp
diff --git a/...userver/utest/using_namespace_userver.hpp → ...userver/utest/using_namespace_userver.hpp b/...userver/utest/using_namespace_userver.hpp → ...userver/utest/using_namespace_userver.hpp
diff --git a/shared/include/userver/utils/algo.hpp → universal/include/userver/utils/algo.hpp b/shared/include/userver/utils/algo.hpp → universal/include/userver/utils/algo.hpp
diff --git a/shared/include/userver/utils/any_movable.hpp → ...sal/include/userver/utils/any_movable.hpp b/shared/include/userver/utils/any_movable.hpp → ...sal/include/userver/utils/any_movable.hpp
diff --git a/shared/include/userver/utils/any_storage.hpp → ...sal/include/userver/utils/any_storage.hpp b/shared/include/userver/utils/any_storage.hpp → ...sal/include/userver/utils/any_storage.hpp
diff --git a/shared/include/userver/utils/assert.hpp → universal/include/userver/utils/assert.hpp b/shared/include/userver/utils/assert.hpp → universal/include/userver/utils/assert.hpp
diff --git a/shared/include/userver/utils/atomic.hpp → universal/include/userver/utils/atomic.hpp b/shared/include/userver/utils/atomic.hpp → universal/include/userver/utils/atomic.hpp
diff --git a/shared/include/userver/utils/boost_uuid4.hpp → ...sal/include/userver/utils/boost_uuid4.hpp b/shared/include/userver/utils/boost_uuid4.hpp → ...sal/include/userver/utils/boost_uuid4.hpp
diff --git a/...nclude/userver/utils/bytes_per_second.hpp → ...nclude/userver/utils/bytes_per_second.hpp b/...nclude/userver/utils/bytes_per_second.hpp → ...nclude/userver/utils/bytes_per_second.hpp
diff --git a/shared/include/userver/utils/cached_hash.hpp → ...sal/include/userver/utils/cached_hash.hpp b/shared/include/userver/utils/cached_hash.hpp → ...sal/include/userver/utils/cached_hash.hpp
diff --git a/...include/userver/utils/checked_pointer.hpp → ...include/userver/utils/checked_pointer.hpp b/...include/userver/utils/checked_pointer.hpp → ...include/userver/utils/checked_pointer.hpp
diff --git a/shared/include/userver/utils/datetime.hpp → universal/include/userver/utils/datetime.hpp b/shared/include/userver/utils/datetime.hpp → universal/include/userver/utils/datetime.hpp
diff --git a/...server/utils/datetime/cpp_20_calendar.hpp → ...server/utils/datetime/cpp_20_calendar.hpp b/...server/utils/datetime/cpp_20_calendar.hpp → ...server/utils/datetime/cpp_20_calendar.hpp
diff --git a/...d/include/userver/utils/datetime/date.hpp → ...l/include/userver/utils/datetime/date.hpp b/...d/include/userver/utils/datetime/date.hpp → ...l/include/userver/utils/datetime/date.hpp
diff --git a/...utils/datetime/from_string_saturating.hpp → ...utils/datetime/from_string_saturating.hpp b/...utils/datetime/from_string_saturating.hpp → ...utils/datetime/from_string_saturating.hpp
diff --git a/...er/utils/datetime/steady_coarse_clock.hpp → ...er/utils/datetime/steady_coarse_clock.hpp b/...er/utils/datetime/steady_coarse_clock.hpp → ...er/utils/datetime/steady_coarse_clock.hpp
diff --git a/...rver/utils/datetime/wall_coarse_clock.hpp → ...rver/utils/datetime/wall_coarse_clock.hpp b/...rver/utils/datetime/wall_coarse_clock.hpp → ...rver/utils/datetime/wall_coarse_clock.hpp
diff --git a/...ed/include/userver/utils/encoding/hex.hpp → ...al/include/userver/utils/encoding/hex.hpp b/...ed/include/userver/utils/encoding/hex.hpp → ...al/include/userver/utils/encoding/hex.hpp
diff --git a/...d/include/userver/utils/encoding/tskv.hpp → ...l/include/userver/utils/encoding/tskv.hpp b/...d/include/userver/utils/encoding/tskv.hpp → ...l/include/userver/utils/encoding/tskv.hpp
diff --git a/shared/include/userver/utils/enumerate.hpp → ...ersal/include/userver/utils/enumerate.hpp b/shared/include/userver/utils/enumerate.hpp → ...ersal/include/userver/utils/enumerate.hpp
diff --git a/shared/include/userver/utils/exception.hpp → ...ersal/include/userver/utils/exception.hpp b/shared/include/userver/utils/exception.hpp → ...ersal/include/userver/utils/exception.hpp
diff --git a/shared/include/userver/utils/expected.hpp → universal/include/userver/utils/expected.hpp b/shared/include/userver/utils/expected.hpp → universal/include/userver/utils/expected.hpp
diff --git a/shared/include/userver/utils/fast_pimpl.hpp → ...rsal/include/userver/utils/fast_pimpl.hpp b/shared/include/userver/utils/fast_pimpl.hpp → ...rsal/include/userver/utils/fast_pimpl.hpp
diff --git a/...nclude/userver/utils/fast_scope_guard.hpp → ...nclude/userver/utils/fast_scope_guard.hpp b/...nclude/userver/utils/fast_scope_guard.hpp → ...nclude/userver/utils/fast_scope_guard.hpp
diff --git a/...ed/include/userver/utils/filter_bloom.hpp → ...al/include/userver/utils/filter_bloom.hpp b/...ed/include/userver/utils/filter_bloom.hpp → ...al/include/userver/utils/filter_bloom.hpp
diff --git a/shared/include/userver/utils/fixed_array.hpp → ...sal/include/userver/utils/fixed_array.hpp b/shared/include/userver/utils/fixed_array.hpp → ...sal/include/userver/utils/fixed_array.hpp
diff --git a/shared/include/userver/utils/flags.hpp → universal/include/userver/utils/flags.hpp b/shared/include/userver/utils/flags.hpp → universal/include/userver/utils/flags.hpp
diff --git a/shared/include/userver/utils/fmt_compat.hpp → ...rsal/include/userver/utils/fmt_compat.hpp b/shared/include/userver/utils/fmt_compat.hpp → ...rsal/include/userver/utils/fmt_compat.hpp
diff --git a/shared/include/userver/utils/from_string.hpp → ...sal/include/userver/utils/from_string.hpp b/shared/include/userver/utils/from_string.hpp → ...sal/include/userver/utils/from_string.hpp
diff --git a/shared/include/userver/utils/get_if.hpp → universal/include/userver/utils/get_if.hpp b/shared/include/userver/utils/get_if.hpp → universal/include/userver/utils/get_if.hpp
diff --git a/...userver/utils/impl/disable_core_dumps.hpp → ...userver/utils/impl/disable_core_dumps.hpp b/...userver/utils/impl/disable_core_dumps.hpp → ...userver/utils/impl/disable_core_dumps.hpp
diff --git a/...server/utils/impl/intrusive_link_mode.hpp → ...server/utils/impl/intrusive_link_mode.hpp b/...server/utils/impl/intrusive_link_mode.hpp → ...server/utils/impl/intrusive_link_mode.hpp
diff --git a/...de/userver/utils/impl/projecting_view.hpp → ...de/userver/utils/impl/projecting_view.hpp b/...de/userver/utils/impl/projecting_view.hpp → ...de/userver/utils/impl/projecting_view.hpp
diff --git a/...de/userver/utils/impl/source_location.hpp → ...de/userver/utils/impl/source_location.hpp b/...de/userver/utils/impl/source_location.hpp → ...de/userver/utils/impl/source_location.hpp
diff --git a/shared/include/userver/utils/impl/span.hpp → ...ersal/include/userver/utils/impl/span.hpp b/shared/include/userver/utils/impl/span.hpp → ...ersal/include/userver/utils/impl/span.hpp
diff --git a/...server/utils/impl/static_registration.hpp → ...server/utils/impl/static_registration.hpp b/...server/utils/impl/static_registration.hpp → ...server/utils/impl/static_registration.hpp
diff --git a/...e/userver/utils/impl/transparent_hash.hpp → ...e/userver/utils/impl/transparent_hash.hpp b/...e/userver/utils/impl/transparent_hash.hpp → ...e/userver/utils/impl/transparent_hash.hpp
diff --git a/...include/userver/utils/invariant_error.hpp → ...include/userver/utils/invariant_error.hpp b/...include/userver/utils/invariant_error.hpp → ...include/userver/utils/invariant_error.hpp
diff --git a/...ed/include/userver/utils/lazy_prvalue.hpp → ...al/include/userver/utils/lazy_prvalue.hpp b/...ed/include/userver/utils/lazy_prvalue.hpp → ...al/include/userver/utils/lazy_prvalue.hpp
diff --git a/...lude/userver/utils/make_intrusive_ptr.hpp → ...lude/userver/utils/make_intrusive_ptr.hpp b/...lude/userver/utils/make_intrusive_ptr.hpp → ...lude/userver/utils/make_intrusive_ptr.hpp
diff --git a/shared/include/userver/utils/meta.hpp → universal/include/userver/utils/meta.hpp b/shared/include/userver/utils/meta.hpp → universal/include/userver/utils/meta.hpp
diff --git a/shared/include/userver/utils/meta_light.hpp → ...rsal/include/userver/utils/meta_light.hpp b/shared/include/userver/utils/meta_light.hpp → ...rsal/include/userver/utils/meta_light.hpp
diff --git a/shared/include/userver/utils/mock_now.hpp → universal/include/userver/utils/mock_now.hpp b/shared/include/userver/utils/mock_now.hpp → universal/include/userver/utils/mock_now.hpp
diff --git a/shared/include/userver/utils/not_null.hpp → universal/include/userver/utils/not_null.hpp b/shared/include/userver/utils/not_null.hpp → universal/include/userver/utils/not_null.hpp
diff --git a/...ed/include/userver/utils/optional_ref.hpp → ...al/include/userver/utils/optional_ref.hpp b/...ed/include/userver/utils/optional_ref.hpp → ...al/include/userver/utils/optional_ref.hpp
diff --git a/shared/include/userver/utils/optionals.hpp → ...ersal/include/userver/utils/optionals.hpp b/shared/include/userver/utils/optionals.hpp → ...ersal/include/userver/utils/optionals.hpp
diff --git a/shared/include/userver/utils/overloaded.hpp → ...rsal/include/userver/utils/overloaded.hpp b/shared/include/userver/utils/overloaded.hpp → ...rsal/include/userver/utils/overloaded.hpp
diff --git a/...d/include/userver/utils/projected_set.hpp → ...l/include/userver/utils/projected_set.hpp b/...d/include/userver/utils/projected_set.hpp → ...l/include/userver/utils/projected_set.hpp
diff --git a/shared/include/userver/utils/rand.hpp → universal/include/userver/utils/rand.hpp b/shared/include/userver/utils/rand.hpp → universal/include/userver/utils/rand.hpp
diff --git a/shared/include/userver/utils/regex.hpp → universal/include/userver/utils/regex.hpp b/shared/include/userver/utils/regex.hpp → universal/include/userver/utils/regex.hpp
diff --git a/...ed/include/userver/utils/result_store.hpp → ...al/include/userver/utils/result_store.hpp b/...ed/include/userver/utils/result_store.hpp → ...al/include/userver/utils/result_store.hpp
diff --git a/shared/include/userver/utils/scope_guard.hpp → ...sal/include/userver/utils/scope_guard.hpp b/shared/include/userver/utils/scope_guard.hpp → ...sal/include/userver/utils/scope_guard.hpp
diff --git a/...ude/userver/utils/shared_readable_ptr.hpp → ...ude/userver/utils/shared_readable_ptr.hpp b/...ude/userver/utils/shared_readable_ptr.hpp → ...ude/userver/utils/shared_readable_ptr.hpp
diff --git a/...ed/include/userver/utils/small_string.hpp → ...al/include/userver/utils/small_string.hpp b/...ed/include/userver/utils/small_string.hpp → ...al/include/userver/utils/small_string.hpp
diff --git a/...rver/utils/small_string_serialization.hpp → ...rver/utils/small_string_serialization.hpp b/...rver/utils/small_string_serialization.hpp → ...rver/utils/small_string_serialization.hpp
diff --git a/.../include/userver/utils/smoothed_value.hpp → .../include/userver/utils/smoothed_value.hpp b/.../include/userver/utils/smoothed_value.hpp → .../include/userver/utils/smoothed_value.hpp
diff --git a/shared/include/userver/utils/str_icase.hpp → ...ersal/include/userver/utils/str_icase.hpp b/shared/include/userver/utils/str_icase.hpp → ...ersal/include/userver/utils/str_icase.hpp
diff --git a/...lude/userver/utils/string_to_duration.hpp → ...lude/userver/utils/string_to_duration.hpp b/...lude/userver/utils/string_to_duration.hpp → ...lude/userver/utils/string_to_duration.hpp
diff --git a/.../include/userver/utils/strong_typedef.hpp → .../include/userver/utils/strong_typedef.hpp b/.../include/userver/utils/strong_typedef.hpp → .../include/userver/utils/strong_typedef.hpp
diff --git a/...d/include/userver/utils/swappingsmart.hpp → ...l/include/userver/utils/swappingsmart.hpp b/...d/include/userver/utils/swappingsmart.hpp → ...l/include/userver/utils/swappingsmart.hpp
diff --git a/shared/include/userver/utils/thread_name.hpp → ...sal/include/userver/utils/thread_name.hpp b/shared/include/userver/utils/thread_name.hpp → ...sal/include/userver/utils/thread_name.hpp
diff --git a/shared/include/userver/utils/threads.hpp → universal/include/userver/utils/threads.hpp b/shared/include/userver/utils/threads.hpp → universal/include/userver/utils/threads.hpp
diff --git a/shared/include/userver/utils/time_of_day.hpp → ...sal/include/userver/utils/time_of_day.hpp b/shared/include/userver/utils/time_of_day.hpp → ...sal/include/userver/utils/time_of_day.hpp
diff --git a/...ed/include/userver/utils/token_bucket.hpp → ...al/include/userver/utils/token_bucket.hpp b/...ed/include/userver/utils/token_bucket.hpp → ...al/include/userver/utils/token_bucket.hpp
diff --git a/...lude/userver/utils/traceful_exception.hpp → ...lude/userver/utils/traceful_exception.hpp b/...lude/userver/utils/traceful_exception.hpp → ...lude/userver/utils/traceful_exception.hpp
diff --git a/shared/include/userver/utils/trivial_map.hpp → ...sal/include/userver/utils/trivial_map.hpp b/shared/include/userver/utils/trivial_map.hpp → ...sal/include/userver/utils/trivial_map.hpp
diff --git a/...include/userver/utils/trivial_map_fwd.hpp → ...include/userver/utils/trivial_map_fwd.hpp b/...include/userver/utils/trivial_map_fwd.hpp → ...include/userver/utils/trivial_map_fwd.hpp
diff --git a/...nclude/userver/utils/underlying_value.hpp → ...nclude/userver/utils/underlying_value.hpp b/...nclude/userver/utils/underlying_value.hpp → ...nclude/userver/utils/underlying_value.hpp
diff --git a/shared/include/userver/utils/uuid4.hpp → universal/include/userver/utils/uuid4.hpp b/shared/include/userver/utils/uuid4.hpp → universal/include/userver/utils/uuid4.hpp
diff --git a/shared/include/userver/utils/void_t.hpp → universal/include/userver/utils/void_t.hpp b/shared/include/userver/utils/void_t.hpp → universal/include/userver/utils/void_t.hpp
diff --git a/...internal/http/header_map_tests_helper.hpp → ...internal/http/header_map_tests_helper.hpp b/...internal/http/header_map_tests_helper.hpp → ...internal/http/header_map_tests_helper.hpp
diff --git a/...rnal/src/http/header_map_tests_helper.cpp → ...rnal/src/http/header_map_tests_helper.cpp b/...rnal/src/http/header_map_tests_helper.cpp → ...rnal/src/http/header_map_tests_helper.cpp
diff --git a/shared/src/cache/lru_benchmark.cpp → universal/src/cache/lru_benchmark.cpp b/shared/src/cache/lru_benchmark.cpp → universal/src/cache/lru_benchmark.cpp
diff --git a/shared/src/cache/lru_map_test.cpp → universal/src/cache/lru_map_test.cpp b/shared/src/cache/lru_map_test.cpp → universal/src/cache/lru_map_test.cpp
diff --git a/shared/src/cache/lru_set_test.cpp → universal/src/cache/lru_set_test.cpp b/shared/src/cache/lru_set_test.cpp → universal/src/cache/lru_set_test.cpp
diff --git a/shared/src/cache/slru_base_test.cpp → universal/src/cache/slru_base_test.cpp b/shared/src/cache/slru_base_test.cpp → universal/src/cache/slru_base_test.cpp
diff --git a/shared/src/cache/slru_benchmark.cpp → universal/src/cache/slru_benchmark.cpp b/shared/src/cache/slru_benchmark.cpp → universal/src/cache/slru_benchmark.cpp
diff --git a/shared/src/compiler/demangle.cpp → universal/src/compiler/demangle.cpp b/shared/src/compiler/demangle.cpp → universal/src/compiler/demangle.cpp
diff --git a/shared/src/compiler/demangle_test.cpp → universal/src/compiler/demangle_test.cpp b/shared/src/compiler/demangle_test.cpp → universal/src/compiler/demangle_test.cpp
diff --git a/shared/src/compiler/relax_cpu.hpp → universal/src/compiler/relax_cpu.hpp b/shared/src/compiler/relax_cpu.hpp → universal/src/compiler/relax_cpu.hpp
diff --git a/shared/src/compiler/select_test.cpp → universal/src/compiler/select_test.cpp b/shared/src/compiler/select_test.cpp → universal/src/compiler/select_test.cpp
diff --git a/shared/src/crypto/algorithm.cpp → universal/src/crypto/algorithm.cpp b/shared/src/crypto/algorithm.cpp → universal/src/crypto/algorithm.cpp
diff --git a/shared/src/crypto/base.cpp → universal/src/crypto/base.cpp b/shared/src/crypto/base.cpp → universal/src/crypto/base.cpp
diff --git a/shared/src/crypto/base64.cpp → universal/src/crypto/base64.cpp b/shared/src/crypto/base64.cpp → universal/src/crypto/base64.cpp
diff --git a/shared/src/crypto/base64_test.cpp → universal/src/crypto/base64_test.cpp b/shared/src/crypto/base64_test.cpp → universal/src/crypto/base64_test.cpp
diff --git a/shared/src/crypto/certificate.cpp → universal/src/crypto/certificate.cpp b/shared/src/crypto/certificate.cpp → universal/src/crypto/certificate.cpp
diff --git a/shared/src/crypto/hash.cpp → universal/src/crypto/hash.cpp b/shared/src/crypto/hash.cpp → universal/src/crypto/hash.cpp
diff --git a/shared/src/crypto/hash_test.cpp → universal/src/crypto/hash_test.cpp b/shared/src/crypto/hash_test.cpp → universal/src/crypto/hash_test.cpp
diff --git a/shared/src/crypto/helpers.cpp → universal/src/crypto/helpers.cpp b/shared/src/crypto/helpers.cpp → universal/src/crypto/helpers.cpp
diff --git a/shared/src/crypto/helpers.hpp → universal/src/crypto/helpers.hpp b/shared/src/crypto/helpers.hpp → universal/src/crypto/helpers.hpp
diff --git a/shared/src/crypto/openssl.cpp → universal/src/crypto/openssl.cpp b/shared/src/crypto/openssl.cpp → universal/src/crypto/openssl.cpp
diff --git a/shared/src/crypto/openssl.hpp → universal/src/crypto/openssl.hpp b/shared/src/crypto/openssl.hpp → universal/src/crypto/openssl.hpp
diff --git a/shared/src/crypto/private_key.cpp → universal/src/crypto/private_key.cpp b/shared/src/crypto/private_key.cpp → universal/src/crypto/private_key.cpp
diff --git a/shared/src/crypto/public_key.cpp → universal/src/crypto/public_key.cpp b/shared/src/crypto/public_key.cpp → universal/src/crypto/public_key.cpp
diff --git a/shared/src/crypto/public_key_test.cpp → universal/src/crypto/public_key_test.cpp b/shared/src/crypto/public_key_test.cpp → universal/src/crypto/public_key_test.cpp
diff --git a/shared/src/crypto/signature_test.cpp → universal/src/crypto/signature_test.cpp b/shared/src/crypto/signature_test.cpp → universal/src/crypto/signature_test.cpp
diff --git a/shared/src/crypto/signers.cpp → universal/src/crypto/signers.cpp b/shared/src/crypto/signers.cpp → universal/src/crypto/signers.cpp
diff --git a/shared/src/crypto/verifiers.cpp → universal/src/crypto/verifiers.cpp b/shared/src/crypto/verifiers.cpp → universal/src/crypto/verifiers.cpp
diff --git a/shared/src/decimal64/decimal64.cpp → universal/src/decimal64/decimal64.cpp b/shared/src/decimal64/decimal64.cpp → universal/src/decimal64/decimal64.cpp
diff --git a/...d/src/decimal64/decimal64_errors_test.cpp → ...l/src/decimal64/decimal64_errors_test.cpp b/...d/src/decimal64/decimal64_errors_test.cpp → ...l/src/decimal64/decimal64_errors_test.cpp
diff --git a/...c/decimal64/decimal64_formatting_test.cpp → ...c/decimal64/decimal64_formatting_test.cpp b/...c/decimal64/decimal64_formatting_test.cpp → ...c/decimal64/decimal64_formatting_test.cpp
diff --git a/.../src/decimal64/decimal64_parsing_test.cpp → .../src/decimal64/decimal64_parsing_test.cpp b/.../src/decimal64/decimal64_parsing_test.cpp → .../src/decimal64/decimal64_parsing_test.cpp
diff --git a/shared/src/decimal64/decimal64_test.cpp → universal/src/decimal64/decimal64_test.cpp b/shared/src/decimal64/decimal64_test.cpp → universal/src/decimal64/decimal64_test.cpp
diff --git a/...ed/src/formats/common/conversion_test.hpp → ...al/src/formats/common/conversion_test.hpp b/...ed/src/formats/common/conversion_test.hpp → ...al/src/formats/common/conversion_test.hpp
diff --git a/...src/formats/common/member_access_test.hpp → ...src/formats/common/member_access_test.hpp b/...src/formats/common/member_access_test.hpp → ...src/formats/common/member_access_test.hpp
diff --git a/...src/formats/common/member_modify_test.hpp → ...src/formats/common/member_modify_test.hpp b/...src/formats/common/member_modify_test.hpp → ...src/formats/common/member_modify_test.hpp
diff --git a/shared/src/formats/common/merge_test.hpp → universal/src/formats/common/merge_test.hpp b/shared/src/formats/common/merge_test.hpp → universal/src/formats/common/merge_test.hpp
diff --git a/shared/src/formats/common/path.cpp → universal/src/formats/common/path.cpp b/shared/src/formats/common/path.cpp → universal/src/formats/common/path.cpp
diff --git a/shared/src/formats/common/roundtrip_test.hpp → ...sal/src/formats/common/roundtrip_test.hpp b/shared/src/formats/common/roundtrip_test.hpp → ...sal/src/formats/common/roundtrip_test.hpp
diff --git a/shared/src/formats/common/serialize_test.hpp → ...sal/src/formats/common/serialize_test.hpp b/shared/src/formats/common/serialize_test.hpp → ...sal/src/formats/common/serialize_test.hpp
diff --git a/.../src/formats/common/transfer_tag_test.cpp → .../src/formats/common/transfer_tag_test.cpp b/.../src/formats/common/transfer_tag_test.cpp → .../src/formats/common/transfer_tag_test.cpp
diff --git a/shared/src/formats/common/utils.cpp → universal/src/formats/common/utils.cpp b/shared/src/formats/common/utils.cpp → universal/src/formats/common/utils.cpp
diff --git a/shared/src/formats/common/utils_test.cpp → universal/src/formats/common/utils_test.cpp b/shared/src/formats/common/utils_test.cpp → universal/src/formats/common/utils_test.cpp
diff --git a/shared/src/formats/common/utils_test.hpp → universal/src/formats/common/utils_test.hpp b/shared/src/formats/common/utils_test.hpp → universal/src/formats/common/utils_test.hpp
diff --git a/shared/src/formats/common/validations.hpp → universal/src/formats/common/validations.hpp b/shared/src/formats/common/validations.hpp → universal/src/formats/common/validations.hpp
diff --git a/...src/formats/common/value_builder_test.cpp → ...src/formats/common/value_builder_test.cpp b/...src/formats/common/value_builder_test.cpp → ...src/formats/common/value_builder_test.cpp
diff --git a/...src/formats/common/value_builder_test.hpp → ...src/formats/common/value_builder_test.hpp b/...src/formats/common/value_builder_test.hpp → ...src/formats/common/value_builder_test.hpp
diff --git a/shared/src/formats/common/value_test.cpp → universal/src/formats/common/value_test.cpp b/shared/src/formats/common/value_test.cpp → universal/src/formats/common/value_test.cpp
diff --git a/shared/src/formats/common/value_test.hpp → universal/src/formats/common/value_test.hpp b/shared/src/formats/common/value_test.hpp → universal/src/formats/common/value_test.hpp
diff --git a/shared/src/formats/json/boost_uuid_test.cpp → ...rsal/src/formats/json/boost_uuid_test.cpp b/shared/src/formats/json/boost_uuid_test.cpp → ...rsal/src/formats/json/boost_uuid_test.cpp
diff --git a/shared/src/formats/json/conversion_test.cpp → ...rsal/src/formats/json/conversion_test.cpp b/shared/src/formats/json/conversion_test.cpp → ...rsal/src/formats/json/conversion_test.cpp
diff --git a/shared/src/formats/json/exception.cpp → universal/src/formats/json/exception.cpp b/shared/src/formats/json/exception.cpp → universal/src/formats/json/exception.cpp
diff --git a/shared/src/formats/json/impl/accept.cpp → universal/src/formats/json/impl/accept.cpp b/shared/src/formats/json/impl/accept.cpp → universal/src/formats/json/impl/accept.cpp
diff --git a/shared/src/formats/json/impl/accept.hpp → universal/src/formats/json/impl/accept.hpp b/shared/src/formats/json/impl/accept.hpp → universal/src/formats/json/impl/accept.hpp
diff --git a/shared/src/formats/json/impl/exttypes.cpp → universal/src/formats/json/impl/exttypes.cpp b/shared/src/formats/json/impl/exttypes.cpp → universal/src/formats/json/impl/exttypes.cpp
diff --git a/shared/src/formats/json/impl/exttypes.hpp → universal/src/formats/json/impl/exttypes.hpp b/shared/src/formats/json/impl/exttypes.hpp → universal/src/formats/json/impl/exttypes.hpp
diff --git a/shared/src/formats/json/impl/json_tree.cpp → ...ersal/src/formats/json/impl/json_tree.cpp b/shared/src/formats/json/impl/json_tree.cpp → ...ersal/src/formats/json/impl/json_tree.cpp
diff --git a/shared/src/formats/json/impl/json_tree.hpp → ...ersal/src/formats/json/impl/json_tree.hpp b/shared/src/formats/json/impl/json_tree.hpp → ...ersal/src/formats/json/impl/json_tree.hpp
diff --git a/...rmats/json/impl/mutable_value_wrapper.cpp → ...rmats/json/impl/mutable_value_wrapper.cpp b/...rmats/json/impl/mutable_value_wrapper.cpp → ...rmats/json/impl/mutable_value_wrapper.cpp
diff --git a/shared/src/formats/json/impl/types.cpp → universal/src/formats/json/impl/types.cpp b/shared/src/formats/json/impl/types.cpp → universal/src/formats/json/impl/types.cpp
diff --git a/shared/src/formats/json/impl/types_impl.cpp → ...rsal/src/formats/json/impl/types_impl.cpp b/shared/src/formats/json/impl/types_impl.cpp → ...rsal/src/formats/json/impl/types_impl.cpp
diff --git a/shared/src/formats/json/impl/types_impl.hpp → ...rsal/src/formats/json/impl/types_impl.hpp b/shared/src/formats/json/impl/types_impl.hpp → ...rsal/src/formats/json/impl/types_impl.hpp
diff --git a/shared/src/formats/json/inline.cpp → universal/src/formats/json/inline.cpp b/shared/src/formats/json/inline.cpp → universal/src/formats/json/inline.cpp
diff --git a/shared/src/formats/json/iterator.cpp → universal/src/formats/json/iterator.cpp b/shared/src/formats/json/iterator.cpp → universal/src/formats/json/iterator.cpp
diff --git a/.../formats/json/member_access_benchmark.cpp → .../formats/json/member_access_benchmark.cpp b/.../formats/json/member_access_benchmark.cpp → .../formats/json/member_access_benchmark.cpp
diff --git a/...d/src/formats/json/member_access_test.cpp → ...l/src/formats/json/member_access_test.cpp b/...d/src/formats/json/member_access_test.cpp → ...l/src/formats/json/member_access_test.cpp
diff --git a/...d/src/formats/json/member_modify_test.cpp → ...l/src/formats/json/member_modify_test.cpp b/...d/src/formats/json/member_modify_test.cpp → ...l/src/formats/json/member_modify_test.cpp
diff --git a/shared/src/formats/json/merge_test.cpp → universal/src/formats/json/merge_test.cpp b/shared/src/formats/json/merge_test.cpp → universal/src/formats/json/merge_test.cpp
diff --git a/shared/src/formats/json/parse_test.cpp → universal/src/formats/json/parse_test.cpp b/shared/src/formats/json/parse_test.cpp → universal/src/formats/json/parse_test.cpp
diff --git a/...d/src/formats/json/parser/bool_parser.cpp → ...l/src/formats/json/parser/bool_parser.cpp b/...d/src/formats/json/parser/bool_parser.cpp → ...l/src/formats/json/parser/bool_parser.cpp
diff --git a/...ed/src/formats/json/parser/int_parser.cpp → ...al/src/formats/json/parser/int_parser.cpp b/...ed/src/formats/json/parser/int_parser.cpp → ...al/src/formats/json/parser/int_parser.cpp
diff --git a/.../formats/json/parser/parser_benchmark.cpp → .../formats/json/parser/parser_benchmark.cpp b/.../formats/json/parser/parser_benchmark.cpp → .../formats/json/parser/parser_benchmark.cpp
diff --git a/...rc/formats/json/parser/parser_handler.cpp → ...rc/formats/json/parser/parser_handler.cpp b/...rc/formats/json/parser/parser_handler.cpp → ...rc/formats/json/parser/parser_handler.cpp
diff --git a/...d/src/formats/json/parser/parser_json.cpp → ...l/src/formats/json/parser/parser_json.cpp b/...d/src/formats/json/parser/parser_json.cpp → ...l/src/formats/json/parser/parser_json.cpp
diff --git a/.../src/formats/json/parser/parser_state.cpp → .../src/formats/json/parser/parser_state.cpp b/.../src/formats/json/parser/parser_state.cpp → .../src/formats/json/parser/parser_state.cpp
diff --git a/...d/src/formats/json/parser/parser_test.cpp → ...l/src/formats/json/parser/parser_test.cpp b/...d/src/formats/json/parser/parser_test.cpp → ...l/src/formats/json/parser/parser_test.cpp
diff --git a/...src/formats/json/parser/string_parser.cpp → ...src/formats/json/parser/string_parser.cpp b/...src/formats/json/parser/string_parser.cpp → ...src/formats/json/parser/string_parser.cpp
diff --git a/...ormats/json/rapidjson_contiguous_test.cpp → ...ormats/json/rapidjson_contiguous_test.cpp b/...ormats/json/rapidjson_contiguous_test.cpp → ...ormats/json/rapidjson_contiguous_test.cpp
diff --git a/shared/src/formats/json/roundtrip_test.cpp → ...ersal/src/formats/json/roundtrip_test.cpp b/shared/src/formats/json/roundtrip_test.cpp → ...ersal/src/formats/json/roundtrip_test.cpp
diff --git a/shared/src/formats/json/serialize.cpp → universal/src/formats/json/serialize.cpp b/shared/src/formats/json/serialize.cpp → universal/src/formats/json/serialize.cpp
diff --git a/.../src/formats/json/serialize_benchmark.cpp → .../src/formats/json/serialize_benchmark.cpp b/.../src/formats/json/serialize_benchmark.cpp → .../src/formats/json/serialize_benchmark.cpp
diff --git a/shared/src/formats/json/serialize_test.cpp → ...ersal/src/formats/json/serialize_test.cpp b/shared/src/formats/json/serialize_test.cpp → ...ersal/src/formats/json/serialize_test.cpp
diff --git a/shared/src/formats/json/string_builder.cpp → ...ersal/src/formats/json/string_builder.cpp b/shared/src/formats/json/string_builder.cpp → ...ersal/src/formats/json/string_builder.cpp
diff --git a/...formats/json/string_builder_benchmark.cpp → ...formats/json/string_builder_benchmark.cpp b/...formats/json/string_builder_benchmark.cpp → ...formats/json/string_builder_benchmark.cpp
diff --git a/.../src/formats/json/string_builder_test.cpp → .../src/formats/json/string_builder_test.cpp b/.../src/formats/json/string_builder_test.cpp → .../src/formats/json/string_builder_test.cpp
diff --git a/shared/src/formats/json/utils_test.cpp → universal/src/formats/json/utils_test.cpp b/shared/src/formats/json/utils_test.cpp → universal/src/formats/json/utils_test.cpp
diff --git a/shared/src/formats/json/value.cpp → universal/src/formats/json/value.cpp b/shared/src/formats/json/value.cpp → universal/src/formats/json/value.cpp
diff --git a/shared/src/formats/json/value_builder.cpp → universal/src/formats/json/value_builder.cpp b/shared/src/formats/json/value_builder.cpp → universal/src/formats/json/value_builder.cpp
diff --git a/...d/src/formats/json/value_builder_test.cpp → ...l/src/formats/json/value_builder_test.cpp b/...d/src/formats/json/value_builder_test.cpp → ...l/src/formats/json/value_builder_test.cpp
diff --git a/shared/src/formats/json/value_test.cpp → universal/src/formats/json/value_test.cpp b/shared/src/formats/json/value_test.cpp → universal/src/formats/json/value_test.cpp
diff --git a/shared/src/formats/serialize/boost_uuid.cpp → ...rsal/src/formats/serialize/boost_uuid.cpp b/shared/src/formats/serialize/boost_uuid.cpp → ...rsal/src/formats/serialize/boost_uuid.cpp
diff --git a/shared/src/formats/yaml/exception.cpp → universal/src/formats/yaml/exception.cpp b/shared/src/formats/yaml/exception.cpp → universal/src/formats/yaml/exception.cpp
diff --git a/shared/src/formats/yaml/exttypes.cpp → universal/src/formats/yaml/exttypes.cpp b/shared/src/formats/yaml/exttypes.cpp → universal/src/formats/yaml/exttypes.cpp
diff --git a/shared/src/formats/yaml/exttypes.hpp → universal/src/formats/yaml/exttypes.hpp b/shared/src/formats/yaml/exttypes.hpp → universal/src/formats/yaml/exttypes.hpp
diff --git a/shared/src/formats/yaml/iterator.cpp → universal/src/formats/yaml/iterator.cpp b/shared/src/formats/yaml/iterator.cpp → universal/src/formats/yaml/iterator.cpp
diff --git a/...d/src/formats/yaml/member_access_test.cpp → ...l/src/formats/yaml/member_access_test.cpp b/...d/src/formats/yaml/member_access_test.cpp → ...l/src/formats/yaml/member_access_test.cpp
diff --git a/...d/src/formats/yaml/member_modify_test.cpp → ...l/src/formats/yaml/member_modify_test.cpp b/...d/src/formats/yaml/member_modify_test.cpp → ...l/src/formats/yaml/member_modify_test.cpp
diff --git a/shared/src/formats/yaml/merge_test.cpp → universal/src/formats/yaml/merge_test.cpp b/shared/src/formats/yaml/merge_test.cpp → universal/src/formats/yaml/merge_test.cpp
diff --git a/shared/src/formats/yaml/roundtrip_test.cpp → ...ersal/src/formats/yaml/roundtrip_test.cpp b/shared/src/formats/yaml/roundtrip_test.cpp → ...ersal/src/formats/yaml/roundtrip_test.cpp
diff --git a/shared/src/formats/yaml/serialize.cpp → universal/src/formats/yaml/serialize.cpp b/shared/src/formats/yaml/serialize.cpp → universal/src/formats/yaml/serialize.cpp
diff --git a/shared/src/formats/yaml/serialize_test.cpp → ...ersal/src/formats/yaml/serialize_test.cpp b/shared/src/formats/yaml/serialize_test.cpp → ...ersal/src/formats/yaml/serialize_test.cpp
diff --git a/.../src/formats/yaml/string_view_support.hpp → .../src/formats/yaml/string_view_support.hpp b/.../src/formats/yaml/string_view_support.hpp → .../src/formats/yaml/string_view_support.hpp
diff --git a/shared/src/formats/yaml/utils_test.cpp → universal/src/formats/yaml/utils_test.cpp b/shared/src/formats/yaml/utils_test.cpp → universal/src/formats/yaml/utils_test.cpp
diff --git a/shared/src/formats/yaml/value.cpp → universal/src/formats/yaml/value.cpp b/shared/src/formats/yaml/value.cpp → universal/src/formats/yaml/value.cpp
diff --git a/shared/src/formats/yaml/value_builder.cpp → universal/src/formats/yaml/value_builder.cpp b/shared/src/formats/yaml/value_builder.cpp → universal/src/formats/yaml/value_builder.cpp
diff --git a/...d/src/formats/yaml/value_builder_test.cpp → ...l/src/formats/yaml/value_builder_test.cpp b/...d/src/formats/yaml/value_builder_test.cpp → ...l/src/formats/yaml/value_builder_test.cpp
diff --git a/.../src/formats/yaml/value_location_test.cpp → .../src/formats/yaml/value_location_test.cpp b/.../src/formats/yaml/value_location_test.cpp → .../src/formats/yaml/value_location_test.cpp
diff --git a/shared/src/formats/yaml/value_test.cpp → universal/src/formats/yaml/value_test.cpp b/shared/src/formats/yaml/value_test.cpp → universal/src/formats/yaml/value_test.cpp
diff --git a/shared/src/fs/blocking/c_file.cpp → universal/src/fs/blocking/c_file.cpp b/shared/src/fs/blocking/c_file.cpp → universal/src/fs/blocking/c_file.cpp
diff --git a/shared/src/fs/blocking/c_file_test.cpp → universal/src/fs/blocking/c_file_test.cpp b/shared/src/fs/blocking/c_file_test.cpp → universal/src/fs/blocking/c_file_test.cpp
diff --git a/shared/src/fs/blocking/file_descriptor.cpp → ...ersal/src/fs/blocking/file_descriptor.cpp b/shared/src/fs/blocking/file_descriptor.cpp → ...ersal/src/fs/blocking/file_descriptor.cpp
diff --git a/.../src/fs/blocking/file_descriptor_test.cpp → .../src/fs/blocking/file_descriptor_test.cpp b/.../src/fs/blocking/file_descriptor_test.cpp → .../src/fs/blocking/file_descriptor_test.cpp
diff --git a/shared/src/fs/blocking/read.cpp → universal/src/fs/blocking/read.cpp b/shared/src/fs/blocking/read.cpp → universal/src/fs/blocking/read.cpp