diff --git a/.github/doxygen-custom/header.html b/.github/doxygen-custom/header.html
index 27c3b28d..cea0f0e4 100644
--- a/.github/doxygen-custom/header.html
+++ b/.github/doxygen-custom/header.html
@@ -1,4 +1,4 @@
-<!-- HTML header for doxygen 1.11.0-->
+<!-- HTML header for doxygen 1.12.0 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="$langISO">
 <head>
@@ -8,9 +8,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<!--BEGIN PROJECT_ICON-->
-<link rel="icon" href="$relpath^$projecticon" type="image/x-icon" />
-<!--END PROJECT_ICON-->
+<link rel="icon" href="$relpath^icon-64x64.png" type="image/png" />
 <link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
 <!--BEGIN DISABLE_INDEX-->
   <!--BEGIN FULL_SIDEBAR-->
@@ -24,6 +22,7 @@
 <!--END COPY_CLIPBOARD-->
 <script type="text/javascript" src="$relpath^doxygen-awesome-darkmode-toggle.js"></script>
 <script type="text/javascript" src="$relpath^doxygen-awesome-paragraph-link.js"></script>
+<script type="text/javascript" src="$relpath^theme-toggle.js"></script>
 <script type="text/javascript">
 	DoxygenAwesomeDarkModeToggle.init()
 	DoxygenAwesomeParagraphLink.init()
@@ -31,6 +30,7 @@
 $treeview
 $search
 $mathjax
+$darkmode
 <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
 $extrastylesheet
 </head>
@@ -80,6 +80,7 @@
   <!--END SEARCHENGINE-->
  </tbody>
 </table>
+<div id="time-shield-theme-toggle" aria-label="Color theme"></div>
 </div>
 <!--END TITLEAREA-->
 <!-- end header part -->
diff --git a/.github/doxygen-custom/overrides.css b/.github/doxygen-custom/overrides.css
index d48f9542..13fa9101 100644
--- a/.github/doxygen-custom/overrides.css
+++ b/.github/doxygen-custom/overrides.css
@@ -1,8 +1,34 @@
 html {
-    --top-nav-height: 150px
+    --top-nav-height: 150px;
+    --side-nav-fixed-width: 460px;
+}
+
+#titlearea {
+    position: relative;
+}
+
+#time-shield-theme-toggle {
+    position: absolute;
+    top: var(--spacing-medium);
+    right: var(--spacing-medium);
+    z-index: 2;
+    width: var(--searchbar-height);
+    height: var(--searchbar-height);
+}
+
+#time-shield-theme-toggle > doxygen-awesome-dark-mode-toggle {
+    margin: 0;
 }
 
 @media screen and (min-width: 768px) {
+    html {
+        --top-height: 140px;
+    }
+
+    #time-shield-theme-toggle {
+        top: calc(100% + var(--spacing-small) + 1.5px);
+    }
+
     #top {
         height: var(--top-nav-height);
     }
@@ -14,4 +40,4 @@ html {
     #side-nav {
         top: var(--top-nav-height);
     }
-}
\ No newline at end of file
+}
diff --git a/.github/doxygen-custom/theme-toggle.js b/.github/doxygen-custom/theme-toggle.js
new file mode 100644
index 00000000..43425282
--- /dev/null
+++ b/.github/doxygen-custom/theme-toggle.js
@@ -0,0 +1,24 @@
+(function () {
+    function moveThemeToggle() {
+        var target = document.getElementById("time-shield-theme-toggle");
+        var toggles = document.querySelectorAll("doxygen-awesome-dark-mode-toggle");
+        if (!target || toggles.length === 0) {
+            return;
+        }
+
+        if (toggles[0].parentNode !== target) {
+            target.appendChild(toggles[0]);
+        }
+        for (var i = 1; i < toggles.length; ++i) {
+            toggles[i].remove();
+        }
+    }
+
+    document.addEventListener("DOMContentLoaded", function () {
+        moveThemeToggle();
+        window.addEventListener("resize", moveThemeToggle);
+        var observer = new MutationObserver(moveThemeToggle);
+        observer.observe(document.body, { childList: true, subtree: true });
+        window.setInterval(moveThemeToggle, 100);
+    });
+})();
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 80f97cf2..6ba81075 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,6 +42,12 @@ jobs:
         run: cmake -S tests/install_consumer -B build-consumer -DCMAKE_PREFIX_PATH=${{ github.workspace }}/install -DCMAKE_CXX_STANDARD=${{ matrix.std }}
       - name: Build consumer project
         run: cmake --build build-consumer
+      - name: Configure pkg-config consumer
+        run: |
+          PKG_CONFIG_PATH="${{ github.workspace }}/install/lib/pkgconfig" \
+            cmake -S tests/pkg_config_consumer -B build-pkg-config -DCMAKE_CXX_STANDARD=${{ matrix.std }}
+      - name: Build pkg-config consumer
+        run: cmake --build build-pkg-config
 
   windows:
     runs-on: windows-latest
@@ -122,6 +128,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Pin overlay port to the checked-out revision
+        env:
+          TIME_SHIELD_REF: ${{ github.event.pull_request.head.sha || github.sha }}
+        run: |
+          set -euo pipefail
+          test -n "$TIME_SHIELD_REF"
+          archive_url="https://github.com/LimiNode/time-shield-cpp/archive/${TIME_SHIELD_REF}.tar.gz"
+          sha512=$(curl -fsSL "$archive_url" | sha512sum | awk '{print $1}')
+          sed -i -E "s/^    REF .*/    REF ${TIME_SHIELD_REF}/" vcpkg-overlay/ports/time-shield-cpp/portfile.cmake
+          sed -i -E "s/^    SHA512 .*/    SHA512 ${sha512}/" vcpkg-overlay/ports/time-shield-cpp/portfile.cmake
       - name: Install vcpkg
         run: |
           git clone https://github.com/microsoft/vcpkg.git
@@ -129,7 +145,7 @@ jobs:
       - name: Validate port
         run: ./vcpkg/vcpkg install time-shield-cpp --overlay-ports=vcpkg-overlay/ports
       - name: Configure consumer project
-        run: cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake
+        run: cmake -B build -S tests/vcpkg_consumer -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
       - name: Build consumer project
         run: cmake --build build
 
@@ -149,3 +165,28 @@ jobs:
         run: cmake -S tests/install_consumer -B build-consumer -DCMAKE_PREFIX_PATH=${{ github.workspace }}/install -DCMAKE_CXX_STANDARD=11
       - name: Build installed consumer
         run: cmake --build build-consumer
+      - name: Configure pkg-config consumer without NTP
+        run: |
+          PKG_CONFIG_PATH="${{ github.workspace }}/install/lib/pkgconfig" \
+            cmake -S tests/pkg_config_consumer -B build-pkg-config -DCMAKE_CXX_STANDARD=11
+      - name: Build pkg-config consumer without NTP
+        run: cmake --build build-pkg-config
+
+  pkg-config-multiarch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Configure with multiarch library directory
+        run: cmake -S . -B build -DTIME_SHIELD_CPP_BUILD_TESTS=OFF -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu
+      - name: Build and install
+        run: cmake --build build && cmake --install build --prefix install
+      - name: Verify relocatable pkg-config prefix
+        run: |
+          export PKG_CONFIG_PATH="${{ github.workspace }}/install/lib/x86_64-linux-gnu/pkgconfig"
+          test "$(realpath "$(pkg-config --variable=prefix time-shield)")" = "$(realpath install)"
+      - name: Configure pkg-config consumer
+        run: |
+          PKG_CONFIG_PATH="${{ github.workspace }}/install/lib/x86_64-linux-gnu/pkgconfig" \
+            cmake -S tests/pkg_config_consumer -B build-pkg-config -DCMAKE_CXX_STANDARD=11
+      - name: Build pkg-config consumer
+        run: cmake --build build-pkg-config
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 6c038932..fee96c66 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -6,11 +6,17 @@ on:
       - main
     tags:
       - "v*"
+  pull_request:
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
   deploy:
+    if: github.event_name != 'pull_request'
     runs-on: ubuntu-22.04
+    permissions:
+      contents: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -19,7 +25,7 @@ jobs:
           fetch-depth: 0
       - name: Inject documentation version
         run: |
-          CMAKE_VERSION=$(sed -nE 's/^project\(TimeShield VERSION ([^ ]+) .*/\1/p' CMakeLists.txt)
+          CMAKE_VERSION=$(sed -nE 's/^project\(TimeShield VERSION ([^ ]+) .*/\1/p' CMakeLists.txt | head -n 1)
           test -n "$CMAKE_VERSION" || { echo "Unable to determine CMake project version"; exit 1; }
           if [ "$GITHUB_REF_TYPE" = "tag" ]; then
             VERSION="${GITHUB_REF_NAME#v}"
@@ -27,11 +33,13 @@ jobs:
               echo "Tag version $VERSION does not match CMake project version $CMAKE_VERSION"
               exit 1
             fi
+            DOC_VERSION="$VERSION"
           else
-            VERSION="$CMAKE_VERSION"
+            DOC_VERSION="${CMAKE_VERSION}-dev"
           fi
-          test -n "$VERSION" || { echo "Unable to determine project version"; exit 1; }
-          echo "Documentation version: $VERSION"
+          test -n "$DOC_VERSION" || { echo "Unable to determine documentation version"; exit 1; }
+          echo "Documentation version: $DOC_VERSION"
+          echo "DOC_VERSION=$DOC_VERSION" >> "$GITHUB_ENV"
           test -f docs/mainpage.md || { echo "mainpage.md not found!"; exit 1; }
           test -f Doxyfile || { echo "Doxyfile not found!"; exit 1; }
           grep -Fq "VERSION_PLACEHOLDER" docs/mainpage.md || {
@@ -42,21 +50,84 @@ jobs:
             echo "Version-neutral PROJECT_NUMBER not found in Doxyfile"
             exit 1
           }
-          sed -i "s/VERSION_PLACEHOLDER/$VERSION/g" docs/mainpage.md
-          sed -i -E "s/^PROJECT_NUMBER[[:space:]]*=.*/PROJECT_NUMBER         = $VERSION/" Doxyfile
+          sed -i "0,/VERSION_PLACEHOLDER/s//${DOC_VERSION}/" docs/mainpage.md
+          sed -i -E "s/^PROJECT_NUMBER[[:space:]]*=.*/PROJECT_NUMBER         = $DOC_VERSION/" Doxyfile
           if grep -Fq "VERSION_PLACEHOLDER" docs/mainpage.md; then
             echo "Version placeholder was not replaced"
             exit 1
           fi
-          grep -Fxq "PROJECT_NUMBER         = $VERSION" Doxyfile || {
+          grep -Fxq "PROJECT_NUMBER         = $DOC_VERSION" Doxyfile || {
             echo "Doxygen PROJECT_NUMBER was not updated"
             exit 1
           }
       - name: Generate Documentation
-        uses: mattnotmitt/doxygen-action@edge
+        uses: mattnotmitt/doxygen-action@v1.12.0
+      - name: Validate generated documentation
+        run: |
+          test -s docs/html/index.html
+          grep -q "$DOC_VERSION" docs/html/index.html
+          grep -q "Time Shield Library" docs/html/index.html
+          ! grep -R -q "Archived Demo Assets" docs/html
       - name: Publish generated content to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
-          github_token: ${{ secrets.ACCESS_TOKEN }}
+          github_token: ${{ github.token }}
           publish_dir: docs/html
           publish_branch: gh-pages
+
+  validate-docs:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: "true"
+          fetch-depth: 0
+      - name: Inject development version
+        run: |
+          CMAKE_VERSION=$(sed -nE 's/^project\(TimeShield VERSION ([^ ]+) .*/\1/p' CMakeLists.txt | head -n 1)
+          test -n "$CMAKE_VERSION" || { echo "Unable to determine CMake project version"; exit 1; }
+          DOC_VERSION="${CMAKE_VERSION}-dev"
+          echo "Documentation version: $DOC_VERSION"
+          echo "DOC_VERSION=$DOC_VERSION" >> "$GITHUB_ENV"
+          test -f docs/mainpage.md || { echo "mainpage.md not found!"; exit 1; }
+          test -f Doxyfile || { echo "Doxyfile not found!"; exit 1; }
+          grep -Fq "VERSION_PLACEHOLDER" docs/mainpage.md || {
+            echo "Version placeholder not found in mainpage.md"
+            exit 1
+          }
+          grep -Eq '^PROJECT_NUMBER[[:space:]]*=[[:space:]]*$' Doxyfile || {
+            echo "Version-neutral PROJECT_NUMBER not found in Doxyfile"
+            exit 1
+          }
+          sed -i "0,/VERSION_PLACEHOLDER/s//${DOC_VERSION}/" docs/mainpage.md
+          sed -i -E "s/^PROJECT_NUMBER[[:space:]]*=.*/PROJECT_NUMBER         = $DOC_VERSION/" Doxyfile
+          grep -Fq "VERSION_PLACEHOLDER" docs/mainpage.md && {
+            echo "Version placeholder was not replaced"
+            exit 1
+          }
+          grep -Fxq "PROJECT_NUMBER         = $DOC_VERSION" Doxyfile || {
+            echo "Doxygen PROJECT_NUMBER was not updated"
+            exit 1
+          }
+      - name: Generate Documentation
+        uses: mattnotmitt/doxygen-action@v1.12.0
+      - name: Validate generated documentation
+        run: |
+          test -s docs/html/index.html
+          grep -q "$DOC_VERSION" docs/html/index.html
+          grep -q "Time Shield Library" docs/html/index.html
+          ! grep -R -q "Archived Demo Assets" docs/html
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: Install Playwright browser
+        run: |
+          npm install --no-save --no-package-lock @playwright/test@1.49.1
+          npx playwright install --with-deps chromium
+      - name: Run documentation layout smoke tests
+        run: npx playwright test --config=tests/docs_smoke/playwright.config.mjs
diff --git a/AGENTS.md b/AGENTS.md
index b3f95c64..6471f18a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -31,12 +31,11 @@ Global rules:
 Additional policy:
 
 - Public C++ headers are organized by domain under `include/time_shield`.
-  Prefer domain umbrellas (`core.hpp`, `conversions.hpp`, `text.hpp`,
+  Use domain umbrellas (`core.hpp`, `conversions.hpp`, `text.hpp`,
   `date_time.hpp`, `timezone.hpp`, `astronomy.hpp`, `timers.hpp`, and
   optional `ntp.hpp`) for cross-domain includes. Same-domain leaf includes may
   use local paths. Do not use `../` includes or include another domain's leaf
-  header directly. Root-level compatibility headers and documented legacy
-  paths are forwarding shells and are exempt from the domain dependency rule.
+  header directly. Do not add root-level compatibility forwarding headers.
 - Keep domain dependencies acyclic: lower-level domains must not include
   higher-level domain headers. Detail headers belong to their owning domain
   and are not public cross-domain dependencies.
@@ -75,5 +74,6 @@ Use the following order for repository changes and reviews:
 7. Preserve convenient public aliases. Short or alternative names are not legacy merely because a canonical equivalent exists. Classify an API as legacy only when it has been historically renamed or superseded, or when a deliberate replacement is introduced. When replacing a useful short alias, provide an equally practical preferred alias. Move a confirmed legacy alias to `legacy_aliases.hpp` and make it available only through `TIME_SHIELD_ENABLE_LEGACY_ALIASES`.
 8. Keep documentation source templates version-neutral. Do not commit generated
    documentation version substitutions; publish.yaml injects the effective version
-   during publication.
+   during publication. Main-branch documentation uses the CMake version with a
+   `-dev` suffix; release-tag documentation uses the matching tag version.
 9. Finish with `git diff --check`, a status review, and a concise summary of remaining risks or unverified platform-specific checks.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d6a2f4e..2c5cc4d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v1.0.6] - Unreleased
+## [v2.0.0] - Unreleased
 - Added `dse`, `dse_ms`, `dse_to_ts`, and `dse_to_ts_ms` convenience aliases for days-since-epoch conversions.
 - Corrected the default return type of `unix_day_to_ts_ms` to the millisecond timestamp type.
 - Added `ZonedClock` with reusable named-zone and fixed-offset local-time helpers, including explicit resolution of ambiguous and nonexistent local times.
 - Added an MQL4 `TimeShield` facade and aligned MQL4/MQL5 umbrella-header compatibility.
 - Completed ISO week-date parsing support and formatter/parser round-trip coverage.
 - Added timeframe parsing helpers for trading and engineering strings in C++ and MQL5, with docs, examples, and tests.
-- Split Julian conversions into a dedicated header while preserving the public include surface.
+- Split Julian conversions into the astronomy domain and added dedicated canonical headers.
 - Extended parser and formatting examples and refreshed README coverage for newer APIs.
 - Accepted ISO-style offsets in `%z` custom-format parsing.
 - Restored C++11 `constexpr` compatibility in affected header-owned APIs.
@@ -20,6 +20,26 @@ All notable changes to this project will be documented in this file.
 - Moved confirmed legacy day-first Julian overloads and historical next-day aliases behind the same opt-in compatibility layer.
 - Corrected the default return type of `start_of_next_day_from_unix_day` to the seconds timestamp type.
 - Expanded timezone and NTP coverage and finalized recent timezone conversion support and NTP-facing documentation for consumers.
+- Organized public C++ headers into domain directories with domain umbrellas and removed obsolete root-level forwarding headers.
+
+### Breaking header-layout change
+
+Public C++ headers use canonical domain paths. The full-library include remains
+unchanged:
+
+```cpp
+#include <time_shield.hpp>
+```
+
+Old root-level selective include paths are removed. Use domain umbrellas or
+domain-owned leaf headers instead. For example:
+
+```text
+time_shield/validation.hpp       -> time_shield/core/validation.hpp
+time_shield/time_conversions.hpp -> time_shield/conversions.hpp
+time_shield/DateTime.hpp          -> time_shield/date_time.hpp
+time_shield/ntp_client.hpp        -> time_shield/ntp/ntp_client.hpp
+```
 
 ## [v1.0.5] - 2025-12-22
 - Added fast date conversion paths for timestamp-to-calendar helpers, along with unchecked timestamp math to reduce validation overhead in hot paths (legacy fallbacks remain for comparison).
@@ -30,7 +50,7 @@ All notable changes to this project will be documented in this file.
 - Added ISO week-date conversions, formatting, and parsing utilities.
 - Added geocentric MoonPhase calculator with quarter timings, documentation, and tests.
 - Added continuous lunar phase sin/cos helpers, structured quarter instants with event windows, documentation, and tests.
-- Split `time_conversions.hpp` into modular headers while keeping the umbrella include, preserving APIs with compatibility aliases and refreshed docs.
+- Split the former time-conversions aggregate into modular domain headers with compatibility aliases and refreshed docs.
 - Added short-form weekday and timestamp conversion aliases alongside new constexpr timezone offset helpers.
 - Expanded conversion coverage tests to exercise the renamed helpers and new wrappers across C++11/14/17 builds.
 - Documented first/last workday boundary helpers and their UTC semantics in README and Doxygen mainpage.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf349beb..e8322b26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(TimeShield VERSION 1.0.6 LANGUAGES CXX)
+project(TimeShield VERSION 2.0.0 LANGUAGES CXX)
 
 if(NOT DEFINED CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
@@ -44,7 +44,6 @@ else()
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
         PATTERN "ntp" EXCLUDE
         PATTERN "ntp.hpp" EXCLUDE
-        PATTERN "ntp_client*" EXCLUDE
         PATTERN "ntp_time_service.hpp" EXCLUDE
     )
 endif()
@@ -73,6 +72,27 @@ install(FILES
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/TimeShield
 )
 
+if(TIME_SHIELD_ENABLE_NTP_CLIENT)
+    set(TIME_SHIELD_PKG_CONFIG_NTP_DEFINE 1)
+else()
+    set(TIME_SHIELD_PKG_CONFIG_NTP_DEFINE 0)
+endif()
+
+if(WIN32 AND TIME_SHIELD_ENABLE_NTP_CLIENT)
+    set(TIME_SHIELD_PKG_CONFIG_LIBS "-lws2_32")
+else()
+    set(TIME_SHIELD_PKG_CONFIG_LIBS "")
+endif()
+
+string(REPLACE "/" ";" TIME_SHIELD_INSTALL_LIBDIR_COMPONENTS "${CMAKE_INSTALL_LIBDIR}")
+list(LENGTH TIME_SHIELD_INSTALL_LIBDIR_COMPONENTS TIME_SHIELD_INSTALL_LIBDIR_DEPTH)
+math(EXPR TIME_SHIELD_PKG_CONFIG_PREFIX_DEPTH "${TIME_SHIELD_INSTALL_LIBDIR_DEPTH} + 1")
+set(TIME_SHIELD_PKG_CONFIG_PREFIX "")
+foreach(_depth RANGE 1 ${TIME_SHIELD_PKG_CONFIG_PREFIX_DEPTH})
+    string(APPEND TIME_SHIELD_PKG_CONFIG_PREFIX "../")
+endforeach()
+string(REGEX REPLACE "/$" "" TIME_SHIELD_PKG_CONFIG_PREFIX "${TIME_SHIELD_PKG_CONFIG_PREFIX}")
+
 configure_file(cmake/time-shield.pc.in ${CMAKE_CURRENT_BINARY_DIR}/time-shield.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/time-shield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
diff --git a/Doxyfile b/Doxyfile
index 8ce3623f..1ace377a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -61,13 +61,12 @@ PROJECT_BRIEF          = "C++ library for working with time"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = E:/_repoz/time-shield-cpp/docs/icon-64x64.png
+PROJECT_LOGO           = docs/icon-64x64.png
 
 # With the PROJECT_ICON tag one can specify an icon that is included in the tabs
 # when the HTML document is shown. Doxygen will copy the logo to the output
 # directory.
 
-PROJECT_ICON           = docs/icon-64x64.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -907,7 +906,7 @@ WARN_IF_UNDOC_ENUM_VAL = NO
 # Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
-WARN_AS_ERROR          = NO
+WARN_AS_ERROR          = FAIL_ON_WARNINGS
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@@ -1060,7 +1059,8 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = doxygen
+EXCLUDE                = doxygen \
+                         docs/assets/archive
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1076,7 +1076,8 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */*-RU.md \
+                         */docs/assets/archive/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1278,24 +1279,18 @@ VERBATIM_HEADERS       = YES
 # generated with the -Duse_libclang=ON option for CMake.
 # The default value is: NO.
 
-CLANG_ASSISTED_PARSING = NO
-
 # If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
 # tag is set to YES then doxygen will add the directory of each input to the
 # include path.
 # The default value is: YES.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_ADD_INC_PATHS    = YES
-
 # If clang assisted parsing is enabled you can provide the compiler with command
 # line options that you would normally use when invoking the compiler. Note that
 # the include paths will already be set by doxygen for the files and directories
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          =
-
 # If clang assisted parsing is enabled you can provide the clang parser with the
 # path to the directory containing a file called compile_commands.json. This
 # file is the compilation database (see:
@@ -1307,8 +1302,6 @@ CLANG_OPTIONS          =
 # Note: The availability of this option depends on whether or not doxygen was
 # generated with the -Duse_libclang=ON option for CMake.
 
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1413,7 +1406,8 @@ HTML_STYLESHEET        =
 
 HTML_EXTRA_STYLESHEET  = .github/doxygen-awesome-css/doxygen-awesome.css \
                          .github/doxygen-awesome-css/doxygen-awesome-sidebar-only.css \
-                         .github/doxygen-awesome-css/doxygen-awesome-sidebar-only-darkmode-toggle.css
+                         .github/doxygen-awesome-css/doxygen-awesome-sidebar-only-darkmode-toggle.css \
+                         .github/doxygen-custom/overrides.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1424,7 +1418,10 @@ HTML_EXTRA_STYLESHEET  = .github/doxygen-awesome-css/doxygen-awesome.css \
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_FILES       = .github/doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js \
-                         .github/doxygen-awesome-css/doxygen-awesome-paragraph-link.js
+                         .github/doxygen-awesome-css/doxygen-awesome-paragraph-link.js \
+                         .github/doxygen-custom/theme-toggle.js
+
+HTML_COPY_CLIPBOARD    = YES
 
 # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
 # should be rendered with a dark or light theme.
@@ -1504,7 +1501,6 @@ HTML_CODE_FOLDING      = YES
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COPY_CLIPBOARD    = YES
 
 # Doxygen stores a couple of settings persistently in the browser (via e.g.
 # cookies). By default these settings apply to all HTML pages generated by
@@ -1513,7 +1509,6 @@ HTML_COPY_CLIPBOARD    = YES
 # be stored separately.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_PROJECT_COOKIE    =
 
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
@@ -1794,7 +1789,7 @@ ENUM_VALUES_PER_LINE   = 4
 # Minimum value: 0, maximum value: 1500, default value: 250.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-TREEVIEW_WIDTH         = 250
+TREEVIEW_WIDTH         = 460
 
 # If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
 # external symbols imported via tag files in a separate window.
@@ -1845,7 +1840,7 @@ FORMULA_MACROFILE      =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX            = YES
 
 # With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
 # Note that the different versions of MathJax have different requirements with
@@ -2005,7 +2000,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2243,7 +2238,6 @@ RTF_EXTENSIONS_FILE    =
 # available.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTRA_FILES        =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
diff --git a/MQL4/Include/TimeShield.mqh b/MQL4/Include/TimeShield.mqh
index e74901af..e02d2bac 100644
--- a/MQL4/Include/TimeShield.mqh
+++ b/MQL4/Include/TimeShield.mqh
@@ -1,7 +1,7 @@
 //+------------------------------------------------------------------+
 //|                                                   TimeShield.mqh |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL4_MQH_INCLUDED
 #define TIME_SHIELD_MQL4_MQH_INCLUDED
@@ -10,7 +10,7 @@
 /// \brief Main MQL4 header file for the Time Shield library.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 const int TSHIELD_MS_PER_SEC = 1000;       ///< Milliseconds per second.
diff --git a/MQL5/Include/TimeShield.mqh b/MQL5/Include/TimeShield.mqh
index 5edd6acb..37d32165 100644
--- a/MQL5/Include/TimeShield.mqh
+++ b/MQL5/Include/TimeShield.mqh
@@ -1,7 +1,7 @@
 //+------------------------------------------------------------------+
 //|                                                   TimeShield.mqh |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_MQH_INCLUDED
@@ -11,7 +11,7 @@
 /// \brief Main MQL5 header file for the Time Shield library.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 /// \defgroup mql5 MQL5 TimeShield API
diff --git a/MQL5/Include/time_shield/DateTime.mqh b/MQL5/Include/time_shield/DateTime.mqh
index 6f70e876..92187868 100644
--- a/MQL5/Include/time_shield/DateTime.mqh
+++ b/MQL5/Include/time_shield/DateTime.mqh
@@ -2,7 +2,7 @@
 //|                                                     DateTime.mqh |
 //|                                Time Shield - MQL5 DateTime Type |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_DATETIME_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_DATETIME_MQH_INCLUDED
@@ -12,7 +12,7 @@
 /// \brief Lightweight date-time wrapper for MQL5 with fixed UTC offset.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "time_conversions.mqh"
diff --git a/MQL5/Include/time_shield/constants.mqh b/MQL5/Include/time_shield/constants.mqh
index 3f7e723c..a769ddb0 100644
--- a/MQL5/Include/time_shield/constants.mqh
+++ b/MQL5/Include/time_shield/constants.mqh
@@ -2,7 +2,7 @@
 //|                                                    constants.mqh |
 //|                                     Time Shield - MQL5 Constants |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_CONSTANTS_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_CONSTANTS_MQH_INCLUDED
@@ -14,7 +14,7 @@
 /// This file contains various constants used for time calculations and conversions.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 namespace time_shield {
diff --git a/MQL5/Include/time_shield/date_struct.mqh b/MQL5/Include/time_shield/date_struct.mqh
index 7ecd99e7..33d72a7c 100644
--- a/MQL5/Include/time_shield/date_struct.mqh
+++ b/MQL5/Include/time_shield/date_struct.mqh
@@ -2,7 +2,7 @@
 //|                                                  date_struct.mqh |
 //|                                Time Shield - MQL5 Date Structure |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_DATE_STRUCT_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_DATE_STRUCT_MQH_INCLUDED
@@ -15,7 +15,7 @@
 /// to create `DateStruct` instances for working with calendar dates in MQL5.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 namespace time_shield {
diff --git a/MQL5/Include/time_shield/date_time_struct.mqh b/MQL5/Include/time_shield/date_time_struct.mqh
index 19950826..27bd25b1 100644
--- a/MQL5/Include/time_shield/date_time_struct.mqh
+++ b/MQL5/Include/time_shield/date_time_struct.mqh
@@ -2,7 +2,7 @@
 //|                                             date_time_struct.mqh |
 //|                            Time Shield - MQL5 DateTime Structure |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_DATE_TIME_STRUCT_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_DATE_TIME_STRUCT_MQH_INCLUDED
@@ -16,7 +16,7 @@
 /// combined date and time values in MQL5.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 namespace time_shield {
diff --git a/MQL5/Include/time_shield/enums.mqh b/MQL5/Include/time_shield/enums.mqh
index b50afc43..12bc2d2a 100644
--- a/MQL5/Include/time_shield/enums.mqh
+++ b/MQL5/Include/time_shield/enums.mqh
@@ -2,7 +2,7 @@
 //|                                                        enums.mqh |
 //|                                  Time Shield - MQL5 Enumerations |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_ENUMS_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_ENUMS_MQH_INCLUDED
@@ -14,7 +14,7 @@
 /// This file contains enum definitions for representing various time-related concepts.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 namespace time_shield {
diff --git a/MQL5/Include/time_shield/initialization.mqh b/MQL5/Include/time_shield/initialization.mqh
index 09d30fb4..d3dbca0d 100644
--- a/MQL5/Include/time_shield/initialization.mqh
+++ b/MQL5/Include/time_shield/initialization.mqh
@@ -2,7 +2,7 @@
 //|                                               initialization.mqh |
 //|                   Time Shield - Library Initialization Functions |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_INITIALIZATION_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_INITIALIZATION_MQH_INCLUDED
@@ -11,12 +11,12 @@
 /// \ingroup mql5
 /// \brief Library initialization helpers.
 ///
-/// Call ::init() once at the beginning of OnStart before
-/// using other functions from the library. It currently triggers the
+/// Call init() once at the beginning of OnStart before
+/// using other functions from the library. It triggers the
 /// lazy initialization used by microseconds().
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "time_utils.mqh"
diff --git a/MQL5/Include/time_shield/time_conversions.mqh b/MQL5/Include/time_shield/time_conversions.mqh
index ff4dd82a..749882c3 100644
--- a/MQL5/Include/time_shield/time_conversions.mqh
+++ b/MQL5/Include/time_shield/time_conversions.mqh
@@ -2,7 +2,7 @@
 //|                                             time_conversions.mqh |
 //|                              Time Shield - MQL5 Time Conversions |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_CONVERSIONS_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_CONVERSIONS_MQH_INCLUDED
@@ -17,7 +17,7 @@
 /// for obtaining sub-second parts and working with date structures.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "constants.mqh"
diff --git a/MQL5/Include/time_shield/time_formatting.mqh b/MQL5/Include/time_shield/time_formatting.mqh
index 2c81301c..d444e674 100644
--- a/MQL5/Include/time_shield/time_formatting.mqh
+++ b/MQL5/Include/time_shield/time_formatting.mqh
@@ -2,7 +2,7 @@
 //|                                              time_formatting.mqh |
 //|                               Time Shield - MQL5 Time Formatting |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_FORMATTING_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_FORMATTING_MQH_INCLUDED
@@ -16,7 +16,7 @@
 /// string representations including ISO8601 and MQL5 specific formats.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "enums.mqh"
@@ -277,7 +277,9 @@ namespace time_shield {
     }
 
     /// \brief Alias for \ref to_string.
-    /// \copydoc to_string
+    /// \param format_str Format string with custom parameters.
+    /// \param timestamp Timestamp in seconds.
+    /// \param utc_offset UTC offset in seconds.
     string to_str(string format_str, long timestamp, int utc_offset=0) {
        return to_string(format_str, timestamp, utc_offset);
     }
@@ -332,7 +334,9 @@ namespace time_shield {
     }
 
     /// \brief Alias for \ref to_string_ms.
-    /// \copydoc to_string_ms(const string &, long, int)
+    /// \param format_str Format string with custom parameters.
+    /// \param timestamp_ms Timestamp in milliseconds.
+    /// \param utc_offset UTC offset in seconds.
     string to_str_ms(string format_str, long timestamp_ms, int utc_offset=0) {
        return to_string_ms(format_str, timestamp_ms, utc_offset);
     }
diff --git a/MQL5/Include/time_shield/time_parser.mqh b/MQL5/Include/time_shield/time_parser.mqh
index 962bee24..600482fc 100644
--- a/MQL5/Include/time_shield/time_parser.mqh
+++ b/MQL5/Include/time_shield/time_parser.mqh
@@ -2,7 +2,7 @@
 //|                                                  time_parser.mqh |
 //|                                   Time Shield - MQL5 Time Parser |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_PARSER_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_PARSER_MQH_INCLUDED
@@ -17,7 +17,7 @@
 /// timestamp representations.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include <time_shield/enums.mqh>
@@ -283,7 +283,8 @@ namespace time_shield {
     }
 
     /// \brief Alias for parse_time_zone function.
-    /// \copydoc parse_time_zone
+    /// \param tz_str Time zone offset in ±HH:MM format.
+    /// \param tz Receives the parsed time zone.
     bool parse_tz(string tz_str, TimeZoneStruct &tz) { return parse_time_zone(tz_str, tz); }
 
 //------------------------------------------------------------------------------
diff --git a/MQL5/Include/time_shield/time_struct.mqh b/MQL5/Include/time_shield/time_struct.mqh
index 4cd8b9f8..5c008e6a 100644
--- a/MQL5/Include/time_shield/time_struct.mqh
+++ b/MQL5/Include/time_shield/time_struct.mqh
@@ -2,7 +2,7 @@
 //|                                                  time_struct.mqh |
 //|                                Time Shield - MQL5 Time Structure |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_STRUCT_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_STRUCT_MQH_INCLUDED
@@ -16,7 +16,7 @@
 /// in MQL5.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 namespace time_shield {
diff --git a/MQL5/Include/time_shield/time_utils.mqh b/MQL5/Include/time_shield/time_utils.mqh
index 456f4b0f..eeb38520 100644
--- a/MQL5/Include/time_shield/time_utils.mqh
+++ b/MQL5/Include/time_shield/time_utils.mqh
@@ -2,7 +2,7 @@
 //|                                                   time_utils.mqh |
 //|                                Time Shield - MQL5 Time Utilities |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_UTILS_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_UTILS_MQH_INCLUDED
@@ -15,7 +15,7 @@
 /// timestamp in different formats and extracting sub-second components in MQL5.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "constants.mqh"
diff --git a/MQL5/Include/time_shield/time_zone_conversions.mqh b/MQL5/Include/time_shield/time_zone_conversions.mqh
index e7bf1db2..631a70ec 100644
--- a/MQL5/Include/time_shield/time_zone_conversions.mqh
+++ b/MQL5/Include/time_shield/time_zone_conversions.mqh
@@ -2,7 +2,7 @@
 //|                                        time_zone_conversions.mqh |
 //|                         Time Shield - MQL5 Time Zone Conversions |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_ZONE_CONVERSIONS_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_ZONE_CONVERSIONS_MQH_INCLUDED
@@ -12,7 +12,7 @@
 /// \brief Helpers for converting supported regional time zones and UTC.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "time_conversions.mqh"
diff --git a/MQL5/Include/time_shield/time_zone_struct.mqh b/MQL5/Include/time_shield/time_zone_struct.mqh
index 0909d01d..73da6aa6 100644
--- a/MQL5/Include/time_shield/time_zone_struct.mqh
+++ b/MQL5/Include/time_shield/time_zone_struct.mqh
@@ -2,7 +2,7 @@
 //|                                             time_zone_struct.mqh |
 //|                           Time Shield - MQL5 Time Zone Structure |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_TIME_ZONE_STRUCT_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_TIME_ZONE_STRUCT_MQH_INCLUDED
@@ -15,7 +15,7 @@
 /// helper functions to create and convert time zone values in MQL5.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "constants.mqh"
diff --git a/MQL5/Include/time_shield/validation.mqh b/MQL5/Include/time_shield/validation.mqh
index cf343759..e06ac306 100644
--- a/MQL5/Include/time_shield/validation.mqh
+++ b/MQL5/Include/time_shield/validation.mqh
@@ -2,7 +2,7 @@
 //|                                                   validation.mqh |
 //|                          Time Shield - MQL5 Validation Functions |
 //|                                      Copyright 2025, NewYaroslav |
-//|                   https://github.com/NewYaroslav/time-shield-cpp |
+//|                   https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #ifndef TIME_SHIELD_MQL5_HEADER_VALIDATION_MQH_INCLUDED
 #define TIME_SHIELD_MQL5_HEADER_VALIDATION_MQH_INCLUDED
@@ -15,7 +15,7 @@
 /// time zones and timestamps in MQL5.
 
 #property copyright "Copyright 2025, NewYaroslav"
-#property link      "https://github.com/NewYaroslav/time-shield-cpp"
+#property link      "https://github.com/LimiNode/time-shield-cpp"
 #property strict
 
 #include "constants.mqh"
diff --git a/MQL5/Scripts/time_shield/examples/time_conversions_demo.mq5 b/MQL5/Scripts/time_shield/examples/time_conversions_demo.mq5
index 189535b8..97ee18da 100644
--- a/MQL5/Scripts/time_shield/examples/time_conversions_demo.mq5
+++ b/MQL5/Scripts/time_shield/examples/time_conversions_demo.mq5
@@ -2,7 +2,7 @@
 //|                                    time_conversions_demo.mq5 |
 //|                     Time Shield - Conversions Examples       |
 //|                      Copyright 2025, NewYaroslav              |
-//|              https://github.com/NewYaroslav/time-shield-cpp   |
+//|              https://github.com/LimiNode/time-shield-cpp   |
 //+------------------------------------------------------------------+
 #property script_show_inputs
 #property strict
diff --git a/MQL5/Scripts/time_shield/examples/time_formatting_demo.mq5 b/MQL5/Scripts/time_shield/examples/time_formatting_demo.mq5
index 3e8a76f3..e8b200f5 100644
--- a/MQL5/Scripts/time_shield/examples/time_formatting_demo.mq5
+++ b/MQL5/Scripts/time_shield/examples/time_formatting_demo.mq5
@@ -2,7 +2,7 @@
 //|                                     time_formatting_demo.mq5 |
 //|                   Time Shield - Formatting Examples           |
 //|                      Copyright 2025, NewYaroslav                |
-//|              https://github.com/NewYaroslav/time-shield-cpp     |
+//|              https://github.com/LimiNode/time-shield-cpp     |
 //+------------------------------------------------------------------+
 #property script_show_inputs
 #property strict
diff --git a/MQL5/Scripts/time_shield/examples/time_parser_demo.mq5 b/MQL5/Scripts/time_shield/examples/time_parser_demo.mq5
index 7ad8b303..3541e0e7 100644
--- a/MQL5/Scripts/time_shield/examples/time_parser_demo.mq5
+++ b/MQL5/Scripts/time_shield/examples/time_parser_demo.mq5
@@ -2,7 +2,7 @@
 //|                                     time_parser_demo.mq5 |
 //|                   Time Shield - Parsing Examples         |
 //|                      Copyright 2025, NewYaroslav          |
-//|              https://github.com/NewYaroslav/time-shield-cpp |
+//|              https://github.com/LimiNode/time-shield-cpp |
 //+------------------------------------------------------------------+
 #property script_show_inputs
 #property strict
diff --git a/MQL5/Scripts/time_shield/tests/test_eet_to_gmt.mq5 b/MQL5/Scripts/time_shield/tests/test_eet_to_gmt.mq5
index a71acf9c..8de6b995 100644
--- a/MQL5/Scripts/time_shield/tests/test_eet_to_gmt.mq5
+++ b/MQL5/Scripts/time_shield/tests/test_eet_to_gmt.mq5
@@ -2,7 +2,7 @@
 //|                                            test_eet_to_gmt.mq5 |
 //|                      Time Shield - Function Test                |
 //|                      Copyright 2025, NewYaroslav                |
-//|              https://github.com/NewYaroslav/time-shield-cpp     |
+//|              https://github.com/LimiNode/time-shield-cpp     |
 //+------------------------------------------------------------------+
 #property script_show_inputs
 #property strict
diff --git a/MQL5/Scripts/time_shield/tests/test_time_zone_matrix.mq5 b/MQL5/Scripts/time_shield/tests/test_time_zone_matrix.mq5
index dcb82167..0dbcb7f4 100644
--- a/MQL5/Scripts/time_shield/tests/test_time_zone_matrix.mq5
+++ b/MQL5/Scripts/time_shield/tests/test_time_zone_matrix.mq5
@@ -2,7 +2,7 @@
 //|                                       test_time_zone_matrix.mq5  |
 //|                      Time Shield - Function Test                 |
 //|                      Copyright 2025, NewYaroslav                |
-//|              https://github.com/NewYaroslav/time-shield-cpp     |
+//|              https://github.com/LimiNode/time-shield-cpp     |
 //+------------------------------------------------------------------+
 #property script_show_inputs
 #property strict
diff --git a/README-RU.md b/README-RU.md
index 622a8777..100b87d7 100644
--- a/README-RU.md
+++ b/README-RU.md
@@ -3,11 +3,11 @@
 <img src="docs/logo-1280x640.png" alt="Логотип" width="600"/>
 
 ![MIT License](https://img.shields.io/badge/license-MIT-green.svg)
-![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS%20%7C%20MQL5-blue)
+![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS%20%7C%20MQL4%20%7C%20MQL5-blue)
 ![C++ Standard](https://img.shields.io/badge/C++-11--17-orange)
-![CI Windows](https://img.shields.io/github/actions/workflow/status/newyaroslav/time-shield-cpp/ci.yml?branch=main&label=Windows&logo=windows)
-![CI Linux](https://img.shields.io/github/actions/workflow/status/newyaroslav/time-shield-cpp/ci.yml?branch=main&label=Linux&logo=linux)
-![CI macOS](https://img.shields.io/github/actions/workflow/status/newyaroslav/time-shield-cpp/ci.yml?branch=main&label=macOS&logo=apple)
+![CI Windows](https://img.shields.io/github/actions/workflow/status/LimiNode/time-shield-cpp/ci.yml?branch=main&label=Windows&logo=windows)
+![CI Linux](https://img.shields.io/github/actions/workflow/status/LimiNode/time-shield-cpp/ci.yml?branch=main&label=Linux&logo=linux)
+![CI macOS](https://img.shields.io/github/actions/workflow/status/LimiNode/time-shield-cpp/ci.yml?branch=main&label=macOS&logo=apple)
 
 **Time Shield** — это header-only C++-библиотека для работы со временем. Она включает функции для конвертации временных значений, форматирования дат и множество утилит для задач с таймстампами.
 > Названа в честь «временного щита» Хомуры Акэми.
@@ -40,8 +40,9 @@ bool monday = is_workday(now);
 - `time_shield/timers.hpp` — таймеры и планировщик;
 - `time_shield/ntp.hpp` — необязательные NTP-клиент и сервис времени.
 
-Прежние пути корневых заголовков сохраняются как compatibility-forwarders.
-Переход на доменные пути не требует изменения имён API.
+Доменные пути являются единственными поддерживаемыми публичными путями к
+заголовкам. Подключайте umbrella или leaf-header домена, которому принадлежит
+нужный API.
 
 ## Зачем Time Shield?
 
@@ -411,7 +412,7 @@ variables. Для `NtpTimeService` публичный способ подклю
 
 ## Документация
 
-Полное описание API и дополнительные примеры доступны по адресу: <https://newyaroslav.github.io/time-shield-cpp/>
+Полное описание API и дополнительные примеры доступны по адресу: <https://liminode.github.io/time-shield-cpp/>
 
 HTML-документация Doxygen публикуется через GitHub Pages.
 
diff --git a/README.md b/README.md
index 84d3d18e..48c3636e 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@
 ![MIT License](https://img.shields.io/badge/license-MIT-green.svg)
 ![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS%20%7C%20MQL4%20%7C%20MQL5-blue)
 ![C++ Standard](https://img.shields.io/badge/C++-11--17-orange)
-![CI Windows](https://img.shields.io/github/actions/workflow/status/newyaroslav/time-shield-cpp/ci.yml?branch=main&label=Windows&logo=windows)
-![CI Linux](https://img.shields.io/github/actions/workflow/status/newyaroslav/time-shield-cpp/ci.yml?branch=main&label=Linux&logo=linux)
-![CI macOS](https://img.shields.io/github/actions/workflow/status/newyaroslav/time-shield-cpp/ci.yml?branch=main&label=macOS&logo=apple)
+![CI Windows](https://img.shields.io/github/actions/workflow/status/LimiNode/time-shield-cpp/ci.yml?branch=main&label=Windows&logo=windows)
+![CI Linux](https://img.shields.io/github/actions/workflow/status/LimiNode/time-shield-cpp/ci.yml?branch=main&label=Linux&logo=linux)
+![CI macOS](https://img.shields.io/github/actions/workflow/status/LimiNode/time-shield-cpp/ci.yml?branch=main&label=macOS&logo=apple)
 
 **Time Shield** is a header-only C++ library for working with time. It provides
 functions for converting time values, formatting dates and many utilities for
@@ -44,8 +44,8 @@ entry points for focused use:
 - `time_shield/timers.hpp` — timers and scheduling;
 - `time_shield/ntp.hpp` — optional NTP client and time service.
 
-The former root-level header paths remain available as compatibility forwarding
-headers. New code can migrate to domain paths without changing API symbols.
+The domain paths are the only supported public header paths. Include the
+domain umbrella or leaf header that owns the required API.
 
 ## Why Time Shield?
 
@@ -185,7 +185,7 @@ target_link_libraries(app PRIVATE time_shield::time_shield)
 Vendor the library as a submodule:
 
 ```sh
-git submodule add https://github.com/NewYaroslav/time-shield-cpp external/time-shield-cpp
+git submodule add https://github.com/LimiNode/time-shield-cpp external/time-shield-cpp
 ```
 
 Then include it:
@@ -592,7 +592,7 @@ allows a simpler singleton-storage pattern with inline variables. For
 ## Documentation
 
 Full API description and additional examples are available at
-<https://newyaroslav.github.io/time-shield-cpp/>
+<https://liminode.github.io/time-shield-cpp/>
 
 Doxygen HTML is published via GitHub Pages.
 
diff --git a/cmake/check_header_include_policy.cmake b/cmake/check_header_include_policy.cmake
index 9cd10a01..2dd0f070 100644
--- a/cmake/check_header_include_policy.cmake
+++ b/cmake/check_header_include_policy.cmake
@@ -5,8 +5,40 @@ if(NOT DEFINED TIME_SHIELD_SOURCE_DIR)
 endif()
 
 set(TIME_SHIELD_INCLUDE_DIR "${TIME_SHIELD_SOURCE_DIR}/include/time_shield")
+set(TIME_SHIELD_DOMAINS
+    astronomy
+    conversions
+    core
+    datetime
+    ntp
+    text
+    timers
+    timezone)
+set(TIME_SHIELD_ROOT_HEADERS
+    astronomy.hpp
+    conversions.hpp
+    core.hpp
+    date_time.hpp
+    ntp.hpp
+    text.hpp
+    timers.hpp
+    timezone.hpp)
 set(TIME_SHIELD_DOMAIN_UMBRELLAS
-    core.hpp conversions.hpp text.hpp date_time.hpp astronomy.hpp timers.hpp ntp.hpp timezone.hpp)
+    ${TIME_SHIELD_ROOT_HEADERS})
+
+file(GLOB TIME_SHIELD_ROOT_HEADER_FILES RELATIVE "${TIME_SHIELD_INCLUDE_DIR}"
+    "${TIME_SHIELD_INCLUDE_DIR}/*.hpp")
+foreach(root_header IN LISTS TIME_SHIELD_ROOT_HEADER_FILES)
+    if(NOT root_header IN_LIST TIME_SHIELD_ROOT_HEADERS)
+        message(FATAL_ERROR
+            "Unexpected root-level header: ${root_header}. Use a domain directory.")
+    endif()
+endforeach()
+list(LENGTH TIME_SHIELD_ROOT_HEADER_FILES TIME_SHIELD_ROOT_HEADER_COUNT)
+list(LENGTH TIME_SHIELD_ROOT_HEADERS TIME_SHIELD_EXPECTED_ROOT_HEADER_COUNT)
+if(NOT TIME_SHIELD_ROOT_HEADER_COUNT EQUAL TIME_SHIELD_EXPECTED_ROOT_HEADER_COUNT)
+    message(FATAL_ERROR "Root-level header inventory does not match the domain layout")
+endif()
 
 set(TIME_SHIELD_DOMAIN_DEPENDENCIES_core "")
 set(TIME_SHIELD_DOMAIN_DEPENDENCIES_conversions core)
@@ -26,8 +58,8 @@ foreach(header IN LISTS TIME_SHIELD_CANONICAL_HEADERS)
     string(REGEX MATCH "^([^/]+)/" domain_match "${relative_header}")
     set(source_domain "${CMAKE_MATCH_1}")
 
-    if(source_domain STREQUAL "detail" OR source_domain STREQUAL "ntp_client")
-        continue()
+    if(NOT source_domain IN_LIST TIME_SHIELD_DOMAINS)
+        message(FATAL_ERROR "Unknown header domain: ${source_domain}")
     endif()
     if(relative_header MATCHES "(^|/)legacy_aliases\\.hpp$")
         continue()
@@ -115,4 +147,24 @@ foreach(umbrella IN LISTS TIME_SHIELD_DOMAIN_UMBRELLAS)
     endforeach()
 endforeach()
 
+file(STRINGS "${TIME_SHIELD_SOURCE_DIR}/include/time_shield.hpp" TIME_SHIELD_MAIN_HEADER_LINES)
+set(TIME_SHIELD_MAIN_ROOT_HEADERS_FOUND)
+foreach(line IN LISTS TIME_SHIELD_MAIN_HEADER_LINES)
+    if(line MATCHES "^[ \t]*#[ \t]*include[ \t]+[\"<]time_shield/([^>\"]+)[>\"]")
+        set(target "${CMAKE_MATCH_1}")
+        if(NOT target IN_LIST TIME_SHIELD_ROOT_HEADERS)
+            message(FATAL_ERROR
+                "Main umbrella must include root domain umbrellas only: ${line}")
+        endif()
+        list(APPEND TIME_SHIELD_MAIN_ROOT_HEADERS_FOUND "${target}")
+    endif()
+endforeach()
+list(REMOVE_DUPLICATES TIME_SHIELD_MAIN_ROOT_HEADERS_FOUND)
+list(SORT TIME_SHIELD_MAIN_ROOT_HEADERS_FOUND)
+set(TIME_SHIELD_EXPECTED_MAIN_ROOT_HEADERS ${TIME_SHIELD_ROOT_HEADERS})
+list(SORT TIME_SHIELD_EXPECTED_MAIN_ROOT_HEADERS)
+if(NOT TIME_SHIELD_MAIN_ROOT_HEADERS_FOUND STREQUAL TIME_SHIELD_EXPECTED_MAIN_ROOT_HEADERS)
+    message(FATAL_ERROR "Main umbrella does not include exactly the expected domain umbrellas")
+endif()
+
 message(STATUS "Header include policy passed")
diff --git a/cmake/time-shield.pc.in b/cmake/time-shield.pc.in
index 5aa695e0..0bb37480 100644
--- a/cmake/time-shield.pc.in
+++ b/cmake/time-shield.pc.in
@@ -1,6 +1,9 @@
-prefix=@CMAKE_INSTALL_PREFIX@
+prefix=${pcfiledir}/@TIME_SHIELD_PKG_CONFIG_PREFIX@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: time-shield
 Version: @PROJECT_VERSION@
-Cflags: -I${includedir}
+Description: Header-only C++ library for time conversions, formatting, and utilities.
+URL: https://github.com/LimiNode/time-shield-cpp
+Cflags: -I${includedir} -DTIME_SHIELD_ENABLE_NTP_CLIENT=@TIME_SHIELD_PKG_CONFIG_NTP_DEFINE@
+Libs: @TIME_SHIELD_PKG_CONFIG_LIBS@
diff --git a/docs/groups.dox b/docs/groups.dox
index 42ceda94..22f4e1b6 100644
--- a/docs/groups.dox
+++ b/docs/groups.dox
@@ -18,7 +18,6 @@ std::cout << time_shield::to_cstr(weekday, time_shield::FormatType::FULL_NAME);
 
 /*!
 \defgroup lib_initialization Library Initialization
-\ingroup cpp
 \brief Functions used to initialize the Time Shield library.
 
 This group includes functions that perform setup procedures required before using
diff --git a/docs/mainpage.md b/docs/mainpage.md
index 8c59161e..e2aaa5c4 100644
--- a/docs/mainpage.md
+++ b/docs/mainpage.md
@@ -1,6 +1,12 @@
 \mainpage Time Shield Library
 
-**Version:** `VERSION_PLACEHOLDER`
+Version: VERSION_PLACEHOLDER
+
+Header-only C++11–17 library for time conversions, parsing, formatting, ISO 8601,
+time zones, timers, astronomy helpers, and optional NTP services.
+
+[Repository](https://github.com/LimiNode/time-shield-cpp) ·
+[API reference](https://liminode.github.io/time-shield-cpp/)
 
 \section intro_sec Introduction
 
@@ -68,8 +74,7 @@ Public headers are grouped by domain. The preferred entry points are
 `time_shield/core.hpp`, `time_shield/conversions.hpp`, `time_shield/text.hpp`,
 `time_shield/date_time.hpp`, `time_shield/timezone.hpp`,
 `time_shield/astronomy.hpp`, `time_shield/timers.hpp`, and the optional
-`time_shield/ntp.hpp`. Root-level header paths remain available as compatibility
-forwarders.
+`time_shield/ntp.hpp`. Domain paths are the supported public header paths.
 
 \section invariants_sec API Invariants
 
@@ -170,13 +175,13 @@ std::string text = to_string_ms("%G-%V-%u", monday.unix_ms(), monday.utc_offset(
 Time Shield provides an optional NTP stack (`TIME_SHIELD_ENABLE_NTP_CLIENT`)
 that can query remote servers and compute a local offset for UTC time.
 
-### Components
+\subsection ntp_components_sec Components
 - `NtpClient` performs a single NTP request to one server.
 - `NtpClientPool` samples multiple servers with rate limiting and backoff.
 - `NtpClientPoolRunner` runs the pool periodically in a background thread.
 - `NtpTimeService` exposes a singleton interface with cached offset/UTC time.
 
-### Offset computation
+\subsection ntp_offset_sec Offset computation
 Each response is parsed using the standard four-timestamp method:
 `offset = ((t2 - t1) + (t3 - t4)) / 2`,
 `delay = (t4 - t1) - (t3 - t2)`,
@@ -332,7 +337,7 @@ linking details, see `docs/library-integration-guidelines.md` in the repository.
 Vendor the library as a submodule:
 
 \code{.sh}
-git submodule add https://github.com/NewYaroslav/time-shield-cpp external/time-shield-cpp
+git submodule add https://github.com/LimiNode/time-shield-cpp external/time-shield-cpp
 \endcode
 
 Then include it:
@@ -359,7 +364,7 @@ cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=/path/to/vcpkg/scripts/buildsystems/v
 \endcode
 
 The port is intended to be upstreamed to
-\ref https://github.com/microsoft/vcpkg "microsoft/vcpkg".
+[microsoft/vcpkg](https://github.com/microsoft/vcpkg).
 
 For MQL5/MetaTrader, run `install_mql5.bat` to copy the `.mqh` files to your
 include directory.
@@ -381,11 +386,15 @@ To build the C++ examples use the helper scripts:
 \section docs_sec Online Documentation
 
 The latest generated API reference is available at
-\ref https://newyaroslav.github.io/time-shield-cpp/ "newyaroslav.github.io/time-shield-cpp".
+[liminode.github.io/time-shield-cpp](https://liminode.github.io/time-shield-cpp/).
+Russian engineering guides are available in the repository:
+[header implementation](https://github.com/LimiNode/time-shield-cpp/blob/main/docs/header-implementation-guidelines-RU.md),
+[library integration](https://github.com/LimiNode/time-shield-cpp/blob/main/docs/library-integration-guidelines-RU.md), and
+[singleton storage](https://github.com/LimiNode/time-shield-cpp/blob/main/docs/singleton-storage-guidelines-RU.md).
 
 \section repo_sec Repository
 
-[Time Shield Library GitHub repository](https://github.com/NewYaroslav/time-shield-cpp)
+[Time Shield Library GitHub repository](https://github.com/LimiNode/time-shield-cpp)
 
 \section license_sec License
 
diff --git a/include/time_shield/CpuTickTimer.hpp b/include/time_shield/CpuTickTimer.hpp
deleted file mode 100644
index 0db1361f..00000000
--- a/include/time_shield/CpuTickTimer.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_CPUTICKTIMER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_CPUTICKTIMER_HPP_INCLUDED
-
-#include <time_shield/timers/CpuTickTimer.hpp>
-
-#endif // TIME_SHIELD_HEADER_CPUTICKTIMER_HPP_INCLUDED
diff --git a/include/time_shield/DateTime.hpp b/include/time_shield/DateTime.hpp
deleted file mode 100644
index 8637481e..00000000
--- a/include/time_shield/DateTime.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DATETIME_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DATETIME_HPP_INCLUDED
-
-#include <time_shield/datetime/DateTime.hpp>
-
-#endif // TIME_SHIELD_HEADER_DATETIME_HPP_INCLUDED
diff --git a/include/time_shield/DeadlineTimer.hpp b/include/time_shield/DeadlineTimer.hpp
deleted file mode 100644
index 1f2c6732..00000000
--- a/include/time_shield/DeadlineTimer.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DEADLINETIMER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DEADLINETIMER_HPP_INCLUDED
-
-#include <time_shield/timers/DeadlineTimer.hpp>
-
-#endif // TIME_SHIELD_HEADER_DEADLINETIMER_HPP_INCLUDED
diff --git a/include/time_shield/ElapsedTimer.hpp b/include/time_shield/ElapsedTimer.hpp
deleted file mode 100644
index 53147b14..00000000
--- a/include/time_shield/ElapsedTimer.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_ELAPSEDTIMER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_ELAPSEDTIMER_HPP_INCLUDED
-
-#include <time_shield/timers/ElapsedTimer.hpp>
-
-#endif // TIME_SHIELD_HEADER_ELAPSEDTIMER_HPP_INCLUDED
diff --git a/include/time_shield/MoonPhase.hpp b/include/time_shield/MoonPhase.hpp
deleted file mode 100644
index 2c42443d..00000000
--- a/include/time_shield/MoonPhase.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_MOONPHASE_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_MOONPHASE_HPP_INCLUDED
-
-#include <time_shield/astronomy/MoonPhase.hpp>
-
-#endif // TIME_SHIELD_HEADER_MOONPHASE_HPP_INCLUDED
diff --git a/include/time_shield/TimerScheduler.hpp b/include/time_shield/TimerScheduler.hpp
deleted file mode 100644
index 7ae3d21c..00000000
--- a/include/time_shield/TimerScheduler.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIMERSCHEDULER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIMERSCHEDULER_HPP_INCLUDED
-
-#include <time_shield/timers/TimerScheduler.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIMERSCHEDULER_HPP_INCLUDED
diff --git a/include/time_shield/ZonedClock.hpp b/include/time_shield/ZonedClock.hpp
deleted file mode 100644
index 07f1f1a0..00000000
--- a/include/time_shield/ZonedClock.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_ZONEDCLOCK_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_ZONEDCLOCK_HPP_INCLUDED
-
-#include <time_shield/timezone/ZonedClock.hpp>
-
-#endif // TIME_SHIELD_HEADER_ZONEDCLOCK_HPP_INCLUDED
diff --git a/include/time_shield/astronomy/astronomy_conversions.hpp b/include/time_shield/astronomy/astronomy_conversions.hpp
index 4347586a..218aadbc 100644
--- a/include/time_shield/astronomy/astronomy_conversions.hpp
+++ b/include/time_shield/astronomy/astronomy_conversions.hpp
@@ -89,25 +89,25 @@ namespace time_shield {
         return calculator.quarter_instants_unix(static_cast<double>(ts));
     }
 
-    /// \brief Check if timestamp falls into the new moon window (default \pm12h).
+    /// \brief Check if timestamp falls into the new moon window (default ±12 h).
     inline bool is_new_moon_window(fts_t ts, double window_seconds = astronomy::MoonPhase::kDefaultQuarterWindow_s) noexcept {
         static const astronomy::MoonPhase calculator{};
         return calculator.is_new_moon_window(static_cast<double>(ts), window_seconds);
     }
 
-    /// \brief Check if timestamp falls into the full moon window (default \pm12h).
+    /// \brief Check if timestamp falls into the full moon window (default ±12 h).
     inline bool is_full_moon_window(fts_t ts, double window_seconds = astronomy::MoonPhase::kDefaultQuarterWindow_s) noexcept {
         static const astronomy::MoonPhase calculator{};
         return calculator.is_full_moon_window(static_cast<double>(ts), window_seconds);
     }
 
-    /// \brief Check if timestamp falls into the first quarter window (default \pm12h).
+    /// \brief Check if timestamp falls into the first quarter window (default ±12 h).
     inline bool is_first_quarter_window(fts_t ts, double window_seconds = astronomy::MoonPhase::kDefaultQuarterWindow_s) noexcept {
         static const astronomy::MoonPhase calculator{};
         return calculator.is_first_quarter_window(static_cast<double>(ts), window_seconds);
     }
 
-    /// \brief Check if timestamp falls into the last quarter window (default \pm12h).
+    /// \brief Check if timestamp falls into the last quarter window (default ±12 h).
     inline bool is_last_quarter_window(fts_t ts, double window_seconds = astronomy::MoonPhase::kDefaultQuarterWindow_s) noexcept {
         static const astronomy::MoonPhase calculator{};
         return calculator.is_last_quarter_window(static_cast<double>(ts), window_seconds);
diff --git a/include/time_shield/astronomy_conversions.hpp b/include/time_shield/astronomy_conversions.hpp
deleted file mode 100644
index f6c52fd7..00000000
--- a/include/time_shield/astronomy_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_ASTRONOMY_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_ASTRONOMY_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/astronomy/astronomy_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_ASTRONOMY_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/config.hpp b/include/time_shield/config.hpp
deleted file mode 100644
index d5305bab..00000000
--- a/include/time_shield/config.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_CONFIG_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_CONFIG_HPP_INCLUDED
-
-#include <time_shield/core/config.hpp>
-
-#endif // TIME_SHIELD_HEADER_CONFIG_HPP_INCLUDED
diff --git a/include/time_shield/constants.hpp b/include/time_shield/constants.hpp
deleted file mode 100644
index c181467e..00000000
--- a/include/time_shield/constants.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_CONSTANTS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_CONSTANTS_HPP_INCLUDED
-
-#include <time_shield/core/constants.hpp>
-
-#endif // TIME_SHIELD_HEADER_CONSTANTS_HPP_INCLUDED
diff --git a/include/time_shield/conversions/legacy_aliases.hpp b/include/time_shield/conversions/legacy_aliases.hpp
index 29ffde06..052103d8 100644
--- a/include/time_shield/conversions/legacy_aliases.hpp
+++ b/include/time_shield/conversions/legacy_aliases.hpp
@@ -6,8 +6,9 @@
 /// \file legacy_aliases.hpp
 /// \brief Opt-in compatibility aliases for renamed time-conversion helpers.
 ///
-/// Define `TIME_SHIELD_ENABLE_LEGACY_ALIASES` before including this header or
-/// `time_conversions.hpp` to make the aliases available.
+/// Define `TIME_SHIELD_ENABLE_LEGACY_ALIASES` before including this header,
+/// `time_shield/conversions.hpp`, or `time_shield.hpp` to make the aliases
+/// available.
 
 #include <time_shield/conversions.hpp>
 
@@ -35,7 +36,8 @@ namespace time_shield {
     }
 
     /// \brief Legacy alias for days_since_epoch_ms.
-    /// \copydoc days_since_epoch_ms
+    /// \param ts_ms Timestamp in milliseconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T get_unix_day_ms(ts_ms_t ts_ms = time_shield::ts_ms()) noexcept {
         return days_since_epoch_ms<T>(ts_ms);
diff --git a/include/time_shield/conversions/time_conversion_aliases.hpp b/include/time_shield/conversions/time_conversion_aliases.hpp
index d49923b3..0443dab7 100644
--- a/include/time_shield/conversions/time_conversion_aliases.hpp
+++ b/include/time_shield/conversions/time_conversion_aliases.hpp
@@ -35,7 +35,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param ts Timestamp in seconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T get_unixday(ts_t ts = time_shield::ts()) noexcept {
         return days_since_epoch<T>(ts);
@@ -43,7 +44,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param ts Timestamp in seconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T unix_day(ts_t ts = time_shield::ts()) noexcept {
         return days_since_epoch<T>(ts);
@@ -51,7 +53,8 @@ namespace time_shield {
 
 
     /// \brief Short alias for days_since_epoch.
-    /// \copydoc days_since_epoch
+    /// \param ts Timestamp in seconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T dse(ts_t ts = time_shield::ts()) noexcept {
         return days_since_epoch<T>(ts);
@@ -59,7 +62,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param ts Timestamp in seconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T unixday(ts_t ts = time_shield::ts()) noexcept {
         return days_since_epoch<T>(ts);
@@ -67,7 +71,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param ts Timestamp in seconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T uday(ts_t ts = time_shield::ts()) noexcept {
         return days_since_epoch<T>(ts);
@@ -77,7 +82,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param t_ms Timestamp in milliseconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T get_unixday_ms(ts_ms_t t_ms = time_shield::ts_ms()) noexcept {
         return days_since_epoch_ms<T>(t_ms);
@@ -85,7 +91,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param t_ms Timestamp in milliseconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T unix_day_ms(ts_ms_t t_ms = time_shield::ts_ms()) noexcept {
         return days_since_epoch_ms<T>(t_ms);
@@ -93,7 +100,8 @@ namespace time_shield {
 
 
     /// \brief Short alias for days_since_epoch_ms.
-    /// \copydoc days_since_epoch_ms
+    /// \param t_ms Timestamp in milliseconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T dse_ms(ts_ms_t t_ms = time_shield::ts_ms()) noexcept {
         return days_since_epoch_ms<T>(t_ms);
@@ -101,7 +109,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param t_ms Timestamp in milliseconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T unixday_ms(ts_ms_t t_ms = time_shield::ts_ms()) noexcept {
         return days_since_epoch_ms<T>(t_ms);
@@ -109,7 +118,8 @@ namespace time_shield {
 
 
     /// \brief Alias for days_since_epoch function.
-    /// \copydoc days_since_epoch
+    /// \param t_ms Timestamp in milliseconds.
+    /// \return Number of days since the Unix epoch.
     template<class T = dse_t>
     TIME_SHIELD_CONSTEXPR T uday_ms(ts_ms_t t_ms = time_shield::ts_ms()) noexcept {
         return days_since_epoch_ms<T>(t_ms);
@@ -281,7 +291,8 @@ namespace time_shield {
 
     /// \ingroup time_structures
     /// \brief Alias for to_date_time_ms function.
-    /// \copydoc to_date_time_ms
+    /// \param ts Timestamp in milliseconds.
+    /// \return Date-time structure created from the timestamp.
     template<class T>
     inline T to_dt_ms(ts_ms_t ts) {
         return to_date_time_ms<T>(ts);
@@ -289,7 +300,8 @@ namespace time_shield {
 
     /// \ingroup time_structures
     /// \brief Alias for to_date_time_ms function.
-    /// \copydoc to_date_time_ms
+    /// \param ts Timestamp in milliseconds.
+    /// \return Date-time structure created from the timestamp.
     template<class T>
     inline T to_dt_struct_ms(ts_ms_t ts) {
         return to_date_time_ms<T>(ts);
@@ -297,7 +309,8 @@ namespace time_shield {
 
     /// \ingroup time_structures
     /// \brief Alias for to_date_time_ms function.
-    /// \copydoc to_date_time_ms
+    /// \param ts_ms Timestamp in milliseconds.
+    /// \return Date-time structure created from the timestamp.
     inline auto to_dt_ms(ts_ms_t ts_ms)
             -> decltype(to_date_time_ms<DateTimeStruct>(ts_ms)) {
         return to_date_time_ms<DateTimeStruct>(ts_ms);
@@ -2081,7 +2094,8 @@ namespace time_shield {
     }
 
     /// \brief Alias for is_workday(ts_ms_t).
-    /// \copydoc is_workday(ts_ms_t)
+    /// \param ts_ms Timestamp in milliseconds.
+    /// \return True when the timestamp falls on a workday.
     TIME_SHIELD_CONSTEXPR inline bool workday_ms(ts_ms_t ts_ms) noexcept {
         return is_workday_ms(ts_ms);
     }
diff --git a/include/time_shield/conversions/time_unit_conversions.hpp b/include/time_shield/conversions/time_unit_conversions.hpp
index 9e903c0f..4bb59fea 100644
--- a/include/time_shield/conversions/time_unit_conversions.hpp
+++ b/include/time_shield/conversions/time_unit_conversions.hpp
@@ -126,7 +126,6 @@ namespace time_shield {
     /// \brief Helper function for converting seconds to milliseconds (floating-point version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in seconds.
-    /// \param tag std::true_type indicates a floating-point type.
     /// \return ts_ms_t Timestamp in milliseconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_ms_t sec_to_ms_impl(T t, std::true_type) noexcept {
@@ -136,7 +135,6 @@ namespace time_shield {
     /// \brief Helper function for converting seconds to milliseconds (integral version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in seconds.
-    /// \param tag std::false_type indicates a non-floating-point type.
     /// \return ts_ms_t Timestamp in milliseconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_ms_t sec_to_ms_impl(T t, std::false_type) noexcept {
@@ -201,7 +199,6 @@ namespace time_shield {
     /// \brief Helper function for converting minutes to milliseconds (floating-point version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in minutes.
-    /// \param tag std::true_type indicates a floating-point type (double or float).
     /// \return ts_ms_t Timestamp in milliseconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_ms_t min_to_ms_impl(T t, std::true_type) noexcept {
@@ -211,7 +208,6 @@ namespace time_shield {
     /// \brief Helper function for converting minutes to milliseconds (integral version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in minutes.
-    /// \param tag std::false_type indicates a non-floating-point type.
     /// \return ts_ms_t Timestamp in milliseconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_ms_t min_to_ms_impl(T t, std::false_type) noexcept {
@@ -260,7 +256,6 @@ namespace time_shield {
     /// \brief Helper function for converting minutes to seconds (floating-point version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in minutes.
-    /// \param tag std::true_type indicates a floating-point type (double or float).
     /// \return ts_t Timestamp in seconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_t min_to_sec_impl(T t, std::true_type) noexcept {
@@ -270,7 +265,6 @@ namespace time_shield {
     /// \brief Helper function for converting minutes to seconds (integral version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in minutes.
-    /// \param tag std::false_type indicates a non-floating-point type.
     /// \return ts_t Timestamp in seconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_t min_to_sec_impl(T t, std::false_type) noexcept {
@@ -338,7 +332,6 @@ namespace time_shield {
     /// \brief Helper function for converting hours to milliseconds (floating-point version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in hours.
-    /// \param tag std::true_type indicates a floating-point type (double or float).
     /// \return ts_ms_t Timestamp in milliseconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_ms_t hour_to_ms_impl(T t, std::true_type) noexcept {
@@ -348,7 +341,6 @@ namespace time_shield {
     /// \brief Helper function for converting hours to milliseconds (integral version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in hours.
-    /// \param tag Type tag used to select the integral overload (must be std::false_type).
     /// \return ts_ms_t Timestamp in milliseconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_ms_t hour_to_ms_impl(T t, std::false_type) noexcept {
@@ -398,7 +390,6 @@ namespace time_shield {
     /// \brief Helper function for converting hours to seconds (floating-point version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in hours.
-    /// \param tag std::true_type indicates a floating-point type (double or float).
     /// \return ts_t Timestamp in seconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_t hour_to_sec_impl(T t, std::true_type) noexcept {
@@ -408,7 +399,6 @@ namespace time_shield {
     /// \brief Helper function for converting hours to seconds (integral version).
     /// \tparam T Type of the input timestamp.
     /// \param t Timestamp in hours.
-    /// \param tag std::false_type indicates a non-floating-point type.
     /// \return ts_t Timestamp in seconds.
     template<class T>
     TIME_SHIELD_CONSTEXPR ts_t hour_to_sec_impl(T t, std::false_type) noexcept {
diff --git a/include/time_shield/core/types.hpp b/include/time_shield/core/types.hpp
index 199a31df..9de74f5c 100644
--- a/include/time_shield/core/types.hpp
+++ b/include/time_shield/core/types.hpp
@@ -16,7 +16,6 @@ namespace time_shield {
 
 /// \defgroup time_types Time Types
 /// \brief Fundamental type definitions for time-related data.
-/// \ingroup cpp
 ///
 /// This group defines the core time representations used throughout the library,
 /// including timestamps, fractional time units, Julian dates, and time zone offsets.
diff --git a/include/time_shield/date_conversions.hpp b/include/time_shield/date_conversions.hpp
deleted file mode 100644
index 083eec5f..00000000
--- a/include/time_shield/date_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DATE_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DATE_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/date_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_DATE_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/date_struct.hpp b/include/time_shield/date_struct.hpp
deleted file mode 100644
index 5cfb60e3..00000000
--- a/include/time_shield/date_struct.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DATE_STRUCT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DATE_STRUCT_HPP_INCLUDED
-
-#include <time_shield/core/date_struct.hpp>
-
-#endif // TIME_SHIELD_HEADER_DATE_STRUCT_HPP_INCLUDED
diff --git a/include/time_shield/date_time_conversions.hpp b/include/time_shield/date_time_conversions.hpp
deleted file mode 100644
index 72451f9e..00000000
--- a/include/time_shield/date_time_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DATE_TIME_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DATE_TIME_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/date_time_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_DATE_TIME_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/date_time_struct.hpp b/include/time_shield/date_time_struct.hpp
deleted file mode 100644
index fbb1398e..00000000
--- a/include/time_shield/date_time_struct.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DATE_TIME_STRUCT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DATE_TIME_STRUCT_HPP_INCLUDED
-
-#include <time_shield/core/date_time_struct.hpp>
-
-#endif // TIME_SHIELD_HEADER_DATE_TIME_STRUCT_HPP_INCLUDED
diff --git a/include/time_shield/detail/fast_date.hpp b/include/time_shield/detail/fast_date.hpp
deleted file mode 100644
index 7526dd5e..00000000
--- a/include/time_shield/detail/fast_date.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DETAIL_FAST_DATE_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DETAIL_FAST_DATE_HPP_INCLUDED
-
-#include <time_shield/conversions/detail/fast_date.hpp>
-
-#endif // TIME_SHIELD_HEADER_DETAIL_FAST_DATE_HPP_INCLUDED
diff --git a/include/time_shield/detail/floor_math.hpp b/include/time_shield/detail/floor_math.hpp
deleted file mode 100644
index 55e88647..00000000
--- a/include/time_shield/detail/floor_math.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DETAIL_FLOOR_MATH_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DETAIL_FLOOR_MATH_HPP_INCLUDED
-
-#include <time_shield/conversions/detail/floor_math.hpp>
-
-#endif // TIME_SHIELD_HEADER_DETAIL_FLOOR_MATH_HPP_INCLUDED
diff --git a/include/time_shield/detail/mul_hi.hpp b/include/time_shield/detail/mul_hi.hpp
deleted file mode 100644
index 07873e6a..00000000
--- a/include/time_shield/detail/mul_hi.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_DETAIL_MUL_HI_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_DETAIL_MUL_HI_HPP_INCLUDED
-
-#include <time_shield/conversions/detail/mul_hi.hpp>
-
-#endif // TIME_SHIELD_HEADER_DETAIL_MUL_HI_HPP_INCLUDED
diff --git a/include/time_shield/enums.hpp b/include/time_shield/enums.hpp
deleted file mode 100644
index 29a7536b..00000000
--- a/include/time_shield/enums.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_ENUMS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_ENUMS_HPP_INCLUDED
-
-#include <time_shield/core/enums.hpp>
-
-#endif // TIME_SHIELD_HEADER_ENUMS_HPP_INCLUDED
diff --git a/include/time_shield/initialization.hpp b/include/time_shield/initialization.hpp
deleted file mode 100644
index bcb58943..00000000
--- a/include/time_shield/initialization.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_INITIALIZATION_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_INITIALIZATION_HPP_INCLUDED
-
-#include <time_shield/core/initialization.hpp>
-
-#endif // TIME_SHIELD_HEADER_INITIALIZATION_HPP_INCLUDED
diff --git a/include/time_shield/iso_week_conversions.hpp b/include/time_shield/iso_week_conversions.hpp
deleted file mode 100644
index 0b1f083d..00000000
--- a/include/time_shield/iso_week_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_ISO_WEEK_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_ISO_WEEK_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/iso_week_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_ISO_WEEK_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/iso_week_struct.hpp b/include/time_shield/iso_week_struct.hpp
deleted file mode 100644
index 46267c09..00000000
--- a/include/time_shield/iso_week_struct.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_ISO_WEEK_STRUCT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_ISO_WEEK_STRUCT_HPP_INCLUDED
-
-#include <time_shield/core/iso_week_struct.hpp>
-
-#endif // TIME_SHIELD_HEADER_ISO_WEEK_STRUCT_HPP_INCLUDED
diff --git a/include/time_shield/julian_conversions.hpp b/include/time_shield/julian_conversions.hpp
deleted file mode 100644
index d261bb86..00000000
--- a/include/time_shield/julian_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_JULIAN_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_JULIAN_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/astronomy/julian_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_JULIAN_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/legacy_aliases.hpp b/include/time_shield/legacy_aliases.hpp
deleted file mode 100644
index 447d7312..00000000
--- a/include/time_shield/legacy_aliases.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_LEGACY_ALIASES_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_LEGACY_ALIASES_HPP_INCLUDED
-
-#include <time_shield/conversions/legacy_aliases.hpp>
-#include <time_shield/astronomy/legacy_aliases.hpp>
-
-#endif // TIME_SHIELD_HEADER_LEGACY_ALIASES_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client.hpp b/include/time_shield/ntp_client.hpp
deleted file mode 100644
index 540e5f67..00000000
--- a/include/time_shield/ntp_client.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_HPP_INCLUDED
-
-#include <time_shield/ntp/ntp_client.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client/ntp_client_core.hpp b/include/time_shield/ntp_client/ntp_client_core.hpp
deleted file mode 100644
index 2506cc2c..00000000
--- a/include/time_shield/ntp_client/ntp_client_core.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_NTP_CLIENT_CORE_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_NTP_CLIENT_CORE_HPP_INCLUDED
-
-#include <time_shield/ntp/detail/ntp_client_core.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_NTP_CLIENT_CORE_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client/ntp_packet.hpp b/include/time_shield/ntp_client/ntp_packet.hpp
deleted file mode 100644
index 48f5b9c9..00000000
--- a/include/time_shield/ntp_client/ntp_packet.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_NTP_PACKET_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_NTP_PACKET_HPP_INCLUDED
-
-#include <time_shield/ntp/detail/ntp_packet.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_NTP_PACKET_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client/udp_transport.hpp b/include/time_shield/ntp_client/udp_transport.hpp
deleted file mode 100644
index 7bf22918..00000000
--- a/include/time_shield/ntp_client/udp_transport.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_HPP_INCLUDED
-
-#include <time_shield/ntp/detail/udp_transport.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client/udp_transport_posix.hpp b/include/time_shield/ntp_client/udp_transport_posix.hpp
deleted file mode 100644
index 39855bee..00000000
--- a/include/time_shield/ntp_client/udp_transport_posix.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_POSIX_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_POSIX_HPP_INCLUDED
-
-#include <time_shield/ntp/detail/udp_transport_posix.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_POSIX_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client/udp_transport_win.hpp b/include/time_shield/ntp_client/udp_transport_win.hpp
deleted file mode 100644
index 68739995..00000000
--- a/include/time_shield/ntp_client/udp_transport_win.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_WIN_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_WIN_HPP_INCLUDED
-
-#include <time_shield/ntp/detail/udp_transport_win.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_UDP_TRANSPORT_WIN_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client/wsa_guard.hpp b/include/time_shield/ntp_client/wsa_guard.hpp
deleted file mode 100644
index 1d16dd2c..00000000
--- a/include/time_shield/ntp_client/wsa_guard.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_WSA_GUARD_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_WSA_GUARD_HPP_INCLUDED
-
-#include <time_shield/ntp/detail/wsa_guard.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_WSA_GUARD_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client_pool.hpp b/include/time_shield/ntp_client_pool.hpp
deleted file mode 100644
index adfcb64d..00000000
--- a/include/time_shield/ntp_client_pool.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_POOL_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_POOL_HPP_INCLUDED
-
-#include <time_shield/ntp/ntp_client_pool.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_POOL_HPP_INCLUDED
diff --git a/include/time_shield/ntp_client_pool_runner.hpp b/include/time_shield/ntp_client_pool_runner.hpp
deleted file mode 100644
index 9546b0db..00000000
--- a/include/time_shield/ntp_client_pool_runner.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_CLIENT_POOL_RUNNER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_CLIENT_POOL_RUNNER_HPP_INCLUDED
-
-#include <time_shield/ntp/ntp_client_pool_runner.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_CLIENT_POOL_RUNNER_HPP_INCLUDED
diff --git a/include/time_shield/ntp_time_service.hpp b/include/time_shield/ntp_time_service.hpp
deleted file mode 100644
index 6bc02ede..00000000
--- a/include/time_shield/ntp_time_service.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_NTP_TIME_SERVICE_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_NTP_TIME_SERVICE_HPP_INCLUDED
-
-#include <time_shield/ntp/ntp_time_service.hpp>
-
-#endif // TIME_SHIELD_HEADER_NTP_TIME_SERVICE_HPP_INCLUDED
diff --git a/include/time_shield/ole_automation_conversions.hpp b/include/time_shield/ole_automation_conversions.hpp
deleted file mode 100644
index 78ff4338..00000000
--- a/include/time_shield/ole_automation_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_OLE_AUTOMATION_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_OLE_AUTOMATION_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/ole_automation_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_OLE_AUTOMATION_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/text/time_formatting.hpp b/include/time_shield/text/time_formatting.hpp
index 196cc40d..72bd867e 100644
--- a/include/time_shield/text/time_formatting.hpp
+++ b/include/time_shield/text/time_formatting.hpp
@@ -467,7 +467,9 @@ namespace time_shield {
     }
 
     /// \brief Alias for to_string function.
-    /// \copydoc to_string
+    /// \param format_str Format string with custom parameters.
+    /// \param timestamp Timestamp in seconds.
+    /// \param utc_offset UTC offset in seconds.
     template<class T = ts_t>
     inline const std::string to_str(
             const std::string& format_str,
@@ -551,7 +553,9 @@ namespace time_shield {
     }
 
     /// \brief Alias for to_string function.
-    /// \copydoc to_string
+    /// \param format_str Format string with custom parameters.
+    /// \param timestamp Timestamp in milliseconds.
+    /// \param utc_offset UTC offset in seconds.
     template<class T = ts_t>
     inline const std::string to_str_ms(
             const std::string& format_str,
diff --git a/include/time_shield/time_conversion_aliases.hpp b/include/time_shield/time_conversion_aliases.hpp
deleted file mode 100644
index 826fa1a8..00000000
--- a/include/time_shield/time_conversion_aliases.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_CONVERSION_ALIASES_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_CONVERSION_ALIASES_HPP_INCLUDED
-
-#include <time_shield/conversions/time_conversion_aliases.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_CONVERSION_ALIASES_HPP_INCLUDED
diff --git a/include/time_shield/time_conversions.hpp b/include/time_shield/time_conversions.hpp
deleted file mode 100644
index 0c7b2d6b..00000000
--- a/include/time_shield/time_conversions.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions.hpp>
-#include <time_shield/astronomy.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/time_format_parser.hpp b/include/time_shield/time_format_parser.hpp
deleted file mode 100644
index c0746811..00000000
--- a/include/time_shield/time_format_parser.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_FORMAT_PARSER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_FORMAT_PARSER_HPP_INCLUDED
-
-#include <time_shield/text/time_format_parser.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_FORMAT_PARSER_HPP_INCLUDED
diff --git a/include/time_shield/time_formatting.hpp b/include/time_shield/time_formatting.hpp
deleted file mode 100644
index 8a787716..00000000
--- a/include/time_shield/time_formatting.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_FORMATTING_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_FORMATTING_HPP_INCLUDED
-
-#include <time_shield/text/time_formatting.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_FORMATTING_HPP_INCLUDED
diff --git a/include/time_shield/time_parser.hpp b/include/time_shield/time_parser.hpp
deleted file mode 100644
index 33e671e6..00000000
--- a/include/time_shield/time_parser.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_PARSER_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_PARSER_HPP_INCLUDED
-
-#include <time_shield/text/time_parser.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_PARSER_HPP_INCLUDED
diff --git a/include/time_shield/time_struct.hpp b/include/time_shield/time_struct.hpp
deleted file mode 100644
index d58525aa..00000000
--- a/include/time_shield/time_struct.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_STRUCT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_STRUCT_HPP_INCLUDED
-
-#include <time_shield/core/time_struct.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_STRUCT_HPP_INCLUDED
diff --git a/include/time_shield/time_unit_conversions.hpp b/include/time_shield/time_unit_conversions.hpp
deleted file mode 100644
index 7d16c215..00000000
--- a/include/time_shield/time_unit_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_UNIT_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_UNIT_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/time_unit_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_UNIT_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/time_utils.hpp b/include/time_shield/time_utils.hpp
deleted file mode 100644
index 7c3e2c6c..00000000
--- a/include/time_shield/time_utils.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_UTILS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_UTILS_HPP_INCLUDED
-
-#include <time_shield/core/time_utils.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_UTILS_HPP_INCLUDED
diff --git a/include/time_shield/time_zone_conversions.hpp b/include/time_shield/time_zone_conversions.hpp
deleted file mode 100644
index 9694da8a..00000000
--- a/include/time_shield/time_zone_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_ZONE_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_ZONE_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/timezone/time_zone_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_ZONE_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/time_zone_offset.hpp b/include/time_shield/time_zone_offset.hpp
deleted file mode 100644
index db627c38..00000000
--- a/include/time_shield/time_zone_offset.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_ZONE_OFFSET_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_ZONE_OFFSET_HPP_INCLUDED
-
-#include <time_shield/conversions/time_zone_offset.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_ZONE_OFFSET_HPP_INCLUDED
diff --git a/include/time_shield/time_zone_offset_conversions.hpp b/include/time_shield/time_zone_offset_conversions.hpp
deleted file mode 100644
index d067c9e8..00000000
--- a/include/time_shield/time_zone_offset_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_ZONE_OFFSET_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_ZONE_OFFSET_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/time_zone_offset_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_ZONE_OFFSET_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/time_zone_struct.hpp b/include/time_shield/time_zone_struct.hpp
deleted file mode 100644
index 8ec47967..00000000
--- a/include/time_shield/time_zone_struct.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TIME_ZONE_STRUCT_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TIME_ZONE_STRUCT_HPP_INCLUDED
-
-#include <time_shield/core/time_zone_struct.hpp>
-
-#endif // TIME_SHIELD_HEADER_TIME_ZONE_STRUCT_HPP_INCLUDED
diff --git a/include/time_shield/types.hpp b/include/time_shield/types.hpp
deleted file mode 100644
index eb2f4631..00000000
--- a/include/time_shield/types.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_TYPES_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_TYPES_HPP_INCLUDED
-
-#include <time_shield/core/types.hpp>
-
-#endif // TIME_SHIELD_HEADER_TYPES_HPP_INCLUDED
diff --git a/include/time_shield/unix_time_conversions.hpp b/include/time_shield/unix_time_conversions.hpp
deleted file mode 100644
index a0aa8158..00000000
--- a/include/time_shield/unix_time_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_UNIX_TIME_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_UNIX_TIME_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/unix_time_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_UNIX_TIME_CONVERSIONS_HPP_INCLUDED
diff --git a/include/time_shield/validation.hpp b/include/time_shield/validation.hpp
deleted file mode 100644
index f4c18988..00000000
--- a/include/time_shield/validation.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_VALIDATION_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_VALIDATION_HPP_INCLUDED
-
-#include <time_shield/core/validation.hpp>
-
-#endif // TIME_SHIELD_HEADER_VALIDATION_HPP_INCLUDED
diff --git a/include/time_shield/workday_conversions.hpp b/include/time_shield/workday_conversions.hpp
deleted file mode 100644
index 32c01b41..00000000
--- a/include/time_shield/workday_conversions.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: MIT
-#pragma once
-#ifndef TIME_SHIELD_HEADER_WORKDAY_CONVERSIONS_HPP_INCLUDED
-#define TIME_SHIELD_HEADER_WORKDAY_CONVERSIONS_HPP_INCLUDED
-
-#include <time_shield/conversions/workday_conversions.hpp>
-
-#endif // TIME_SHIELD_HEADER_WORKDAY_CONVERSIONS_HPP_INCLUDED
diff --git a/tests/docs_smoke/playwright.config.mjs b/tests/docs_smoke/playwright.config.mjs
new file mode 100644
index 00000000..cc76af46
--- /dev/null
+++ b/tests/docs_smoke/playwright.config.mjs
@@ -0,0 +1,17 @@
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+    testDir: '.',
+    timeout: 30000,
+    use: {
+        baseURL: 'http://127.0.0.1:4173',
+        browserName: 'chromium'
+    },
+    webServer: {
+        command: 'python3 -m http.server 4173 --directory docs/html',
+        cwd: '../..',
+        url: 'http://127.0.0.1:4173/index.html',
+        reuseExistingServer: false,
+        timeout: 30000
+    }
+});
diff --git a/tests/docs_smoke/site.spec.mjs b/tests/docs_smoke/site.spec.mjs
new file mode 100644
index 00000000..b15f2f55
--- /dev/null
+++ b/tests/docs_smoke/site.spec.mjs
@@ -0,0 +1,63 @@
+import { expect, test } from '@playwright/test';
+
+function assertHorizontallyInside(inner, outer) {
+    expect(inner.x).toBeGreaterThanOrEqual(outer.x);
+    expect(inner.x + inner.width).toBeLessThanOrEqual(outer.x + outer.width);
+}
+
+function assertNoOverlap(first, second) {
+    const overlaps = first.x < second.x + second.width
+        && first.x + first.width > second.x
+        && first.y < second.y + second.height
+        && first.y + first.height > second.y;
+    expect(overlaps).toBe(false);
+}
+
+async function loadDocumentation(page, width, height) {
+    await page.setViewportSize({ width, height });
+    await page.goto('/index.html', { waitUntil: 'networkidle' });
+    await page.locator('#MSearchBox').waitFor({ state: 'visible' });
+    await page.waitForFunction(() => {
+        const toggles = document.querySelectorAll('doxygen-awesome-dark-mode-toggle');
+        return toggles.length === 1
+            && document.querySelector('#time-shield-theme-toggle > doxygen-awesome-dark-mode-toggle');
+    });
+    await page.waitForTimeout(200);
+}
+
+test('desktop search layout stays within the sidebar and viewport', async ({ page }) => {
+    await loadDocumentation(page, 1440, 900);
+
+    const search = await page.locator('#MSearchBox').boundingBox();
+    const sidebar = await page.locator('#side-nav').boundingBox();
+    const toggle = await page.locator('doxygen-awesome-dark-mode-toggle').boundingBox();
+    expect(search).not.toBeNull();
+    expect(sidebar).not.toBeNull();
+    expect(toggle).not.toBeNull();
+    assertHorizontallyInside(search, sidebar);
+    assertHorizontallyInside(toggle, sidebar);
+    expect(search.x).toBeGreaterThanOrEqual(0);
+    expect(search.y).toBeGreaterThanOrEqual(0);
+    expect(search.x + search.width).toBeLessThanOrEqual(1440);
+    expect(search.y + search.height).toBeLessThanOrEqual(900);
+    assertNoOverlap(search, toggle);
+    expect(toggle.y).toBeLessThanOrEqual(search.y);
+});
+
+test('mobile search layout has no overflow or toggle overlap', async ({ page }) => {
+    await loadDocumentation(page, 390, 844);
+
+    const search = await page.locator('#MSearchBox').boundingBox();
+    const toggle = await page.locator('doxygen-awesome-dark-mode-toggle').boundingBox();
+    expect(search).not.toBeNull();
+    expect(toggle).not.toBeNull();
+    expect(search.x).toBeGreaterThanOrEqual(0);
+    expect(search.y).toBeGreaterThanOrEqual(0);
+    expect(search.x + search.width).toBeLessThanOrEqual(390);
+    expect(search.y + search.height).toBeLessThanOrEqual(844);
+    assertNoOverlap(search, toggle);
+    expect(toggle.y).toBeLessThanOrEqual(search.y);
+    expect(await page.locator('#time-shield-theme-toggle > doxygen-awesome-dark-mode-toggle').count()).toBe(1);
+    expect(await page.evaluate(() => document.documentElement.scrollWidth))
+        .toBeLessThanOrEqual(390);
+});
diff --git a/tests/include_compatibility_test.cpp b/tests/include_compatibility_test.cpp
deleted file mode 100644
index 6aad3131..00000000
--- a/tests/include_compatibility_test.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#define TIME_SHIELD_ENABLE_LEGACY_ALIASES
-
-#include <time_shield/config.hpp>
-#include <time_shield/types.hpp>
-#include <time_shield/constants.hpp>
-#include <time_shield/enums.hpp>
-#include <time_shield/time_struct.hpp>
-#include <time_shield/date_struct.hpp>
-#include <time_shield/date_time_struct.hpp>
-#include <time_shield/iso_week_struct.hpp>
-#include <time_shield/time_zone_struct.hpp>
-#include <time_shield/time_utils.hpp>
-#include <time_shield/validation.hpp>
-#include <time_shield/initialization.hpp>
-#include <time_shield/time_unit_conversions.hpp>
-#include <time_shield/unix_time_conversions.hpp>
-#include <time_shield/date_conversions.hpp>
-#include <time_shield/date_time_conversions.hpp>
-#include <time_shield/iso_week_conversions.hpp>
-#include <time_shield/workday_conversions.hpp>
-#include <time_shield/ole_automation_conversions.hpp>
-#include <time_shield/time_zone_offset.hpp>
-#include <time_shield/time_zone_offset_conversions.hpp>
-#include <time_shield/time_conversion_aliases.hpp>
-#include <time_shield/legacy_aliases.hpp>
-#include <time_shield/time_conversions.hpp>
-#include <time_shield/time_format_parser.hpp>
-#include <time_shield/time_parser.hpp>
-#include <time_shield/time_formatting.hpp>
-#include <time_shield/DateTime.hpp>
-#include <time_shield/time_zone_conversions.hpp>
-#include <time_shield/ZonedClock.hpp>
-#include <time_shield/julian_conversions.hpp>
-#include <time_shield/astronomy_conversions.hpp>
-#include <time_shield/MoonPhase.hpp>
-#include <time_shield/CpuTickTimer.hpp>
-#include <time_shield/DeadlineTimer.hpp>
-#include <time_shield/ElapsedTimer.hpp>
-#include <time_shield/TimerScheduler.hpp>
-#include <time_shield/detail/floor_math.hpp>
-
-#if TIME_SHIELD_ENABLE_NTP_CLIENT
-#   include <time_shield/ntp_client.hpp>
-#   include <time_shield/ntp_client_pool.hpp>
-#   include <time_shield/ntp_client_pool_runner.hpp>
-#   include <time_shield/ntp_time_service.hpp>
-#   include <time_shield/ntp_client/ntp_client_core.hpp>
-#   include <time_shield/ntp_client/ntp_packet.hpp>
-#   include <time_shield/ntp_client/udp_transport.hpp>
-#endif
-
-int main() {
-    return 0;
-}
diff --git a/tests/install_consumer/consumer.cpp b/tests/install_consumer/consumer.cpp
index 1ed16c57..11cf4419 100644
--- a/tests/install_consumer/consumer.cpp
+++ b/tests/install_consumer/consumer.cpp
@@ -1,11 +1,9 @@
 #include <time_shield.hpp>
 #include <time_shield/core.hpp>
 #include <time_shield/core/config.hpp>
-#include <time_shield/config.hpp>
 #if TIME_SHIELD_ENABLE_NTP_CLIENT
 #include <time_shield/ntp.hpp>
 #include <time_shield/ntp/ntp_time_service.hpp>
-#include <time_shield/ntp_time_service.hpp>
 #endif
 
 /// \brief Verify library usage from an installed location.
diff --git a/tests/pkg_config_consumer/CMakeLists.txt b/tests/pkg_config_consumer/CMakeLists.txt
new file mode 100644
index 00000000..e6c4813d
--- /dev/null
+++ b/tests/pkg_config_consumer/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.15)
+project(PkgConfigConsumer LANGUAGES CXX)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(TIME_SHIELD REQUIRED IMPORTED_TARGET time-shield)
+
+add_executable(pkg_config_consumer consumer.cpp)
+target_link_libraries(pkg_config_consumer PRIVATE PkgConfig::TIME_SHIELD)
+
+if(MSVC)
+    target_compile_options(pkg_config_consumer PRIVATE /W4)
+else()
+    target_compile_options(pkg_config_consumer PRIVATE -Wall -Wextra -Wpedantic)
+endif()
diff --git a/tests/pkg_config_consumer/consumer.cpp b/tests/pkg_config_consumer/consumer.cpp
new file mode 100644
index 00000000..6b21d6a4
--- /dev/null
+++ b/tests/pkg_config_consumer/consumer.cpp
@@ -0,0 +1,7 @@
+#include <time_shield.hpp>
+
+int main() {
+    const auto current_ts = time_shield::now();
+    const auto mono_ms = time_shield::monotonic_ms();
+    return (current_ts > 0 && mono_ms >= 0) ? 0 : 1;
+}
diff --git a/tests/vcpkg_consumer/CMakeLists.txt b/tests/vcpkg_consumer/CMakeLists.txt
new file mode 100644
index 00000000..ce9edeb9
--- /dev/null
+++ b/tests/vcpkg_consumer/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.15)
+project(VcpkgConsumer LANGUAGES CXX)
+
+find_package(TimeShield CONFIG REQUIRED)
+
+add_executable(vcpkg_consumer consumer.cpp)
+target_link_libraries(vcpkg_consumer PRIVATE time_shield::time_shield)
diff --git a/tests/vcpkg_consumer/consumer.cpp b/tests/vcpkg_consumer/consumer.cpp
new file mode 100644
index 00000000..50399967
--- /dev/null
+++ b/tests/vcpkg_consumer/consumer.cpp
@@ -0,0 +1,5 @@
+#include <time_shield.hpp>
+
+int main() {
+    return time_shield::now() > 0 ? 0 : 1;
+}
diff --git a/vcpkg-overlay/ports/time-shield-cpp/portfile.cmake b/vcpkg-overlay/ports/time-shield-cpp/portfile.cmake
index 1d1ecaca..31f02d9d 100644
--- a/vcpkg-overlay/ports/time-shield-cpp/portfile.cmake
+++ b/vcpkg-overlay/ports/time-shield-cpp/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO NewYaroslav/time-shield-cpp
-    REF v1.0.5
-    SHA512 6eacc2a238c11d1212dd87bfbf9e99ad66ebd17a0de7828d7d244b571afedde846f3f9b6ec92f1f84fcc95cb1a63eefe0e193db38643fb8507e7db71240546b8
-    HEAD_REF stable
+    REPO LimiNode/time-shield-cpp
+    REF 231bb8f484774015dbd1219785ac85806e3b1d8a
+    SHA512 4c2f0aac6bd695cf6f648fc20a2e921705427260ac64562e075dd277c01df8f820f3c01505c1c054aec096133dbf85a7eddf4e49e4ca8c5fa5999ce2606c0a45
+    HEAD_REF main
 )
 
 vcpkg_cmake_configure(
@@ -15,6 +15,11 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig"
+)
+
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME TimeShield
     CONFIG_PATH lib/cmake/TimeShield
diff --git a/vcpkg-overlay/ports/time-shield-cpp/vcpkg.json b/vcpkg-overlay/ports/time-shield-cpp/vcpkg.json
index b0b7d19a..e1a0848c 100644
--- a/vcpkg-overlay/ports/time-shield-cpp/vcpkg.json
+++ b/vcpkg-overlay/ports/time-shield-cpp/vcpkg.json
@@ -1,11 +1,17 @@
 {
   "name": "time-shield-cpp",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "description": "Header-only C++ library for time conversions, formatting, and utilities.",
-  "homepage": "https://github.com/NewYaroslav/time-shield-cpp",
+  "homepage": "https://github.com/LimiNode/time-shield-cpp",
   "license": "MIT",
   "dependencies": [
-    "vcpkg-cmake",
-    "vcpkg-cmake-config"
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
