diff --git a/.gitattributes b/.gitattributes
index 53f8a7c0..06f3513c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,18 +1,16 @@
-/.github                        export-ignore
-/etc                            export-ignore
-/docs                           export-ignore
-/.editorconfig                  export-ignore
-/.gitattributes                 export-ignore
-/.gitignore                     export-ignore
-/README.md                      export-ignore
-/behat.yml.dist                 export-ignore
-/composer-require-checker.json  export-ignore
-/docs                           export-ignore
-/ecs.php                        export-ignore
-/node_modules                   export-ignore
-/phpunit.xml.dist               export-ignore
-/psalm-baseline.xml             export-ignore
-/psalm.xml                      export-ignore
-/tests                          export-ignore
-/CHANGELOG.md                   export-ignore
-/UPGRADE.md                     export-ignore
+/.github                            export-ignore
+/docs                               export-ignore
+/tests                              export-ignore
+/node_modules                       export-ignore
+/.editorconfig                      export-ignore
+/.gitattributes                     export-ignore
+/.gitignore                         export-ignore
+/CHANGELOG.md                       export-ignore
+/CLAUDE.md                          export-ignore
+/README.md                          export-ignore
+/UPGRADE.md                         export-ignore
+/composer-dependency-analyser.php   export-ignore
+/ecs.php                            export-ignore
+/phpstan.neon                       export-ignore
+/phpunit.xml.dist                   export-ignore
+/rector.php                         export-ignore
diff --git a/.github/workflows/backwards-compatibility-check.yaml b/.github/workflows/backwards-compatibility-check.yaml
deleted file mode 100644
index 806dd6a9..00000000
--- a/.github/workflows/backwards-compatibility-check.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# See https://github.com/Roave/BackwardCompatibilityCheck
-
-name: "Backwards Compatibility Check"
-
-on:
-    pull_request: ~
-
-jobs:
-    backwards-compatibility-check:
-        name: "Backwards Compatibility Check"
-
-        runs-on: "ubuntu-latest"
-
-        steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-                with:
-                    fetch-depth: 0
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
-                with:
-                    php-version: "8.1"
-                    coverage: "none"
-
-            -   name: "Install tool"
-                run: "composer global require roave/backward-compatibility-check"
-
-            -   name: "Check for BC breaks"
-                run: "~/.composer/vendor/bin/roave-backward-compatibility-check --from=origin/${{ github.event.pull_request.base.ref }} --format=github-actions"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 13668636..42ec099d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,344 +1,74 @@
 name: "build"
+
 on:
-    push:
-        branches:
-            - "1.x"
-        paths-ignore:
-            - "**/*.md"
-    pull_request:
-        paths-ignore:
-            - "**/*.md"
+    push: ~
+    pull_request: ~
     workflow_dispatch: ~
 
-env:
-    APP_ENV: "test"
-    DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=8.0"
-    PHP_EXTENSIONS: "intl, mbstring"
-
 jobs:
     coding-standards:
-        name: "Coding Standards (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }})"
-
         runs-on: "ubuntu-latest"
-
-        strategy:
-            matrix:
-                php-version:
-                    - "8.1" # Always use the lowest version of PHP since a higher version could create actual syntax errors in lower versions
-
-                dependencies:
-                    - "highest"
-
         steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
-                with:
-                    php-version: "${{ matrix.php-version }}"
-                    extensions: "${{ env.PHP_EXTENSIONS }}"
-                    coverage: "none"
-
-            -   name: "Install composer dependencies"
-                uses: "ramsey/composer-install@v3"
-                with:
-                    dependency-versions: "${{ matrix.dependencies }}"
-
-            -   name: "Validate composer"
-                run: "composer validate --strict"
-
-            -   name: "Check composer normalized"
-                run: "composer normalize --dry-run"
-
-            -   name: "Check style"
-                run: "composer check-style"
-
-            -   name: "Rector"
-                run: "vendor/bin/rector process --dry-run"
-                continue-on-error: true
-
-            -   name: "Lint yaml files"
-                run: "(cd tests/Application && bin/console lint:yaml ../../src/Resources)"
-
-            -   name: "Lint twig files"
-                run: "(cd tests/Application && bin/console lint:twig ../../src/Resources)"
+            -   uses: "setono/sylius-plugin/coding-standards@v2"
 
     dependency-analysis:
-        name: "Dependency Analysis (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }} | SF${{ matrix.symfony }})"
-
         runs-on: "ubuntu-latest"
-
         strategy:
+            fail-fast: false
             matrix:
-                php-version:
-                    - "8.1"
-                    - "8.2"
-
-                dependencies:
-                    - "highest"
-                
-                symfony:
-                    - "~5.4.0"
-                    - "~6.4.0"
-
+                php-version: ["8.2", "8.3", "8.4"]
+                dependencies: ["lowest", "highest"]
+                symfony: ["~6.4.0", "~7.4.0"]
         steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
+            -   uses: "setono/sylius-plugin/dependency-analysis@v2"
                 with:
-                    coverage: "none"
-                    extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
-                    tools: "composer-require-checker, composer-unused, flex"
-
-            -   name: "Remove require-dev section in composer.json"
-                run: "composer config --unset require-dev"
-            
-            -   name: "Install composer dependencies"
-                uses: "ramsey/composer-install@v3"
-                env:
-                    SYMFONY_REQUIRE: "${{ matrix.symfony }}"
-                with:
-                    dependency-versions: "${{ matrix.dependencies }}"
-
-            -   name: "Run maglnet/composer-require-checker"
-                run: "composer-require-checker check"
+                    dependencies: "${{ matrix.dependencies }}"
+                    symfony: "${{ matrix.symfony }}"
 
-            -   name: "Run composer-unused/composer-unused"
-                run: "composer-unused"
-    
     static-code-analysis:
-        name: "Static Code Analysis (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }} | SF${{ matrix.symfony }})"
-
         runs-on: "ubuntu-latest"
-
         strategy:
+            fail-fast: false
             matrix:
-                php-version:
-                    - "8.1"
-                    - "8.2"
-
-                dependencies:
-                    - "lowest"
-                    - "highest"
-
-                symfony:
-                    - "~5.4.0"
-                    - "~6.4.0"
-
+                php-version: ["8.2", "8.3", "8.4"]
+                dependencies: ["lowest", "highest"]
+                symfony: ["~6.4.0", "~7.4.0"]
         steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
+            -   uses: "setono/sylius-plugin/static-code-analysis@v2"
                 with:
-                    coverage: "none"
-                    extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
-                    tools: "flex"
-
-            -   name: "Remove sylius/sylius from composer.json"
-                run: "composer remove --dev --no-update --no-plugins --no-scripts sylius/sylius"
-            
-            -   name: "Install composer dependencies"
-                uses: "ramsey/composer-install@v3"
-                env:
-                    SYMFONY_REQUIRE: "${{ matrix.symfony }}"
-                with:
-                    dependency-versions: "${{ matrix.dependencies }}"
-
-            -   name: "Static analysis"
-                run: "vendor/bin/psalm --php-version=${{ matrix.php-version }}"
+                    dependencies: "${{ matrix.dependencies }}"
+                    symfony: "${{ matrix.symfony }}"
 
     unit-tests:
-        name: "Unit tests (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }} | SF${{ matrix.symfony }})"
-
         runs-on: "ubuntu-latest"
-
         strategy:
+            fail-fast: false
             matrix:
-                php-version:
-                    - "8.1"
-                    - "8.2"
-                
-                dependencies:
-                    - "highest"
-
-                symfony:
-                    - "~5.4.0"
-                    - "~6.4.0"
-
+                php-version: ["8.2", "8.3", "8.4"]
+                dependencies: ["lowest", "highest"]
+                symfony: ["~6.4.0", "~7.4.0"]
         steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
+            -   uses: "setono/sylius-plugin/unit-tests@v2"
                 with:
-                    coverage: "none"
-                    extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
-                    tools: "flex"
-
-            -   name: "Install composer dependencies"
-                uses: "ramsey/composer-install@v3"
-                env:
-                    SYMFONY_REQUIRE: "${{ matrix.symfony }}"
-                with:
-                    dependency-versions: "${{ matrix.dependencies }}"
-
-            -   name: "Run phpunit"
-                run: "composer phpunit"
-                
-            -   name: "Run phpspec"
-                run: "composer phpspec"
-
-    integration-tests:
-        name: "Integration tests (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }} | SF${{ matrix.symfony }})"
+                    dependencies: "${{ matrix.dependencies }}"
+                    symfony: "${{ matrix.symfony }}"
+                    testsuite: "unit"
 
+    functional-tests:
         runs-on: "ubuntu-latest"
-
         strategy:
+            fail-fast: false
             matrix:
-                php-version:
-                    - "8.1"
-                    - "8.2"
-
-                dependencies:
-                    - "highest"
-                
-                symfony:
-                    - "~5.4.0"
-                    - "~6.4.0"
-
+                php-version: ["8.2", "8.3", "8.4"]
+                dependencies: ["highest"]
+                symfony: ["~6.4.0", "~7.4.0"]
         steps:
-            -   name: "Start MySQL"
-                run: "sudo /etc/init.d/mysql start"
-
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
+            -   uses: "setono/sylius-plugin/functional-tests@v2"
                 with:
-                    coverage: "none"
-                    extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
-                    tools: "flex,symfony"
-
-            -   name: "Install composer dependencies"
-                uses: "ramsey/composer-install@v3"
-                env:
-                    SYMFONY_REQUIRE: "${{ matrix.symfony }}"
-                with:
-                    dependency-versions: "${{ matrix.dependencies }}"
-
-            -   name: "Lint container"
-                run: "(cd tests/Application && bin/console lint:container)"
-
-            -   name: "Create database"
-                run: "(cd tests/Application && bin/console doctrine:database:create)"
-
-            -   name: "Create database schema"
-                run: "(cd tests/Application && bin/console doctrine:schema:create)"
-
-            -   name: "Validate Doctrine mapping"
-                run: "(cd tests/Application && bin/console doctrine:schema:validate -vvv)" # The verbose flag will show 'missing' SQL statements, if any
-
-            -   name: "Get Yarn cache directory"
-                id: "yarn-cache"
-                run: "echo \"::set-output name=dir::$(yarn cache dir)\""
-
-            -   name: "Cache Yarn"
-                uses: "actions/cache@v2"
-                with:
-                    path: "${{ steps.yarn-cache.outputs.dir }}"
-                    key: "yarn-${{ hashFiles('**/package.json **/yarn.lock') }}"
-                    restore-keys: "yarn-"
-
-            -   name: "Install JS dependencies"
-                run: "(cd tests/Application && yarn install)"
-
-            -   name: "Install assets"
-                run: "(cd tests/Application && bin/console assets:install public -vvv)"
-
-            -   name: "Build assets"
-                run: "(cd tests/Application && yarn build)"
-
-            -   name: "Output PHP version for Symfony CLI"
-                run: "php -v | head -n 1 | awk '{ print $2 }' > .php-version"
-
-            -   name: "Install certificates"
-                run: "symfony server:ca:install"
-
-            -   name: "Run Chrome Headless"
-                run: "google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &"
-
-            -   name: "Wait for Chrome to start"
-                run: |
-                    until curl -s http://127.0.0.1:9222/json/version | grep "Browser" > /dev/null 2>&1
-                    do
-                        sleep 1
-                    done
-
-            -   name: "Run webserver"
-                run: "(cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)"
-
-            -   name: "Wait for webserver to start"
-                run: |
-                    until symfony server:list | grep /public > /dev/null 2>&1
-                    do
-                        sleep 1
-                    done
-
-            -   name: "Run behat"
-                run: "vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun"
-
-            -   name: "Upload Behat logs"
-                uses: "actions/upload-artifact@v4"
-                if: "failure()"
-                with:
-                    name: "Behat logs"
-                    path: "etc/build/"
-                    if-no-files-found: "ignore"
-    
-    code-coverage:
-        name: "Code Coverage (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }})"
-
-        runs-on: "ubuntu-latest"
-
-        strategy:
-            matrix:
-                php-version:
-                    - "8.2"
-
-                dependencies:
-                    - "highest"
-
-        steps:
-            -   name: "Checkout"
-                uses: "actions/checkout@v4"
-
-            -   name: "Setup PHP, with composer and extensions"
-                uses: "shivammathur/setup-php@v2"
-                with:
-                    coverage: "pcov"
-                    extensions: "${{ env.PHP_EXTENSIONS }}"
-                    php-version: "${{ matrix.php-version }}"
-
-            -   name: "Install composer dependencies"
-                uses: "ramsey/composer-install@v3"
-                with:
-                    dependency-versions: "${{ matrix.dependencies }}"
-
-            -   name: "Collect code coverage with pcov and phpunit/phpunit"
-                run: "vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml"
-
-            -   name: "Send code coverage report to Codecov.io"
-                uses: "codecov/codecov-action@v4"
-                with:
-                    token: "${{ secrets.CODECOV_TOKEN }}"
+                    dependencies: "${{ matrix.dependencies }}"
+                    symfony: "${{ matrix.symfony }}"
+                    testsuite: "functional"
diff --git a/.gitignore b/.gitignore
index 2efe830e..757fe535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,15 +3,15 @@
 /node_modules/
 /composer.lock
 
-/etc/build/*
-!/etc/build/.gitignore
-
 /tests/Application/yarn.lock
 
-/behat.yml
-/phpspec.yml
 /.phpunit.result.cache
+/.phpunit.cache/
 
 # Symfony CLI https://symfony.com/doc/current/setup/symfony_server.html#different-php-settings-per-project
 /.php-version
 /php.ini
+
+# Claude Code local config
+/.claude/
+/.mcp.json
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000..7b6b9ed2
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,93 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## What this is
+
+A Sylius plugin (`setono/sylius-pickup-point-plugin`, type `sylius-plugin`) that adds a pickup-point chooser to the shipping checkout step: once the page has rendered, a small framework-free script loads the points asynchronously and renders them as radio buttons (no `<select>`, no Stimulus). Supports DAO, GLS, PostNord, and a `faker` provider for dev. Each third-party provider lives behind an optional `setono/*-bundle` dependency and is only enabled when both configured and (by default) when its bundle class is present — see `src/DependencyInjection/Configuration.php`.
+
+The plugin code is in `src/`; `tests/Application/` is a full Sylius Symfony app used by phpunit, behat and the integration suite (its `bin/console` is the way to run Symfony commands against this plugin).
+
+## Commands
+
+> **PHP version — use the versioned binary directly, never switch the global default.**
+> This repo's `vendor/` is locked to PHP `>= 8.4` (composer.lock was resolved on 8.4),
+> so the shell default — which is often an older version like 8.1 — fails Composer's
+> platform check. Do **not** run the `8.1`/`8.2`/`8.3`/`8.4` switcher aliases from
+> `~/.zshrc`: they `brew unlink`/`brew link --force` and change the *system-wide*
+> default PHP, which can break other work in progress on this machine. Instead invoke
+> the matching binary directly, e.g.
+> `"$(brew --prefix php@8.4)/bin/php" vendor/bin/rector process --dry-run`
+> (or `composer`, `phpunit`, `phpstan`, …). Prefix any tooling that hits the platform
+> check the same way.
+
+All commands run from the repo root unless noted. Composer scripts wrap most things:
+
+- `composer phpunit` — run unit tests (`phpunit.xml.dist`, suite covers `tests/`)
+- `composer phpspec` — run phpspec specs in `spec/`
+- `composer behat` — run Behat (needs the integration setup below; the script forces `-d memory_limit=-1` and progress format)
+- `composer tests` — phpspec + behat
+- `composer analyse` — Psalm
+- `composer check-style` / `composer fix-style` — ECS (Sylius Labs ruleset, see `ecs.php`)
+- `composer checks` — validate, normalize dry-run, check-style, analyse (matches the "Coding Standards" CI job)
+- `composer fixtures` — `cd tests/Application && bin/console sylius:fixtures:load` (honors `SYMFONY_ENV`)
+
+Single-test invocations (use the project-local `vendor/bin`):
+
+- `vendor/bin/phpunit --filter SomeTest` or `vendor/bin/phpunit tests/Path/To/SomeTest.php`
+- `vendor/bin/phpspec run spec/Path/To/SomeSpec.php`
+- `vendor/bin/behat features/shop/some.feature:42`
+- `vendor/bin/rector process --dry-run` (CI runs this `continue-on-error`)
+
+Symfony app inside `tests/Application/`:
+
+- `(cd tests/Application && bin/console <cmd>)` — schema diff/migrate, lint:container, lint:yaml, lint:twig, sylius:install:assets, etc.
+- Yarn assets: `(cd tests/Application && yarn install && yarn build)`. `node_modules` at the repo root is a symlink to `tests/Application/node_modules`.
+
+Behat integration setup (mirrors CI in `.github/workflows/build.yaml`): start MySQL, create DB + schema in `tests/Application/`, install/build yarn assets, run `symfony server:start --port=8080 --dir=public --daemon`, run headless Chrome on `127.0.0.1:9222`. The Behat base URL is `https://127.0.0.1:8080/` (see `behat.yml.dist`).
+
+## Architecture
+
+**Providers are the core abstraction.** `Setono\SyliusPickupPointPlugin\Provider\ProviderInterface` is implemented by one concrete class per carrier (`DAOProvider`, `GlsProvider`, `PostNordProvider`, `FakerProvider`). Each is registered as a service tagged `setono_sylius_pickup_point.provider` — usually via the `#[AsProvider(code, name)]` attribute — and exposes `findPickupPoints(Address)` (the list for an order address) and `findPickupPoint(id, metadata)`.
+
+**Provider registration happens in a compiler pass.** `DependencyInjection/Compiler/RegisterProvidersPass` reads the tagged services, stamps each provider's `code` onto it (`setCode()`), registers it into the `setono_sylius_pickup_point.registry.provider` (`ProviderRegistry`, a Sylius `ServiceRegistry`), exposes the code→name map as the `setono_sylius_pickup_point.providers` parameter, and rejects duplicate codes (`NonUniqueProviderCodeException`). There are **no provider decorators**: the 1.x `CachedProvider`/`LocalProvider` and the messenger-driven local DB snapshot (`LoadPickupPoints*`, `PickupPointRepository`) were removed in 2.0 (see `UPGRADE.md`) — providers are now called live.
+
+When adding/changing a provider, the work happens in three places: the `Provider/` class, a service definition in `config/services/providers/`, and (usually) a corresponding `setono/*-bundle` `class_exists` check in `Configuration.php`.
+
+**Checkout pickup-point selection (async, no framework).** This is the heart of the shop UX and it deliberately makes **zero provider calls while the shipping page renders**, so a slow or down carrier can never stall checkout:
+
+- `Form/Extension/ShipmentTypeExtension` adds a hidden `pickupPoint` field (`Form/Type/PickupPointType`, a `HiddenType` + `Form/DataTransformer/PickupPointTransformer`). `Form/Extension/ShippingMethodChoiceTypeExtension` stamps `data-pickup-point-provider` onto each pickup-capable shipping-method radio.
+- After the page is on screen, the framework-free `public/js/setono-pickup-point.js` (wired via the `_javascripts` twig hook on `sylius_shop.base#javascripts`) fetches `GET /pickup-points` (`Controller/Action/PickupPointsAction`) **once**. That endpoint returns each pickup-capable method's points for the current cart, keyed by method code, with a per-provider `try/catch` so one failing carrier doesn't take the others down. The script builds the radio list, toggles the visible group as the shipping method changes, and shows loading/empty/error states. It (re-)initialises on both `DOMContentLoaded` and `turbo:load` because Sylius' shop navigates with Turbo (checkout steps are AJAX body swaps).
+- Each radio's value is a `value` token — the whole `DTO/PickupPoint` base64url-encoded by `Encoder/PickupPointEncoder`. Selecting a radio writes the token into the hidden field; on submit `PickupPointTransformer` decodes it straight back into the `PickupPoint` (no provider call, no re-resolve, no faker drift) and `Model/PickupPointAwareTrait::setPickupPoint()` persists it to the `pickup_point` JSON column. `Validator/Constraints/HasPickupPointSelected` enforces that a pickup-capable method actually got a point.
+
+**Identity lives on the DTO.** `DTO/PickupPoint` is a plain final class with public properties (`provider`, `id`, `country`, `name`, …, plus an open `metadata` map) and `fromArray()`/`jsonSerialize()` — not a Doctrine resource. The 1.x `Model/PickupPoint*` resources and the `PickupPointCode` (`provider---id---country`) value object were removed in 2.0.
+
+**Resource extension model (Sylius pattern).** Consumers extend `Sylius\Component\Core\Model\Shipment` with `PickupPointAwareTrait` (and implement `ShipmentInterface`) and `ShippingMethod` with `PickupPointProviderAwareTrait` (both `#[ORM\Column]` attribute mappings). The plugin owns no Doctrine resource of its own anymore.
+
+## Working agreements
+
+- **Don't commit unless I say so.** Stage and run local checks freely, but
+  wait for an explicit instruction before running `git commit` (and before
+  `git push`).
+- **Verify UI changes with Playwright.** After any change that affects the
+  rendered admin/shop UI — twig hooks, form rendering, the shop JS, the
+  AJAX endpoints, checkout flow — drive the test app in a browser via the
+  `mcp__playwright__browser_*` tools (`browser_navigate`, `browser_snapshot`,
+  `browser_console_messages`, `browser_network_requests`, etc.) before
+  reporting the task done. Type checking and unit tests verify code
+  correctness, not feature correctness; the UI flow is the only check
+  that catches twig-hook misconfiguration, broken JSON shape, or missing
+  asset wiring.
+- **Always translate new message keys into every supported locale.** When you
+  add a key under `translations/` (`messages.*.yml`, `validators.*.yml`),
+  provide it in all of these locales, not just `en`/`da`:
+  - Nordic: Danish (`da`), Swedish (`sv`), Norwegian (`no`), Finnish (`fi`)
+  - Large EU: German (`de`), French (`fr`), Spanish (`es`), Italian (`it`), Dutch (`nl`), Polish (`pl`)
+  - Other common Sylius locales: Portuguese (`pt`), Czech (`cs`), Hungarian (`hu`), Romanian (`ro`), Ukrainian (`uk`)
+
+## Constraints worth knowing
+
+- PHP `>=8.1`; CI matrix is PHP 8.1/8.2 × Symfony 5.4/6.4 × lowest/highest deps. Don't use 8.3+ syntax. (Coding-standards job pins 8.1 specifically to catch syntax that wouldn't parse on the lower bound.)
+- The `composer checks` job validates `composer.json` *and* runs `composer normalize --dry-run` — after editing `composer.json`, run `composer normalize` locally.
+- Yaml/Twig linting in CI runs through `tests/Application/bin/console lint:yaml ../../src/Resources` and the equivalent `lint:twig` — keep `src/Resources/**` valid against the test kernel.
+- `dependency-analysis` job runs `composer-require-checker` and `composer-unused` on a `require-dev`-stripped composer.json — only declare runtime deps that are actually used in `src/`, and don't leave unused ones.
diff --git a/LICENSE b/LICENSE
index ddee45d0..84b974ae 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Setono
+Copyright (c) 2026 Setono
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 489372e9..ab8dc4a4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Software License][ico-license]](LICENSE)
 [![Build Status][ico-github-actions]][link-github-actions]
 
-Add a `<select>` that contains pickup points to your select shipping checkout step.
+Add a pickup-point chooser to your shipping checkout step.
 
 - [Screenshots](#screenshots)
 - [Installation](#installation)
@@ -15,20 +15,27 @@ Add a `<select>` that contains pickup points to your select shipping checkout st
 - DAO
 - GLS
 - PostNord
-- Fake provider (for development/playing purposes)
+- Fake provider (for development/playing purposes — not enabled in `prod`)
+
+## Compatibility
+
+| Plugin | Sylius        | PHP    | Symfony            |
+|--------|---------------|--------|--------------------|
+| 2.x    | `^2.0`        | `>=8.2`| `^6.4 \|\| ^7.4`   |
+| 1.x    | `^1.0`        | `>=8.1`| `^5.4 \|\| ^6.0`   |
+
+Migrating from 1.x to 2.x: see [UPGRADE.md](UPGRADE.md).
 
 ## Screenshots
 
 ### Shop
 
-This is the shipping method step in the checkout process where you can choose a pickup point.
+This is the shipping method step in the checkout process where you can choose a pickup point. The points
+are loaded asynchronously after the page renders, the nearest one is pre-selected, and the shopper can
+expand the list to pick another.
 
 ![Screenshot showing checkout select shipping step with pickup points available](docs/images/shop-checkout-select-shipping-pickup-point.png)
 
-On the complete order step in checkout you can see the pickup point you have chosen.
-
-![Screenshot showing checkout complete step with pickup point address](docs/images/shop-checkout-complete-shipping-pickup-point.png)
-
 ### Admin
 
 On the order you can see what pickup point the customer has chosen.
@@ -43,15 +50,11 @@ When you edit shipping method you can associate a pickup point provider to that
 
 ### Step 1: Install and enable plugin
 
-Open a command console, enter your project directory and execute the following command to download the latest stable version of this plugin:
-
 ```bash
-$ composer require setono/sylius-pickup-point-plugin
+composer require setono/sylius-pickup-point-plugin
 ```
 
-This command requires you to have Composer installed globally, as explained in the [installation chapter](https://getcomposer.org/doc/00-intro.md) of the Composer documentation.
-
-Add bundle to your `config/bundles.php`:
+Add the bundle to your `config/bundles.php`:
 
 ```php
 <?php
@@ -62,79 +65,23 @@ return [
     Setono\SyliusPickupPointPlugin\SetonoSyliusPickupPointPlugin::class => ['all' => true],
     // ...
 ];
-
 ```
 
-### Step 2: Import routing and configs
+### Step 2: Import routing
 
-#### Import routing
- 
-````yaml
+```yaml
 # config/routes/setono_sylius_pickup_point.yaml
-setono_sylius_pickup_point_plugin:
-    resource: "@SetonoSyliusPickupPointPlugin/Resources/config/routing.yaml"
-````
-
-#### Import application config
-
-````yaml
-# config/packages/setono_sylius_pickup_point.yaml
-imports:
-    - { resource: "@SetonoSyliusPickupPointPlugin/Resources/config/app/config.yaml" }    
-````
-
-#### (Optional) Import fixtures to play in your app
-
-````yaml
-# config/packages/setono_sylius_pickup_point.yaml
-imports:
-    - { resource: "@SetonoSyliusPickupPointPlugin/Resources/config/app/fixtures.yaml" }    
-````
-
-### Step 3: Update templates
-
-Add the following to the admin template `SyliusAdminBundle/ShippingMethod/_form.html.twig`
-
-```twig
-{{ form_row(form.pickupPointProvider) }}
-```
-
-See an example [here](tests/Application/templates/bundles/SyliusAdminBundle/ShippingMethod/_form.html.twig).
-
-Next add the following to the shop template `SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig`
-
-```twig
-{% form_theme form.pickupPointId '@SetonoSyliusPickupPointPlugin/Form/theme.html.twig' %}
-
-{{ form_row(form.pickupPointId) }}
-```
-
-See an example [here](tests/Application/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig).
-
-Next add the following to the shop template `SyliusShopBundle/Common/Order/_shipments.html.twig`
-after shipment method header:
-
-```twig
-{% include "@SetonoSyliusPickupPointPlugin/Shop/Label/Shipment/pickupPoint.html.twig" %}
-```
-
-See an example [here](tests/Application/templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig).
-
-Next add the following to the admin template `SyliusAdminBundle/Order/Show/_shipment.html.twig`
-after shipment header:
-
-```twig
-{% include "@SetonoSyliusPickupPointPlugin/Shop/Label/Shipment/pickupPoint.html.twig" %}
+setono_sylius_pickup_point:
+    resource: "@SetonoSyliusPickupPointPlugin/config/routes.yaml"
 ```
 
-See an example [here](tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/_shipment.html.twig).
+If your store has [localized URLs disabled](https://docs.sylius.com/en/latest/cookbook/shop/disabling-localised-urls.html),
+import `@SetonoSyliusPickupPointPlugin/config/routes_no_locale.yaml` instead.
 
-### Step 4: Customize resources
+### Step 3: Customize resources
 
 **Shipment resource**
 
-If you haven't extended the shipment resource yet, here is what it should look like:
-
 ```php
 <?php
 // src/Entity/Shipment.php
@@ -148,10 +95,8 @@ use Setono\SyliusPickupPointPlugin\Model\PickupPointAwareTrait;
 use Setono\SyliusPickupPointPlugin\Model\ShipmentInterface;
 use Sylius\Component\Core\Model\Shipment as BaseShipment;
 
-/**
- * @ORM\Entity()
- * @ORM\Table(name="sylius_shipment")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shipment')]
 class Shipment extends BaseShipment implements ShipmentInterface
 {
     use PickupPointAwareTrait;
@@ -160,8 +105,6 @@ class Shipment extends BaseShipment implements ShipmentInterface
 
 **Shipping method resource**
 
-If you haven't extended the shipping method resource yet, here is what it should look like:
-
 ```php
 <?php
 // src/Entity/ShippingMethod.php
@@ -175,26 +118,20 @@ use Setono\SyliusPickupPointPlugin\Model\PickupPointProviderAwareTrait;
 use Setono\SyliusPickupPointPlugin\Model\ShippingMethodInterface;
 use Sylius\Component\Core\Model\ShippingMethod as BaseShippingMethod;
 
-/**
- * @ORM\Entity()
- * @ORM\Table(name="sylius_shipping_method")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shipping_method')]
 class ShippingMethod extends BaseShippingMethod implements ShippingMethodInterface
 {
     use PickupPointProviderAwareTrait;
 }
-
 ```
 
-You can read about extending resources [here](https://docs.sylius.com/en/latest/customization/model.html).
+You can read about extending resources [here](https://docs.sylius.com/customization/model).
 
 **Update shipping resources config**
 
-Next you need to tell Sylius that you will use your own extended resources:
-
 ```yaml
 # config/packages/_sylius.yaml
-
 sylius_shipping:
     resources:
         shipment:
@@ -205,130 +142,91 @@ sylius_shipping:
                 model: App\Entity\ShippingMethod
 ```
 
-### Step 5: Configure plugin
+### Step 4: Configure plugin
 
 **Enable desired providers**
 
-Note that:
-- `faker` provider will not work on prod environment
-- `budbee` provider require `setono/budbee-bundle` to be installed
-- `coolrunner` provider require `setono/coolrunner-bundle` to be installed
-- `gls` provider require `setono/gls-webservice-bundle` to be installed
-- `dao` provider require `setono/dao-bundle` to be installed
-- `post_nord` provider require `setono/post-nord-bundle` to be installed
+- `faker` will not work in the production environment
+- Each carrier provider requires its corresponding bundle to be installed:
+  - `dao` → `setono/dao-bundle`
+  - `gls` → `setono/gls-webservice-bundle`
+  - `post_nord` → `setono/post-nord-bundle`
+
+The carrier bundles are listed in this plugin's `suggest` section — install only the ones you need.
 
 ```yaml
 # config/packages/setono_sylius_pickup_point.yaml
 setono_sylius_pickup_point:
     providers:
         faker: true
-        budbee: true
-        coolrunner: true
         gls: true
         post_nord: true
         dao: true
 ```
 
-**If you want to use cache**
-
-Cache disabled by default. To enable it, make next configuration:
-
-```yaml
-# config/packages/setono_sylius_pickup_point.yaml
-framework:
-    cache:
-        pools:
-            setono_sylius_pickup_point.provider_cache_pool:
-                adapter: cache.app
-
-setono_sylius_pickup_point:
-    cache:
-        enabled: true
-        pool: setono_sylius_pickup_point.provider_cache_pool
-```
-
-### Step 6: Update database schema
+### Step 5: Database
 
 ```bash
 bin/console doctrine:migrations:diff
-bin/console doctrine:migrations:migrate 
+bin/console doctrine:migrations:migrate
 ```
 
-### Step 7: Update validation groups
+### Step 6: Validation groups
 
 Add `checkout_select_shipping` to `sylius.form.type.checkout_select_shipping.validation_groups`:
 
 ```yaml
 # config/packages/_sylius.yaml
-
 parameters:
     sylius.form.type.checkout_select_shipping.validation_groups: ['sylius', 'checkout_select_shipping']
 ```
 
-# Step 8: Install assets
+### Step 7: Install assets
 
 ```bash
-bin/console sylius:install:assets  
-bin/console sylius:theme:assets:install
+bin/console assets:install
 ```
 
+The plugin's JavaScript and CSS are auto-included on the shop checkout via Twig
+hooks (`sylius_shop.checkout#javascripts` / `sylius_shop.checkout#stylesheets`).
+
+### Step 8: Admin shipping method form
+
+Add the `pickupPointProvider` field to your admin shipping-method form. With
+Sylius 2.x's Twig hooks the cleanest path is a project-local hook config that
+points at a template containing `{{ form_row(form.pickupPointProvider) }}`,
+attached to `sylius_admin.shipping_method.update.content.form.options` (or a
+form section you already render).
+
 ## Play
 
-To see pickup points list, use next example address at checkout:
+To see the pickup points list, use the following example address at checkout:
 
-  ```
-  Dannebrogsgade 1
-  9000 Aalborg
-  DK
-  ```
+```
+Dannebrogsgade 1
+9000 Aalborg
+DK
+```
 
-  ```
-  Hämeentie 1
-  00350 Helsinki
-  FI
-  ```
+```
+Hämeentie 1
+00350 Helsinki
+FI
+```
 
-  ```
-  Vasterhaninge 1
-  137 94 Stockholm
-  SE
-  ```
+```
+Vasterhaninge 1
+137 94 Stockholm
+SE
+```
 
-Note, that providers have their pickup points only at given countries:
+Providers have pickup points in the following countries:
 
 - **DAO**: DK
 - **PostNord**: DK, SE, FI
 - **GLS**: See https://gls-group.eu/EU/en/depot-parcelshop-search
 
-So, to play with all 3 providers at once - use `DK` address.
-
-## Troubleshooting
-
-* At `/en_US/checkout/select-shipping` step you see `No results found` at `Pickup point id` field.
-  
-  - Check your browser's developer console and make sure JS scripts loaded correctly.
-  Also make sure `setono-pickup-point.js` compiled (read as you not forgot to run `sylius:install:assets`).
-
-  - Make sure content of plugin's `src/Resources/views/_javascripts.html.twig` actually rendered. 
-  If not - probably, you erased `{{ sonata_block_render_event('sylius.shop.layout.javascripts') }}` 
-  from your custom `layout.html.twig`.
-  
-  Also, make sure `{{ sonata_block_render_event('sylius.admin.layout.javascripts') }}` in place at 
-  your admin's `layout.html.twig` if it was customized.
-  
-  - If you're using themes, make sure you executed `sylius:theme:assets:install` after plugin installation.
-
-* `The service "setono_sylius_pickup_point.registry.provider" has a dependency on a non-existent service "setono_post_nord.http_client".`
-
-  You should specify `setono_post_nord.http_client` configuration or define `Buzz\Client\BuzzClientInterface` service to use as default http client.
-  See https://github.com/Setono/PostNordBundle/issues/1
-  
-  You should add [config/packages/buzz.yaml](tests/Application/config/packages/buzz.yaml) and 
-  [config/packages/nyholm_psr7.yaml](tests/Application/config/packages/nyholm_psr7.yaml) configs.
-
-* You're facing `Pickup point cannot be blank.` validation error at `/checkout/address` step at your application
-
-  Make sure you're followed instructions from `Installation step 7`. 
+So, to play with all 3 providers at once — use a `DK` address.
 
 [ico-version]: https://poser.pugx.org/setono/sylius-pickup-point-plugin/v/stable
 [ico-license]: https://poser.pugx.org/setono/sylius-pickup-point-plugin/license
diff --git a/UPGRADE.md b/UPGRADE.md
new file mode 100644
index 00000000..04c293eb
--- /dev/null
+++ b/UPGRADE.md
@@ -0,0 +1,399 @@
+# Upgrade from 1.x to 2.0
+
+## Requirements
+
+| Component | 1.x                      | 2.0                  |
+|-----------|--------------------------|----------------------|
+| PHP       | `>=8.1`                  | `>=8.2`              |
+| Symfony   | `^5.4 \|\| ^6.0`         | `^6.4 \|\| ^7.4`     |
+| Sylius    | `^1.0`                   | `^2.0`               |
+| Doctrine ORM | `^2.7`                | `^3.0`               |
+
+## Removed runtime dependencies
+
+| Package | Replacement |
+|---------|-------------|
+| `friendsofsymfony/rest-bundle` | `symfony/http-foundation` (a plain `JsonResponse`) |
+| `doctrine/event-manager` | Pulled transitively by Doctrine ORM 3 |
+| `behat/transliterator` | Removed along with `CachedProvider` |
+| `psr/cache`, `symfony/cache` | Removed along with `CachedProvider` |
+| `symfony/messenger` | Removed along with `LoadPickupPointsHandler` |
+| `symfony/console` | Removed along with `LoadPickupPointsCommand` |
+| `sylius/resource-bundle` | Removed (no plugin-owned resource anymore) |
+
+The plugin no longer depends on FOSRestBundle, JMS Serializer or the Symfony
+Serializer. A single shop endpoint (`PickupPointsAction`) returns a plain
+`JsonResponse` built directly: a map of shipping-method code → that method's
+pickup points for the current cart. Each point carries display fields (`name`,
+`address`, `zipCode`, `city`, `latitude`, `longitude`) plus a `value` token —
+the *whole* point, base64url-encoded by `PickupPointEncoder`. The shipping page
+fetches this **asynchronously, after it has rendered** (so a slow or down carrier
+API never blocks the page), and the framework-free shop JS
+(`public/js/setono-pickup-point.js`) builds the radio list from the response.
+
+## Plugin file layout
+
+The plugin moved from `src/Resources/**` to repo-root locations
+(matches Sylius 2.x conventions / `setono/sylius-plugin-skeleton`):
+
+| 1.x path                                     | 2.0 path                |
+|----------------------------------------------|-------------------------|
+| `src/Resources/config/`                      | `config/`               |
+| `src/Resources/config/services/*.xml`        | `config/services/*.php` (PHP DSL) |
+| `src/Resources/config/services/providers/*.xml` | `config/services/providers/*.php` |
+| `src/Resources/config/routing.yaml`          | `config/routes.yaml` (imports `config/routes/shop.yaml`) |
+| `src/Resources/config/routing_non_localized.yaml` | `config/routes_no_locale.yaml` |
+| `src/Resources/config/doctrine/`             | (removed — no plugin-owned doctrine resource) |
+| `src/Resources/config/validation/`           | `config/validation/`    |
+| `src/Resources/config/routes/`               | `config/routes/`        |
+| `src/Resources/config/app/config.yaml`       | (removed — inlined via `Extension::prepend()`) |
+| `src/Resources/config/app/fixtures.yaml`     | (removed — example data, copy into your test app if needed) |
+| `src/Resources/config/serializer/PickupPoint.yml` | (removed — the DTO has no serializer metadata; the endpoint builds its JSON directly) |
+| `src/Resources/translations/`                | `translations/`         |
+| `src/Resources/views/`                       | `templates/`            |
+| `src/Resources/public/`                      | `public/`               |
+
+Update any `@SetonoSyliusPickupPointPlugin/Resources/...` references in your
+own templates and config to drop the `Resources/` segment.
+
+## Routing import
+
+The routing now follows the `setono/sylius-plugin-skeleton` layout: a top-level
+`config/routes.yaml` (localized, prefixed with `/{_locale}`) delegates to the
+per-section files under `config/routes/` (`config/routes/shop.yaml`). A
+`config/routes_no_locale.yaml` variant is provided for stores with localized
+URLs disabled.
+
+```yaml
+# config/routes/setono_sylius_pickup_point.yaml
+
+setono_sylius_pickup_point:
+    resource: "@SetonoSyliusPickupPointPlugin/config/routes.yaml"
+```
+
+Previously: `@SetonoSyliusPickupPointPlugin/Resources/config/routing.yaml`.
+
+The plugin now owns a single shop route:
+
+- `setono_sylius_pickup_point_shop_pickup_points` → `/{_locale}/pickup-points`
+  — returns the pickup points of every pickup-capable shipping method for the
+  current cart, keyed by method code (fetched asynchronously by the shop JS).
+
+The two `1.x`/early-`2.x` AJAX routes
+(`…_ajax_pickup_points_search_by_cart_address` → `/ajax/pickup-points/from-cart`
+and `…_ajax_pickup_point_by_identifier` → `/ajax/pickup-points/from-identifier`)
+are gone. Drop any custom links or fetch calls to those URLs.
+
+## Templates → Twig hooks
+
+The plugin now wires its layout JS snippet and the pickup-point shipment label
+automatically via `sylius_twig_hooks`. Consumers no longer need to:
+
+- include `@SetonoSyliusPickupPointPlugin/_javascripts.html.twig` manually in
+  `layout.html.twig`; the plugin attaches it to `sylius_shop.base#javascripts`
+  (the chooser is shop-only, so it is no longer attached to the admin layout).
+- include `@SetonoSyliusPickupPointPlugin/shop/label/shipment/pickupPoint.html.twig`
+  in admin order-show templates; the plugin attaches it to
+  `sylius_admin.order.show.content.sections.shipments.item`.
+
+Drop the matching `{% include … pickupPoint.html.twig %}` blocks from your
+custom admin templates if you copied them from the 1.x README.
+
+## Service IDs
+
+Services owned by the plugin now use FQCN service IDs (Sylius 2.x convention).
+Examples:
+
+| 1.x ID                                                              | 2.0 ID                                                                       |
+|---------------------------------------------------------------------|------------------------------------------------------------------------------|
+| `setono_sylius_pickup_point.command.load_pickup_points`             | (removed — see "Removed: local snapshot and message bus")                    |
+| `setono_sylius_pickup_point.controller.action.pickup_point_by_id`   | (removed — the chosen point is now self-contained; there is no per-identifier lookup) |
+| `setono_sylius_pickup_point.controller.action.pickup_points_search_by_cart_address` | `Setono\SyliusPickupPointPlugin\Controller\Action\PickupPointsAction` (now returns every method's points in one call) |
+| `setono_sylius_pickup_point.message.handler.load_pickup_points`     | (removed — see "Removed: local snapshot and message bus")                    |
+| `setono_sylius_pickup_point.validator.has_pickup_point_selected`    | `Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelectedValidator` |
+| `setono_sylius_pickup_point.fixture.shipping_method`                | `Setono\SyliusPickupPointPlugin\Fixture\ShippingMethodFixture`               |
+| `setono_sylius_pickup_point.fixture.example_factory.shipping_method`| `Setono\SyliusPickupPointPlugin\Fixture\Factory\ShippingMethodExampleFactory`|
+| `setono_sylius_pickup_point.shipping.order_shipping_method_selection_requirement_checker` | `Setono\SyliusPickupPointPlugin\Shipping\OrderShippingMethodSelectionRequirementChecker` |
+| `setono_sylius_pickup_point.block_event_listener.javascript`        | (removed — JS layout snippet now wired through `sylius_twig_hooks`)         |
+| `setono_sylius_pickup_point.repository.pickup_point`                | (removed — see "Removed: local snapshot and message bus")                    |
+
+These IDs are still kept (compiler pass and bundle config reference them):
+
+- `setono_sylius_pickup_point.registry.provider`
+- `setono_sylius_pickup_point.provider.*` (per-provider services tagged `setono_sylius_pickup_point.provider`)
+
+## Removed: provider cache
+
+The opt-in PSR-cache decorator (`Setono\SyliusPickupPointPlugin\Provider\CachedProvider`)
+has been removed in 2.0 along with the `setono_sylius_pickup_point.cache` configuration
+key and the `psr/cache` / `symfony/cache` runtime dependencies. Pickup-point lookups
+are now served directly by each provider. Drop the following from your application
+configuration:
+
+```yaml
+# Remove this — no longer supported
+setono_sylius_pickup_point:
+    cache:
+        enabled: true
+        pool: setono_sylius_pickup_point.provider_cache_pool
+
+framework:
+    cache:
+        pools:
+            setono_sylius_pickup_point.provider_cache_pool: ~
+```
+
+## Removed: local snapshot and message bus
+
+The `LocalProvider` decorator (which fell back to a local DB snapshot of pickup
+points when a third-party API timed out) has been removed in 2.0 along with the
+infrastructure that populated that snapshot. Specifically the following have all
+been removed:
+
+- `Setono\SyliusPickupPointPlugin\Provider\LocalProvider`
+- `Setono\SyliusPickupPointPlugin\Command\LoadPickupPointsCommand`
+  and the `setono-sylius-pickup-point:load-pickup-points` console command
+- `Setono\SyliusPickupPointPlugin\Message\Command\LoadPickupPoints` /
+  `Setono\SyliusPickupPointPlugin\Message\Handler\LoadPickupPointsHandler`
+  and the `setono_sylius_pickup_point.command_bus` messenger bus
+- `Setono\SyliusPickupPointPlugin\Doctrine\ORM\PickupPointRepository` and
+  `Setono\SyliusPickupPointPlugin\Repository\PickupPointRepositoryInterface`
+- `Setono\SyliusPickupPointPlugin\EventListener\AddIndicesSubscriber`
+- `Setono\SyliusPickupPointPlugin\Exception\TimeoutException`
+- The plugin-owned `PickupPoint` Doctrine resource and its tables
+  (`setono_sylius_pickup_point__pickup_point` / `..._pickup_point_code`)
+- The `setono_sylius_pickup_point.local` config key
+
+Drop the following from your application configuration:
+
+```yaml
+# Remove this — no longer supported
+setono_sylius_pickup_point:
+    local: true
+```
+
+Generate a migration with `bin/console doctrine:migrations:diff` to drop the
+two plugin-owned tables. Each provider still implements `findPickupPoints()`
+and `findPickupPoint()` directly against the carrier API.
+
+`Setono\SyliusPickupPointPlugin\Provider\ProviderInterface::findAllPickupPoints()`
+was the entry point used by the now-removed `LoadPickupPointsHandler`. Since
+nothing in the plugin calls it anymore, it has been dropped from the interface
+and from every shipped provider implementation. Custom providers that still
+declare it should remove the method to match the interface.
+
+`Setono\SyliusPickupPointPlugin\Model\PickupPoint`,
+`Setono\SyliusPickupPointPlugin\Model\PickupPointInterface` and
+`Setono\SyliusPickupPointPlugin\Model\PickupPointCode` are removed. The
+replacement is `Setono\SyliusPickupPointPlugin\DTO\PickupPoint` — a final
+class with public properties (scalars plus an open `metadata` map) and
+`fromArray()` / `jsonSerialize()` helpers, but no `#[Groups]` /
+`#[SerializedName]` attributes and no Sylius resource behaviour. It's populated
+from the carrier API response by each provider, and emitted (with its
+`identifier` token) by the AJAX endpoints.
+
+The `PickupPointCode` value object has been inlined as plain `provider`,
+`id` and `country` properties on the DTO, and the old `provider---id---country`
+wire-format string is gone.
+
+The checkout no longer round-trips a point *identifier*. Each pickup point in
+the AJAX response carries a `value` token produced by
+`Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder` — base64url-encoded
+JSON of the *whole* DTO. The shop JS uses that token as the chosen radio's value
+and writes it into the hidden input; on submit
+`Setono\SyliusPickupPointPlugin\Form\DataTransformer\PickupPointTransformer`
+decodes it straight back into the `PickupPoint`. Nothing is re-resolved through
+the provider, so a slow or down carrier never blocks the submit and the
+persisted point is exactly what the shopper saw.
+
+`PickupPointIdentifier` and `PickupPointIdentifierEncoder` still exist — they
+back the `findPickupPoint()` metadata contract below — but no longer carry the
+checkout's form value.
+
+Provider implementations now resolve a point from its id plus an open
+metadata map (into which the well-known country is folded):
+
+```php
+public function findPickupPoint(string $id, array $metadata = []): ?PickupPoint;
+```
+
+Consumers that hand-built or type-hinted `PickupPointInterface` should
+switch to the new DTO and replace setter calls with direct property
+assignment:
+
+```php
+// 1.x / early 2.x
+$pickupPoint = new \Setono\SyliusPickupPointPlugin\Model\PickupPoint();
+$pickupPoint->setCode(new \Setono\SyliusPickupPointPlugin\Model\PickupPointCode('abc', 'gls', 'DK'));
+$pickupPoint->setName('Aalborg Centrum');
+
+// 2.x
+$pickupPoint = new \Setono\SyliusPickupPointPlugin\DTO\PickupPoint();
+$pickupPoint->provider = 'gls';
+$pickupPoint->id = 'abc';
+$pickupPoint->country = 'DK';
+$pickupPoint->name = 'Aalborg Centrum';
+```
+
+## `PickupPointAwareInterface`: deprecated id getter, new DTO getter
+
+`PickupPointAwareInterface` (and `PickupPointAwareTrait`) gained a new
+`pickup_point` JSON column / `?PickupPoint $pickupPoint` accessor. The
+existing `pickupPointId` API stays for backwards compatibility but is now
+deprecated:
+
+| Deprecated (1.x / early 2.x)                  | 2.x replacement                                       |
+|-----------------------------------------------|-------------------------------------------------------|
+| `hasPickupPointId(): bool`                    | `hasPickupPoint(): bool`                              |
+| `setPickupPointId(?string $pickupPointId)`    | `setPickupPoint(?\Setono\SyliusPickupPointPlugin\DTO\PickupPoint $pickupPoint)` |
+| `getPickupPointId(): ?string`                 | `getPickupPoint(): ?\Setono\SyliusPickupPointPlugin\DTO\PickupPoint`            |
+| column `pickup_point_id` (`STRING`)           | column `pickup_point` (`JSON`)                        |
+
+The trait ships **both** columns side-by-side. As of 2.0 the plugin reads
+and writes only the new `pickup_point` JSON column: the checkout form
+resolves the selected point and stores the full DTO, and the shipment label
+template renders `shipment.pickupPoint` directly. The legacy
+`pickup_point_id` string column is kept only for backwards compatibility and
+is never written anymore. Migrate your data in two moves: (1) backfill the
+JSON column from the legacy string, (2) when you're ready, drop the legacy
+column and stop using the deprecated methods.
+
+### Example data migration
+
+Doctrine migrations live in your application, not in this plugin. Below
+is a Doctrine Migrations class that handles step (1) — it adds the
+`pickup_point` JSON column (the trait expects it) and populates it from
+the legacy `pickup_point_id` strings, splitting on the `---` delimiter.
+
+The table name follows whatever entity uses `PickupPointAwareTrait` — by
+convention `sylius_shipment` for a Shipment customisation. Adjust both
+the table name and the SQL dialect to match your setup.
+
+```php
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260520000000BackfillPickupPointJson extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Backfill pickup_point JSON column from legacy pickup_point_id strings';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // 1. Add the new JSON column (skip this statement if a schema diff
+        //    already created it via PickupPointAwareTrait's #[ORM\Column]).
+        $this->addSql('ALTER TABLE sylius_shipment ADD pickup_point JSON DEFAULT NULL');
+
+        // 2. Split "<provider>---<id>---<country>" into a JSON object.
+        //    MySQL / MariaDB:
+        $this->addSql(<<<'SQL'
+            UPDATE sylius_shipment
+            SET pickup_point = JSON_OBJECT(
+                'provider', SUBSTRING_INDEX(pickup_point_id, '---', 1),
+                'id',       SUBSTRING_INDEX(SUBSTRING_INDEX(pickup_point_id, '---', 2), '---', -1),
+                'country',  SUBSTRING_INDEX(pickup_point_id, '---', -1)
+            )
+            WHERE pickup_point_id IS NOT NULL
+              AND pickup_point IS NULL
+        SQL);
+
+        // PostgreSQL equivalent (use one or the other, not both):
+        //
+        // $this->addSql(<<<'SQL'
+        //     UPDATE sylius_shipment
+        //     SET pickup_point = jsonb_build_object(
+        //         'provider', split_part(pickup_point_id, '---', 1),
+        //         'id',       split_part(pickup_point_id, '---', 2),
+        //         'country',  split_part(pickup_point_id, '---', 3)
+        //     )
+        //     WHERE pickup_point_id IS NOT NULL
+        //       AND pickup_point IS NULL
+        // SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_shipment DROP pickup_point');
+    }
+}
+```
+
+The backfill only fills in `provider`, `id` and `country` — the only data
+present in the legacy string. The remaining DTO fields (`name`,
+`address`, `zipCode`, `city`, `latitude`, `longitude`) stay `null` until
+the next time a fresh pickup point is selected. If you need them
+populated for historical orders, run an additional pass that fetches each
+shipment through the provider registry and re-stores the full DTO.
+
+Once your reads are switched to `getPickupPoint()`, a follow-up migration
+can drop the legacy column:
+
+```php
+$this->addSql('ALTER TABLE sylius_shipment DROP pickup_point_id');
+```
+
+## Doctrine mappings
+
+The traits `PickupPointAwareTrait` and `PickupPointProviderAwareTrait` now use
+PHP 8 attribute mappings (`#[ORM\Column]`) instead of PHPDoc annotations.
+Doctrine ORM 3 silently ignores PHPDoc-mapped associations, so any class that
+re-declares these columns via PHPDoc on the consumer side must be converted to
+attributes.
+
+## Carrier provider bundles
+
+The third-party carrier bundles (`setono/dao-bundle`,
+`setono/gls-webservice-bundle`, `setono/post-nord-bundle`) moved from
+`require-dev` to `suggest`. Each provider is enabled only when:
+
+1. The matching bundle is installed in your application.
+2. The provider is set to `true` in your plugin configuration.
+
+The plugin runtime continues to throw a configuration error if you enable a
+provider without the matching bundle.
+
+## Removed providers
+
+The Budbee (`Setono\SyliusPickupPointPlugin\Provider\BudbeeProvider`) and
+CoolRunner (`Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider`)
+providers — along with their service definitions and configuration nodes
+— have been removed in 2.0. If you depended on either, switch to one of
+the remaining providers (DAO, GLS, PostNord, Faker) or implement your own
+`ProviderInterface` and tag it with `setono_sylius_pickup_point.provider`.
+Drop these keys from your application configuration:
+
+```yaml
+# Remove these — no longer supported
+setono_sylius_pickup_point:
+    providers:
+        budbee: true
+        coolrunner: true
+```
+
+## Removed dev dependencies
+
+- `phpspec/phpspec`, `phpspec/prophecy-phpunit` (old)
+- `psalm/*`, `weirdan/doctrine-psalm-plugin`
+- `setono/code-quality-pack`, `setono/sylius-behat-pack`
+- `behat/behat`
+- `jms/serializer-bundle`, `kriswallsmith/buzz`, `nyholm/psr7`
+- `polishsymfonycommunity/symfony-mocker-container`
+- `matthiasnoback/symfony-config-test`
+
+All testing now uses PHPUnit + Prophecy via `setono/sylius-plugin: ^2.0`
+which bundles PHPStan, PHPUnit, Rector, ECS and CI composite actions.
+
+## Translation keys
+
+No keys were removed. The async chooser adds three UI strings under
+`setono_sylius_pickup_point.ui` — `loading_pickup_points`, `no_pickup_points`
+and `error_loading_pickup_points` (its loading/empty/error states). The bundled
+`en` and `da` catalogs cover them; translate them if you ship other locales.
diff --git a/behat.yml.dist b/behat.yml.dist
deleted file mode 100644
index cc4a4e61..00000000
--- a/behat.yml.dist
+++ /dev/null
@@ -1,55 +0,0 @@
-imports:
-    - vendor/sylius/sylius/src/Sylius/Behat/Resources/config/suites.yml
-    - tests/Behat/Resources/suites.yml
-
-default:
-    extensions:
-        DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
-
-        FriendsOfBehat\MinkDebugExtension:
-            directory: etc/build
-            clean_start: false
-            screenshot: true
-
-        Behat\MinkExtension:
-            files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
-            base_url: "https://127.0.0.1:8080/"
-            default_session: symfony
-            javascript_session: chrome_headless
-            sessions:
-                symfony:
-                    symfony: ~
-                chrome_headless:
-                    chrome:
-                        api_url: http://127.0.0.1:9222
-                        validate_certificate: false
-                chrome:
-                    selenium2:
-                        browser: chrome
-                        capabilities:
-                            browserName: chrome
-                            browser: chrome
-                            version: ""
-                            marionette: null # https://github.com/Behat/MinkExtension/pull/311
-                            chrome:
-                                switches:
-                                    - "start-fullscreen"
-                                    - "start-maximized"
-                                    - "no-sandbox"
-                            extra_capabilities:
-                                unexpectedAlertBehaviour: accept
-                firefox:
-                    selenium2:
-                        browser: firefox
-            show_auto: false
-
-        FriendsOfBehat\SymfonyExtension:
-            bootstrap: tests/Application/config/bootstrap.php
-            kernel:
-                class: Setono\SyliusPickupPointPlugin\Tests\Application\Kernel
-
-        FriendsOfBehat\VariadicExtension: ~
-
-        FriendsOfBehat\SuiteSettingsExtension:
-            paths:
-                - "features"
diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php
new file mode 100644
index 00000000..8ebbe947
--- /dev/null
+++ b/composer-dependency-analyser.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
+use ShipMonk\ComposerDependencyAnalyser\Config\ErrorType;
+
+return (new Configuration())
+    ->addPathToExclude(__DIR__ . '/tests')
+    // Carrier providers reference classes from `suggest`-only bundles.
+    ->ignoreErrorsOnPath(__DIR__ . '/src/Provider/DAOProvider.php', [ErrorType::UNKNOWN_CLASS])
+    ->ignoreErrorsOnPath(__DIR__ . '/src/Provider/GlsProvider.php', [ErrorType::UNKNOWN_CLASS])
+    ->ignoreErrorsOnPath(__DIR__ . '/src/Provider/PostNordProvider.php', [ErrorType::UNKNOWN_CLASS])
+    ->ignoreErrorsOnPath(__DIR__ . '/src/DependencyInjection/Configuration.php', [ErrorType::UNKNOWN_CLASS])
+;
diff --git a/composer-require-checker.json b/composer-require-checker.json
deleted file mode 100644
index 693ca7fb..00000000
--- a/composer-require-checker.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "symbol-whitelist": [
-        "Faker\\Factory",
-        "Faker\\Generator",
-        "Setono\\BudbeeBundle\\SetonoBudbeeBundle",
-        "Setono\\Budbee\\Client\\ClientInterface",
-        "Setono\\Budbee\\DTO\\Box",
-        "Setono\\CoolRunnerBundle\\SetonoCoolRunnerBundle",
-        "Setono\\CoolRunner\\Client\\ClientInterface",
-        "Setono\\CoolRunner\\DTO\\Servicepoint",
-        "Setono\\DAOBundle\\SetonoDAOBundle",
-        "Setono\\DAO\\Client\\ClientInterface",
-        "Setono\\GLS\\Webservice\\Client\\ClientInterface",
-        "Setono\\GLS\\Webservice\\Exception\\ConnectionException",
-        "Setono\\GLS\\Webservice\\Exception\\NoResultException",
-        "Setono\\GLS\\Webservice\\Exception\\ParcelShopNotFoundException",
-        "Setono\\GLS\\Webservice\\Model\\ParcelShop",
-        "Setono\\GlsWebserviceBundle\\SetonoGlsWebserviceBundle",
-        "Setono\\PostNordBundle\\SetonoPostNordBundle",
-        "Setono\\PostNord\\Client\\ClientInterface",
-        "Setono\\PostNord\\Request\\Query\\ServicePoints\\ByIdsQuery",
-        "Setono\\PostNord\\Request\\Query\\ServicePoints\\NearestByAddressQuery",
-        "Setono\\PostNord\\Response\\ServicePoints\\ServicePoint",
-        "Symfony\\Component\\Security\\Csrf\\CsrfToken",
-        "Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface"
-    ]
-}
diff --git a/composer-unused.php b/composer-unused.php
deleted file mode 100644
index 26c4ff22..00000000
--- a/composer-unused.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use ComposerUnused\ComposerUnused\Configuration\Configuration;
-use ComposerUnused\ComposerUnused\Configuration\NamedFilter;
-
-return static function (Configuration $config): Configuration {
-    return $config
-        ->addNamedFilter(NamedFilter::fromString('symfony/security-bundle'))
-    ;
-};
diff --git a/composer.json b/composer.json
index 05cc8ad8..560ed7a9 100644
--- a/composer.json
+++ b/composer.json
@@ -8,74 +8,43 @@
         "sylius-plugin"
     ],
     "require": {
-        "php": ">=8.1",
-        "ext-mbstring": "*",
-        "behat/transliterator": "^1.5",
-        "doctrine/event-manager": "^1.2",
-        "doctrine/orm": "^2.7",
-        "friendsofsymfony/rest-bundle": "^2.8 || ^3.0",
-        "psr/cache": "^1.0 || ^2.0 || ^3.0",
-        "psr/http-client": "^1.0",
-        "sylius/core": "^1.0",
-        "sylius/core-bundle": "^1.0",
-        "sylius/order": "^1.0",
-        "sylius/registry": "^1.0",
-        "sylius/resource-bundle": "^1.8",
-        "sylius/shipping": "^1.0",
-        "sylius/shipping-bundle": "^1.0",
-        "symfony/cache": "^5.4 || ^6.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/form": "^5.4 || ^6.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/messenger": "^5.4 || ^6.0",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
-        "symfony/security-bundle": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0",
+        "php": ">=8.2",
+        "doctrine/dbal": "^3.0 || ^4.0",
+        "doctrine/orm": "^3.0",
+        "fakerphp/faker": "^1.21",
+        "sylius/core": "^2.0",
+        "sylius/core-bundle": "^2.0",
+        "sylius/order": "^2.0",
+        "sylius/shipping": "^2.0",
+        "sylius/shipping-bundle": "^2.0",
+        "symfony/config": "^6.4 || ^7.4",
+        "symfony/dependency-injection": "^6.4 || ^7.4",
+        "symfony/form": "^6.4 || ^7.4",
+        "symfony/http-foundation": "^6.4 || ^7.4",
+        "symfony/http-kernel": "^6.4 || ^7.4",
+        "symfony/options-resolver": "^6.4 || ^7.4",
+        "symfony/validator": "^6.4 || ^7.4",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
-        "api-platform/core": "^2.7.16",
-        "babdev/pagerfanta-bundle": "^3.8",
-        "behat/behat": "^3.14",
+        "api-platform/core": "~4.2.1",
+        "dama/doctrine-test-bundle": "^8.6",
         "doctrine/doctrine-bundle": "^2.11",
-        "fakerphp/faker": "^1.21",
-        "jms/serializer-bundle": "^4.2",
-        "kriswallsmith/buzz": "^1.2",
-        "lexik/jwt-authentication-bundle": "^2.17",
-        "matthiasnoback/symfony-config-test": "^4.3 || ^5.1",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3 || ^5.1",
-        "nyholm/psr7": "^1.5",
-        "phpspec/phpspec": "^7.3",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.6.17",
-        "polishsymfonycommunity/symfony-mocker-container": "^1.0.7",
-        "psalm/plugin-phpunit": "^0.18.4",
-        "psalm/plugin-symfony": "^5.0",
-        "setono/budbee-bundle": "^1.0",
-        "setono/code-quality-pack": "^2.7",
-        "setono/coolrunner-bundle": "^1.0",
-        "setono/dao-bundle": "^1.1",
-        "setono/gls-webservice-bundle": "^1.3",
-        "setono/post-nord-bundle": "^2.0@alpha",
-        "setono/post-nord-php-sdk": "^2.0@alpha",
-        "setono/sylius-behat-pack": "^0.2",
-        "sylius/sylius": "~1.12.13",
-        "symfony/debug-bundle": "^5.4 || ^6.4",
-        "symfony/dotenv": "^5.4 || ^6.4",
-        "symfony/property-info": "^5.4 || ^6.4",
-        "symfony/serializer": "^5.4 || ^6.4",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.4",
-        "symfony/webpack-encore-bundle": "^1.17.2",
-        "weirdan/doctrine-psalm-plugin": "^2.8",
-        "willdurand/negotiation": "^3.1"
+        "lexik/jwt-authentication-bundle": "^3.1",
+        "setono/gls-webservice-bundle": "^1.4",
+        "setono/sylius-plugin": "^2.0",
+        "sylius/sylius": "~2.2.5",
+        "symfony/browser-kit": "^6.4 || ^7.4",
+        "symfony/css-selector": "^6.4 || ^7.4",
+        "symfony/debug-bundle": "^6.4 || ^7.4",
+        "symfony/dom-crawler": "^6.4 || ^7.4",
+        "symfony/dotenv": "^6.4 || ^7.4",
+        "symfony/property-info": "^6.4 || ^7.4",
+        "symfony/var-exporter": "^6.4 || ^7.4",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.4",
+        "symfony/webpack-encore-bundle": "^2.2"
     },
     "suggest": {
-        "setono/coolrunner-bundle": "Install this bundle to use the CoolRunner provider",
         "setono/dao-bundle": "Install this bundle to use the DAO provider",
         "setono/gls-webservice-bundle": "Install this bundle to use the GLS provider",
         "setono/post-nord-bundle": "Install this bundle to use the PostNord provider"
@@ -98,28 +67,17 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": false,
             "ergebnis/composer-normalize": true,
-            "php-http/discovery": true,
+            "infection/extension-installer": true,
+            "php-http/discovery": false,
+            "phpstan/extension-installer": true,
             "symfony/thanks": false
         },
         "sort-packages": true
     },
     "scripts": {
-        "analyse": "psalm",
-        "behat": "php -d memory_limit=-1 vendor/bin/behat --no-interaction --format=progress",
+        "analyse": "phpstan analyse",
         "check-style": "ecs check",
-        "checks": [
-            "composer validate --strict",
-            "composer normalize --dry-run",
-            "@check-style",
-            "@analyse"
-        ],
         "fix-style": "ecs check --fix",
-        "fixtures": "(cd tests/Application && bin/console sylius:fixtures:load --no-interaction -e ${SYMFONY_ENV:-'dev'})",
-        "phpspec": "phpspec run",
-        "phpunit": "phpunit",
-        "tests": [
-            "@phpspec",
-            "@behat"
-        ]
+        "phpunit": "phpunit"
     }
 }
diff --git a/config/routes.yaml b/config/routes.yaml
new file mode 100644
index 00000000..09d14445
--- /dev/null
+++ b/config/routes.yaml
@@ -0,0 +1,5 @@
+setono_sylius_pickup_point_shop:
+    resource: "@SetonoSyliusPickupPointPlugin/config/routes/shop.yaml"
+    prefix: /{_locale}
+    requirements:
+        _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
diff --git a/config/routes/shop.yaml b/config/routes/shop.yaml
new file mode 100644
index 00000000..15cbe4ef
--- /dev/null
+++ b/config/routes/shop.yaml
@@ -0,0 +1,6 @@
+setono_sylius_pickup_point_shop_pickup_points:
+    path: /pickup-points
+    methods: [GET]
+    defaults:
+        _controller: Setono\SyliusPickupPointPlugin\Controller\Action\PickupPointsAction
+        _format: json
diff --git a/config/routes_no_locale.yaml b/config/routes_no_locale.yaml
new file mode 100644
index 00000000..deda74af
--- /dev/null
+++ b/config/routes_no_locale.yaml
@@ -0,0 +1,6 @@
+# By default, Sylius uses urls like https://example.com/en_US/, but Sylius also offers the option to disable
+# localized URLs (see https://docs.sylius.com/en/latest/cookbook/shop/disabling-localised-urls.html).
+# Import this file instead of config/routes.yaml when your store has localized URLs disabled.
+
+setono_sylius_pickup_point_shop:
+    resource: "@SetonoSyliusPickupPointPlugin/config/routes/shop.yaml"
diff --git a/config/services.php b/config/services.php
new file mode 100644
index 00000000..2920048c
--- /dev/null
+++ b/config/services.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import('services/controller.php');
+    $containerConfigurator->import('services/encoder.php');
+    $containerConfigurator->import('services/fixture.php');
+    $containerConfigurator->import('services/form.php');
+    $containerConfigurator->import('services/registry.php');
+    $containerConfigurator->import('services/shipping.php');
+    $containerConfigurator->import('services/validator.php');
+};
diff --git a/config/services/controller.php b/config/services/controller.php
new file mode 100644
index 00000000..5a45691e
--- /dev/null
+++ b/config/services/controller.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Controller\Action\PickupPointsAction;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistry;
+use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(PickupPointsAction::class)
+        ->args([
+            service('sylius.context.cart'),
+            service(ProviderRegistry::class),
+            service(PickupPointEncoder::class),
+            service(ShippingMethodsResolverInterface::class),
+        ])
+        ->public()
+    ;
+};
diff --git a/config/services/encoder.php b/config/services/encoder.php
new file mode 100644
index 00000000..f100a6cd
--- /dev/null
+++ b/config/services/encoder.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoderInterface;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointIdentifierEncoder;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointIdentifierEncoderInterface;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(PickupPointIdentifierEncoder::class);
+
+    $services->alias(PickupPointIdentifierEncoderInterface::class, PickupPointIdentifierEncoder::class);
+
+    $services->set(PickupPointEncoder::class);
+
+    $services->alias(PickupPointEncoderInterface::class, PickupPointEncoder::class);
+};
diff --git a/config/services/fixture.php b/config/services/fixture.php
new file mode 100644
index 00000000..f2ba9426
--- /dev/null
+++ b/config/services/fixture.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Fixture\Factory\ShippingMethodExampleFactory;
+use Setono\SyliusPickupPointPlugin\Fixture\ShippingMethodFixture;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(ShippingMethodExampleFactory::class)
+        ->args([
+            service('sylius.factory.shipping_method'),
+            service('sylius.repository.zone'),
+            service('sylius.repository.shipping_category'),
+            service('sylius.repository.locale'),
+            service('sylius.repository.channel'),
+            service('sylius.repository.tax_category'),
+        ])
+    ;
+
+    $services->set(ShippingMethodFixture::class)
+        ->args([
+            service('sylius.manager.shipping_method'),
+            service(ShippingMethodExampleFactory::class),
+        ])
+        ->tag('sylius_fixtures.fixture')
+    ;
+};
diff --git a/config/services/form.php b/config/services/form.php
new file mode 100644
index 00000000..0b3a0100
--- /dev/null
+++ b/config/services/form.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder;
+use Setono\SyliusPickupPointPlugin\Form\DataTransformer\PickupPointTransformer;
+use Setono\SyliusPickupPointPlugin\Form\Extension\ShipmentTypeExtension;
+use Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodChoiceTypeExtension;
+use Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodTypeExtension;
+use Setono\SyliusPickupPointPlugin\Form\Type\PickupPointType;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistry;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(PickupPointTransformer::class)
+        ->args([
+            service(PickupPointEncoder::class),
+        ])
+    ;
+
+    $services->set(PickupPointType::class)
+        ->args([
+            service(PickupPointTransformer::class),
+        ])
+        ->tag('form.type')
+    ;
+
+    $services->set(ShipmentTypeExtension::class)
+        ->tag('form.type_extension')
+    ;
+
+    $services->set(ShippingMethodChoiceTypeExtension::class)
+        ->args([
+            service(ProviderRegistry::class),
+        ])
+        ->tag('form.type_extension')
+    ;
+
+    $services->set(ShippingMethodTypeExtension::class)
+        ->args([
+            param('setono_sylius_pickup_point.providers'),
+        ])
+        ->tag('form.type_extension')
+    ;
+};
diff --git a/config/services/providers/dao.php b/config/services/providers/dao.php
new file mode 100644
index 00000000..34dc6f91
--- /dev/null
+++ b/config/services/providers/dao.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Provider\DAOProvider;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set('setono_sylius_pickup_point.provider.dao', DAOProvider::class)
+        ->args([
+            service('setono_dao.client'),
+        ])
+        ->tag('setono_sylius_pickup_point.provider')
+    ;
+};
diff --git a/config/services/providers/faker.php b/config/services/providers/faker.php
new file mode 100644
index 00000000..8f463a46
--- /dev/null
+++ b/config/services/providers/faker.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Provider\FakerProvider;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set('setono_sylius_pickup_point.provider.faker', FakerProvider::class)
+        ->tag('setono_sylius_pickup_point.provider')
+    ;
+};
diff --git a/config/services/providers/gls.php b/config/services/providers/gls.php
new file mode 100644
index 00000000..72e0698e
--- /dev/null
+++ b/config/services/providers/gls.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\GLS\Webservice\Client\ClientInterface;
+use Setono\SyliusPickupPointPlugin\Provider\GlsProvider;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set('setono_sylius_pickup_point.provider.gls', GlsProvider::class)
+        ->args([
+            service(ClientInterface::class),
+        ])
+        ->tag('setono_sylius_pickup_point.provider')
+    ;
+};
diff --git a/config/services/providers/post_nord.php b/config/services/providers/post_nord.php
new file mode 100644
index 00000000..0b290356
--- /dev/null
+++ b/config/services/providers/post_nord.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Provider\PostNordProvider;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set('setono_sylius_pickup_point.provider.post_nord', PostNordProvider::class)
+        ->args([
+            service('setono_post_nord.client'),
+        ])
+        ->tag('setono_sylius_pickup_point.provider')
+    ;
+};
diff --git a/config/services/registry.php b/config/services/registry.php
new file mode 100644
index 00000000..a947f844
--- /dev/null
+++ b/config/services/registry.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistry;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistryInterface;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(ProviderRegistry::class);
+
+    $services->alias(ProviderRegistryInterface::class, ProviderRegistry::class);
+};
diff --git a/config/services/shipping.php b/config/services/shipping.php
new file mode 100644
index 00000000..0ba9f99b
--- /dev/null
+++ b/config/services/shipping.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Shipping\OrderShippingMethodSelectionRequirementChecker;
+use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(OrderShippingMethodSelectionRequirementChecker::class)
+        ->decorate('sylius.checker.order_shipping_method_selection_requirement', null, 256)
+        ->args([
+            service('.inner'),
+            service(ShippingMethodsResolverInterface::class),
+        ])
+    ;
+};
diff --git a/config/services/validator.php b/config/services/validator.php
new file mode 100644
index 00000000..6b2e95b1
--- /dev/null
+++ b/config/services/validator.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelectedValidator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(HasPickupPointSelectedValidator::class)
+        ->tag('validator.constraint_validator')
+    ;
+};
diff --git a/src/Resources/config/validation/Shipment.xml b/config/validation/Shipment.xml
similarity index 100%
rename from src/Resources/config/validation/Shipment.xml
rename to config/validation/Shipment.xml
diff --git a/docs/images/admin-order-shipping-pickup-point.png b/docs/images/admin-order-shipping-pickup-point.png
index 5d9b7220..9c397c71 100644
Binary files a/docs/images/admin-order-shipping-pickup-point.png and b/docs/images/admin-order-shipping-pickup-point.png differ
diff --git a/docs/images/admin-shipping-method-pickup-point-provider.png b/docs/images/admin-shipping-method-pickup-point-provider.png
index 06fb6000..c3b6d413 100644
Binary files a/docs/images/admin-shipping-method-pickup-point-provider.png and b/docs/images/admin-shipping-method-pickup-point-provider.png differ
diff --git a/docs/images/shop-checkout-complete-shipping-pickup-point.png b/docs/images/shop-checkout-complete-shipping-pickup-point.png
deleted file mode 100644
index d85217b9..00000000
Binary files a/docs/images/shop-checkout-complete-shipping-pickup-point.png and /dev/null differ
diff --git a/docs/images/shop-checkout-select-shipping-pickup-point.png b/docs/images/shop-checkout-select-shipping-pickup-point.png
index 4842cb80..b1df7937 100644
Binary files a/docs/images/shop-checkout-select-shipping-pickup-point.png and b/docs/images/shop-checkout-select-shipping-pickup-point.png differ
diff --git a/docs/pickup-points.png b/docs/pickup-points.png
index 1314acb5..37f89b0d 100644
Binary files a/docs/pickup-points.png and b/docs/pickup-points.png differ
diff --git a/ecs.php b/ecs.php
index 6e01c257..59aabb3a 100644
--- a/ecs.php
+++ b/ecs.php
@@ -9,9 +9,11 @@
     $config->paths([
         'src',
         'tests',
+        'composer-dependency-analyser.php',
+        'ecs.php',
+        'rector.php',
     ]);
     $config->skip([
-        'tests/Application/node_modules/**',
-        'tests/Application/var/**',
+        'tests/Application/**',
     ]);
 };
diff --git a/features/admin/managing_shipping_points_providers.feature b/features/admin/managing_shipping_points_providers.feature
deleted file mode 100644
index 295c1c64..00000000
--- a/features/admin/managing_shipping_points_providers.feature
+++ /dev/null
@@ -1,24 +0,0 @@
-@managing_shipping_providers
-Feature: Managing shipping points providers
-    In order to allow users to choose a shipping point
-    As an Administrator
-    I want to be able to manage shipping point providers
-
-  Background:
-      Given the store operates on a channel named "Web-US" in "USD" currency
-      And the store is available in "English (United States)"
-      And the store has a zone "United States" with code "US"
-      And I am logged in as an administrator
-
-    @ui @javascript
-    Scenario: Adding new shipping provider
-        When I want to create a new shipping method
-        And I specify its code as "gls"
-        And I specify its position as 0
-        And I name it "GLS" in "English (United States)"
-        And I define it for the zone named "United States"
-        And I select "GLS" as pickup point provider
-        And I specify its amount as 5 for "Web-US" channel
-        And I add it
-        Then I should be notified that it has been successfully created
-        And the shipping method "GLS" should appear in the registry
diff --git a/features/shop/selecting_new_pickup_address_during_checkout.feature b/features/shop/selecting_new_pickup_address_during_checkout.feature
deleted file mode 100644
index 2cd46451..00000000
--- a/features/shop/selecting_new_pickup_address_during_checkout.feature
+++ /dev/null
@@ -1,25 +0,0 @@
-@shop_shipping_pickup
-Feature: Selecting new pickup address during the checkout
-    In order to conveniently pickup my delivery
-    As a customer
-    I want to select a new pickup address from a list of available pickup places during checkout
-
-    Background:
-        Given the store operates on a single channel in "United States"
-        And the store has a product "PHP T-Shirt"
-        And the store has "DHL" shipping method with "$5.00" fee
-        And the store has "GLS" shipping method with "$5.00" fee
-        And the store has "PostNord" shipping method with "$5.00" fee
-        And shipping method "GLS" has the selected "faker" pickup point provider
-
-    @ui @javascript
-    Scenario: Selecting shipping provider and choosing shipping point
-        Given I have product "PHP T-Shirt" in the cart
-        When I am at the checkout addressing step
-        And I specify the email as "mail@mail.com"
-        And I specify the billing address as "Fifth Avenue", "New York", "12342", "United States" for "John John"
-        And I complete the addressing step
-        And I select "GLS" pickup point shipping method
-        And I choose the first option
-        And I complete the shipping step
-        Then the shipping method should have a pickup point
diff --git a/phpspec.yml.dist b/phpspec.yml.dist
deleted file mode 100644
index 60298580..00000000
--- a/phpspec.yml.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-suites:
-    main:
-        namespace: Setono\SyliusPickupPointPlugin
-        psr4_prefix: Setono\SyliusPickupPointPlugin
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 00000000..0f9f2a89
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,36 @@
+parameters:
+    level: max
+
+    paths:
+        - src
+        - tests
+
+    excludePaths:
+        - tests/Application/*
+        # Carrier-specific providers reference classes from `suggest`-only bundles
+        # that are not installed in this plugin's dev environment.
+        - src/Provider/DAOProvider.php
+        - src/Provider/GlsProvider.php
+        - src/Provider/PostNordProvider.php
+
+    bootstrapFiles:
+        - tests/Application/config/bootstrap.php
+
+    # Doctrine Configuration
+    doctrine:
+        repositoryClass: Doctrine\ORM\EntityRepository
+
+    reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
+
+    ignoreErrors:
+        -
+            identifier: missingType.generics
+        -
+            identifier: missingType.iterableValue
+        # Trait analysis: PHPStan won't analyse traits used only by consumer-side entities.
+        -
+            identifier: trait.unused
+        # Test smoke-assertions: assertInstanceOf against the concrete class is intentional.
+        -
+            identifier: staticMethod.alreadyNarrowedType
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e3d44052..7db2c811 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" colors="true"
-         bootstrap="tests/Application/config/bootstrap.php">
-    <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
+         bootstrap="tests/Application/config/bootstrap.php" cacheDirectory=".phpunit.cache"
+         beStrictAboutChangesToGlobalState="false"
+         failOnRisky="false"
+         defaultTestSuite="unit">
     <testsuites>
-        <testsuite name="SetonoSyliusPickupPointPlugin Test Suite">
-            <directory>tests</directory>
+        <testsuite name="unit">
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="functional">
+            <directory>tests/Functional</directory>
         </testsuite>
     </testsuites>
     <php>
         <env name="APP_ENV" value="test"/>
         <env name="SHELL_VERBOSITY" value="-1"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
+    <extensions>
+        <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
+    </extensions>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index b9d44f8b..00000000
--- a/psalm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    phpVersion="8.1"
-    errorLevel="6"
-    findUnusedBaselineEntry="false"
-    findUnusedPsalmSuppress="false"
-    findUnusedCode="false"
-    findUnusedVariablesAndParams="false"
->
-    <projectFiles>
-        <directory name="src"/>
-        <directory name="tests"/>
-        <ignoreFiles>
-            <directory name="tests/Application"/>
-            <directory name="tests/Behat"/>
-            <directory name="vendor"/>
-        </ignoreFiles>
-    </projectFiles>
-    <plugins>
-        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-        <pluginClass class="Weirdan\DoctrinePsalmPlugin\Plugin"/>
-    </plugins>
-    <forbiddenFunctions>
-        <function name="dd"/>
-        <function name="dump"/>
-        <function name="exit"/>
-        <function name="var_dump"/>
-        <function name="print_r"/>
-    </forbiddenFunctions>
-    <issueHandlers>
-        <MissingTemplateParam>
-            <errorLevel type="suppress">
-                <directory name="src/Form"/>
-                <directory name="src/Repository"/>
-            </errorLevel>
-        </MissingTemplateParam>
-    </issueHandlers>
-</psalm>
diff --git a/public/css/setono-pickup-point.css b/public/css/setono-pickup-point.css
new file mode 100644
index 00000000..a372b0e1
--- /dev/null
+++ b/public/css/setono-pickup-point.css
@@ -0,0 +1,26 @@
+/*
+ * Styling for the checkout pickup-point chooser. The bulk of the look is built from Bootstrap 5.3
+ * utility classes in public/js/setono-pickup-point.js; this file only covers what utilities cannot
+ * express. Everything keys off Bootstrap/Sylius CSS variables so it follows the active theme (e.g.
+ * the brand "success" colour).
+ */
+
+/* Dashed rule between the shipping method and its pickup section. */
+.setono-pickup-point__divider {
+    border: 0;
+    border-top: var(--bs-border-width) dashed var(--bs-border-color);
+    opacity: 1;
+}
+
+/* The pickup-point list scrolls rather than pushing the page down. */
+.setono-pickup-point__list {
+    max-height: 22rem;
+    overflow-y: auto;
+}
+
+/* The filled check shown next to the chosen point in the compact summary. */
+.setono-pickup-point__check {
+    width: 2rem;
+    height: 2rem;
+    flex: 0 0 2rem;
+}
diff --git a/public/js/setono-pickup-point.js b/public/js/setono-pickup-point.js
new file mode 100644
index 00000000..07a82c71
--- /dev/null
+++ b/public/js/setono-pickup-point.js
@@ -0,0 +1,325 @@
+/**
+ * Pickup-point chooser (no framework, no Stimulus).
+ *
+ * The shipping page renders without any provider calls. Once it is on screen this script fetches — once
+ * per visit, asynchronously — every pickup-capable method's points for the current cart from a single
+ * JSON endpoint (window.setonoSyliusPickupPointUrl); a slow or down provider therefore degrades
+ * gracefully instead of blocking checkout.
+ *
+ * The chooser is built client-side and inserted into the selected pickup-capable shipping method's card.
+ * It has two states: a compact summary of the chosen point (with a "Change" button) and an expandable
+ * list of points (with a "Selected" badge on the current one and a "Keep this" shortcut). Selecting a
+ * point writes its opaque token into the hidden input, which the server decodes on submit (no re-fetch).
+ *
+ * Sylius' shop navigates with Turbo (checkout steps are AJAX body swaps), so init is bound to both
+ * DOMContentLoaded and turbo:load; a per-field flag keeps it from running twice on the same DOM.
+ */
+(function () {
+    'use strict';
+
+    if (window.__setonoSyliusPickupPointBooted) {
+        return;
+    }
+    window.__setonoSyliusPickupPointBooted = true;
+
+    const SVG_NS = 'http://www.w3.org/2000/svg';
+    const SECTION_ATTR = 'data-setono-pickup-section';
+
+    function shipmentIndex(name) {
+        const match = /\[shipments]\[(\d+)]/.exec(name || '');
+
+        return match ? match[1] : '0';
+    }
+
+    function methodRadioSelector(index) {
+        return 'input[type="radio"][name*="[shipments][' + index + '][method]"]';
+    }
+
+    function el(tag, className, text) {
+        const node = document.createElement(tag);
+        if (className) {
+            node.className = className;
+        }
+        if (undefined !== text && null !== text) {
+            node.textContent = text;
+        }
+
+        return node;
+    }
+
+    // The token is base64url(JSON of the whole point); decoding it lets the compact summary show the
+    // chosen point's details without matching it back to a (possibly regenerated) fetched point.
+    function decodeToken(token) {
+        try {
+            let base64 = String(token).replace(/-/g, '+').replace(/_/g, '/');
+            while (0 !== base64.length % 4) {
+                base64 += '=';
+            }
+            const bytes = Uint8Array.from(atob(base64), function (character) {
+                return character.charCodeAt(0);
+            });
+
+            return JSON.parse(new TextDecoder().decode(bytes));
+        } catch (error) {
+            return null;
+        }
+    }
+
+    function addressLine(point, separator) {
+        const locality = [point.zipCode, point.city].filter(Boolean).join(' ');
+
+        return [point.address, locality].filter(Boolean).join(separator);
+    }
+
+    // A point's identity is provider + id + country, not its full token: a provider may return slightly
+    // different details for the same point between calls (and the faker provider regenerates them), so a
+    // persisted selection must still match its list entry on reload by identity rather than byte-equality.
+    function identity(token) {
+        const point = decodeToken(token);
+
+        return null === point ? null : [point.provider, point.id, point.country].join(' ');
+    }
+
+    function checkIcon() {
+        const svg = document.createElementNS(SVG_NS, 'svg');
+        svg.setAttribute('viewBox', '0 0 16 16');
+        svg.setAttribute('width', '16');
+        svg.setAttribute('height', '16');
+        svg.setAttribute('fill', 'currentColor');
+
+        const path = document.createElementNS(SVG_NS, 'path');
+        path.setAttribute('d', 'M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.267.267 0 0 1 .02-.022z');
+        svg.appendChild(path);
+
+        return svg;
+    }
+
+    function message(field, attribute) {
+        return el('div', 'setono-sylius-pickup-point-field-message text-body-secondary small py-2', field.getAttribute(attribute));
+    }
+
+    function summary(field, input, rerender) {
+        const point = decodeToken(input.value) || {};
+
+        const box = el('div', 'd-flex align-items-center gap-3 bg-body border border-primary rounded-3 p-3');
+
+        const check = el('span', 'setono-pickup-point__check rounded-circle bg-primary text-white d-inline-flex align-items-center justify-content-center');
+        check.appendChild(checkIcon());
+        box.appendChild(check);
+
+        const info = el('div', 'flex-grow-1');
+        info.appendChild(el('div', 'fw-bold', point.name || ''));
+        info.appendChild(el('div', 'text-body-secondary small', addressLine(point, ' · ')));
+        box.appendChild(info);
+
+        const change = el('button', 'btn btn-link text-primary fw-semibold text-decoration-none p-0', field.getAttribute('data-change-text'));
+        change.type = 'button';
+        change.addEventListener('click', function () {
+            field._mode = 'list';
+            rerender();
+        });
+        box.appendChild(change);
+
+        return box;
+    }
+
+    function list(field, input, points, rerender) {
+        const wrapper = el('div');
+
+        const current = input.value ? decodeToken(input.value) : null;
+        const currentIdentity = input.value ? identity(input.value) : null;
+        if (null !== current) {
+            const head = el('div', 'd-flex justify-content-between align-items-center gap-2 mb-2');
+
+            const label = el('div', 'small text-body-secondary');
+            label.appendChild(document.createTextNode((field.getAttribute('data-currently-text') || '') + ' '));
+            label.appendChild(el('span', 'fw-bold text-body', current.name || ''));
+            head.appendChild(label);
+
+            const keep = el('button', 'btn btn-sm btn-outline-primary flex-shrink-0', field.getAttribute('data-keep-text'));
+            keep.type = 'button';
+            keep.addEventListener('click', function () {
+                field._mode = 'summary';
+                rerender();
+            });
+            head.appendChild(keep);
+
+            wrapper.appendChild(head);
+        }
+
+        const group = el('div', 'setono-pickup-point__list list-group');
+        const groupName = 'setono-pickup-point-choice-' + shipmentIndex(input.getAttribute('name'));
+
+        points.forEach(function (point) {
+            const isSelected = null !== currentIdentity && identity(point.value) === currentIdentity;
+            const item = el('label', 'list-group-item d-flex align-items-center gap-3' + (isSelected ? ' bg-primary-subtle' : ''));
+
+            const radio = el('input', 'form-check-input flex-shrink-0 m-0');
+            radio.type = 'radio';
+            radio.name = groupName;
+            radio.value = point.value;
+            radio.checked = isSelected;
+            radio.addEventListener('change', function () {
+                input.value = radio.value;
+                field._mode = 'summary';
+                rerender();
+            });
+            item.appendChild(radio);
+
+            const info = el('div', 'flex-grow-1');
+            info.appendChild(el('div', 'fw-bold', point.name || ''));
+            info.appendChild(el('div', 'text-body-secondary small', addressLine(point, ', ')));
+            item.appendChild(info);
+
+            if (isSelected) {
+                item.appendChild(el('span', 'badge bg-primary text-white flex-shrink-0', field.getAttribute('data-selected-text')));
+            }
+
+            group.appendChild(item);
+        });
+
+        wrapper.appendChild(group);
+
+        return wrapper;
+    }
+
+    function removeSection(index) {
+        document.querySelectorAll('[' + SECTION_ATTR + '="' + index + '"]').forEach(function (section) {
+            section.remove();
+        });
+    }
+
+    function render(field, state) {
+        const input = field.querySelector('[data-pickup-point-input]');
+        if (null === input) {
+            return;
+        }
+
+        const index = shipmentIndex(input.getAttribute('name'));
+        removeSection(index);
+
+        const method = document.querySelector(methodRadioSelector(index) + ':checked');
+        if (null === method || !method.hasAttribute('data-pickup-point-provider')) {
+            return;
+        }
+
+        const card = method.closest('.card');
+        if (null === card) {
+            return;
+        }
+
+        const section = el('div', 'setono-pickup-point px-3 pb-3');
+        section.setAttribute(SECTION_ATTR, index);
+        section.appendChild(el('hr', 'setono-pickup-point__divider my-3'));
+
+        const points = (state.data && false !== state.data) ? (state.data[method.value] || []) : null;
+
+        // Pre-select the nearest point (providers return them ordered by distance from the address) so
+        // the shopper lands on the most likely choice in the compact summary instead of an open list;
+        // they can still open the list to pick another.
+        if (Array.isArray(points) && points.length > 0 && '' === input.value) {
+            input.value = points[0].value;
+            field._mode = 'summary';
+        }
+
+        const summaryMode = 'summary' === field._mode && '' !== input.value;
+
+        const heading = el('div', 'fw-bold mb-2');
+        heading.appendChild(document.createTextNode(field.getAttribute('data-label-text') || ''));
+        if (!summaryMode && Array.isArray(points) && points.length > 0) {
+            heading.appendChild(document.createTextNode(' '));
+            heading.appendChild(el('span', 'text-danger', '*'));
+        }
+        section.appendChild(heading);
+
+        const rerender = function () {
+            render(field, state);
+        };
+
+        if (summaryMode) {
+            section.appendChild(summary(field, input, rerender));
+        } else if (null === state.data) {
+            section.appendChild(message(field, 'data-loading-text'));
+        } else if (false === state.data) {
+            section.appendChild(message(field, 'data-error-text'));
+        } else if (!Array.isArray(points) || 0 === points.length) {
+            section.appendChild(message(field, 'data-empty-text'));
+        } else {
+            section.appendChild(list(field, input, points, rerender));
+        }
+
+        card.appendChild(section);
+    }
+
+    function setup(field, state) {
+        const input = field.querySelector('[data-pickup-point-input]');
+        if (null === input) {
+            return;
+        }
+
+        field._mode = 'summary';
+
+        document.querySelectorAll(methodRadioSelector(shipmentIndex(input.getAttribute('name')))).forEach(function (radio) {
+            radio.addEventListener('change', function () {
+                input.value = '';
+                field._mode = 'summary';
+                render(field, state);
+            });
+        });
+
+        render(field, state);
+    }
+
+    function init() {
+        const url = window.setonoSyliusPickupPointUrl;
+        if (!url) {
+            return;
+        }
+
+        const fields = [];
+        document.querySelectorAll('[data-pickup-point-field]').forEach(function (field) {
+            if (!field.hasAttribute('data-pickup-point-ready')) {
+                field.setAttribute('data-pickup-point-ready', '');
+                fields.push(field);
+            }
+        });
+        if (0 === fields.length) {
+            return;
+        }
+
+        // null = still loading, false = failed, object = points keyed by shipping method code.
+        const state = { data: null };
+
+        fields.forEach(function (field) {
+            setup(field, state);
+        });
+
+        fetch(url, { headers: { 'X-Requested-With': 'XMLHttpRequest' }, credentials: 'same-origin' })
+            .then(function (response) {
+                if (!response.ok) {
+                    throw new Error('Request failed: ' + response.status);
+                }
+
+                return response.json();
+            })
+            .then(function (data) {
+                state.data = data;
+            })
+            .catch(function () {
+                state.data = false;
+            })
+            .then(function () {
+                fields.forEach(function (field) {
+                    render(field, state);
+                });
+            });
+    }
+
+    document.addEventListener('DOMContentLoaded', init);
+    document.addEventListener('turbo:load', init);
+
+    // The script itself may be (re-)evaluated after the DOM is already interactive.
+    if ('loading' !== document.readyState) {
+        init();
+    }
+})();
diff --git a/rector.php b/rector.php
index af10a309..489a662c 100644
--- a/rector.php
+++ b/rector.php
@@ -20,6 +20,6 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81
+        LevelSetList::UP_TO_PHP_82,
     ]);
 };
diff --git a/spec/Controller/Action/PickupPointsSearchByCartAddressActionSpec.php b/spec/Controller/Action/PickupPointsSearchByCartAddressActionSpec.php
deleted file mode 100644
index c778e481..00000000
--- a/spec/Controller/Action/PickupPointsSearchByCartAddressActionSpec.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Controller\Action;
-
-use FOS\RestBundle\View\ViewHandlerInterface;
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Setono\SyliusPickupPointPlugin\Controller\Action\PickupPointsSearchByCartAddressAction;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface;
-use Sylius\Component\Order\Context\CartContextInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-
-final class PickupPointsSearchByCartAddressActionSpec extends ObjectBehavior
-{
-    function let(
-        ViewHandlerInterface $viewHandler,
-        CartContextInterface $cartContext,
-        CsrfTokenManagerInterface $csrfTokenManager,
-        ServiceRegistryInterface $providerRegistry,
-        ShippingMethodRepositoryInterface $shippingMethodRepository
-    ): void {
-        $this->beConstructedWith(
-            $viewHandler,
-            $cartContext,
-            $csrfTokenManager,
-            $providerRegistry,
-            $shippingMethodRepository
-        );
-    }
-
-    function it_is_initializable(): void
-    {
-        $this->shouldHaveType(PickupPointsSearchByCartAddressAction::class);
-    }
-
-    function it_finds_pickup_points(
-        Request $request,
-        CartContextInterface $cartContext,
-        OrderInterface $order,
-        ServiceRegistryInterface $providerRegistry,
-        CsrfTokenManagerInterface $csrfTokenManager,
-        ProviderInterface $provider,
-        ViewHandlerInterface $viewHandler,
-        Response $response
-    ): void {
-        $order->getId()->willReturn(1);
-        $cartContext->getCart()->willReturn($order);
-        $request->get('_csrf_token')->willReturn('token');
-        $request->get('providerCode')->willReturn('gls');
-        $providerRegistry->has('gls')->willReturn(true);
-        $providerRegistry->get('gls')->willReturn($provider);
-        $csrfTokenManager->isTokenValid(Argument::any())->willReturn(true);
-        $viewHandler->handle(Argument::any())->willReturn($response);
-
-        $provider->findPickupPoints($order)->willReturn([])->shouldBeCalled();
-
-        $this->__invoke($request, 'gls');
-    }
-}
diff --git a/spec/Exception/NonUniqueProviderCodeExceptionSpec.php b/spec/Exception/NonUniqueProviderCodeExceptionSpec.php
deleted file mode 100644
index 790723f3..00000000
--- a/spec/Exception/NonUniqueProviderCodeExceptionSpec.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Exception;
-
-use PhpSpec\ObjectBehavior;
-use Setono\SyliusPickupPointPlugin\Exception\NonUniqueProviderCodeException;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-
-final class NonUniqueProviderCodeExceptionSpec extends ObjectBehavior
-{
-    public function let(ProviderInterface $provider): void
-    {
-        $provider->getCode()->willReturn('gls');
-
-        $this->beConstructedWith($provider);
-    }
-
-    public function it_is_initializable(): void
-    {
-        $this->shouldHaveType(NonUniqueProviderCodeException::class);
-    }
-
-    public function it_is_a_invalid_argument_exception_exception(): void
-    {
-        $this->shouldHaveType(\InvalidArgumentException::class);
-    }
-}
diff --git a/spec/Form/Extension/ShipmentTypeExtensionSpec.php b/spec/Form/Extension/ShipmentTypeExtensionSpec.php
deleted file mode 100644
index 27ec1329..00000000
--- a/spec/Form/Extension/ShipmentTypeExtensionSpec.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Form\Extension;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Setono\SyliusPickupPointPlugin\Form\Extension\ShipmentTypeExtension;
-use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ShipmentTypeExtensionSpec extends ObjectBehavior
-{
-    public function it_is_initializable(): void
-    {
-        $this->shouldHaveType(ShipmentTypeExtension::class);
-    }
-
-    public function it_is_an_abstract_type_extension_form(): void
-    {
-        $this->shouldHaveType(AbstractTypeExtension::class);
-    }
-
-    public function it_takes_arguments(FormBuilderInterface $builder): void
-    {
-        $builder->add(Argument::type('string'), Argument::type('string'), Argument::any())->willReturn($builder);
-        $this->buildForm($builder, []);
-    }
-}
diff --git a/spec/Form/Extension/ShippingMethodChoiceTypeExtensionSpec.php b/spec/Form/Extension/ShippingMethodChoiceTypeExtensionSpec.php
deleted file mode 100644
index 8b230a2c..00000000
--- a/spec/Form/Extension/ShippingMethodChoiceTypeExtensionSpec.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Form\Extension;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodChoiceTypeExtension;
-use Sylius\Component\Order\Context\CartContextInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-
-class ShippingMethodChoiceTypeExtensionSpec extends ObjectBehavior
-{
-    public function let(ServiceRegistryInterface $providerRegistry, RouterInterface $router, CartContextInterface $cartContext, CsrfTokenManagerInterface $csrfTokenManager)
-    {
-        $this->beConstructedWith($providerRegistry, $router, $cartContext, $csrfTokenManager);
-    }
-
-    public function it_is_initializable(): void
-    {
-        $this->shouldHaveType(ShippingMethodChoiceTypeExtension::class);
-    }
-
-    public function it_is_an_abstract_type_extension_form(): void
-    {
-        $this->shouldHaveType(AbstractTypeExtension::class);
-    }
-
-    public function it_takes_arguments(FormBuilderInterface $builder): void
-    {
-        $builder->add(Argument::type('string'), Argument::type('string'), Argument::any())->willReturn($builder);
-        $this->buildForm($builder, []);
-    }
-}
diff --git a/spec/Form/Extension/ShippingMethodTypeExtensionSpec.php b/spec/Form/Extension/ShippingMethodTypeExtensionSpec.php
deleted file mode 100644
index 7ca532e9..00000000
--- a/spec/Form/Extension/ShippingMethodTypeExtensionSpec.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Form\Extension;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodTypeExtension;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ShippingMethodTypeExtensionSpec extends ObjectBehavior
-{
-    public function let(ServiceRegistryInterface $providerRegistry)
-    {
-        $this->beConstructedWith([]);
-    }
-
-    public function it_is_initializable(): void
-    {
-        $this->shouldHaveType(ShippingMethodTypeExtension::class);
-    }
-
-    public function it_is_an_abstract_type_extension_form(): void
-    {
-        $this->shouldHaveType(AbstractTypeExtension::class);
-    }
-
-    public function it_takes_arguments(FormBuilderInterface $builder): void
-    {
-        $builder->add(Argument::type('string'), Argument::type('string'), Argument::any())->willReturn($builder);
-        $this->buildForm($builder, []);
-    }
-}
diff --git a/spec/Provider/DAOProviderSpec.php b/spec/Provider/DAOProviderSpec.php
deleted file mode 100644
index 45b94611..00000000
--- a/spec/Provider/DAOProviderSpec.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Provider;
-
-use PhpSpec\ObjectBehavior;
-use Setono\DAO\Client\ClientInterface;
-use Setono\SyliusPickupPointPlugin\Model\PickupPoint;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Provider\DAOProvider;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use Sylius\Component\Core\Model\AddressInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-
-class DAOProviderSpec extends ObjectBehavior
-{
-    public function let(ClientInterface $client, FactoryInterface $factory): void
-    {
-        $factory->createNew()->willReturn(new PickupPoint());
-        $this->beConstructedWith($client, $factory);
-    }
-
-    public function it_is_initializable(): void
-    {
-        $this->shouldHaveType(DAOProvider::class);
-    }
-
-    public function it_implements_provider_interface(): void
-    {
-        $this->shouldImplement(ProviderInterface::class);
-    }
-
-    public function it_finds_one_pickup_point(ClientInterface $client): void
-    {
-        $client->get('/DAOPakkeshop/FindPakkeshop.php', [
-            'shopid' => '1234',
-        ])->willReturn([
-            'resultat' => [
-                'pakkeshops' => [$this->pickupPointArray('1234')],
-            ],
-        ]);
-
-        $pickupPoint = $this->findPickupPoint(new PickupPointCode('1234', 'dao', 'DK'));
-        $pickupPoint->shouldBeAnInstanceOf(PickupPoint::class);
-
-        $this->testPickupPoint($pickupPoint, '1234');
-    }
-
-    public function it_finds_multiple_pickup_points(
-        ClientInterface $client,
-        OrderInterface $order,
-        AddressInterface $address
-    ): void {
-        $client->get('/DAOPakkeshop/FindPakkeshop.php', [
-            'postnr' => 'AE8000',
-            'adresse' => 'Street 10',
-            'antal' => 10,
-        ])->willReturn([
-            'resultat' => [
-                'pakkeshops' => [$this->pickupPointArray('0'), $this->pickupPointArray('1')],
-            ],
-        ]);
-
-        $address->getPostcode()->willReturn('AE 8000');
-        $address->getStreet()->willReturn('Street 10');
-
-        $order->getShippingAddress()->willReturn($address);
-
-        $pickupPoints = $this->findPickupPoints($order);
-        $pickupPoints->shouldBeArrayOfPickupPoints('0', '1'); // these are the ids to match
-    }
-
-    public function getMatchers(): array
-    {
-        return [
-            'beArrayOfPickupPoints' => static function ($pickupPoints, ...$ids) {
-                foreach ($pickupPoints as $idx => $element) {
-                    if (!$element instanceof PickupPoint) {
-                        return false;
-                    }
-
-                    if ($element->getCode()->getIdPart() !== $ids[$idx]) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-        ];
-    }
-
-    /**
-     * @param PickupPoint $pickupPoint
-     */
-    private function testPickupPoint($pickupPoint, string $id): void
-    {
-        $code = $pickupPoint->getCode();
-        $code->shouldBeAnInstanceOf(PickupPointCode::class);
-        $code->getIdPart()->shouldReturn($id);
-
-        $pickupPoint->getName()->shouldReturn('Mediabox');
-        $pickupPoint->getAddress()->shouldReturn('Bilka Vejle 20');
-        $pickupPoint->getZipCode()->shouldReturn('7100');
-        $pickupPoint->getCity()->shouldReturn('Vejle');
-        $pickupPoint->getCountry()->shouldReturn('DK');
-        $pickupPoint->getLatitude()->shouldReturn(55.7119);
-        $pickupPoint->getLongitude()->shouldReturn(9.539939);
-    }
-
-    private function pickupPointArray(string $id): array
-    {
-        return [
-            'shopId' => $id,
-            'navn' => 'Mediabox',
-            'adresse' => 'Bilka Vejle 20',
-            'postnr' => '7100',
-            'bynavn' => 'Vejle',
-            'udsortering' => 'E',
-            'latitude' => 55.7119,
-            'longitude' => 9.539939,
-            'afstand' => 2.652,
-            'aabningstider' => [
-                'man' => '08:00 - 22:00',
-                'tir' => '08:00 - 22:00',
-                'ons' => '08:00 - 22:00',
-                'tor' => '08:00 - 22:00',
-                'fre' => '08:00 - 24:00',
-                'lor' => '10:00 - 24:00',
-                'son' => '10:00 - 22:00',
-            ],
-        ];
-    }
-}
diff --git a/spec/Validator/Constraints/HasPickupPointSelectedSpec.php b/spec/Validator/Constraints/HasPickupPointSelectedSpec.php
deleted file mode 100644
index 547b7d10..00000000
--- a/spec/Validator/Constraints/HasPickupPointSelectedSpec.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace spec\Setono\SyliusPickupPointPlugin\Validator\Constraints;
-
-use PhpSpec\ObjectBehavior;
-use Symfony\Component\Validator\Constraint;
-
-final class HasPickupPointSelectedSpec extends ObjectBehavior
-{
-    public function it_is_a_constraint()
-    {
-        $this->shouldHaveType(Constraint::class);
-    }
-
-    public function it_has_validator()
-    {
-        $this->validatedBy()->shouldReturn('setono_pickup_point_has_pickup_point_selected');
-    }
-
-    public function it_has_a_target()
-    {
-        $this->getTargets()->shouldReturn('class');
-    }
-
-    function it_has_a_message(): void
-    {
-        $this->pickupPointNotBlank->shouldReturn('setono_pickup_point.shipment.pickup_point.not_blank');
-    }
-}
diff --git a/src/Attribute/AsProvider.php b/src/Attribute/AsProvider.php
new file mode 100644
index 00000000..62e788e3
--- /dev/null
+++ b/src/Attribute/AsProvider.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Attribute;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final readonly class AsProvider
+{
+    public function __construct(
+        /**
+         * A unique machine identifier for the provider — used as the key in the
+         * provider registry, as the value submitted by the shipping-method
+         * choice and as the `provider` part of the pickup-point wire-format
+         * string. Examples: `"faker"`, `"gls"`, `"post_nord"`.
+         */
+        public string $code,
+
+        /**
+         * The human-readable company name of the provider as it appears to
+         * merchants in the admin shipping-method form when they pick the
+         * provider for a shipping method — e.g. `"GLS"`, `"PostNord"`,
+         * `"DAO"`. This is the carrier's brand name, not a translation key.
+         */
+        public string $name,
+    ) {
+    }
+}
diff --git a/src/Command/LoadPickupPointsCommand.php b/src/Command/LoadPickupPointsCommand.php
deleted file mode 100644
index e996f145..00000000
--- a/src/Command/LoadPickupPointsCommand.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Command;
-
-use Setono\SyliusPickupPointPlugin\Message\Command\LoadPickupPoints;
-use function sprintf;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Messenger\MessageBusInterface;
-
-final class LoadPickupPointsCommand extends Command
-{
-    protected static $defaultName = 'setono-sylius-pickup-point:load-pickup-points';
-
-    private SymfonyStyle $io;
-
-    private ServiceRegistryInterface $providerRegistry;
-
-    private MessageBusInterface $messageBus;
-
-    public function __construct(ServiceRegistryInterface $providerRegistry, MessageBusInterface $messageBus)
-    {
-        $this->providerRegistry = $providerRegistry;
-        $this->messageBus = $messageBus;
-
-        parent::__construct();
-    }
-
-    public function configure(): void
-    {
-        $this
-            ->setDescription('Load all pickup points into local database')
-            ->addArgument('provider', InputArgument::OPTIONAL, 'If given, the command will only fetch pickup points from this provider')
-        ;
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $this->io = new SymfonyStyle($input, $output);
-
-        $providerCode = $input->getArgument('provider');
-
-        if (is_string($providerCode)) {
-            $providers = [$this->providerRegistry->get($providerCode)];
-        } else {
-            $providers = $this->providerRegistry->all();
-        }
-
-        $this->dispatch($providers);
-
-        return 0;
-    }
-
-    private function dispatch(array $providers): void
-    {
-        ProgressBar::setFormatDefinition('custom', ' %current%/%max%: %message%');
-
-        $progressBar = $this->io->createProgressBar(count($providers));
-        $progressBar->setFormat('custom');
-
-        foreach ($providers as $provider) {
-            $progressBar->setMessage(sprintf('Dispatching command to load pickup points for %s', (string) $provider));
-            $this->messageBus->dispatch(new LoadPickupPoints($provider));
-            $progressBar->advance();
-        }
-        $progressBar->finish();
-
-        $this->io->newLine();
-        $this->io->success('All commands dispatched!');
-    }
-}
diff --git a/src/Controller/Action/PickupPointByIdAction.php b/src/Controller/Action/PickupPointByIdAction.php
deleted file mode 100644
index b22d36d7..00000000
--- a/src/Controller/Action/PickupPointByIdAction.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Controller\Action;
-
-use FOS\RestBundle\View\View;
-use FOS\RestBundle\View\ViewHandlerInterface;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Symfony\Component\Form\DataTransformerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-final class PickupPointByIdAction
-{
-    private ViewHandlerInterface $viewHandler;
-
-    private DataTransformerInterface $pickupPointToIdentifierTransformer;
-
-    public function __construct(
-        ViewHandlerInterface $viewHandler,
-        DataTransformerInterface $pickupPointToIdentifierTransformer,
-    ) {
-        $this->viewHandler = $viewHandler;
-        $this->pickupPointToIdentifierTransformer = $pickupPointToIdentifierTransformer;
-    }
-
-    public function __invoke(Request $request): Response
-    {
-        $pickupPointId = $request->get('pickupPointId');
-        if (!is_scalar($pickupPointId) || '' === $pickupPointId) {
-            throw new NotFoundHttpException();
-        }
-
-        /** @var PickupPointInterface|mixed $pickupPoint */
-        $pickupPoint = $this->pickupPointToIdentifierTransformer->reverseTransform($pickupPointId);
-        if (!$pickupPoint instanceof PickupPointInterface) {
-            throw new NotFoundHttpException();
-        }
-
-        $view = View::create($pickupPoint);
-        $view->getContext()->addGroup('Detailed');
-
-        return $this->viewHandler->handle($view);
-    }
-}
diff --git a/src/Controller/Action/PickupPointsAction.php b/src/Controller/Action/PickupPointsAction.php
new file mode 100644
index 00000000..a94519ce
--- /dev/null
+++ b/src/Controller/Action/PickupPointsAction.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Controller\Action;
+
+use Setono\SyliusPickupPointPlugin\DTO\Address;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoderInterface;
+use Setono\SyliusPickupPointPlugin\Model\ShippingMethodInterface;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistryInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Order\Context\CartContextInterface;
+use Sylius\Component\Order\Context\CartNotFoundException;
+use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Returns, for the current cart, the pickup points of every shipping method that is available for the
+ * cart's shipment(s) and has a provider, keyed by shipping method code. It resolves the available methods
+ * with the shipping-methods resolver — the same methods Sylius renders as the radios (channel + zone +
+ * shipping category), not merely every channel-enabled method — so it only calls the providers behind
+ * methods the shopper can actually select.
+ *
+ * The checkout page calls this asynchronously *after* it has rendered, so a slow or down carrier API never
+ * blocks the shipping page — and a single failing provider only empties its own entry (the per-provider
+ * try/catch) instead of taking the others down.
+ *
+ * Each point carries an opaque `value` token ({@see PickupPointEncoderInterface}) that the shop JS uses as
+ * the selected radio's value; on submit the hidden field's transformer decodes it back into the point, so
+ * nothing is re-fetched server-side.
+ */
+final readonly class PickupPointsAction
+{
+    public function __construct(
+        private CartContextInterface $cartContext,
+        private ProviderRegistryInterface $providerRegistry,
+        private PickupPointEncoderInterface $encoder,
+        private ShippingMethodsResolverInterface $shippingMethodsResolver,
+    ) {
+    }
+
+    public function __invoke(): Response
+    {
+        try {
+            $order = $this->cartContext->getCart();
+        } catch (CartNotFoundException) {
+            return new JsonResponse([]);
+        }
+
+        if (!$order instanceof OrderInterface) {
+            return new JsonResponse([]);
+        }
+
+        $address = Address::fromOrder($order);
+
+        $result = [];
+
+        foreach ($order->getShipments() as $shipment) {
+            foreach ($this->shippingMethodsResolver->getSupportedMethods($shipment) as $method) {
+                if (!$method instanceof ShippingMethodInterface || !$method->hasPickupPointProvider()) {
+                    continue;
+                }
+
+                $code = (string) $method->getCode();
+                if (isset($result[$code])) {
+                    // Already computed for an earlier shipment; the points only depend on the provider.
+                    continue;
+                }
+
+                $providerCode = $method->getPickupPointProvider();
+                if (null === $providerCode || !$this->providerRegistry->has($providerCode)) {
+                    continue;
+                }
+
+                $result[$code] = $this->pickupPoints($providerCode, $address);
+            }
+        }
+
+        return new JsonResponse($result);
+    }
+
+    /**
+     * @return list<array<string, string|null>>
+     */
+    private function pickupPoints(string $providerCode, Address $address): array
+    {
+        try {
+            $pickupPoints = $this->providerRegistry->get($providerCode)->findPickupPoints($address);
+        } catch (\Throwable) {
+            // A slow/unavailable provider must not break the others; its entry is simply empty.
+            return [];
+        }
+
+        $result = [];
+        foreach ($pickupPoints as $pickupPoint) {
+            try {
+                $value = $this->encoder->encode($pickupPoint);
+            } catch (\JsonException) {
+                // A point we cannot encode (e.g. a carrier returning a non-UTF-8 string) is skipped
+                // rather than 500-ing the whole endpoint; the other points and carriers still load.
+                continue;
+            }
+
+            $result[] = [
+                'value' => $value,
+                'name' => $pickupPoint->name,
+                'address' => $pickupPoint->address,
+                'zipCode' => $pickupPoint->zipCode,
+                'city' => $pickupPoint->city,
+                'latitude' => $pickupPoint->latitude,
+                'longitude' => $pickupPoint->longitude,
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Controller/Action/PickupPointsSearchByCartAddressAction.php b/src/Controller/Action/PickupPointsSearchByCartAddressAction.php
deleted file mode 100644
index 9d58fb74..00000000
--- a/src/Controller/Action/PickupPointsSearchByCartAddressAction.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Controller\Action;
-
-use FOS\RestBundle\View\View;
-use FOS\RestBundle\View\ViewHandlerInterface;
-use Generator;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use function sprintf;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Order\Context\CartContextInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Security\Csrf\CsrfToken;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-
-final class PickupPointsSearchByCartAddressAction
-{
-    private ViewHandlerInterface $viewHandler;
-
-    private CartContextInterface $cartContext;
-
-    private CsrfTokenManagerInterface $csrfTokenManager;
-
-    private ServiceRegistryInterface $providerRegistry;
-
-    public function __construct(
-        ViewHandlerInterface $viewHandler,
-        CartContextInterface $cartContext,
-        CsrfTokenManagerInterface $csrfTokenManager,
-        ServiceRegistryInterface $providerRegistry,
-    ) {
-        $this->viewHandler = $viewHandler;
-        $this->cartContext = $cartContext;
-        $this->csrfTokenManager = $csrfTokenManager;
-        $this->providerRegistry = $providerRegistry;
-    }
-
-    public function __invoke(Request $request): Response
-    {
-        /** @var OrderInterface $order */
-        $order = $this->cartContext->getCart();
-
-        if (!$this->isCsrfTokenValid((string) $order->getId(), $request->get('_csrf_token'))) {
-            throw new HttpException(Response::HTTP_FORBIDDEN, 'Invalid CSRF token.');
-        }
-
-        $providerCode = $request->get('providerCode');
-        if (!is_string($providerCode) || '' === $providerCode) {
-            throw new NotFoundHttpException('Empty provider code');
-        }
-
-        if (!$this->providerRegistry->has($providerCode)) {
-            throw new NotFoundHttpException(sprintf(
-                'Provider \'%s\' not recognized. Expecting one of: %s',
-                $providerCode,
-                implode(', ', array_keys($this->providerRegistry->all())),
-            ));
-        }
-
-        /** @var ProviderInterface $provider */
-        $provider = $this->providerRegistry->get($providerCode);
-        $pickupPoints = $provider->findPickupPoints($order);
-
-        if ($pickupPoints instanceof Generator) {
-            $pickupPoints = iterator_to_array($pickupPoints);
-        }
-
-        $view = View::create($pickupPoints);
-        $view->getContext()->addGroup('Autocomplete');
-
-        return $this->viewHandler->handle($view);
-    }
-
-    private function isCsrfTokenValid(string $id, ?string $token): bool
-    {
-        return $this->csrfTokenManager->isTokenValid(new CsrfToken($id, $token));
-    }
-}
diff --git a/src/DTO/Address.php b/src/DTO/Address.php
new file mode 100644
index 00000000..bb74aaa9
--- /dev/null
+++ b/src/DTO/Address.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\DTO;
+
+use Sylius\Component\Core\Model\OrderInterface;
+
+/**
+ * An immutable, order-agnostic query object describing the address a provider should search
+ * pickup points near. Decoupling the providers from {@see OrderInterface} lets them be used
+ * in non-checkout scenarios (e.g. an admin tool or a standalone lookup) where there is no order.
+ *
+ * All fields are nullable because a cart may not have a (complete) shipping address yet; each
+ * provider decides which fields it requires and early-returns when a needed one is missing.
+ */
+final readonly class Address
+{
+    public function __construct(
+        public ?string $street = null,
+        public ?string $postalCode = null,
+        public ?string $city = null,
+        public ?string $countryCode = null,
+    ) {
+    }
+
+    /**
+     * Builds an {@see Address} from an order's shipping address. Returns an all-null instance when
+     * the order has no shipping address yet, so providers see the same "missing field" shape they
+     * would for a partially filled address.
+     */
+    public static function fromOrder(OrderInterface $order): self
+    {
+        $shippingAddress = $order->getShippingAddress();
+        if (null === $shippingAddress) {
+            return new self();
+        }
+
+        return new self(
+            $shippingAddress->getStreet(),
+            $shippingAddress->getPostcode(),
+            $shippingAddress->getCity(),
+            $shippingAddress->getCountryCode(),
+        );
+    }
+}
diff --git a/src/DTO/PickupPoint.php b/src/DTO/PickupPoint.php
new file mode 100644
index 00000000..faac27d3
--- /dev/null
+++ b/src/DTO/PickupPoint.php
@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\DTO;
+
+final class PickupPoint implements \JsonSerializable
+{
+    public ?string $provider = null;
+
+    public ?string $id = null;
+
+    public ?string $name = null;
+
+    public ?string $address = null;
+
+    public ?string $zipCode = null;
+
+    public ?string $city = null;
+
+    public ?string $country = null;
+
+    public ?string $latitude = null;
+
+    public ?string $longitude = null;
+
+    /**
+     * Open, provider-defined data carried inside the pickup point identifier so a custom provider
+     * can round-trip whatever extra context its
+     * {@see \Setono\SyliusPickupPointPlugin\Provider\ProviderInterface::findPickupPoint()} needs
+     * to re-resolve the point by its id (a region, a warehouse, a token, …). The well-known
+     * {@see self::$country} is folded in automatically by {@see PickupPointIdentifier::fromPickupPoint()},
+     * so it need not be repeated here.
+     *
+     * @var array<string, mixed>
+     */
+    public array $metadata = [];
+
+    /**
+     * @param array<string, mixed> $data
+     */
+    public static function fromArray(array $data): self
+    {
+        $pickupPoint = new self();
+        $pickupPoint->provider = self::scalarOrNull($data['provider'] ?? null);
+        $pickupPoint->id = self::scalarOrNull($data['id'] ?? null);
+        $pickupPoint->name = self::scalarOrNull($data['name'] ?? null);
+        $pickupPoint->address = self::scalarOrNull($data['address'] ?? null);
+        $pickupPoint->zipCode = self::scalarOrNull($data['zipCode'] ?? null);
+        $pickupPoint->city = self::scalarOrNull($data['city'] ?? null);
+        $pickupPoint->country = self::scalarOrNull($data['country'] ?? null);
+        $pickupPoint->latitude = self::scalarOrNull($data['latitude'] ?? null);
+        $pickupPoint->longitude = self::scalarOrNull($data['longitude'] ?? null);
+        $pickupPoint->metadata = self::stringKeyedArray($data['metadata'] ?? null);
+
+        return $pickupPoint;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'provider' => $this->provider,
+            'id' => $this->id,
+            'name' => $this->name,
+            'address' => $this->address,
+            'zipCode' => $this->zipCode,
+            'city' => $this->city,
+            'country' => $this->country,
+            'latitude' => $this->latitude,
+            'longitude' => $this->longitude,
+            'metadata' => $this->metadata,
+        ];
+    }
+
+    /**
+     * Returns the value as a string, accepting strings as-is and stringifying int/float.
+     *
+     * Some fields (id, zip code, coordinates) can legitimately be numeric: when the DTO is
+     * rehydrated from the Doctrine JSON column (see {@see \Setono\SyliusPickupPointPlugin\Model\PickupPointAwareTrait}),
+     * JSON numbers decode as int/float, so coercing them here prevents the value from being
+     * silently dropped. Booleans are intentionally not accepted — `(string) false` is '' and
+     * a bool is never a valid field value.
+     */
+    private static function scalarOrNull(mixed $value): ?string
+    {
+        if (is_string($value)) {
+            return $value;
+        }
+
+        if (is_int($value) || is_float($value)) {
+            return (string) $value;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private static function stringKeyedArray(mixed $value): array
+    {
+        if (!is_array($value)) {
+            return [];
+        }
+
+        $result = [];
+        foreach ($value as $key => $item) {
+            $result[(string) $key] = $item;
+        }
+
+        return $result;
+    }
+}
diff --git a/src/DTO/PickupPointIdentifier.php b/src/DTO/PickupPointIdentifier.php
new file mode 100644
index 00000000..4aceeb38
--- /dev/null
+++ b/src/DTO/PickupPointIdentifier.php
@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\DTO;
+
+/**
+ * The decoded form of a pickup point identifier: the provider it belongs to, the
+ * provider-local id, and the open metadata needed to re-resolve it (see
+ * {@see PickupPoint::$metadata}). Implements {@see \JsonSerializable} so it is the single
+ * source of the identifier's wire shape; the bytes on the wire are produced from it by
+ * {@see \Setono\SyliusPickupPointPlugin\Encoder\PickupPointIdentifierEncoderInterface}.
+ */
+final readonly class PickupPointIdentifier implements \JsonSerializable
+{
+    /**
+     * @param array<string, mixed> $metadata
+     */
+    public function __construct(
+        public string $provider,
+        public string $id,
+        public array $metadata = [],
+    ) {
+    }
+
+    /**
+     * Builds an identifier from a pickup point, or null when the point lacks the
+     * provider/id needed to identify it.
+     *
+     * The well-known {@see PickupPoint::$country} is a first-class property on the point but
+     * travels in the identifier's metadata, because that is what
+     * {@see \Setono\SyliusPickupPointPlugin\Provider\ProviderInterface::findPickupPoint()}
+     * consumes to re-resolve the point by id.
+     */
+    public static function fromPickupPoint(PickupPoint $pickupPoint): ?self
+    {
+        if (null === $pickupPoint->provider || null === $pickupPoint->id) {
+            return null;
+        }
+
+        $metadata = $pickupPoint->metadata;
+        if (null !== $pickupPoint->country) {
+            // "+" keeps the left operand on a key collision, so the first-class country wins over
+            // any stale metadata['country'] a consumer set. Do not flip the operands.
+            $metadata = ['country' => $pickupPoint->country] + $metadata;
+        }
+
+        return new self($pickupPoint->provider, $pickupPoint->id, $metadata);
+    }
+
+    /**
+     * Rebuilds an identifier from its decoded array form — the inverse of {@see jsonSerialize()}.
+     *
+     * @param array<array-key, mixed> $data
+     *
+     * @throws \InvalidArgumentException if $data lacks a string "provider" and/or "id"
+     */
+    public static function fromArray(array $data): self
+    {
+        $provider = $data['provider'] ?? null;
+        $id = $data['id'] ?? null;
+        if (!is_string($provider) || !is_string($id)) {
+            throw new \InvalidArgumentException('A pickup point identifier requires a string "provider" and "id".');
+        }
+
+        return new self($provider, $id, self::stringKeyedArray($data['metadata'] ?? null));
+    }
+
+    /**
+     * @return array{provider: string, id: string, metadata: array<string, mixed>}
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'provider' => $this->provider,
+            'id' => $this->id,
+            'metadata' => $this->metadata,
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private static function stringKeyedArray(mixed $value): array
+    {
+        if (!is_array($value)) {
+            return [];
+        }
+
+        $result = [];
+        foreach ($value as $key => $item) {
+            $result[(string) $key] = $item;
+        }
+
+        return $result;
+    }
+}
diff --git a/src/DependencyInjection/Compiler/RegisterProvidersPass.php b/src/DependencyInjection/Compiler/RegisterProvidersPass.php
index 2675d7fe..50f7c650 100644
--- a/src/DependencyInjection/Compiler/RegisterProvidersPass.php
+++ b/src/DependencyInjection/Compiler/RegisterProvidersPass.php
@@ -5,62 +5,93 @@
 namespace Setono\SyliusPickupPointPlugin\DependencyInjection\Compiler;
 
 use InvalidArgumentException;
-use Setono\SyliusPickupPointPlugin\Provider\CachedProvider;
-use Setono\SyliusPickupPointPlugin\Provider\LocalProvider;
+use ReflectionClass;
+use Setono\SyliusPickupPointPlugin\Attribute\AsProvider;
+use Setono\SyliusPickupPointPlugin\Exception\NonUniqueProviderCodeException;
+use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistry;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
 final class RegisterProvidersPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (!$container->hasDefinition('setono_sylius_pickup_point.registry.provider')) {
+        if (!$container->hasDefinition(ProviderRegistry::class)) {
             return;
         }
 
-        $registry = $container->getDefinition('setono_sylius_pickup_point.registry.provider');
-        $cacheEnabled = $container->getParameter('setono_sylius_pickup_point.cache.enabled') === true;
-        $localEnabled = $container->getParameter('setono_sylius_pickup_point.local') === true;
+        $registry = $container->getDefinition(ProviderRegistry::class);
 
-        $typeToLabelMap = [];
+        /** @var array<string, string> $codeToNameMap */
+        $codeToNameMap = [];
         foreach ($container->findTaggedServiceIds('setono_sylius_pickup_point.provider') as $id => $tagged) {
             foreach ($tagged as $attributes) {
-                if (!isset($attributes['code'], $attributes['label'])) {
-                    throw new InvalidArgumentException('Tagged pickup point provider `' . $id . '` needs to have `code`, and `label` attributes.');
+                [$code, $name] = $this->resolveCodeAndName($container, $id, is_array($attributes) ? $attributes : []);
+
+                if (isset($codeToNameMap[$code])) {
+                    throw new NonUniqueProviderCodeException($code);
                 }
 
-                $typeToLabelMap[$attributes['code']] = $attributes['label'];
+                $codeToNameMap[$code] = $name;
 
-                if ($cacheEnabled) {
-                    $decoratedId = $id;
-                    $id .= '.cached'; // overwrite the id
-                    $cachedDefinition = new Definition(CachedProvider::class, [
-                        new Reference('setono_sylius_pickup_point.cache'),
-                        new Reference($id . '.inner'),
-                    ]);
-                    $cachedDefinition->setDecoratedService($decoratedId, null, 256);
+                $definition = $container->getDefinition($id);
 
-                    $container->setDefinition($id, $cachedDefinition);
-                }
+                // Resolve the code into the provider instance once, at compile time, so it can
+                // stamp the code onto the pickup points it returns without runtime reflection.
+                $definition->addMethodCall('setCode', [$code]);
 
-                if ($localEnabled) {
-                    $decoratedId = $id;
-                    $id .= '.local'; // overwrite the id
-                    $cachedDefinition = new Definition(LocalProvider::class, [
-                        new Reference($id . '.inner'),
-                        new Reference('setono_sylius_pickup_point.repository.pickup_point'),
-                    ]);
-                    $cachedDefinition->setDecoratedService($decoratedId, null, 512);
+                // Providers are lazy so that one whose construction reaches out to an external service
+                // — e.g. the GLS provider opening a SOAP client against a possibly-down WSDL — is built
+                // only when actually called (inside PickupPointsAction's per-provider try/catch), rather
+                // than failing the resolution of the whole registry, the checkout form, or the endpoint.
+                //
+                // The concrete providers are `final`, so the default lazy *ghost* — which works by
+                // subclassing the class — cannot be generated on PHP < 8.4 (which uses VarExporter-generated
+                // proxies rather than native lazy objects). "Interface proxifying" sidesteps that: the
+                // `proxy` tag makes Symfony build a virtual proxy that *implements* ProviderInterface instead
+                // of extending the final class, which works on every supported PHP version. Every method
+                // called on the proxy (setCode/findPickupPoints/findPickupPoint) is declared on the interface.
+                $definition->setLazy(true);
+                $definition->addTag('proxy', ['interface' => ProviderInterface::class]);
 
-                    $container->setDefinition($id, $cachedDefinition);
-                }
+                $registry->addMethodCall('add', [new Reference($id), $code, $name]);
+            }
+        }
+
+        $container->setParameter('setono_sylius_pickup_point.providers', $codeToNameMap);
+    }
+
+    /**
+     * @param array<int|string, mixed> $tagAttributes
+     *
+     * @return array{0: string, 1: string}
+     */
+    private function resolveCodeAndName(ContainerBuilder $container, string $id, array $tagAttributes): array
+    {
+        $code = $tagAttributes['code'] ?? null;
+        $name = $tagAttributes['name'] ?? null;
+
+        if (is_string($code) && '' !== $code && is_string($name) && '' !== $name) {
+            return [$code, $name];
+        }
+
+        $class = $container->getDefinition($id)->getClass();
+        if (is_string($class) && class_exists($class)) {
+            $reflection = new ReflectionClass($class);
+            $attributes = $reflection->getAttributes(AsProvider::class);
+            if ([] !== $attributes) {
+                $attribute = $attributes[0]->newInstance();
 
-                $registry->addMethodCall('register', [$attributes['code'], new Reference($id)]);
+                return [$attribute->code, $attribute->name];
             }
         }
 
-        $container->setParameter('setono_sylius_pickup_point.providers', $typeToLabelMap);
+        throw new InvalidArgumentException(sprintf(
+            'Tagged pickup point provider "%s" must either set `code` and `name` tag attributes or declare the #[%s] attribute on its class.',
+            $id,
+            AsProvider::class,
+        ));
     }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 3e46a4dc..d8ab5962 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -4,18 +4,9 @@
 
 namespace Setono\SyliusPickupPointPlugin\DependencyInjection;
 
-use Setono\BudbeeBundle\SetonoBudbeeBundle;
-use Setono\CoolRunnerBundle\SetonoCoolRunnerBundle;
 use Setono\DAOBundle\SetonoDAOBundle;
 use Setono\GlsWebserviceBundle\SetonoGlsWebserviceBundle;
 use Setono\PostNordBundle\SetonoPostNordBundle;
-use Setono\SyliusPickupPointPlugin\Doctrine\ORM\PickupPointRepository;
-use Setono\SyliusPickupPointPlugin\Model\PickupPoint;
-use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
-use Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType;
-use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
-use Sylius\Component\Resource\Factory\Factory;
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -25,29 +16,13 @@ public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('setono_sylius_pickup_point');
 
-        /** @var ArrayNodeDefinition $rootNode */
+        /** @phpstan-ignore missingType.generics (TreeBuilder is generic in Symfony >=7.1 but not in 6.4) */
         $rootNode = $treeBuilder->getRootNode();
 
         /** @psalm-suppress MixedMethodCall,PossiblyUndefinedMethod,PossiblyNullReference */
         $rootNode
             ->addDefaultsIfNotSet()
             ->children()
-                ->scalarNode('driver')->defaultValue(SyliusResourceBundle::DRIVER_DOCTRINE_ORM)->end()
-                ->arrayNode('cache')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->booleanNode('enabled')
-                            ->defaultFalse()
-                        ->end()
-                        ->scalarNode('pool')
-                            ->defaultNull()
-                        ->end()
-                    ->end()
-                ->end()
-                ->booleanNode('local')
-                    ->defaultValue(true)
-                    ->info('Whether to use the local database when timeouts occur in third party HTTP calls. Remember to run the setono-sylius-pickup-point:load-pickup-points command periodically to populate the local database with pickup points')
-                ->end()
                 ->arrayNode('providers')
                     ->addDefaultsIfNotSet()
                     ->children()
@@ -55,14 +30,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->info('Whether to enable the Faker provider')
                             ->defaultValue(false)
                         ->end()
-                        ->booleanNode('budbee')
-                            ->info('Whether to enable the Budbee provider')
-                            ->defaultValue(class_exists(SetonoBudbeeBundle::class))
-                        ->end()
-                        ->booleanNode('coolrunner')
-                            ->info('Whether to enable the CoolRunner provider')
-                            ->defaultValue(class_exists(SetonoCoolRunnerBundle::class))
-                        ->end()
                         ->booleanNode('dao')
                             ->info('Whether to enable the DAO provider')
                             ->defaultValue(class_exists(SetonoDAOBundle::class))
@@ -74,32 +41,12 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->booleanNode('post_nord')
                             ->info('Whether to enable the PostNord provider')
                             ->defaultValue(class_exists(SetonoPostNordBundle::class))
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
         ;
 
-        $this->addResourcesSection($rootNode);
-
         return $treeBuilder;
     }
-
-    private function addResourcesSection(ArrayNodeDefinition $node): void
-    {
-        /** @psalm-suppress MixedMethodCall,PossiblyUndefinedMethod,PossiblyNullReference */
-        $node
-            ->children()
-                ->arrayNode('resources')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->arrayNode('pickup_point')
-                            ->addDefaultsIfNotSet()
-                            ->children()
-                                ->variableNode('options')->end()
-                                ->arrayNode('classes')
-                                    ->addDefaultsIfNotSet()
-                                    ->children()
-                                        ->scalarNode('model')->defaultValue(PickupPoint::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('repository')->defaultValue(PickupPointRepository::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('form')->defaultValue(DefaultResourceType::class)->end()
-                                        ->scalarNode('factory')->defaultValue(Factory::class)->end();
-    }
 }
diff --git a/src/DependencyInjection/SetonoSyliusPickupPointExtension.php b/src/DependencyInjection/SetonoSyliusPickupPointExtension.php
index 83a908cc..c63fcf08 100644
--- a/src/DependencyInjection/SetonoSyliusPickupPointExtension.php
+++ b/src/DependencyInjection/SetonoSyliusPickupPointExtension.php
@@ -5,66 +5,47 @@
 namespace Setono\SyliusPickupPointPlugin\DependencyInjection;
 
 use LogicException;
-use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Setono\SyliusPickupPointPlugin\Attribute\AsProvider;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Webmozart\Assert\Assert;
 
-final class SetonoSyliusPickupPointExtension extends AbstractResourceExtension
+final class SetonoSyliusPickupPointExtension extends Extension implements PrependExtensionInterface
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
-        /** @psalm-suppress PossiblyNullArgument */
+        /** @var array{
+         *     providers: array{faker: bool, dao: bool, gls: bool, post_nord: bool}
+         * } $config
+         */
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $container->setParameter('setono_sylius_pickup_point.local', $config['local']);
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
 
-        $this->registerResources('setono_sylius_pickup_point', $config['driver'], $config['resources'], $container);
+        $loader->load('services.php');
 
-        $loader->load('services.xml');
+        $container->registerAttributeForAutoconfiguration(
+            AsProvider::class,
+            static function (ChildDefinition $definition, AsProvider $attribute): void {
+                $definition->addTag('setono_sylius_pickup_point.provider', [
+                    'code' => $attribute->code,
+                    'name' => $attribute->name,
+                ]);
+            },
+        );
 
         $bundles = $container->hasParameter('kernel.bundles') ? $container->getParameter('kernel.bundles') : [];
         Assert::isArray($bundles);
 
-        $cacheEnabled = $config['cache']['enabled'];
-        if ($cacheEnabled) {
-            if (!interface_exists(AdapterInterface::class)) {
-                throw new LogicException('Using cache is only supported when symfony/cache is installed.');
-            }
-
-            if (null === $config['cache']['pool']) {
-                throw new LogicException('You should specify pool in order to use cache for pickup point providers.');
-            }
-
-            $container->setAlias('setono_sylius_pickup_point.cache', $config['cache']['pool']);
-        }
-
-        $container->setParameter('setono_sylius_pickup_point.cache.enabled', $cacheEnabled);
-
         if ($config['providers']['faker']) {
             if ('prod' === $container->getParameter('kernel.environment')) {
                 throw new LogicException("You can't use faker provider in production environment.");
             }
 
-            $loader->load('services/providers/faker.xml');
-        }
-
-        if ($config['providers']['budbee']) {
-            if (!isset($bundles['SetonoBudbeeBundle'])) {
-                throw new LogicException('You should use SetonoBudbeeBundle or disable budbee provider.');
-            }
-
-            $loader->load('services/providers/budbee.xml');
-        }
-
-        if ($config['providers']['coolrunner']) {
-            if (!isset($bundles['SetonoCoolRunnerBundle'])) {
-                throw new LogicException('You should use SetonoCoolRunnerBundle or disable coolrunner provider.');
-            }
-
-            $loader->load('services/providers/coolrunner.xml');
+            $loader->load('services/providers/faker.php');
         }
 
         if ($config['providers']['dao']) {
@@ -72,7 +53,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 throw new LogicException('You should use SetonoDAOBundle or disable dao provider.');
             }
 
-            $loader->load('services/providers/dao.xml');
+            $loader->load('services/providers/dao.php');
         }
 
         if ($config['providers']['gls']) {
@@ -80,7 +61,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 throw new LogicException('You should use SetonoGlsWebserviceBundle or disable gls provider.');
             }
 
-            $loader->load('services/providers/gls.xml');
+            $loader->load('services/providers/gls.php');
         }
 
         if ($config['providers']['post_nord']) {
@@ -88,7 +69,51 @@ public function load(array $configs, ContainerBuilder $container): void
                 throw new LogicException('You should use SetonoPostNordBundle or disable post_nord provider.');
             }
 
-            $loader->load('services/providers/post_nord.xml');
+            $loader->load('services/providers/post_nord.php');
         }
     }
+
+    public function prepend(ContainerBuilder $container): void
+    {
+        $container->prependExtensionConfig('sylius_twig_hooks', [
+            'hooks' => [
+                'sylius_admin.order.show.content.sections.shipments.item' => [
+                    'pickup_point' => [
+                        'template' => '@SetonoSyliusPickupPointPlugin/admin/order/show/shipment/pickupPoint.html.twig',
+                        'priority' => 0,
+                    ],
+                ],
+                'sylius_admin.shipping_method.create.content.form.configuration' => [
+                    'pickup_point_provider' => [
+                        'template' => '@SetonoSyliusPickupPointPlugin/admin/shipping_method/form/configuration/pickupPointProvider.html.twig',
+                        'priority' => 50,
+                    ],
+                ],
+                'sylius_admin.shipping_method.update.content.form.configuration' => [
+                    'pickup_point_provider' => [
+                        'template' => '@SetonoSyliusPickupPointPlugin/admin/shipping_method/form/configuration/pickupPointProvider.html.twig',
+                        'priority' => 50,
+                    ],
+                ],
+                'sylius_shop.checkout.select_shipping.content.form.shipments.shipment' => [
+                    'pickup_point' => [
+                        'template' => '@SetonoSyliusPickupPointPlugin/shop/checkout/select_shipping/shipment/pickupPoint.html.twig',
+                        'priority' => -100,
+                    ],
+                ],
+                'sylius_shop.checkout#stylesheets' => [
+                    'setono_sylius_pickup_point.stylesheets' => [
+                        'template' => '@SetonoSyliusPickupPointPlugin/_stylesheets.html.twig',
+                        'priority' => -100,
+                    ],
+                ],
+                'sylius_shop.checkout#javascripts' => [
+                    'setono_sylius_pickup_point.javascripts' => [
+                        'template' => '@SetonoSyliusPickupPointPlugin/_javascripts.html.twig',
+                        'priority' => -100,
+                    ],
+                ],
+            ],
+        ]);
+    }
 }
diff --git a/src/Doctrine/ORM/PickupPointRepository.php b/src/Doctrine/ORM/PickupPointRepository.php
deleted file mode 100644
index fdefbfb1..00000000
--- a/src/Doctrine/ORM/PickupPointRepository.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Doctrine\ORM;
-
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Setono\SyliusPickupPointPlugin\Repository\PickupPointRepositoryInterface;
-use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
-use Sylius\Component\Core\Model\OrderInterface;
-use Webmozart\Assert\Assert;
-
-class PickupPointRepository extends EntityRepository implements PickupPointRepositoryInterface
-{
-    public function findOneByCode(PickupPointCode $code): ?PickupPointInterface
-    {
-        return $this->createQueryBuilder('o')
-            ->andWhere('o.code.id = :codeId')
-            ->andWhere('o.code.provider = :codeProvider')
-            ->andWhere('o.code.country = :codeCountry')
-            ->setParameters([
-                'codeId' => $code->getIdPart(),
-                'codeProvider' => $code->getProviderPart(),
-                'codeCountry' => $code->getCountryPart(),
-            ])
-            ->getQuery()
-            ->getOneOrNullResult()
-        ;
-    }
-
-    public function findByOrder(OrderInterface $order, string $provider): array
-    {
-        $shippingAddress = $order->getShippingAddress();
-        if (null === $shippingAddress) {
-            return [];
-        }
-
-        $countryCode = $shippingAddress->getCountryCode();
-        if (null === $countryCode) {
-            return [];
-        }
-
-        $postalCode = $shippingAddress->getPostcode();
-        if (null === $postalCode) {
-            return [];
-        }
-
-        $objs = $this->createQueryBuilder('o')
-            ->andWhere('o.code.provider = :provider')
-            ->andWhere('o.code.country = :country')
-            ->andWhere('o.zipCode = :postalCode')
-            ->setParameters([
-                'provider' => $provider,
-                'country' => $countryCode,
-                'postalCode' => $postalCode,
-            ])
-            ->getQuery()
-            ->getResult();
-
-        Assert::allIsInstanceOf($objs, PickupPointInterface::class);
-        Assert::isList($objs);
-
-        return $objs;
-    }
-}
diff --git a/src/Encoder/PickupPointEncoder.php b/src/Encoder/PickupPointEncoder.php
new file mode 100644
index 00000000..deddffa3
--- /dev/null
+++ b/src/Encoder/PickupPointEncoder.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Encoder;
+
+use InvalidArgumentException;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use function sprintf;
+
+/**
+ * Encodes a whole {@see PickupPoint} as base64url(JSON) so the chosen point can travel through the
+ * page — into the AJAX response and back as the selected radio's value — and be persisted on submit
+ * without ever calling the provider again. This is what lets the checkout fetch pickup points
+ * asynchronously (the render never blocks on a provider) and still avoids re-resolving the point on
+ * submit (which would block again and, for the faker provider, return a different random point).
+ *
+ * Mirrors {@see PickupPointIdentifierEncoder}, but carries the full point (name, address, ...) — not just
+ * its identifier — because nothing re-fetches the details server-side anymore.
+ */
+final class PickupPointEncoder implements PickupPointEncoderInterface
+{
+    /**
+     * @throws \JsonException if the point cannot be encoded (e.g. it holds a non-UTF-8 string)
+     */
+    public function encode(PickupPoint $pickupPoint): string
+    {
+        $json = json_encode($pickupPoint, \JSON_THROW_ON_ERROR);
+
+        // base64url (RFC 4648 §5): base64-encode, then make it URL- and form-safe by swapping the two
+        // non-safe characters (`+` -> `-`, `/` -> `_`) and dropping the `=` padding. `decode()` reverses it.
+        return rtrim(strtr(base64_encode($json), '+/', '-_'), '=');
+    }
+
+    public function decode(string $value): PickupPoint
+    {
+        $json = base64_decode(strtr($value, '-_', '+/'), true);
+        if (false === $json) {
+            throw new InvalidArgumentException(sprintf('The pickup point "%s" is not valid base64.', $value));
+        }
+
+        $decoded = json_decode($json, true);
+        if (!is_array($decoded)) {
+            throw new InvalidArgumentException(sprintf('The pickup point "%s" does not decode to an object.', $value));
+        }
+
+        /** @var array<string, mixed> $data */
+        $data = $decoded;
+
+        return PickupPoint::fromArray($data);
+    }
+}
diff --git a/src/Encoder/PickupPointEncoderInterface.php b/src/Encoder/PickupPointEncoderInterface.php
new file mode 100644
index 00000000..fc4ae493
--- /dev/null
+++ b/src/Encoder/PickupPointEncoderInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Encoder;
+
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+
+interface PickupPointEncoderInterface
+{
+    /**
+     * Encodes a full pickup point into an opaque, transport-safe token.
+     *
+     * @throws \JsonException if the point cannot be encoded (e.g. it holds a non-UTF-8 string)
+     */
+    public function encode(PickupPoint $pickupPoint): string;
+
+    /**
+     * Reverses {@see encode()}.
+     *
+     * @throws \InvalidArgumentException if the token is malformed
+     */
+    public function decode(string $value): PickupPoint;
+}
diff --git a/src/Encoder/PickupPointIdentifierEncoder.php b/src/Encoder/PickupPointIdentifierEncoder.php
new file mode 100644
index 00000000..3a6a62eb
--- /dev/null
+++ b/src/Encoder/PickupPointIdentifierEncoder.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Encoder;
+
+use InvalidArgumentException;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPointIdentifier;
+use function sprintf;
+
+/**
+ * Encodes the identifier as base64url(JSON) so it can hold an arbitrary metadata map while
+ * remaining safe to use as a form value / query string. The token is opaque on purpose.
+ */
+final class PickupPointIdentifierEncoder implements PickupPointIdentifierEncoderInterface
+{
+    public function encode(PickupPointIdentifier $identifier): string
+    {
+        $json = json_encode($identifier, \JSON_THROW_ON_ERROR);
+
+        // base64url (RFC 4648 §5): base64-encode, then make it URL- and form-safe by swapping the two
+        // non-safe characters (`+` -> `-`, `/` -> `_`) and dropping the `=` padding. `decode()` reverses it.
+        return rtrim(strtr(base64_encode($json), '+/', '-_'), '=');
+    }
+
+    public function decode(string $value): PickupPointIdentifier
+    {
+        $json = base64_decode(strtr($value, '-_', '+/'), true);
+        if (false === $json) {
+            throw new InvalidArgumentException(sprintf('The pickup point identifier "%s" is not valid base64.', $value));
+        }
+
+        $decoded = json_decode($json, true);
+        if (!is_array($decoded)) {
+            throw new InvalidArgumentException(sprintf('The pickup point identifier "%s" does not decode to an object.', $value));
+        }
+
+        return PickupPointIdentifier::fromArray($decoded);
+    }
+}
diff --git a/src/Encoder/PickupPointIdentifierEncoderInterface.php b/src/Encoder/PickupPointIdentifierEncoderInterface.php
new file mode 100644
index 00000000..7018671c
--- /dev/null
+++ b/src/Encoder/PickupPointIdentifierEncoderInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Encoder;
+
+use Setono\SyliusPickupPointPlugin\DTO\PickupPointIdentifier;
+
+/**
+ * Owns the identifier's transport encoding: it frames the JSON shape defined by
+ * {@see PickupPointIdentifier} as the opaque, URL/form-safe string carried between the shop
+ * (form value / AJAX) and PHP.
+ */
+interface PickupPointIdentifierEncoderInterface
+{
+    public function encode(PickupPointIdentifier $identifier): string;
+
+    /**
+     * @throws \InvalidArgumentException if $value is not a valid encoded identifier
+     */
+    public function decode(string $value): PickupPointIdentifier;
+}
diff --git a/src/EventListener/AddIndicesSubscriber.php b/src/EventListener/AddIndicesSubscriber.php
deleted file mode 100644
index 3c8dcc36..00000000
--- a/src/EventListener/AddIndicesSubscriber.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\EventListener;
-
-use Doctrine\Common\EventSubscriber;
-use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
-use Doctrine\ORM\Events;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-
-final class AddIndicesSubscriber implements EventSubscriber
-{
-    public function getSubscribedEvents(): array
-    {
-        return [
-            Events::loadClassMetadata,
-        ];
-    }
-
-    public function loadClassMetadata(LoadClassMetadataEventArgs $event): void
-    {
-        $metadata = $event->getClassMetadata();
-
-        if (!is_subclass_of($metadata->name, PickupPointInterface::class, true)) {
-            return;
-        }
-
-        $tableConfig = [
-            'uniqueConstraints' => [
-                'unique_code_idx' => [
-                    'columns' => [
-                        'code_id',
-                        'code_provider',
-                        'code_country',
-                    ],
-                ],
-            ],
-        ];
-
-        /** @psalm-suppress InvalidPropertyAssignmentValue */
-        $metadata->table = array_merge_recursive($tableConfig, $metadata->table);
-    }
-}
diff --git a/src/Exception/NonUniqueProviderCodeException.php b/src/Exception/NonUniqueProviderCodeException.php
index cee18775..4969c179 100644
--- a/src/Exception/NonUniqueProviderCodeException.php
+++ b/src/Exception/NonUniqueProviderCodeException.php
@@ -5,13 +5,12 @@
 namespace Setono\SyliusPickupPointPlugin\Exception;
 
 use InvalidArgumentException;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
 use function sprintf;
 
 final class NonUniqueProviderCodeException extends InvalidArgumentException implements ExceptionInterface
 {
-    public function __construct(ProviderInterface $provider)
+    public function __construct(string $code)
     {
-        parent::__construct(sprintf('The code %s is not unique. Found in %s', $provider->getCode(), get_class($provider)));
+        parent::__construct(sprintf('More than one pickup point provider is registered with the code "%s". Provider codes must be unique.', $code));
     }
 }
diff --git a/src/Exception/TimeoutException.php b/src/Exception/TimeoutException.php
deleted file mode 100644
index 84a8f412..00000000
--- a/src/Exception/TimeoutException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Exception;
-
-use RuntimeException;
-use Throwable;
-
-/**
- * This is a special exception only thrown when a timeout occurs when trying to fetch pickup point(s) from external providers
- */
-final class TimeoutException extends RuntimeException implements ExceptionInterface
-{
-    public function __construct(Throwable $previous = null)
-    {
-        parent::__construct('This is a special exception only thrown when a timeout occurs when trying to fetch pickup point(s) from external providers', 0, $previous);
-    }
-}
diff --git a/src/Exception/UnknownProviderException.php b/src/Exception/UnknownProviderException.php
new file mode 100644
index 00000000..8dcf4758
--- /dev/null
+++ b/src/Exception/UnknownProviderException.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Exception;
+
+use InvalidArgumentException;
+use function sprintf;
+
+final class UnknownProviderException extends InvalidArgumentException implements ExceptionInterface
+{
+    /**
+     * @param list<string> $availableCodes
+     */
+    public function __construct(string $code, array $availableCodes)
+    {
+        parent::__construct(sprintf(
+            'No pickup point provider is registered with the code "%s". Available codes: %s',
+            $code,
+            [] === $availableCodes ? '(none)' : implode(', ', $availableCodes),
+        ));
+    }
+}
diff --git a/src/Fixture/Factory/ShippingMethodExampleFactoryTrait.php b/src/Fixture/Factory/ShippingMethodExampleFactoryTrait.php
index 84eb218e..d9673994 100644
--- a/src/Fixture/Factory/ShippingMethodExampleFactoryTrait.php
+++ b/src/Fixture/Factory/ShippingMethodExampleFactoryTrait.php
@@ -11,9 +11,16 @@ trait ShippingMethodExampleFactoryTrait
 {
     protected function setPickupPointOptions(ShippingMethodInterface $shippingMethod, array $options): void
     {
-        if (array_key_exists('pickup_point_provider', $options)) {
-            $shippingMethod->setPickupPointProvider($options['pickup_point_provider']);
+        if (!array_key_exists('pickup_point_provider', $options)) {
+            return;
         }
+
+        $value = $options['pickup_point_provider'];
+        if (null !== $value && !is_string($value)) {
+            return;
+        }
+
+        $shippingMethod->setPickupPointProvider($value);
     }
 
     protected function configurePickupPointOptions(OptionsResolver $resolver): void
diff --git a/src/Form/DataTransformer/PickupPointToIdentifierTransformer.php b/src/Form/DataTransformer/PickupPointToIdentifierTransformer.php
deleted file mode 100644
index 6b551d11..00000000
--- a/src/Form/DataTransformer/PickupPointToIdentifierTransformer.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Form\DataTransformer;
-
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use function sprintf;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\Form\DataTransformerInterface;
-use Symfony\Component\Form\Exception\TransformationFailedException;
-
-final class PickupPointToIdentifierTransformer implements DataTransformerInterface
-{
-    private ServiceRegistryInterface $providerRegistry;
-
-    public function __construct(ServiceRegistryInterface $providerRegistry)
-    {
-        $this->providerRegistry = $providerRegistry;
-    }
-
-    /**
-     * @param mixed|PickupPointInterface $value
-     */
-    public function transform($value): ?PickupPointCode
-    {
-        if (null === $value) {
-            return null;
-        }
-
-        $this->assertTransformationValueType($value, PickupPointInterface::class);
-
-        return $value->getCode();
-    }
-
-    /**
-     * @param mixed $value
-     */
-    public function reverseTransform($value): ?PickupPointInterface
-    {
-        if (null === $value) {
-            return null;
-        }
-
-        $pickupPointId = PickupPointCode::createFromString($value);
-
-        /** @var ProviderInterface $provider */
-        $provider = $this->providerRegistry->get($pickupPointId->getProviderPart());
-
-        /** @var PickupPointInterface $pickupPoint */
-        $pickupPoint = $provider->findPickupPoint($pickupPointId);
-
-        $this->assertTransformationValueType($pickupPoint, PickupPointInterface::class);
-
-        return $pickupPoint;
-    }
-
-    /**
-     * @template ExpectedType of object
-     *
-     * @param mixed $value
-     * @param class-string<ExpectedType> $expectedType
-     *
-     * @psalm-assert ExpectedType $value
-     */
-    private function assertTransformationValueType($value, string $expectedType): void
-    {
-        if (!$value instanceof $expectedType) {
-            throw new TransformationFailedException(
-                sprintf(
-                    'Expected "%s", but got "%s"',
-                    $expectedType,
-                    is_object($value) ? get_class($value) : gettype($value),
-                ),
-            );
-        }
-    }
-}
diff --git a/src/Form/DataTransformer/PickupPointTransformer.php b/src/Form/DataTransformer/PickupPointTransformer.php
new file mode 100644
index 00000000..86a4fb20
--- /dev/null
+++ b/src/Form/DataTransformer/PickupPointTransformer.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Form\DataTransformer;
+
+use InvalidArgumentException;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoderInterface;
+use function sprintf;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * Bridges the {@see PickupPoint} model value and the opaque token carried by the hidden input.
+ *
+ * Both directions go through {@see PickupPointEncoderInterface} only — no provider lookup — so a slow
+ * or unavailable carrier API never blocks the submit, and the persisted point is exactly the one the
+ * shopper picked (the AJAX response carried the same token).
+ */
+final readonly class PickupPointTransformer implements DataTransformerInterface
+{
+    public function __construct(private PickupPointEncoderInterface $encoder)
+    {
+    }
+
+    public function transform(mixed $value): ?string
+    {
+        if (null === $value) {
+            return null;
+        }
+
+        if (!$value instanceof PickupPoint) {
+            throw new TransformationFailedException(
+                sprintf('Expected "%s", but got "%s"', PickupPoint::class, get_debug_type($value)),
+            );
+        }
+
+        return $this->encoder->encode($value);
+    }
+
+    public function reverseTransform(mixed $value): ?PickupPoint
+    {
+        if (null === $value || '' === $value) {
+            return null;
+        }
+
+        if (!is_string($value)) {
+            throw new TransformationFailedException(sprintf('Expected string, got "%s"', get_debug_type($value)));
+        }
+
+        try {
+            return $this->encoder->decode($value);
+        } catch (InvalidArgumentException $e) {
+            throw new TransformationFailedException($e->getMessage(), 0, $e);
+        }
+    }
+}
diff --git a/src/Form/Extension/ShipmentTypeExtension.php b/src/Form/Extension/ShipmentTypeExtension.php
index 9a80e8f9..26f1da4f 100644
--- a/src/Form/Extension/ShipmentTypeExtension.php
+++ b/src/Form/Extension/ShipmentTypeExtension.php
@@ -4,7 +4,7 @@
 
 namespace Setono\SyliusPickupPointPlugin\Form\Extension;
 
-use Setono\SyliusPickupPointPlugin\Form\Type\PickupPointIdChoiceType;
+use Setono\SyliusPickupPointPlugin\Form\Type\PickupPointType;
 use Sylius\Bundle\CoreBundle\Form\Type\Checkout\ShipmentType;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -13,13 +13,13 @@ final class ShipmentTypeExtension extends AbstractTypeExtension
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder
-            ->add('pickupPointId', PickupPointIdChoiceType::class, [
-                'label' => 'setono_sylius_pickup_point.form.shipment.pickup_point',
-                'placeholder' => 'setono_sylius_pickup_point.form.shipment.select_pickup_point',
-                'required' => true,
-            ])
-        ;
+        // A hidden field, always present. Whether a pickup point is *required* depends on the chosen
+        // shipping method, which is enforced by the HasPickupPointSelected validator on the shipment —
+        // not here — so the field itself is optional at the form level.
+        $builder->add('pickupPoint', PickupPointType::class, [
+            'required' => false,
+            'label' => false,
+        ]);
     }
 
     public static function getExtendedTypes(): iterable
diff --git a/src/Form/Extension/ShippingMethodChoiceTypeExtension.php b/src/Form/Extension/ShippingMethodChoiceTypeExtension.php
index 876ccae8..acf4f010 100644
--- a/src/Form/Extension/ShippingMethodChoiceTypeExtension.php
+++ b/src/Form/Extension/ShippingMethodChoiceTypeExtension.php
@@ -5,59 +5,37 @@
 namespace Setono\SyliusPickupPointPlugin\Form\Extension;
 
 use Setono\SyliusPickupPointPlugin\Model\PickupPointProviderAwareInterface;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistryInterface;
 use Sylius\Bundle\ShippingBundle\Form\Type\ShippingMethodChoiceType;
-use Sylius\Component\Order\Context\CartContextInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
+/**
+ * Stamps `data-pickup-point-provider="<code>"` onto each shipping-method radio that has a (registered)
+ * provider. The shop JS reads this to know — immediately, before the AJAX response arrives — which
+ * methods need pickup points, so it can show a "loading…" placeholder for the selected pickup method
+ * instead of a blank gap while a (possibly slow) provider is being fetched.
+ */
 final class ShippingMethodChoiceTypeExtension extends AbstractTypeExtension
 {
-    private ServiceRegistryInterface $providerRegistry;
-
-    private RouterInterface $router;
-
-    private CartContextInterface $cartContext;
-
-    private CsrfTokenManagerInterface $csrfTokenManager;
-
     public function __construct(
-        ServiceRegistryInterface $providerRegistry,
-        RouterInterface $router,
-        CartContextInterface $cartContext,
-        CsrfTokenManagerInterface $csrfTokenManager,
+        private readonly ProviderRegistryInterface $providerRegistry,
     ) {
-        $this->providerRegistry = $providerRegistry;
-        $this->router = $router;
-        $this->cartContext = $cartContext;
-        $this->csrfTokenManager = $csrfTokenManager;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $defaultAttr = ['class' => 'input-shipping-method'];
-
-        $resolver->setDefault('choice_attr', function (PickupPointProviderAwareInterface $choiceValue, $key, $value) use ($defaultAttr): array {
+        $resolver->setDefault('choice_attr', function (PickupPointProviderAwareInterface $choiceValue): array {
             if (!$choiceValue->hasPickupPointProvider()) {
-                return $defaultAttr;
+                return [];
             }
 
-            /** @var string $pickupPointProviderId */
-            $pickupPointProviderId = $choiceValue->getPickupPointProvider();
-            if (!$this->providerRegistry->has($pickupPointProviderId)) {
-                return $defaultAttr;
+            $pickupPointProvider = $choiceValue->getPickupPointProvider();
+            if (null === $pickupPointProvider || !$this->providerRegistry->has($pickupPointProvider)) {
+                return [];
             }
 
-            /** @var ProviderInterface $provider */
-            $provider = $this->providerRegistry->get($pickupPointProviderId);
-
-            return [
-                'data-pickup-point-provider' => $provider->getCode(),
-                'data-csrf-token' => $this->csrfTokenManager->getToken((string) $this->cartContext->getCart()->getId()),
-            ] + $defaultAttr;
+            return ['data-pickup-point-provider' => $pickupPointProvider];
         });
     }
 
diff --git a/src/Form/Extension/ShippingMethodTypeExtension.php b/src/Form/Extension/ShippingMethodTypeExtension.php
index 85d8ef6c..48c6adbf 100644
--- a/src/Form/Extension/ShippingMethodTypeExtension.php
+++ b/src/Form/Extension/ShippingMethodTypeExtension.php
@@ -12,16 +12,22 @@
 
 final class ShippingMethodTypeExtension extends AbstractTypeExtension
 {
-    private array $providers;
-
-    public function __construct(array $providers)
+    /**
+     * @param array<string, string> $providers a map of provider code => human-readable name
+     *                                          (e.g. ['gls' => 'GLS']), injected from the
+     *                                          `setono_sylius_pickup_point.providers` container
+     *                                          parameter built by RegisterProvidersPass. Flipped
+     *                                          to name => code for the provider choice field.
+     */
+    public function __construct(private readonly array $providers)
     {
-        $this->providers = $providers;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->add('pickupPointProvider', ChoiceType::class, [
+            // A shipping method need not be a pickup-point method, so a provider is optional.
+            'required' => false,
             'placeholder' => 'setono_sylius_pickup_point.form.shipping_method.select_pickup_point_provider',
             'label' => 'setono_sylius_pickup_point.form.shipping_method.pickup_point_provider',
             'choices' => array_flip($this->providers),
diff --git a/src/Form/Type/PickupPointChoiceType.php b/src/Form/Type/PickupPointChoiceType.php
deleted file mode 100644
index f829718d..00000000
--- a/src/Form/Type/PickupPointChoiceType.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class PickupPointChoiceType extends AbstractType
-{
-    public function buildView(FormView $view, FormInterface $form, array $options): void
-    {
-        // @todo Check multiple option works as expected if it will be required
-        $view->vars['multiple'] = $options['multiple'];
-        $view->vars['choice_name'] = $options['choice_name'];
-        $view->vars['choice_value'] = $options['choice_value'];
-        $view->vars['placeholder'] = $options['placeholder'];
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver
-            ->setRequired([
-                'choice_name',
-                'choice_value',
-            ])
-            ->setDefaults([
-                'multiple' => false,
-                'error_bubbling' => false,
-                'placeholder' => '',
-            ])
-            ->setAllowedTypes('choice_name', ['string'])
-            ->setAllowedTypes('choice_value', ['string'])
-            ->setAllowedTypes('multiple', ['bool'])
-            ->setAllowedTypes('placeholder', ['string'])
-        ;
-    }
-
-    public function getParent(): string
-    {
-        return HiddenType::class;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'setono_sylius_pickup_point_choice';
-    }
-}
diff --git a/src/Form/Type/PickupPointIdChoiceType.php b/src/Form/Type/PickupPointIdChoiceType.php
deleted file mode 100644
index 9a7cd284..00000000
--- a/src/Form/Type/PickupPointIdChoiceType.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class PickupPointIdChoiceType extends AbstractType
-{
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'choice_name' => 'location',
-            'choice_value' => 'id',
-        ]);
-    }
-
-    public function getParent(): string
-    {
-        return PickupPointChoiceType::class;
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'setono_sylius_pickup_point_id_choice';
-    }
-}
diff --git a/src/Form/Type/PickupPointType.php b/src/Form/Type/PickupPointType.php
new file mode 100644
index 00000000..7e78fe4c
--- /dev/null
+++ b/src/Form/Type/PickupPointType.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Form\Type;
+
+use Setono\SyliusPickupPointPlugin\Form\DataTransformer\PickupPointTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * A hidden field whose model data is a {@see \Setono\SyliusPickupPointPlugin\DTO\PickupPoint} and whose
+ * view data is the opaque token (bridged by {@see PickupPointTransformer}). The visible chooser — the
+ * pickup-point radios — is rendered by the shop JS from the asynchronously fetched AJAX response, not by
+ * Symfony's choice machinery, so this is a plain HiddenType, not a ChoiceType.
+ */
+final class PickupPointType extends AbstractType
+{
+    public function __construct(private readonly PickupPointTransformer $transformer)
+    {
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder->addModelTransformer($this->transformer);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'error_bubbling' => false,
+            // The model data is a PickupPoint object but the transformer renders it as a string token;
+            // null data_class stops Symfony expecting the view data to be an object.
+            'data_class' => null,
+        ]);
+    }
+
+    public function getParent(): string
+    {
+        return HiddenType::class;
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return 'setono_sylius_pickup_point';
+    }
+}
diff --git a/src/Message/Command/CommandInterface.php b/src/Message/Command/CommandInterface.php
deleted file mode 100644
index cb3ca6a5..00000000
--- a/src/Message/Command/CommandInterface.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Message\Command;
-
-interface CommandInterface
-{
-}
diff --git a/src/Message/Command/LoadPickupPoints.php b/src/Message/Command/LoadPickupPoints.php
deleted file mode 100644
index f2e26435..00000000
--- a/src/Message/Command/LoadPickupPoints.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Message\Command;
-
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use Webmozart\Assert\Assert;
-
-final class LoadPickupPoints implements CommandInterface
-{
-    /** @var string */
-    private $provider;
-
-    /**
-     * @param mixed|ProviderInterface $provider
-     */
-    public function __construct($provider)
-    {
-        if ($provider instanceof ProviderInterface) {
-            $provider = $provider->getCode();
-        }
-
-        Assert::string($provider);
-
-        $this->provider = $provider;
-    }
-
-    public function getProvider(): string
-    {
-        return $this->provider;
-    }
-}
diff --git a/src/Message/Handler/LoadPickupPointsHandler.php b/src/Message/Handler/LoadPickupPointsHandler.php
deleted file mode 100644
index 55ce51d7..00000000
--- a/src/Message/Handler/LoadPickupPointsHandler.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Message\Handler;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Setono\SyliusPickupPointPlugin\Message\Command\LoadPickupPoints;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use Setono\SyliusPickupPointPlugin\Repository\PickupPointRepositoryInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Webmozart\Assert\Assert;
-
-final class LoadPickupPointsHandler implements MessageHandlerInterface
-{
-    private ServiceRegistryInterface $providerRegistry;
-
-    private PickupPointRepositoryInterface $pickupPointRepository;
-
-    private EntityManagerInterface $pickupPointManager;
-
-    public function __construct(
-        ServiceRegistryInterface $providerRegistry,
-        PickupPointRepositoryInterface $pickupPointRepository,
-        EntityManagerInterface $pickupPointManager,
-    ) {
-        $this->providerRegistry = $providerRegistry;
-        $this->pickupPointRepository = $pickupPointRepository;
-        $this->pickupPointManager = $pickupPointManager;
-    }
-
-    public function __invoke(LoadPickupPoints $message): void
-    {
-        /** @var ProviderInterface $provider */
-        $provider = $this->providerRegistry->get($message->getProvider());
-
-        $pickupPoints = $provider->findAllPickupPoints();
-
-        $i = 1;
-
-        foreach ($pickupPoints as $pickupPoint) {
-            $pickupPointCode = $pickupPoint->getCode();
-            Assert::notNull($pickupPointCode);
-
-            $localPickupPoint = $this->pickupPointRepository->findOneByCode($pickupPointCode);
-
-            // if it's found, we will update the properties, else we will just persist this object
-            if (null === $localPickupPoint) {
-                $this->pickupPointManager->persist($pickupPoint);
-            } else {
-                $localPickupPoint->setName($pickupPoint->getName());
-                $localPickupPoint->setAddress($pickupPoint->getAddress());
-                $localPickupPoint->setZipCode($pickupPoint->getZipCode());
-                $localPickupPoint->setCity($pickupPoint->getCity());
-                $localPickupPoint->setCountry($pickupPoint->getCountry());
-                $localPickupPoint->setLatitude($pickupPoint->getLatitude());
-                $localPickupPoint->setLongitude($pickupPoint->getLongitude());
-            }
-
-            if ($i % 50 === 0) {
-                $this->flush();
-            }
-
-            ++$i;
-        }
-
-        $this->flush();
-    }
-
-    private function flush(): void
-    {
-        $this->pickupPointManager->flush();
-        $this->pickupPointManager->clear();
-    }
-}
diff --git a/src/Model/PickupPoint.php b/src/Model/PickupPoint.php
deleted file mode 100644
index 1a6ea6b8..00000000
--- a/src/Model/PickupPoint.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Model;
-
-use function sprintf;
-use Webmozart\Assert\Assert;
-
-class PickupPoint implements PickupPointInterface
-{
-    protected ?int $id;
-
-    protected ?PickupPointCode $code = null;
-
-    protected ?string $name = null;
-
-    protected ?string $address = null;
-
-    protected ?string $zipCode = null;
-
-    protected ?string $city = null;
-
-    protected ?string $country = null;
-
-    protected ?float $latitude = null;
-
-    protected ?float $longitude = null;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getCode(): ?PickupPointCode
-    {
-        return $this->code;
-    }
-
-    public function setCode(PickupPointCode $code): void
-    {
-        $this->code = $code;
-    }
-
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
-
-    public function getAddress(): ?string
-    {
-        return $this->address;
-    }
-
-    public function setAddress(string $address): void
-    {
-        $this->address = $address;
-    }
-
-    public function getZipCode(): ?string
-    {
-        return $this->zipCode;
-    }
-
-    public function setZipCode(string $zipCode): void
-    {
-        $this->zipCode = $zipCode;
-    }
-
-    public function getCity(): ?string
-    {
-        return $this->city;
-    }
-
-    public function setCity(string $city): void
-    {
-        $this->city = $city;
-    }
-
-    public function getCountry(): ?string
-    {
-        return $this->country;
-    }
-
-    public function setCountry(string $country): void
-    {
-        $this->country = $country;
-    }
-
-    public function getLatitude(): ?float
-    {
-        return $this->latitude;
-    }
-
-    public function setLatitude(?float $latitude): void
-    {
-        Assert::nullOrRange($latitude, -90, 90);
-
-        $this->latitude = $latitude;
-    }
-
-    public function getLongitude(): ?float
-    {
-        return $this->longitude;
-    }
-
-    public function setLongitude(?float $longitude): void
-    {
-        Assert::nullOrRange($longitude, -180, 180);
-
-        $this->longitude = $longitude;
-    }
-
-    public function getFullAddress(): string
-    {
-        return sprintf(
-            '%s, %s %s',
-            $this->getAddress(),
-            $this->getZipCode(),
-            $this->getCity(),
-        );
-    }
-}
diff --git a/src/Model/PickupPointAwareInterface.php b/src/Model/PickupPointAwareInterface.php
index af94596b..b2dca7f8 100644
--- a/src/Model/PickupPointAwareInterface.php
+++ b/src/Model/PickupPointAwareInterface.php
@@ -4,11 +4,28 @@
 
 namespace Setono\SyliusPickupPointPlugin\Model;
 
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+
 interface PickupPointAwareInterface
 {
+    /**
+     * @deprecated since 2.0, use {@see hasPickupPoint()} instead
+     */
     public function hasPickupPointId(): bool;
 
+    /**
+     * @deprecated since 2.0, use {@see setPickupPoint()} instead
+     */
     public function setPickupPointId(?string $pickupPoint): void;
 
+    /**
+     * @deprecated since 2.0, use {@see getPickupPoint()} instead
+     */
     public function getPickupPointId(): ?string;
+
+    public function hasPickupPoint(): bool;
+
+    public function setPickupPoint(?PickupPoint $pickupPoint): void;
+
+    public function getPickupPoint(): ?PickupPoint;
 }
diff --git a/src/Model/PickupPointAwareTrait.php b/src/Model/PickupPointAwareTrait.php
index cf80be61..565dd9aa 100644
--- a/src/Model/PickupPointAwareTrait.php
+++ b/src/Model/PickupPointAwareTrait.php
@@ -4,25 +4,64 @@
 
 namespace Setono\SyliusPickupPointPlugin\Model;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
 
 trait PickupPointAwareTrait
 {
-    /** @ORM\Column(name="pickup_point_id", type="string", nullable=true) */
+    /** @deprecated since 2.0, use the {@see $pickupPoint} column instead */
+    #[ORM\Column(name: 'pickup_point_id', type: Types::STRING, nullable: true)]
     protected ?string $pickupPointId = null;
 
+    /** @var array<string, mixed>|PickupPoint|null */
+    #[ORM\Column(name: 'pickup_point', type: Types::JSON, nullable: true)]
+    protected null|PickupPoint|array $pickupPoint = null;
+
+    /**
+     * @deprecated since 2.0, use {@see hasPickupPoint()} instead
+     */
     public function hasPickupPointId(): bool
     {
         return null !== $this->pickupPointId;
     }
 
+    /**
+     * @deprecated since 2.0, use {@see setPickupPoint()} instead
+     */
     public function setPickupPointId(?string $pickupPointId): void
     {
         $this->pickupPointId = $pickupPointId;
     }
 
+    /**
+     * @deprecated since 2.0, use {@see getPickupPoint()} instead
+     */
     public function getPickupPointId(): ?string
     {
         return $this->pickupPointId;
     }
+
+    public function hasPickupPoint(): bool
+    {
+        return null !== $this->pickupPoint;
+    }
+
+    public function setPickupPoint(?PickupPoint $pickupPoint): void
+    {
+        $this->pickupPoint = $pickupPoint;
+    }
+
+    public function getPickupPoint(): ?PickupPoint
+    {
+        if (null === $this->pickupPoint) {
+            return null;
+        }
+
+        if ($this->pickupPoint instanceof PickupPoint) {
+            return $this->pickupPoint;
+        }
+
+        return PickupPoint::fromArray($this->pickupPoint);
+    }
 }
diff --git a/src/Model/PickupPointCode.php b/src/Model/PickupPointCode.php
deleted file mode 100644
index ed7e60c0..00000000
--- a/src/Model/PickupPointCode.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Model;
-
-use InvalidArgumentException;
-use Symfony\Component\Intl\Countries;
-use Webmozart\Assert\Assert;
-
-final class PickupPointCode
-{
-    private const DELIMITER = '---';
-
-    private string $id;
-
-    private string $provider;
-
-    /**
-     * Some providers will only have unique ids per country
-     * hence we need the country to make it completely unique in these cases
-     *
-     * @var string
-     */
-    private $country;
-
-    /**
-     * @param mixed $id
-     */
-    public function __construct($id, string $provider, string $country)
-    {
-        Assert::scalar($id);
-
-        $country = mb_strtoupper($country);
-        Assert::true(Countries::exists($country));
-
-        $this->id = (string) $id;
-        $this->provider = $provider;
-        $this->country = $country;
-    }
-
-    public static function createFromString(string $val): self
-    {
-        $parts = explode(self::DELIMITER, $val);
-
-        if (!isset($parts[0])) {
-            throw new InvalidArgumentException('No provider part provided');
-        }
-
-        if (!isset($parts[1])) {
-            throw new InvalidArgumentException('No id part provided');
-        }
-
-        if (!isset($parts[2])) {
-            throw new InvalidArgumentException('No country part provided');
-        }
-
-        return new self($parts[1], $parts[0], $parts[2]);
-    }
-
-    public function __toString(): string
-    {
-        return $this->getValue();
-    }
-
-    public function getValue(): string
-    {
-        return $this->provider . self::DELIMITER . $this->id . self::DELIMITER . $this->country;
-    }
-
-    public function getIdPart(): string
-    {
-        return $this->id;
-    }
-
-    public function getProviderPart(): string
-    {
-        return $this->provider;
-    }
-
-    public function getCountryPart(): string
-    {
-        return $this->country;
-    }
-}
diff --git a/src/Model/PickupPointInterface.php b/src/Model/PickupPointInterface.php
deleted file mode 100644
index c18621d8..00000000
--- a/src/Model/PickupPointInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Model;
-
-use Sylius\Component\Resource\Model\ResourceInterface;
-
-interface PickupPointInterface extends ResourceInterface
-{
-    public function getCode(): ?PickupPointCode;
-
-    public function setCode(PickupPointCode $code): void;
-
-    public function getName(): ?string;
-
-    public function setName(string $name): void;
-
-    public function getAddress(): ?string;
-
-    public function setAddress(string $address): void;
-
-    public function getZipCode(): ?string;
-
-    public function setZipCode(string $zipCode): void;
-
-    public function getCity(): ?string;
-
-    public function setCity(string $city): void;
-
-    /**
-     * This is the alpha 2 country code
-     */
-    public function getCountry(): ?string;
-
-    public function setCountry(string $country): void;
-
-    public function getLatitude(): ?float;
-
-    /**
-     * @throws \InvalidArgumentException if the $latitude is invalid
-     */
-    public function setLatitude(?float $latitude): void;
-
-    public function getLongitude(): ?float;
-
-    /**
-     * @throws \InvalidArgumentException if the $longitude is invalid
-     */
-    public function setLongitude(?float $longitude): void;
-
-    public function getFullAddress(): string;
-}
diff --git a/src/Model/PickupPointProviderAwareTrait.php b/src/Model/PickupPointProviderAwareTrait.php
index 1240278a..c0533912 100644
--- a/src/Model/PickupPointProviderAwareTrait.php
+++ b/src/Model/PickupPointProviderAwareTrait.php
@@ -4,12 +4,13 @@
 
 namespace Setono\SyliusPickupPointPlugin\Model;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 trait PickupPointProviderAwareTrait
 {
-    /** @ORM\Column(name="pickup_point_provider", type="string", nullable=true) */
-    protected ?string $pickupPointProvider;
+    #[ORM\Column(name: 'pickup_point_provider', type: Types::STRING, nullable: true)]
+    protected ?string $pickupPointProvider = null;
 
     public function hasPickupPointProvider(): bool
     {
diff --git a/src/Provider/BudbeeProvider.php b/src/Provider/BudbeeProvider.php
deleted file mode 100644
index 3c3d536d..00000000
--- a/src/Provider/BudbeeProvider.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Provider;
-
-use Setono\Budbee\Client\ClientInterface;
-use Setono\Budbee\DTO\Box;
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-use Throwable;
-use Webmozart\Assert\Assert;
-
-final class BudbeeProvider extends Provider
-{
-    private ClientInterface $client;
-
-    private FactoryInterface $pickupPointFactory;
-
-    public function __construct(ClientInterface $client, FactoryInterface $pickupPointFactory)
-    {
-        $this->client = $client;
-        $this->pickupPointFactory = $pickupPointFactory;
-    }
-
-    public function findPickupPoints(OrderInterface $order): iterable
-    {
-        $shippingAddress = $order->getShippingAddress();
-        if (null === $shippingAddress) {
-            return [];
-        }
-
-        $street = $shippingAddress->getStreet();
-        $postCode = $shippingAddress->getPostcode();
-        $countryCode = $shippingAddress->getCountryCode();
-        $city = $shippingAddress->getCity();
-        if (null === $street || null === $postCode || null === $countryCode || null === $city) {
-            return [];
-        }
-
-        try {
-            $boxes = $this->client->boxes()->getAvailableLockers(
-                $countryCode,
-                $postCode,
-            );
-        } catch (\Throwable $e) {
-            throw new TimeoutException($e);
-        }
-
-        $pickupPoints = [];
-        foreach ($boxes as $item) {
-            $pickupPoints[] = $this->transform($item);
-        }
-
-        return $pickupPoints;
-    }
-
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
-    {
-        try {
-            $box = $this->client->boxes()->getLockerByIdentifier($code->getIdPart());
-            if (null === $box) {
-                return null;
-            }
-
-            return $this->transform($box);
-        } catch (Throwable $e) {
-            throw new TimeoutException($e);
-        }
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        return [];
-    }
-
-    public function getCode(): string
-    {
-        return 'budbee';
-    }
-
-    public function getName(): string
-    {
-        return 'Budbee';
-    }
-
-    private function transform(Box $box): PickupPointInterface
-    {
-        /** @var PickupPointInterface|object $pickupPoint */
-        $pickupPoint = $this->pickupPointFactory->createNew();
-
-        Assert::isInstanceOf($pickupPoint, PickupPointInterface::class);
-
-        $pickupPoint->setCode(new PickupPointCode(
-            $box->id,
-            $this->getCode(),
-            $box->address->country,
-        ));
-        $pickupPoint->setName($box->name);
-        $pickupPoint->setAddress($box->address->street);
-        $pickupPoint->setZipCode($box->address->postalCode);
-        $pickupPoint->setCity($box->address->city);
-        $pickupPoint->setCountry($box->address->country);
-        $pickupPoint->setLatitude($box->address->coordinate->latitude);
-        $pickupPoint->setLongitude($box->address->coordinate->longitude);
-
-        return $pickupPoint;
-    }
-}
diff --git a/src/Provider/CachedProvider.php b/src/Provider/CachedProvider.php
deleted file mode 100644
index 340266c7..00000000
--- a/src/Provider/CachedProvider.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Provider;
-
-use Behat\Transliterator\Transliterator;
-use Generator;
-use Psr\Cache\CacheItemPoolInterface;
-use RuntimeException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use function sprintf;
-use Sylius\Component\Core\Model\AddressInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Webmozart\Assert\Assert;
-
-final class CachedProvider extends Provider
-{
-    private CacheItemPoolInterface $cacheItemPool;
-
-    private ProviderInterface $provider;
-
-    public function __construct(CacheItemPoolInterface $cacheItemPool, ProviderInterface $provider)
-    {
-        $this->cacheItemPool = $cacheItemPool;
-        $this->provider = $provider;
-    }
-
-    public function findPickupPoints(OrderInterface $order): iterable
-    {
-        $orderCacheKey = $this->buildOrderCacheKey($order);
-        if (!$this->cacheItemPool->hasItem($orderCacheKey)) {
-            $pickupPoints = $this->provider->findPickupPoints($order);
-
-            if ($pickupPoints instanceof Generator) {
-                $pickupPoints = iterator_to_array($pickupPoints);
-            }
-
-            $pickupPointsCacheItem = $this->cacheItemPool->getItem($orderCacheKey);
-            $pickupPointsCacheItem->set($pickupPoints);
-            $this->cacheItemPool->save($pickupPointsCacheItem);
-
-            // Store separate PickupPoints to retrieve at findOnePickupPointById
-            /** @var PickupPointInterface $pickupPoint */
-            foreach ($pickupPoints as $pickupPoint) {
-                $pickupPointCacheKey = $this->buildPickupPointIdCacheKey($pickupPoint->getCode());
-                $pickupPointCacheItem = $this->cacheItemPool->getItem($pickupPointCacheKey);
-                $pickupPointCacheItem->set($pickupPoint);
-                $this->cacheItemPool->save($pickupPointCacheItem);
-            }
-        }
-
-        /** @var PickupPointInterface[] $pickupPoints */
-        $pickupPoints = $this->cacheItemPool->getItem($orderCacheKey)->get();
-
-        return $pickupPoints;
-    }
-
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
-    {
-        $pickupPointCacheKey = $this->buildPickupPointIdCacheKey($code);
-        if (!$this->cacheItemPool->hasItem($pickupPointCacheKey)) {
-            $pickupPoint = $this->provider->findPickupPoint($code);
-            if (null === $pickupPoint) {
-                // Do not cache PickupPoint that wasn't found
-                return null;
-            }
-
-            $pickupPointCacheItem = $this->cacheItemPool->getItem($pickupPointCacheKey);
-            $pickupPointCacheItem->set($pickupPoint);
-            $this->cacheItemPool->save($pickupPointCacheItem);
-        }
-
-        /** @var PickupPointInterface $pickupPoint */
-        $pickupPoint = $this->cacheItemPool->getItem($pickupPointCacheKey)->get();
-
-        return $pickupPoint;
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        yield from $this->provider->findAllPickupPoints();
-    }
-
-    public function getCode(): string
-    {
-        return $this->provider->getCode();
-    }
-
-    public function getName(): string
-    {
-        return $this->provider->getName();
-    }
-
-    private function buildOrderCacheKey(OrderInterface $order): string
-    {
-        $shippingAddress = $order->getShippingAddress();
-        if (!$shippingAddress instanceof AddressInterface) {
-            throw new RuntimeException(sprintf(
-                'Shipping address was not found for order #%s',
-                $order->getNumber(),
-            ));
-        }
-
-        $countryCode = $shippingAddress->getCountryCode();
-        Assert::notNull($countryCode);
-
-        $postCode = $shippingAddress->getPostcode();
-        Assert::notNull($postCode);
-
-        $street = $shippingAddress->getStreet();
-        Assert::notNull($street);
-
-        // As far as DAO/Gls/PostNord using only these 3 fields to
-        // search for pickup points, we should build cache key based on them only
-        return sprintf(
-            '%s-%s-%s-%s',
-            $this->getCode(),
-            Transliterator::transliterate($countryCode),
-            Transliterator::transliterate($postCode),
-            Transliterator::transliterate($street),
-        );
-    }
-
-    private function buildPickupPointIdCacheKey(PickupPointCode $id): string
-    {
-        return $id->getValue();
-    }
-}
diff --git a/src/Provider/CoolRunnerProvider.php b/src/Provider/CoolRunnerProvider.php
deleted file mode 100644
index 65a5e85c..00000000
--- a/src/Provider/CoolRunnerProvider.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Provider;
-
-use Setono\CoolRunner\Client\ClientInterface;
-use Setono\CoolRunner\DTO\Servicepoint;
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-use Throwable;
-use Webmozart\Assert\Assert;
-
-final class CoolRunnerProvider extends Provider
-{
-    private ClientInterface $client;
-
-    private FactoryInterface $pickupPointFactory;
-
-    private string $carrier;
-
-    public function __construct(ClientInterface $client, FactoryInterface $pickupPointFactory, string $carrier)
-    {
-        $this->client = $client;
-        $this->pickupPointFactory = $pickupPointFactory;
-        $this->carrier = $carrier;
-    }
-
-    public function findPickupPoints(OrderInterface $order): iterable
-    {
-        $shippingAddress = $order->getShippingAddress();
-        if (null === $shippingAddress) {
-            return [];
-        }
-
-        $street = $shippingAddress->getStreet();
-        $postCode = $shippingAddress->getPostcode();
-        $countryCode = $shippingAddress->getCountryCode();
-        $city = $shippingAddress->getCity();
-        if (null === $street || null === $postCode || null === $countryCode || null === $city) {
-            return [];
-        }
-
-        try {
-            $servicepoints = $this->client->servicepoints()->find(
-                $this->carrier,
-                $countryCode,
-                $street,
-                $postCode,
-                $city,
-            );
-        } catch (\Throwable $e) {
-            throw new TimeoutException($e);
-        }
-
-        $pickupPoints = [];
-        foreach ($servicepoints as $item) {
-            $pickupPoints[] = $this->transform($item);
-        }
-
-        return $pickupPoints;
-    }
-
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
-    {
-        try {
-            $servicepoint = $this->client->servicepoints()->findById($this->carrier, $code->getIdPart());
-            if (null === $servicepoint) {
-                return null;
-            }
-
-            return $this->transform($servicepoint);
-        } catch (Throwable $e) {
-            throw new TimeoutException($e);
-        }
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        return [];
-    }
-
-    public function getCode(): string
-    {
-        return sprintf('coolrunner_%s', $this->carrier);
-    }
-
-    public function getName(): string
-    {
-        return sprintf('CoolRunner %s', ucfirst($this->carrier));
-    }
-
-    private function transform(Servicepoint $servicepoint): PickupPointInterface
-    {
-        /** @var PickupPointInterface|object $pickupPoint */
-        $pickupPoint = $this->pickupPointFactory->createNew();
-
-        Assert::isInstanceOf($pickupPoint, PickupPointInterface::class);
-
-        $pickupPoint->setCode(new PickupPointCode(
-            $servicepoint->id,
-            $this->getCode(),
-            $servicepoint->address->countryCode,
-        ));
-        $pickupPoint->setName($servicepoint->name);
-        $pickupPoint->setAddress($servicepoint->address->street);
-        $pickupPoint->setZipCode($servicepoint->address->zipCode);
-        $pickupPoint->setCity($servicepoint->address->city);
-        $pickupPoint->setCountry($servicepoint->address->countryCode);
-        $pickupPoint->setLatitude($servicepoint->coordinates->latitude);
-        $pickupPoint->setLongitude($servicepoint->coordinates->longitude);
-
-        return $pickupPoint;
-    }
-}
diff --git a/src/Provider/DAOProvider.php b/src/Provider/DAOProvider.php
index 767d51ba..9618c4c3 100644
--- a/src/Provider/DAOProvider.php
+++ b/src/Provider/DAOProvider.php
@@ -5,76 +5,46 @@
 namespace Setono\SyliusPickupPointPlugin\Provider;
 
 use function preg_replace;
-use Psr\Http\Client\NetworkExceptionInterface;
 use Setono\DAO\Client\ClientInterface;
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-use Webmozart\Assert\Assert;
+use Setono\SyliusPickupPointPlugin\Attribute\AsProvider;
+use Setono\SyliusPickupPointPlugin\DTO\Address;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
 
+#[AsProvider(code: 'dao', name: 'DAO')]
 final class DAOProvider extends Provider
 {
-    private ClientInterface $client;
-
-    private FactoryInterface $pickupPointFactory;
-
-    public function __construct(ClientInterface $client, FactoryInterface $pickupPointFactory)
+    public function __construct(private readonly ClientInterface $client)
     {
-        $this->client = $client;
-        $this->pickupPointFactory = $pickupPointFactory;
     }
 
-    public function findPickupPoints(OrderInterface $order): iterable
+    public function findPickupPoints(Address $address): array
     {
-        $shippingAddress = $order->getShippingAddress();
-        if (null === $shippingAddress) {
-            return [];
-        }
-
-        $street = $shippingAddress->getStreet();
-        $postCode = $shippingAddress->getPostcode();
+        $street = $address->street;
+        $postCode = $address->postalCode;
         if (null === $street || null === $postCode) {
             return [];
         }
 
-        yield from $this->_findPickupPoints([
+        return $this->_findPickupPoints([
             'postnr' => preg_replace('/\s+/', '', $postCode),
             'adresse' => $street,
             'antal' => 10,
         ]);
     }
 
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
+    public function findPickupPoint(string $id, array $metadata = []): ?PickupPoint
     {
-        foreach ($this->_findPickupPoints([
-            'shopid' => $code->getIdPart(),
-        ]) as $pickupPoint) {
-            return $pickupPoint;
-        }
-
-        return null;
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        yield from $this->_findPickupPoints([
-            'postnr' => '9999', // Notice that this is a hack to get all pickup points
-            'antal' => 5000,
-        ]);
+        return $this->_findPickupPoints([
+            'shopid' => $id,
+        ])[0] ?? null;
     }
 
     /**
-     * @return iterable<PickupPointInterface>
+     * @return list<PickupPoint>
      */
-    private function _findPickupPoints(array $params): iterable
+    private function _findPickupPoints(array $params): array
     {
-        try {
-            $result = $this->client->get('/DAOPakkeshop/FindPakkeshop.php', $params);
-        } catch (NetworkExceptionInterface $e) {
-            throw new TimeoutException($e);
-        }
+        $result = $this->client->get('/DAOPakkeshop/FindPakkeshop.php', $params);
 
         $pickupPoints = $result['resultat']['pakkeshops'] ?? [];
 
@@ -82,39 +52,26 @@ private function _findPickupPoints(array $params): iterable
             return [];
         }
 
+        $list = [];
         foreach ($pickupPoints as $pickupPoint) {
-            yield $this->populatePickupPoint($pickupPoint);
+            $list[] = $this->populatePickupPoint($pickupPoint);
         }
-    }
-
-    public function getCode(): string
-    {
-        return 'dao';
-    }
 
-    public function getName(): string
-    {
-        return 'DAO';
+        return $list;
     }
 
-    private function populatePickupPoint(array $servicePoint): PickupPointInterface
+    private function populatePickupPoint(array $servicePoint): PickupPoint
     {
-        $countryCode = 'DK'; // DAO only operates in Denmark
-
-        /** @var PickupPointInterface|object $pickupPoint */
-        $pickupPoint = $this->pickupPointFactory->createNew();
-
-        Assert::isInstanceOf($pickupPoint, PickupPointInterface::class);
-
-        $pickupPoint->setCode(new PickupPointCode($servicePoint['shopId'], $this->getCode(), $countryCode));
-        $pickupPoint->setName($servicePoint['navn']);
-        $pickupPoint->setAddress($servicePoint['adresse']);
-        $pickupPoint->setZipCode($servicePoint['postnr']);
-        $pickupPoint->setCity($servicePoint['bynavn']);
-        $pickupPoint->setCountry($countryCode);
-
-        $pickupPoint->setLatitude((float) $servicePoint['latitude']);
-        $pickupPoint->setLongitude((float) $servicePoint['longitude']);
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = $this->getCode();
+        $pickupPoint->id = (string) $servicePoint['shopId'];
+        $pickupPoint->name = $servicePoint['navn'];
+        $pickupPoint->address = $servicePoint['adresse'];
+        $pickupPoint->zipCode = $servicePoint['postnr'];
+        $pickupPoint->city = $servicePoint['bynavn'];
+        $pickupPoint->country = 'DK'; // DAO only operates in Denmark
+        $pickupPoint->latitude = (string) $servicePoint['latitude'];
+        $pickupPoint->longitude = (string) $servicePoint['longitude'];
 
         return $pickupPoint;
     }
diff --git a/src/Provider/FakerProvider.php b/src/Provider/FakerProvider.php
index 8c7e469d..51ea9505 100644
--- a/src/Provider/FakerProvider.php
+++ b/src/Provider/FakerProvider.php
@@ -6,31 +6,24 @@
 
 use Faker\Factory;
 use Faker\Generator;
-use Setono\SyliusPickupPointPlugin\Model\PickupPoint;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
+use Setono\SyliusPickupPointPlugin\Attribute\AsProvider;
+use Setono\SyliusPickupPointPlugin\DTO\Address;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
 use Webmozart\Assert\Assert;
 
+#[AsProvider(code: 'faker', name: 'Faker')]
 final class FakerProvider extends Provider
 {
-    private Generator $faker;
+    private readonly Generator $faker;
 
-    private FactoryInterface $pickupPointFactory;
-
-    public function __construct(FactoryInterface $pickupPointFactory)
+    public function __construct()
     {
         $this->faker = Factory::create();
-        $this->pickupPointFactory = $pickupPointFactory;
     }
 
-    public function findPickupPoints(OrderInterface $order): iterable
+    public function findPickupPoints(Address $address): array
     {
-        $address = $order->getShippingAddress();
-        Assert::notNull($address);
-
-        $countryCode = $address->getCountryCode();
+        $countryCode = $address->countryCode;
         Assert::notNull($countryCode);
 
         $pickupPoints = [];
@@ -41,26 +34,11 @@ public function findPickupPoints(OrderInterface $order): iterable
         return $pickupPoints;
     }
 
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
-    {
-        return $this->createFakePickupPoint($code->getIdPart(), $code->getCountryPart());
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        for ($i = 0; $i < 10; ++$i) {
-            yield $this->createFakePickupPoint((string) $i);
-        }
-    }
-
-    public function getCode(): string
+    public function findPickupPoint(string $id, array $metadata = []): PickupPoint
     {
-        return 'faker';
-    }
+        $country = $metadata['country'] ?? null;
 
-    public function getName(): string
-    {
-        return 'Faker';
+        return $this->createFakePickupPoint($id, is_string($country) ? $country : null);
     }
 
     private function createFakePickupPoint(string $index, ?string $countryCode = null): PickupPoint
@@ -69,19 +47,16 @@ private function createFakePickupPoint(string $index, ?string $countryCode = nul
             $countryCode = $this->faker->countryCode;
         }
 
-        /** @var PickupPointInterface|object $pickupPoint */
-        $pickupPoint = $this->pickupPointFactory->createNew();
-
-        Assert::isInstanceOf($pickupPoint, PickupPointInterface::class);
-
-        $pickupPoint->setCode(new PickupPointCode($index, $this->getCode(), $countryCode));
-        $pickupPoint->setName("Post office #$index");
-        $pickupPoint->setAddress($this->faker->streetAddress);
-        $pickupPoint->setZipCode((string) $this->faker->numberBetween(11111, 99999));
-        $pickupPoint->setCity($this->faker->city);
-        $pickupPoint->setCountry($countryCode);
-        $pickupPoint->setLatitude($this->faker->latitude);
-        $pickupPoint->setLongitude($this->faker->longitude);
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = $this->getCode();
+        $pickupPoint->id = $index;
+        $pickupPoint->name = "Post office #$index";
+        $pickupPoint->address = $this->faker->streetAddress;
+        $pickupPoint->zipCode = (string) $this->faker->numberBetween(11111, 99999);
+        $pickupPoint->city = $this->faker->city;
+        $pickupPoint->country = $countryCode;
+        $pickupPoint->latitude = (string) $this->faker->latitude;
+        $pickupPoint->longitude = (string) $this->faker->longitude;
 
         return $pickupPoint;
     }
diff --git a/src/Provider/GlsProvider.php b/src/Provider/GlsProvider.php
index 1c14d379..bd190471 100644
--- a/src/Provider/GlsProvider.php
+++ b/src/Provider/GlsProvider.php
@@ -6,59 +6,35 @@
 
 use function preg_replace;
 use Setono\GLS\Webservice\Client\ClientInterface;
-use Setono\GLS\Webservice\Exception\ConnectionException;
-use Setono\GLS\Webservice\Exception\NoResultException;
 use Setono\GLS\Webservice\Exception\ParcelShopNotFoundException;
 use Setono\GLS\Webservice\Model\ParcelShop;
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-use Webmozart\Assert\Assert;
+use Setono\SyliusPickupPointPlugin\Attribute\AsProvider;
+use Setono\SyliusPickupPointPlugin\DTO\Address;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
 
+#[AsProvider(code: 'gls', name: 'GLS')]
 final class GlsProvider extends Provider
 {
-    private ClientInterface $client;
-
-    private FactoryInterface $pickupPointFactory;
-
-    private array $countryCodes;
-
     public function __construct(
-        ClientInterface $client,
-        FactoryInterface $pickupPointFactory,
-        array $countryCodes = ['DK', 'SE'],
+        private readonly ClientInterface $client,
     ) {
-        $this->client = $client;
-        $this->pickupPointFactory = $pickupPointFactory;
-        $this->countryCodes = $countryCodes;
     }
 
-    public function findPickupPoints(OrderInterface $order): iterable
+    public function findPickupPoints(Address $address): array
     {
-        $shippingAddress = $order->getShippingAddress();
-        if (null === $shippingAddress) {
-            return [];
-        }
-
-        $street = $shippingAddress->getStreet();
-        $postCode = $shippingAddress->getPostcode();
-        $countryCode = $shippingAddress->getCountryCode();
+        $street = $address->street;
+        $postCode = $address->postalCode;
+        $countryCode = $address->countryCode;
         if (null === $street || null === $postCode || null === $countryCode) {
             return [];
         }
 
-        try {
-            $parcelShops = $this->client->searchNearestParcelShops(
-                $street,
-                preg_replace('/\s+/', '', $postCode),
-                $countryCode,
-                10,
-            );
-        } catch (ConnectionException $e) {
-            throw new TimeoutException($e);
-        }
+        $parcelShops = $this->client->searchNearestParcelShops(
+            $street,
+            preg_replace('/\s+/', '', $postCode),
+            $countryCode,
+            10,
+        );
 
         $pickupPoints = [];
         foreach ($parcelShops as $item) {
@@ -68,61 +44,29 @@ public function findPickupPoints(OrderInterface $order): iterable
         return $pickupPoints;
     }
 
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
+    public function findPickupPoint(string $id, array $metadata = []): ?PickupPoint
     {
         try {
-            $parcelShop = $this->client->getOneParcelShop($code->getIdPart());
-
-            return $this->transform($parcelShop);
-        } catch (ParcelShopNotFoundException $e) {
+            $parcelShop = $this->client->getOneParcelShop($id);
+        } catch (ParcelShopNotFoundException) {
             return null;
-        } catch (ConnectionException $e) {
-            throw new TimeoutException($e);
         }
-    }
 
-    public function findAllPickupPoints(): iterable
-    {
-        try {
-            foreach ($this->countryCodes as $countryCode) {
-                $parcelShops = $this->client->getAllParcelShops($countryCode);
-
-                foreach ($parcelShops as $item) {
-                    yield $this->transform($item);
-                }
-            }
-        } catch (ConnectionException $e) {
-            throw new TimeoutException($e);
-        } catch (NoResultException $e) {
-            return [];
-        }
-    }
-
-    public function getCode(): string
-    {
-        return 'gls';
+        return $this->transform($parcelShop);
     }
 
-    public function getName(): string
+    private function transform(ParcelShop $parcelShop): PickupPoint
     {
-        return 'GLS';
-    }
-
-    private function transform(ParcelShop $parcelShop): PickupPointInterface
-    {
-        /** @var PickupPointInterface|object $pickupPoint */
-        $pickupPoint = $this->pickupPointFactory->createNew();
-
-        Assert::isInstanceOf($pickupPoint, PickupPointInterface::class);
-
-        $pickupPoint->setCode(new PickupPointCode($parcelShop->getNumber(), $this->getCode(), $parcelShop->getCountryCode()));
-        $pickupPoint->setName($parcelShop->getCompanyName());
-        $pickupPoint->setAddress($parcelShop->getStreetName());
-        $pickupPoint->setZipCode($parcelShop->getZipCode());
-        $pickupPoint->setCity($parcelShop->getCity());
-        $pickupPoint->setCountry($parcelShop->getCountryCode());
-        $pickupPoint->setLatitude((float) $parcelShop->getLatitude());
-        $pickupPoint->setLongitude((float) $parcelShop->getLongitude());
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = $this->getCode();
+        $pickupPoint->id = (string) $parcelShop->getNumber();
+        $pickupPoint->name = $parcelShop->getCompanyName();
+        $pickupPoint->address = $parcelShop->getStreetName();
+        $pickupPoint->zipCode = $parcelShop->getZipCode();
+        $pickupPoint->city = $parcelShop->getCity();
+        $pickupPoint->country = $parcelShop->getCountryCode();
+        $pickupPoint->latitude = (string) $parcelShop->getLatitude();
+        $pickupPoint->longitude = (string) $parcelShop->getLongitude();
 
         return $pickupPoint;
     }
diff --git a/src/Provider/LocalProvider.php b/src/Provider/LocalProvider.php
deleted file mode 100644
index b6a2e4ee..00000000
--- a/src/Provider/LocalProvider.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Provider;
-
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Setono\SyliusPickupPointPlugin\Repository\PickupPointRepositoryInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-
-final class LocalProvider extends Provider
-{
-    private ProviderInterface $decoratedProvider;
-
-    private PickupPointRepositoryInterface $pickupPointRepository;
-
-    public function __construct(ProviderInterface $decoratedProvider, PickupPointRepositoryInterface $pickupPointRepository)
-    {
-        $this->decoratedProvider = $decoratedProvider;
-        $this->pickupPointRepository = $pickupPointRepository;
-    }
-
-    public function findPickupPoints(OrderInterface $order): iterable
-    {
-        try {
-            return $this->decoratedProvider->findPickupPoints($order);
-        } catch (TimeoutException $e) {
-            return $this->pickupPointRepository->findByOrder($order, $this->decoratedProvider->getCode());
-        }
-    }
-
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
-    {
-        try {
-            return $this->decoratedProvider->findPickupPoint($code);
-        } catch (TimeoutException $e) {
-            return $this->pickupPointRepository->findOneByCode($code);
-        }
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        yield from $this->decoratedProvider->findAllPickupPoints();
-    }
-
-    public function getCode(): string
-    {
-        return $this->decoratedProvider->getCode();
-    }
-
-    public function getName(): string
-    {
-        return $this->decoratedProvider->getName();
-    }
-}
diff --git a/src/Provider/PostNordProvider.php b/src/Provider/PostNordProvider.php
index f60aea77..1037a29a 100644
--- a/src/Provider/PostNordProvider.php
+++ b/src/Provider/PostNordProvider.php
@@ -4,37 +4,27 @@
 
 namespace Setono\SyliusPickupPointPlugin\Provider;
 
-use Psr\Http\Client\NetworkExceptionInterface;
 use Setono\PostNord\Client\ClientInterface;
 use Setono\PostNord\Request\Query\ServicePoints\ByIdsQuery;
 use Setono\PostNord\Request\Query\ServicePoints\NearestByAddressQuery;
 use Setono\PostNord\Response\ServicePoints\ServicePoint;
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-use Webmozart\Assert\Assert;
+use Setono\SyliusPickupPointPlugin\Attribute\AsProvider;
+use Setono\SyliusPickupPointPlugin\DTO\Address;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
 
 /**
  * @see https://developer.postnord.com/api/docs/location
  */
+#[AsProvider(code: 'post_nord', name: 'PostNord')]
 final class PostNordProvider extends Provider
 {
-    public function __construct(
-        private readonly ClientInterface $client,
-        private readonly FactoryInterface $pickupPointFactory,
-    ) {
+    public function __construct(private readonly ClientInterface $client)
+    {
     }
 
-    public function findPickupPoints(OrderInterface $order): iterable
+    public function findPickupPoints(Address $address): array
     {
-        $shippingAddress = $order->getShippingAddress();
-        if (null === $shippingAddress) {
-            return [];
-        }
-
-        $street = $shippingAddress->getStreet();
+        $street = $address->street;
         if (null === $street) {
             return [];
         }
@@ -47,24 +37,20 @@ public function findPickupPoints(OrderInterface $order): iterable
         $streetNumber = array_pop($streetParts);
         $street = implode(' ', $streetParts);
 
-        $postCode = $shippingAddress->getPostcode();
-        $city = $shippingAddress->getCity();
-        $countryCode = $shippingAddress->getCountryCode();
+        $postCode = $address->postalCode;
+        $city = $address->city;
+        $countryCode = $address->countryCode;
         if (null === $postCode || null === $city || null === $countryCode) {
             return [];
         }
 
-        try {
-            $result = $this->client->servicePoints()->getNearestByAddress(NearestByAddressQuery::create(
-                streetName: $street,
-                streetNumber: $streetNumber,
-                postalCode: $postCode,
-                city: $city,
-                countryCode: $countryCode,
-            ));
-        } catch (NetworkExceptionInterface $e) {
-            throw new TimeoutException($e);
-        }
+        $result = $this->client->servicePoints()->getNearestByAddress(NearestByAddressQuery::create(
+            streetName: $street,
+            streetNumber: $streetNumber,
+            postalCode: $postCode,
+            city: $city,
+            countryCode: $countryCode,
+        ));
 
         if ([] === $result->servicePoints) {
             return [];
@@ -78,16 +64,14 @@ public function findPickupPoints(OrderInterface $order): iterable
         return $pickupPoints;
     }
 
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
+    public function findPickupPoint(string $id, array $metadata = []): ?PickupPoint
     {
-        try {
-            $result = $this->client->servicePoints()->getByIds(ByIdsQuery::create(
-                ids: [$code->getIdPart()],
-                countryCode: $code->getCountryPart(),
-            ));
-        } catch (NetworkExceptionInterface $e) {
-            throw new TimeoutException($e);
-        }
+        $country = $metadata['country'] ?? null;
+
+        $result = $this->client->servicePoints()->getByIds(ByIdsQuery::create(
+            ids: [$id],
+            countryCode: is_string($country) ? $country : null,
+        ));
 
         if ([] === $result->servicePoints) {
             return null;
@@ -96,53 +80,17 @@ public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
         return $this->transform($result->servicePoints[0]);
     }
 
-    public function findAllPickupPoints(): iterable
-    {
-        // todo implement this
-        return [];
-    }
-
-    public function getCode(): string
-    {
-        return 'post_nord';
-    }
-
-    public function getName(): string
-    {
-        return 'PostNord';
-    }
-
-    private function transform(ServicePoint $servicePoint): PickupPointInterface
+    private function transform(ServicePoint $servicePoint): PickupPoint
     {
-        $id = new PickupPointCode(
-            $servicePoint->servicePointId,
-            $this->getCode(),
-            $servicePoint->visitingAddress->countryCode,
-        );
-
-        /** @var PickupPointInterface|object $pickupPoint */
-        $pickupPoint = $this->pickupPointFactory->createNew();
-
-        Assert::isInstanceOf($pickupPoint, PickupPointInterface::class);
-
-        $pickupPoint->setCode($id);
-        $pickupPoint->setName($servicePoint->name);
-        $pickupPoint->setAddress($servicePoint->visitingAddress->streetName . ' ' . $servicePoint->visitingAddress->streetNumber);
-        $pickupPoint->setZipCode($servicePoint->visitingAddress->postalCode);
-        $pickupPoint->setCity($servicePoint->visitingAddress->city);
-        $pickupPoint->setCountry($servicePoint->visitingAddress->countryCode);
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = $this->getCode();
+        $pickupPoint->id = (string) $servicePoint->servicePointId;
+        $pickupPoint->name = $servicePoint->name;
+        $pickupPoint->address = $servicePoint->visitingAddress->streetName . ' ' . $servicePoint->visitingAddress->streetNumber;
+        $pickupPoint->zipCode = $servicePoint->visitingAddress->postalCode;
+        $pickupPoint->city = $servicePoint->visitingAddress->city;
+        $pickupPoint->country = $servicePoint->visitingAddress->countryCode;
 
         return $pickupPoint;
     }
-
-    private static function isValidServicePoint(array $servicePoint): bool
-    {
-        // some service points will not have a city because they are special internal service points
-        // we exclude these service points since they don't make any sense for the end user
-        if (!isset($servicePoint['visitingAddress']['city'])) {
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/Provider/Provider.php b/src/Provider/Provider.php
index 04f30d48..95a7745f 100644
--- a/src/Provider/Provider.php
+++ b/src/Provider/Provider.php
@@ -4,10 +4,41 @@
 
 namespace Setono\SyliusPickupPointPlugin\Provider;
 
+use LogicException;
+use function sprintf;
+
 abstract class Provider implements ProviderInterface
 {
-    public function __toString(): string
+    /**
+     * The code this provider is registered under. Null until {@see setCode()} is called,
+     * which the RegisterProvidersPass wires for every service tagged
+     * "setono_sylius_pickup_point.provider". Read it through {@see getCode()}, never directly,
+     * so an unregistered provider fails loudly instead of stamping an empty code.
+     */
+    private ?string $code = null;
+
+    public function setCode(string $code): void
+    {
+        $this->code = $code;
+    }
+
+    /**
+     * Returns the code this provider was registered under, for stamping onto the pickup
+     * points it returns.
+     *
+     * @throws LogicException if the code was never set — i.e. the provider was instantiated
+     *                        without going through the compiler pass (not registered as a
+     *                        service tagged "setono_sylius_pickup_point.provider")
+     */
+    protected function getCode(): string
     {
-        return $this->getCode();
+        if (null === $this->code) {
+            throw new LogicException(sprintf(
+                'The code has not been set on the pickup point provider "%s". It is set automatically when the provider is registered as a service tagged "setono_sylius_pickup_point.provider".',
+                static::class,
+            ));
+        }
+
+        return $this->code;
     }
 }
diff --git a/src/Provider/ProviderInterface.php b/src/Provider/ProviderInterface.php
index 28581236..eeac5b97 100644
--- a/src/Provider/ProviderInterface.php
+++ b/src/Provider/ProviderInterface.php
@@ -4,37 +4,37 @@
 
 namespace Setono\SyliusPickupPointPlugin\Provider;
 
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
+use Setono\SyliusPickupPointPlugin\DTO\Address;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
 
 interface ProviderInterface
 {
-    public function __toString(): string;
-
-    /**
-     * A unique code identifying this provider
-     */
-    public function getCode(): string;
-
     /**
-     * Will return the name of this provider
+     * Sets the code this provider is registered under. Called once by the container
+     * (wired by the RegisterProvidersPass) so the provider can stamp it onto the
+     * pickup points it returns. The code is resolved at compile time — either from
+     * the `#[AsProvider]` attribute or from the service tag's `code` attribute.
      */
-    public function getName(): string;
+    public function setCode(string $code): void;
 
     /**
-     * Will return an array of pickup points
+     * Returns the pickup points near the given address.
+     *
+     * Takes an {@see Address} rather than an order so providers can be used outside the checkout
+     * flow (e.g. an admin tool or a standalone lookup). Build one from an order with
+     * {@see Address::fromOrder()}.
      *
-     * @return iterable<PickupPointInterface>
+     * @return list<PickupPoint>
      */
-    public function findPickupPoints(OrderInterface $order): iterable;
-
-    public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface;
+    public function findPickupPoints(Address $address): array;
 
     /**
-     * Returns all pickup points for this provider
+     * Resolves a single pickup point from its provider-local id.
      *
-     * @return iterable<PickupPointInterface>
+     * @param array<string, mixed> $metadata extra, carrier-specific context needed to resolve the
+     *                                        pickup point (e.g. `['country' => 'DK']`). Untyped on
+     *                                        purpose: the data required to look up a pickup point by
+     *                                        id varies per carrier, so this stays an open SPI hook.
      */
-    public function findAllPickupPoints(): iterable;
+    public function findPickupPoint(string $id, array $metadata = []): ?PickupPoint;
 }
diff --git a/src/Registry/ProviderRegistry.php b/src/Registry/ProviderRegistry.php
new file mode 100644
index 00000000..39b97933
--- /dev/null
+++ b/src/Registry/ProviderRegistry.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Registry;
+
+use Setono\SyliusPickupPointPlugin\Exception\UnknownProviderException;
+use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
+
+final class ProviderRegistry implements ProviderRegistryInterface
+{
+    /**
+     * Map of provider code => provider instance. This is the registry's single source of
+     * truth and is populated once at container build time: RegisterProvidersPass resolves
+     * each tagged provider's code (from its #[AsProvider] attribute or its service tag) and
+     * wires one add() call per provider. The same code is also handed to the provider via
+     * setCode(), so the instance and the registry agree on it.
+     *
+     * @var array<string, ProviderInterface>
+     */
+    private array $providers = [];
+
+    /**
+     * Map of provider code => human-readable carrier name (e.g. 'gls' => 'GLS'). Used as the
+     * label shown to merchants when picking a provider in the admin shipping-method form.
+     * Kept in lock-step with {@see $providers} — both are filled by the same add() call.
+     *
+     * @var array<string, string>
+     */
+    private array $names = [];
+
+    public function add(ProviderInterface $provider, string $code, string $name): void
+    {
+        $this->providers[$code] = $provider;
+        $this->names[$code] = $name;
+    }
+
+    public function has(string $code): bool
+    {
+        return isset($this->providers[$code]);
+    }
+
+    public function get(string $code): ProviderInterface
+    {
+        return $this->providers[$code] ?? throw new UnknownProviderException($code, array_keys($this->providers));
+    }
+
+    public function all(): array
+    {
+        return $this->providers;
+    }
+
+    public function names(): array
+    {
+        return $this->names;
+    }
+
+    /**
+     * Allows iterating the registry directly, e.g. `foreach ($registry as $code => $provider)`.
+     *
+     * @return \ArrayIterator<string, ProviderInterface>
+     */
+    public function getIterator(): \ArrayIterator
+    {
+        return new \ArrayIterator($this->providers);
+    }
+}
diff --git a/src/Registry/ProviderRegistryInterface.php b/src/Registry/ProviderRegistryInterface.php
new file mode 100644
index 00000000..b79adba5
--- /dev/null
+++ b/src/Registry/ProviderRegistryInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Registry;
+
+use Setono\SyliusPickupPointPlugin\Exception\UnknownProviderException;
+use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
+
+/**
+ * @extends \IteratorAggregate<string, ProviderInterface>
+ */
+interface ProviderRegistryInterface extends \IteratorAggregate
+{
+    /**
+     * Registers a provider under the given code. The name is the human-readable
+     * carrier name shown to merchants. Wired by the RegisterProvidersPass.
+     */
+    public function add(ProviderInterface $provider, string $code, string $name): void;
+
+    public function has(string $code): bool;
+
+    /**
+     * @throws UnknownProviderException if no provider is registered with the given code
+     */
+    public function get(string $code): ProviderInterface;
+
+    /**
+     * @return array<string, ProviderInterface>
+     */
+    public function all(): array;
+
+    /**
+     * @return array<string, string> a map of provider code => human-readable name
+     */
+    public function names(): array;
+}
diff --git a/src/Repository/PickupPointRepositoryInterface.php b/src/Repository/PickupPointRepositoryInterface.php
deleted file mode 100644
index dbafce71..00000000
--- a/src/Repository/PickupPointRepositoryInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Repository;
-
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
-
-interface PickupPointRepositoryInterface extends RepositoryInterface
-{
-    public function findOneByCode(PickupPointCode $code): ?PickupPointInterface;
-
-    /**
-     * @psalm-return list<PickupPointInterface>
-     */
-    public function findByOrder(OrderInterface $order, string $provider): array;
-}
diff --git a/src/Resources/config/app/config.yaml b/src/Resources/config/app/config.yaml
deleted file mode 100644
index d67a06cf..00000000
--- a/src/Resources/config/app/config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-framework:
-    messenger:
-        buses:
-            setono_sylius_pickup_point.command_bus: ~
-
-jms_serializer:
-    metadata:
-        directories:
-            setono-sylius-pickup-point:
-                namespace_prefix: "Setono\\SyliusPickupPointPlugin\\Model"
-                path: "@SetonoSyliusPickupPointPlugin/Resources/config/serializer"
diff --git a/src/Resources/config/app/fixtures.yaml b/src/Resources/config/app/fixtures.yaml
deleted file mode 100644
index 1ab6ebf0..00000000
--- a/src/Resources/config/app/fixtures.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-sylius_fixtures:
-    suites:
-        default:
-            fixtures:
-                geographical:
-                    options:
-                        countries:
-                            - 'DK'
-                            - 'SE'
-                            - 'FI'
-
-                            # @todo Remove all other countries once https://github.com/Sylius/Sylius/issues/11216 fixed
-                            - 'US'
-                            - 'FR'
-                            - 'DE'
-                            - 'AU'
-                            - 'CA'
-                            - 'MX'
-                            - 'NZ'
-                            - 'PT'
-                            - 'ES'
-                            - 'CN'
-                        zones:
-                            WORLD:
-                                name: 'World'
-                                countries:
-                                    - 'DK'
-                                    - 'SE'
-                                    - 'FI'
-                                    - 'US'
-                                    - 'FR'
-                                    - 'DE'
-                                    - 'AU'
-                                    - 'CA'
-                                    - 'MX'
-                                    - 'NZ'
-                                    - 'PT'
-                                    - 'ES'
-                                    - 'CN'
-                            DAO_PP_COUNTRIES:
-                                name: 'Denmark'
-                                countries:
-                                    # Dao operates at DK only
-                                    - 'DK'
-                            POSTNORD_PP_COUNTRIES:
-                                name: 'PostNord countries'
-                                countries:
-                                    - 'DK'
-                                    - 'SE'
-                                    - 'FI'
-                            GLS_PP_COUNTRIES:
-                                name: 'GLS countries'
-                                countries:
-                                    - 'DK'
-                                    - 'SE'
-                                    - 'FI'
-                                    - 'FR'
-                                    - 'DE'
-                                    - 'PT'
-                                    - 'ES'
-
-                setono_sylius_pickup_point_shipping_method:
-                    options:
-                        custom:
-                            dao_pickup_point:
-                                code: "dao_pickup_point"
-                                name: "DAO with pickup points"
-                                enabled: true
-                                zone: "DAO_PP_COUNTRIES"
-                                pickup_point_provider: dao
-                                channels:
-                                    - "FASHION_WEB"
-                            gls_pickup_point:
-                                code: "gls_pickup_point"
-                                name: "GLS with pickup points"
-                                enabled: true
-                                zone: "WORLD"
-                                pickup_point_provider: gls
-                                channels:
-                                    - "FASHION_WEB"
-                            gls_home:
-                                code: "gls_home"
-                                name: "GLS home delivery"
-                                enabled: true
-                                zone: "WORLD"
-                                channels:
-                                    - "FASHION_WEB"
-                            post_nord_pickup_point:
-                                code: "post_nord_pickup_point"
-                                name: "PostNord with pickup points"
-                                enabled: true
-                                zone: "POSTNORD_PP_COUNTRIES"
-                                pickup_point_provider: post_nord
-                                channels:
-                                    - "FASHION_WEB"
-                            post_nord_home:
-                                code: "post_nord_home"
-                                name: "PostNord home delivery"
-                                enabled: true
-                                zone: "WORLD"
-                                channels:
-                                    - "FASHION_WEB"
-                            faker:
-                                code: "faker"
-                                name: "Fake delivery"
-                                enabled: true
-                                zone: "WORLD"
-                                pickup_point_provider: faker
-                                channels:
-                                    - "FASHION_WEB"
diff --git a/src/Resources/config/doctrine/model/PickupPoint.orm.xml b/src/Resources/config/doctrine/model/PickupPoint.orm.xml
deleted file mode 100644
index 5e9d65d9..00000000
--- a/src/Resources/config/doctrine/model/PickupPoint.orm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping">
-    <mapped-superclass name="Setono\SyliusPickupPointPlugin\Model\PickupPoint"
-                       table="setono_sylius_pickup_point__pickup_point">
-        <!-- todo create unique constraint on the columns in the embedded 'code' -->
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO"/>
-        </id>
-
-        <embedded name="code" class="Setono\SyliusPickupPointPlugin\Model\PickupPointCode"/>
-
-        <field name="name" type="string"/>
-        <field name="address" type="string"/>
-        <field name="zipCode" type="string"/>
-        <field name="city" type="string"/>
-        <field name="country" column="country" type="string"/>
-        <field name="latitude" nullable="true" type="decimal" precision="10" scale="8"/>
-        <field name="longitude" nullable="true" type="decimal" precision="11" scale="8"/>
-    </mapped-superclass>
-</doctrine-mapping>
diff --git a/src/Resources/config/doctrine/model/PickupPointCode.orm.xml b/src/Resources/config/doctrine/model/PickupPointCode.orm.xml
deleted file mode 100644
index c6b23418..00000000
--- a/src/Resources/config/doctrine/model/PickupPointCode.orm.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping">
-    <embeddable name="Setono\SyliusPickupPointPlugin\Model\PickupPointCode">
-        <field name="id"/>
-        <field name="provider"/>
-        <field name="country"/>
-    </embeddable>
-</doctrine-mapping>
diff --git a/src/Resources/config/routes/shop/ajax/pickup-point.yaml b/src/Resources/config/routes/shop/ajax/pickup-point.yaml
deleted file mode 100644
index 3939c896..00000000
--- a/src/Resources/config/routes/shop/ajax/pickup-point.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-setono_sylius_pickup_point_shop_ajax_pickup_points_search_by_cart_address:
-    path: /search
-    methods: [GET]
-    defaults:
-        _controller: setono_sylius_pickup_point.controller.action.pickup_points_search_by_cart_address
-        _format: json
-
-setono_sylius_pickup_point_shop_ajax_pickup_point_by_id:
-    path: /{pickupPointId}
-    methods: [GET]
-    defaults:
-        _controller: setono_sylius_pickup_point.controller.action.pickup_point_by_id
-        _format: json
-
diff --git a/src/Resources/config/routing.yaml b/src/Resources/config/routing.yaml
deleted file mode 100644
index f907c5a5..00000000
--- a/src/Resources/config/routing.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-setono_sylius_pickup_point_shop_ajax_pickup_point:
-    resource: "@SetonoSyliusPickupPointPlugin/Resources/config/routes/shop/ajax/pickup-point.yaml"
-    prefix: /{_locale}/ajax/pickup-points
diff --git a/src/Resources/config/routing_non_localized.yaml b/src/Resources/config/routing_non_localized.yaml
deleted file mode 100644
index 1c5a6c5c..00000000
--- a/src/Resources/config/routing_non_localized.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-setono_sylius_pickup_point_shop_ajax_pickup_point:
-    resource: "@SetonoSyliusPickupPointPlugin/Resources/config/routes/shop/ajax/pickup-point.yaml"
-    prefix: /ajax/pickup-points
diff --git a/src/Resources/config/serializer/PickupPoint.yml b/src/Resources/config/serializer/PickupPoint.yml
deleted file mode 100644
index c55e4f1a..00000000
--- a/src/Resources/config/serializer/PickupPoint.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-Setono\SyliusPickupPointPlugin\Model\PickupPoint:
-    exclusion_policy: ALL
-    xml_root_name: setono_sylius_pickup_point
-    properties:
-        name:
-            type: string
-            groups: [Detailed, Autocomplete]
-        latitude:
-            type: string
-            groups: [Detailed, Autocomplete]
-        longitude:
-            type: string
-            groups: [Detailed, Autocomplete]
-    virtual_properties:
-        getCode:
-            serialized_name: code
-            type: string
-            groups: [Detailed, Autocomplete]
-        getFullAddress:
-            serialized_name: full_address
-            type: string
-            groups: [Detailed, Autocomplete]
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
deleted file mode 100644
index 8b2f6e05..00000000
--- a/src/Resources/config/services.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <imports>
-        <import resource="services/command.xml"/>
-        <import resource="services/controller.xml"/>
-        <import resource="services/event_listener.xml"/>
-        <import resource="services/fixture.xml"/>
-        <import resource="services/form.xml"/>
-        <import resource="services/message.xml"/>
-        <import resource="services/registry.xml"/>
-        <import resource="services/shipping.xml"/>
-        <import resource="services/validator.xml"/>
-    </imports>
-</container>
diff --git a/src/Resources/config/services/command.xml b/src/Resources/config/services/command.xml
deleted file mode 100644
index 58bebef1..00000000
--- a/src/Resources/config/services/command.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <service id="setono_sylius_pickup_point.command.load_pickup_points"
-                 class="Setono\SyliusPickupPointPlugin\Command\LoadPickupPointsCommand">
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider"/>
-            <argument type="service" id="setono_sylius_pickup_point.command_bus"/>
-
-            <tag name="console.command"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/controller.xml b/src/Resources/config/services/controller.xml
deleted file mode 100644
index c2fdd8d9..00000000
--- a/src/Resources/config/services/controller.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.controller.action.pickup_points_search_by_cart_address"
-                 class="Setono\SyliusPickupPointPlugin\Controller\Action\PickupPointsSearchByCartAddressAction">
-            <argument type="service" id="fos_rest.view_handler.default" />
-            <argument type="service" id="sylius.context.cart.composite" />
-            <argument type="service" id="security.csrf.token_manager" />
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider" />
-            <tag name="controller.service_arguments"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.controller.action.pickup_point_by_id"
-                 class="Setono\SyliusPickupPointPlugin\Controller\Action\PickupPointByIdAction">
-            <argument type="service" id="fos_rest.view_handler.default" />
-            <argument type="service" id="setono_sylius_pickup_point.form.type.data_transformer.pickup_point_to_identifier" />
-            <tag name="controller.service_arguments"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/event_listener.xml b/src/Resources/config/services/event_listener.xml
deleted file mode 100644
index 952b7275..00000000
--- a/src/Resources/config/services/event_listener.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.block_event_listener.javascript"
-                 class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
-            <argument>@SetonoSyliusPickupPointPlugin/_javascripts.html.twig</argument>
-            <tag name="kernel.event_listener" event="sonata.block.event.sylius.shop.layout.javascripts" method="onBlockEvent" />
-            <tag name="kernel.event_listener" event="sonata.block.event.sylius.admin.layout.javascripts" method="onBlockEvent" />
-        </service>
-
-        <service id="Setono\SyliusPickupPointPlugin\EventListener\AddIndicesSubscriber">
-            <tag name="doctrine.event_subscriber"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/fixture.xml b/src/Resources/config/services/fixture.xml
deleted file mode 100644
index 586887d3..00000000
--- a/src/Resources/config/services/fixture.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.fixture.shipping_method"
-                 class="Setono\SyliusPickupPointPlugin\Fixture\ShippingMethodFixture">
-            <argument type="service" id="sylius.manager.shipping_method" />
-            <argument type="service" id="setono_sylius_pickup_point.fixture.example_factory.shipping_method" />
-            <tag name="sylius_fixtures.fixture" />
-        </service>
-
-        <service id="setono_sylius_pickup_point.fixture.example_factory.shipping_method"
-                 class="Setono\SyliusPickupPointPlugin\Fixture\Factory\ShippingMethodExampleFactory">
-            <argument type="service" id="sylius.factory.shipping_method" />
-            <argument type="service" id="sylius.repository.zone" />
-            <argument type="service" id="sylius.repository.shipping_category" />
-            <argument type="service" id="sylius.repository.locale" />
-            <argument type="service" id="sylius.repository.channel" />
-            <argument type="service" id="sylius.repository.tax_category" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/form.xml b/src/Resources/config/services/form.xml
deleted file mode 100644
index 776d223f..00000000
--- a/src/Resources/config/services/form.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <!-- Transformers -->
-        <service id="setono_sylius_pickup_point.form.type.data_transformer.pickup_point_to_identifier"
-                 class="Setono\SyliusPickupPointPlugin\Form\DataTransformer\PickupPointToIdentifierTransformer">
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider" />
-        </service>
-
-        <!-- Forms -->
-        <service id="Setono\SyliusPickupPointPlugin\Form\Type\PickupPointChoiceType">
-            <tag name="form.type" />
-        </service>
-
-        <service id="Setono\SyliusPickupPointPlugin\Form\Type\PickupPointIdChoiceType">
-            <tag name="form.type" />
-        </service>
-
-        <!-- Form extensions -->
-        <service id="Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodChoiceTypeExtension">
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider" />
-            <argument type="service" id="router" />
-            <argument type="service" id="sylius.context.cart.composite" />
-            <argument type="service" id="security.csrf.token_manager" />
-            <tag name="form.type_extension" extended_type="Sylius\Bundle\ShippingBundle\Form\Type\ShippingMethodChoiceType" />
-        </service>
-
-        <service id="Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodTypeExtension">
-            <argument>%setono_sylius_pickup_point.providers%</argument>
-            <tag name="form.type_extension" extended_type="Sylius\Bundle\ShippingBundle\Form\Type\ShippingMethodType" />
-        </service>
-
-        <service id="Setono\SyliusPickupPointPlugin\Form\Extension\ShipmentTypeExtension">
-            <tag name="form.type_extension" extended_type="Sylius\Bundle\CoreBundle\Form\Type\Checkout\ShipmentType" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/message.xml b/src/Resources/config/services/message.xml
deleted file mode 100644
index ed0c3ef8..00000000
--- a/src/Resources/config/services/message.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <service id="setono_sylius_pickup_point.message.handler.load_pickup_points"
-                 class="Setono\SyliusPickupPointPlugin\Message\Handler\LoadPickupPointsHandler">
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider"/>
-            <argument type="service" id="setono_sylius_pickup_point.repository.pickup_point"/>
-            <argument type="service" id="setono_sylius_pickup_point.manager.pickup_point"/>
-
-            <tag name="messenger.message_handler"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers/budbee.xml b/src/Resources/config/services/providers/budbee.xml
deleted file mode 100644
index ce002ee2..00000000
--- a/src/Resources/config/services/providers/budbee.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <service id="setono_sylius_pickup_point.provider.budbee"
-                 class="Setono\SyliusPickupPointPlugin\Provider\BudbeeProvider">
-            <argument type="service" id="setono_budbee.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>bpost</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="budbee"
-                 label="setono_sylius_pickup_point.provider.budbee"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers/coolrunner.xml b/src/Resources/config/services/providers/coolrunner.xml
deleted file mode 100644
index 585f0940..00000000
--- a/src/Resources/config/services/providers/coolrunner.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <service id="setono_sylius_pickup_point.provider.coolrunner_bpost"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>bpost</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_bpost"
-                 label="setono_sylius_pickup_point.provider.coolrunner_bpost"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_bring"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>bring</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_bring"
-                 label="setono_sylius_pickup_point.provider.coolrunner_bring"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_bringse"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>bringse</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_bringse"
-                 label="setono_sylius_pickup_point.provider.coolrunner_bringse"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_colisprive"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>colisprive</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_colisprive"
-                 label="setono_sylius_pickup_point.provider.coolrunner_colisprive"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_dhl"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>dhl</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_dhl"
-                 label="setono_sylius_pickup_point.provider.coolrunner_dhl"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_dhlpaket"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>dhlpaket</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_dhlpaket"
-                 label="setono_sylius_pickup_point.provider.coolrunner_dhlpaket"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_dhlconnect"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>dhlconnect</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_dhlconnect"
-                 label="setono_sylius_pickup_point.provider.coolrunner_dhlconnect"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_helthjem"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>helthjem</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_helthjem"
-                 label="setono_sylius_pickup_point.provider.coolrunner_helthjem"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_hermes"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>hermes</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_hermes"
-                 label="setono_sylius_pickup_point.provider.coolrunner_hermes"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_gls"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>gls</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_gls"
-                 label="setono_sylius_pickup_point.provider.coolrunner_gls"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_instabox"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>instabox</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_instabox"
-                 label="setono_sylius_pickup_point.provider.coolrunner_instabox"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_instahome"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>instahome</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_instahome"
-                 label="setono_sylius_pickup_point.provider.coolrunner_instahome"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_mondialrelay"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>mondialrelay</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_mondialrelay"
-                 label="setono_sylius_pickup_point.provider.coolrunner_mondialrelay"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_mtd"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>mtd</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_mtd"
-                 label="setono_sylius_pickup_point.provider.coolrunner_mtd"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_postnl"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>postnl</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_postnl"
-                 label="setono_sylius_pickup_point.provider.coolrunner_postnl"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_postnord"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>postnord</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_postnord"
-                 label="setono_sylius_pickup_point.provider.coolrunner_postnord"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.coolrunner_royalmail"
-                 class="Setono\SyliusPickupPointPlugin\Provider\CoolRunnerProvider">
-            <argument type="service" id="setono_coolrunner.client.default"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <argument>royalmail</argument>
-
-            <tag name="setono_sylius_pickup_point.provider" code="coolrunner_royalmail"
-                 label="setono_sylius_pickup_point.provider.coolrunner_royalmail"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers/dao.xml b/src/Resources/config/services/providers/dao.xml
deleted file mode 100644
index 8b011bc9..00000000
--- a/src/Resources/config/services/providers/dao.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.provider.dao"
-                 class="Setono\SyliusPickupPointPlugin\Provider\DAOProvider">
-            <argument type="service" id="setono_dao.client"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <tag name="setono_sylius_pickup_point.provider" code="dao" label="setono_sylius_pickup_point.provider.dao"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers/faker.xml b/src/Resources/config/services/providers/faker.xml
deleted file mode 100644
index 7ad6648b..00000000
--- a/src/Resources/config/services/providers/faker.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.provider.faker"
-                 class="Setono\SyliusPickupPointPlugin\Provider\FakerProvider">
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <tag name="setono_sylius_pickup_point.provider" code="faker"
-                 label="setono_sylius_pickup_point.provider.faker"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers/gls.xml b/src/Resources/config/services/providers/gls.xml
deleted file mode 100644
index fa7848ae..00000000
--- a/src/Resources/config/services/providers/gls.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <service id="setono_sylius_pickup_point.provider.gls"
-                 class="Setono\SyliusPickupPointPlugin\Provider\GlsProvider">
-            <argument type="service" id="setono_gls_webservice.client"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <tag name="setono_sylius_pickup_point.provider" code="gls" label="setono_sylius_pickup_point.provider.gls"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers/post_nord.xml b/src/Resources/config/services/providers/post_nord.xml
deleted file mode 100644
index 5faf2deb..00000000
--- a/src/Resources/config/services/providers/post_nord.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.provider.post_nord"
-                 class="Setono\SyliusPickupPointPlugin\Provider\PostNordProvider">
-            <argument type="service" id="setono_post_nord.client"/>
-            <argument type="service" id="setono_sylius_pickup_point.factory.pickup_point"/>
-            <tag name="setono_sylius_pickup_point.provider" code="post_nord"
-                 label="setono_sylius_pickup_point.provider.post_nord"/>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/registry.xml b/src/Resources/config/services/registry.xml
deleted file mode 100644
index 45d5f0cf..00000000
--- a/src/Resources/config/services/registry.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.registry.provider"
-                 class="Sylius\Component\Registry\ServiceRegistry">
-            <argument>Setono\SyliusPickupPointPlugin\Provider\ProviderInterface</argument>
-            <argument>pickup point provider</argument>
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/config/services/shipping.xml b/src/Resources/config/services/shipping.xml
deleted file mode 100644
index 7cc55d40..00000000
--- a/src/Resources/config/services/shipping.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <service id="setono_sylius_pickup_point.shipping.order_shipping_method_selection_requirement_checker"
-                 class="Setono\SyliusPickupPointPlugin\Shipping\OrderShippingMethodSelectionRequirementChecker"
-                 decorates="sylius.checker.order_shipping_method_selection_requirement" decoration-priority="256">
-            <argument type="service"
-                      id="setono_sylius_pickup_point.shipping.order_shipping_method_selection_requirement_checker.inner"/>
-            <argument type="service" id="sylius.shipping_methods_resolver"/>
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/validator.xml b/src/Resources/config/services/validator.xml
deleted file mode 100644
index 23fccef6..00000000
--- a/src/Resources/config/services/validator.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-
-        <service id="setono_sylius_pickup_point.validator.has_pickup_point_selected"
-                 class="Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelectedValidator">
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider"/>
-            <tag name="validator.constraint_validator" alias="setono_pickup_point_has_pickup_point_selected" />
-        </service>
-
-    </services>
-</container>
diff --git a/src/Resources/public/js/setono-pickup-point.js b/src/Resources/public/js/setono-pickup-point.js
deleted file mode 100644
index 271300fa..00000000
--- a/src/Resources/public/js/setono-pickup-point.js
+++ /dev/null
@@ -1,103 +0,0 @@
-let pickupPoints = {
-  pickupPointShippingMethods: document.querySelectorAll('input.input-shipping-method[data-pickup-point-provider]'),
-  pickupPointsField: document.querySelectorAll('div.setono-sylius-pickup-point-field')[0],
-  pickupPointsFieldInput: document.querySelectorAll('div.setono-sylius-pickup-point-field > input.setono-sylius-pickup-point-field-input')[0],
-  pickupPointsFieldChoices: document.querySelectorAll('div.setono-sylius-pickup-point-field-choices')[0],
-  pickupPointsFieldChoicePrototype: document.querySelectorAll('div.setono-sylius-pickup-point-field-choice-prototype')[0],
-  shippingMethods: document.querySelectorAll('input.input-shipping-method'),
-  pickupPointChoices: {},
-  lastChosenPickupPointId: null,
-  init: function (args) {
-    this.searchUrl = args.searchUrl;
-
-    if (0 === this.pickupPointShippingMethods.length) {
-      return;
-    }
-
-    this.pickupPointShippingMethods.forEach((element) => {
-      this.searchAndStorePickupPoints(element);
-    });
-
-    this.shippingMethods.forEach((element) => {
-      element.addEventListener('change', () => {
-        if (0 !== this.pickupPointsFieldInput.value.length) {
-          this.lastChosenPickupPointId = this.pickupPointsFieldInput.value;
-        }
-        this.pickupPointsFieldInput.value = null;
-        this.render();
-      });
-    });
-
-    this.render();
-  },
-  searchAndStorePickupPoints: function (input) {
-    let shippingMethodCode = input.getAttribute('value');
-    this.pickupPointChoices[shippingMethodCode] = {};
-
-    let pickupPointChoices = this.pickupPointChoices;
-    let inputSearchUrl = this.searchUrl;
-    inputSearchUrl = inputSearchUrl.replace('{providerCode}', input.getAttribute('data-pickup-point-provider'));
-    inputSearchUrl = inputSearchUrl.replace('{_csrf_token}', input.getAttribute('data-csrf-token'));
-
-    const xhttp = new XMLHttpRequest();
-    xhttp.onreadystatechange = function () {
-      if (4 === xhttp.readyState && 200 === xhttp.status) {
-        pickupPointChoices[shippingMethodCode] = JSON.parse(xhttp.response);
-      }
-    }
-    // Use synchronous xhttp request since we need the result to continue the process
-    // @todo Convert to async as synchronous requests deprecated by browsers
-    xhttp.open('GET', inputSearchUrl, false);
-    xhttp.send();
-
-    this.pickupPointChoices = pickupPointChoices;
-  },
-  render: function () {
-    let selectedElement = document.querySelectorAll('input.input-shipping-method:checked');
-    selectedElement = selectedElement[0];
-    let currentShippingMethodCode = selectedElement.getAttribute('value');
-
-    const values = this.pickupPointChoices[currentShippingMethodCode];
-    if (undefined === values || undefined === values.length || 0 === values.length) {
-      this.pickupPointsField.style.display = 'none';
-      this.pickupPointsFieldChoices.innerHTML = '';
-      return;
-    }
-
-    this.pickupPointsField.style.display = 'block';
-    this.pickupPointsFieldChoices.innerHTML = this.valuesToRadio(values);
-
-    var currentPickupPointId = this.pickupPointsFieldInput.value;
-    if (null === currentPickupPointId || 0 === currentPickupPointId.length) {
-      currentPickupPointId = this.lastChosenPickupPointId;
-    }
-
-    var currentPickupPointRadio = document.querySelector(`input.setono-sylius-pickup-point-field-choice-field[value="${currentPickupPointId}"]`);
-    if (null !== currentPickupPointRadio) {
-      currentPickupPointRadio.checked = true;
-    }
-
-    const choices = document.querySelectorAll('input.setono-sylius-pickup-point-field-choice-field');
-    choices.forEach((choice) => {
-      choice.addEventListener('change', () => {
-        this.pickupPointsFieldInput.value = choice.getAttribute('value');
-      });
-    });
-  },
-  valuesToRadio(values) {
-    let content = ``;
-
-    values.forEach((value) => {
-      let prototype = this.pickupPointsFieldChoicePrototype.innerHTML;
-      let radio = prototype.replace(/{code}/g, value.code);
-      radio = radio.replace(/{name}/g, value.name);
-      radio = radio.replace(/{full_address}/g, value.full_address);
-      radio = radio.replace(/{latitude}/g, value.latitude);
-      radio = radio.replace(/{longitude}/g, value.longitude);
-
-      content += radio;
-    });
-
-    return content;
-  },
-};
diff --git a/src/Resources/translations/messages.da.yml b/src/Resources/translations/messages.da.yml
deleted file mode 100644
index 098958a2..00000000
--- a/src/Resources/translations/messages.da.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-setono_sylius_pickup_point:
-    ui:
-        shipment_to: Til afhentningssted 
-    form:
-        shipment:
-            pickup_point: Afhentningssted
-            select_pickup_point: Vælg afhentningssted
-        shipping_method:
-            pickup_point_provider: Afhentningsudbyder
-            select_pickup_point_provider: Vælg afhentningsudbyder
-    provider:
-        faker: Dummy
-        budbee: Budbee
-        coolrunner_bpost: CoolRunner BPost
-        coolrunner_bring: CoolRunner Bring
-        coolrunner_bringse: CoolRunner Bring SE
-        coolrunner_colisprive: CoolRunner Colisprive
-        coolrunner_dhl: CoolRunner DHL
-        coolrunner_dhlconnect: CoolRunner DHL Connect
-        coolrunner_dhlpaket: CoolRunner DHL Paket
-        coolrunner_gls: CoolRunner GLS
-        coolrunner_helthjem: CoolRunner Helthjem
-        coolrunner_hermes: CoolRunner Hermes
-        coolrunner_instabox: CoolRunner Instabox
-        coolrunner_instahome: CoolRunner Instahome
-        coolrunner_mondialrelay: CoolRunner Mondialrelay
-        coolrunner_mtd: CoolRunner MTD
-        coolrunner_postnl: CoolRunner PostNL
-        coolrunner_postnord: CoolRunner PostNord
-        coolrunner_royalmail: CoolRunner Royalmail
-        dao: DAO
-        gls: GLS
-        post_nord: PostNord
diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
deleted file mode 100644
index 9047a12e..00000000
--- a/src/Resources/translations/messages.en.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-setono_sylius_pickup_point:
-    ui:
-        shipment_to: To pickup point
-    form:
-        shipment:
-            pickup_point: Pickup point
-            select_pickup_point: Select pickup point
-        shipping_method:
-            pickup_point_provider: Pickup point provider
-            select_pickup_point_provider: Select pickup point provider
-    provider:
-        faker: Faker
-        budbee: Budbee
-        coolrunner_bpost: CoolRunner BPost
-        coolrunner_bring: CoolRunner Bring
-        coolrunner_bringse: CoolRunner Bring SE
-        coolrunner_colisprive: CoolRunner Colisprive
-        coolrunner_dhl: CoolRunner DHL
-        coolrunner_dhlconnect: CoolRunner DHL Connect
-        coolrunner_dhlpaket: CoolRunner DHL Paket
-        coolrunner_gls: CoolRunner GLS
-        coolrunner_helthjem: CoolRunner Helthjem
-        coolrunner_hermes: CoolRunner Hermes
-        coolrunner_instabox: CoolRunner Instabox
-        coolrunner_instahome: CoolRunner Instahome
-        coolrunner_mondialrelay: CoolRunner Mondialrelay
-        coolrunner_mtd: CoolRunner MTD
-        coolrunner_postnl: CoolRunner PostNL
-        coolrunner_postnord: CoolRunner PostNord
-        coolrunner_royalmail: CoolRunner Royalmail
-        dao: DAO
-        gls: GLS
-        post_nord: PostNord
diff --git a/src/Resources/views/Form/theme.html.twig b/src/Resources/views/Form/theme.html.twig
deleted file mode 100644
index f9c0dbe6..00000000
--- a/src/Resources/views/Form/theme.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends '@SyliusUi/Form/theme.html.twig' %}
-
-{% block setono_sylius_pickup_point_choice_row %}
-    <div class="setono-sylius-pickup-point-field {% if required %}required {% endif %}field{% if (not compound or force_error|default(false)) and not valid %} error{% endif %}">
-        {{- form_label(form) -}}
-        {{- form_widget(form, {'attr': {'class': 'setono-sylius-pickup-point-field-input'}}) -}}
-        {{- form_errors(form) -}}
-
-        {# @todo Omit using prototype like this as it present at DOM and querySelector results #}
-        <div class="setono-sylius-pickup-point-field-choice-prototype" style="display: none;">
-            <div class="item">
-                <div class="field">
-                    <div class="ui radio checkbox">
-                        <input id="{{ form.vars.id }}_{code}" class="setono-sylius-pickup-point-field-choice-field"
-                               type="radio" name="{{ form.vars.id }}[pickupPoint]" required value="{code}">
-                    </div>
-                </div>
-                <div class="content">
-                    <span class="header">
-                        <label for="{{ form.vars.id }}_{code}" class="required">
-                            {name}, {full_address}
-                            &middot; <a href="http://maps.google.com/maps?&z=16&q={latitude}+{longitude}" target="_blank">See on the map</a>
-                        </label>
-                    </span>
-                </div>
-            </div>
-        </div>
-        <div class="setono-sylius-pickup-point-field-choices ui items"></div>
-    </div>
-{% endblock %}
diff --git a/src/Resources/views/Shop/Label/Shipment/pickupPoint.html.twig b/src/Resources/views/Shop/Label/Shipment/pickupPoint.html.twig
deleted file mode 100644
index b7a45f8f..00000000
--- a/src/Resources/views/Shop/Label/Shipment/pickupPoint.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-{% set pickupPointId = shipment.pickupPointId %}
-
-{% if pickupPointId %}
-    <label class="setono-sylius-pickup-point-label"
-           data-pickup-point-id="{{ pickupPointId }}"
-           data-url="{{ path('setono_sylius_pickup_point_shop_ajax_pickup_point_by_id', { 'pickupPointId': pickupPointId }) }}"
-           style="display: none;">
-        {{ 'setono_sylius_pickup_point.ui.shipment_to'|trans }}
-    </label>
-{% endif %}
diff --git a/src/Resources/views/_javascripts.html.twig b/src/Resources/views/_javascripts.html.twig
deleted file mode 100644
index 9514d506..00000000
--- a/src/Resources/views/_javascripts.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-<script src="{{ asset('bundles/setonosyliuspickuppointplugin/js/setono-pickup-point.js') }}"></script>
-<script>
-    pickupPoints.init({
-        searchUrl: "{{ path('setono_sylius_pickup_point_shop_ajax_pickup_points_search_by_cart_address') }}?providerCode={providerCode}&_csrf_token={_csrf_token}",
-    });
-</script>
diff --git a/src/SetonoSyliusPickupPointPlugin.php b/src/SetonoSyliusPickupPointPlugin.php
index 1844b60a..a348d8f0 100644
--- a/src/SetonoSyliusPickupPointPlugin.php
+++ b/src/SetonoSyliusPickupPointPlugin.php
@@ -6,11 +6,10 @@
 
 use Setono\SyliusPickupPointPlugin\DependencyInjection\Compiler\RegisterProvidersPass;
 use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
-use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
-use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-final class SetonoSyliusPickupPointPlugin extends AbstractResourceBundle
+final class SetonoSyliusPickupPointPlugin extends Bundle
 {
     use SyliusPluginTrait;
 
@@ -21,10 +20,8 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new RegisterProvidersPass());
     }
 
-    public function getSupportedDrivers(): array
+    public function getPath(): string
     {
-        return [
-            SyliusResourceBundle::DRIVER_DOCTRINE_ORM,
-        ];
+        return \dirname(__DIR__);
     }
 }
diff --git a/src/Shipping/OrderShippingMethodSelectionRequirementChecker.php b/src/Shipping/OrderShippingMethodSelectionRequirementChecker.php
index e58d3dd5..ef3e9982 100644
--- a/src/Shipping/OrderShippingMethodSelectionRequirementChecker.php
+++ b/src/Shipping/OrderShippingMethodSelectionRequirementChecker.php
@@ -10,29 +10,24 @@
 use Sylius\Component\Core\Model\ShipmentInterface;
 use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface;
 
-final class OrderShippingMethodSelectionRequirementChecker implements OrderShippingMethodSelectionRequirementCheckerInterface
+final readonly class OrderShippingMethodSelectionRequirementChecker implements OrderShippingMethodSelectionRequirementCheckerInterface
 {
-    private OrderShippingMethodSelectionRequirementCheckerInterface $decorated;
-
-    private ShippingMethodsResolverInterface $shippingMethodsResolver;
-
-    public function __construct(OrderShippingMethodSelectionRequirementCheckerInterface $decorated, ShippingMethodsResolverInterface $shippingMethodsResolver)
-    {
-        $this->decorated = $decorated;
-        $this->shippingMethodsResolver = $shippingMethodsResolver;
+    public function __construct(
+        private OrderShippingMethodSelectionRequirementCheckerInterface $decorated,
+        private ShippingMethodsResolverInterface $shippingMethodsResolver,
+    ) {
     }
 
     public function isShippingMethodSelectionRequired(OrderInterface $order): bool
     {
-        $required = $this->decorated->isShippingMethodSelectionRequired($order);
-        if (true === $required) {
+        if ($this->decorated->isShippingMethodSelectionRequired($order)) {
             return true;
         }
 
-        // the original Sylius checker returns false in two cases
+        // The original Sylius checker returns false in two cases
         // 1. If shipping is not required
         // 2. If there only is one available shipping method
-        // we need to cover both cases here
+        // We need to cover both cases here
 
         if (!$order->isShippingRequired()) {
             return false;
diff --git a/src/Validator/Constraints/HasPickupPointSelected.php b/src/Validator/Constraints/HasPickupPointSelected.php
index e6cde63b..0e453f02 100644
--- a/src/Validator/Constraints/HasPickupPointSelected.php
+++ b/src/Validator/Constraints/HasPickupPointSelected.php
@@ -10,11 +10,6 @@ final class HasPickupPointSelected extends Constraint
 {
     public string $pickupPointNotBlank = 'setono_pickup_point.shipment.pickup_point.not_blank';
 
-    public function validatedBy(): string
-    {
-        return 'setono_pickup_point_has_pickup_point_selected';
-    }
-
     public function getTargets(): string
     {
         return Constraint::CLASS_CONSTRAINT;
diff --git a/src/Validator/Constraints/HasPickupPointSelectedValidator.php b/src/Validator/Constraints/HasPickupPointSelectedValidator.php
index 936c3988..5696ce43 100644
--- a/src/Validator/Constraints/HasPickupPointSelectedValidator.php
+++ b/src/Validator/Constraints/HasPickupPointSelectedValidator.php
@@ -12,7 +12,7 @@
 
 final class HasPickupPointSelectedValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint): void
+    public function validate(mixed $value, Constraint $constraint): void
     {
         if (null === $value || '' === $value) {
             return;
@@ -36,7 +36,7 @@ public function validate($value, Constraint $constraint): void
             return;
         }
 
-        if (!$value->hasPickupPointId()) {
+        if (!$value->hasPickupPoint()) {
             $this->context
                 ->buildViolation($constraint->pickupPointNotBlank)
                 ->addViolation()
diff --git a/templates/_javascripts.html.twig b/templates/_javascripts.html.twig
new file mode 100644
index 00000000..75c56464
--- /dev/null
+++ b/templates/_javascripts.html.twig
@@ -0,0 +1,2 @@
+<script>window.setonoSyliusPickupPointUrl = '{{ path('setono_sylius_pickup_point_shop_pickup_points') }}';</script>
+<script src="{{ asset('bundles/setonosyliuspickuppointplugin/js/setono-pickup-point.js') }}"></script>
diff --git a/templates/_stylesheets.html.twig b/templates/_stylesheets.html.twig
new file mode 100644
index 00000000..32ac47c2
--- /dev/null
+++ b/templates/_stylesheets.html.twig
@@ -0,0 +1 @@
+<link rel="stylesheet" href="{{ asset('bundles/setonosyliuspickuppointplugin/css/setono-pickup-point.css') }}">
diff --git a/templates/admin/order/show/shipment/pickupPoint.html.twig b/templates/admin/order/show/shipment/pickupPoint.html.twig
new file mode 100644
index 00000000..f2cad2e1
--- /dev/null
+++ b/templates/admin/order/show/shipment/pickupPoint.html.twig
@@ -0,0 +1,10 @@
+{% set pickupPoint = hookable_metadata.context.shipment.pickupPoint %}
+
+{% if pickupPoint %}
+    <td class="setono-sylius-pickup-point-label">
+        <strong>{{ 'setono_sylius_pickup_point.ui.shipment_to'|trans }}</strong><br>
+        {{ pickupPoint.name }}, {{ pickupPoint.address }}, {{ pickupPoint.zipCode }} {{ pickupPoint.city }}
+    </td>
+{% else %}
+    <td>&nbsp;</td>
+{% endif %}
diff --git a/templates/admin/shipping_method/form/configuration/pickupPointProvider.html.twig b/templates/admin/shipping_method/form/configuration/pickupPointProvider.html.twig
new file mode 100644
index 00000000..b6e59262
--- /dev/null
+++ b/templates/admin/shipping_method/form/configuration/pickupPointProvider.html.twig
@@ -0,0 +1,3 @@
+<div class="col-12">
+    {{ form_row(hookable_metadata.context.form.pickupPointProvider) }}
+</div>
diff --git a/templates/shop/checkout/select_shipping/shipment/pickupPoint.html.twig b/templates/shop/checkout/select_shipping/shipment/pickupPoint.html.twig
new file mode 100644
index 00000000..dde32adf
--- /dev/null
+++ b/templates/shop/checkout/select_shipping/shipment/pickupPoint.html.twig
@@ -0,0 +1,23 @@
+{% set form = hookable_metadata.context.form %}
+
+{% if form.pickupPoint is defined %}
+    {#
+        Carrier only: the hidden field is what is submitted, and the data attributes hand the localized
+        strings to public/js/setono-pickup-point.js. The visible chooser is built by that script and
+        inserted into the selected pickup-capable shipping method's card, because the points are fetched
+        asynchronously after the page has rendered (a slow/down provider never blocks the page).
+    #}
+    <div data-pickup-point-field
+         data-label-text="{{ 'setono_sylius_pickup_point.form.shipment.pickup_point'|trans }}"
+         data-loading-text="{{ 'setono_sylius_pickup_point.ui.loading_pickup_points'|trans }}"
+         data-empty-text="{{ 'setono_sylius_pickup_point.ui.no_pickup_points'|trans }}"
+         data-error-text="{{ 'setono_sylius_pickup_point.ui.error_loading_pickup_points'|trans }}"
+         data-change-text="{{ 'setono_sylius_pickup_point.ui.change'|trans }}"
+         data-keep-text="{{ 'setono_sylius_pickup_point.ui.keep_this'|trans }}"
+         data-currently-text="{{ 'setono_sylius_pickup_point.ui.currently'|trans }}"
+         data-selected-text="{{ 'setono_sylius_pickup_point.ui.selected'|trans }}"
+         hidden
+    >
+        {{ form_widget(form.pickupPoint, {'attr': {'data-pickup-point-input': ''}}) }}
+    </div>
+{% endif %}
diff --git a/tests/Application/.env b/tests/Application/.env
index 15b087f9..de7bee1c 100644
--- a/tests/Application/.env
+++ b/tests/Application/.env
@@ -23,13 +23,13 @@ APP_SECRET=EDITME
 # Format described at https://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls
-DATABASE_URL=mysql://root@127.0.0.1/setono_sylius_pickup_point_%kernel.environment%?serverVersion=5.7
+DATABASE_URL=mysql://root@127.0.0.1/sylius_pickup_point_plugin_%kernel.environment%?serverVersion=11.6.2-MariaDB
 ###< doctrine/doctrine-bundle ###
 
 ###> lexik/jwt-authentication-bundle ###
 JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
 JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
-JWT_PASSPHRASE=acme_plugin_development
+JWT_PASSPHRASE=sylius_pickup_point_plugin_development
 ###< lexik/jwt-authentication-bundle ###
 
 ###> symfony/messenger ###
@@ -45,22 +45,3 @@ MESSENGER_TRANSPORT_DSN=doctrine://default
 # Delivery is disabled by default via "null://localhost"
 MAILER_DSN=null://localhost
 ###< symfony/swiftmailer-bundle ###
-
-###> setono/dao-bundle ###
-DAO_CUSTOMER_ID=
-DAO_PASSWORD=
-###< setono/dao-bundle ###
-
-###> setono/post-nord-bundle ###
-POST_NORD_API_KEY=
-###< setono/post-nord-bundle ###
-
-###> setono/coolrunner-bundle ###
-COOLRUNNER_USERNAME=
-COOLRUNNER_TOKEN=
-###< setono/coolrunner-bundle ###
-
-###> setono/budbee-bundle ###
-BUDBEE_API_KEY=
-BUDBEE_API_SECRET=
-###< setono/budbee-bundle ###
diff --git a/tests/Application/.gitignore b/tests/Application/.gitignore
index bc600a8c..57ff3f19 100644
--- a/tests/Application/.gitignore
+++ b/tests/Application/.gitignore
@@ -21,3 +21,5 @@
 ###> symfony/web-server-bundle ###
 /.web-server-pid
 ###< symfony/web-server-bundle ###
+
+/config/reference.php
diff --git a/tests/Application/Kernel.php b/tests/Application/Kernel.php
index 10aa2999..6f42149f 100644
--- a/tests/Application/Kernel.php
+++ b/tests/Application/Kernel.php
@@ -4,80 +4,10 @@
 
 namespace Setono\SyliusPickupPointPlugin\Tests\Application;
 
-use PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 final class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
-
-    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
-
-    public function getCacheDir(): string
-    {
-        return $this->getProjectDir() . '/var/cache/' . $this->environment;
-    }
-
-    public function getLogDir(): string
-    {
-        return $this->getProjectDir() . '/var/log';
-    }
-
-    public function registerBundles(): iterable
-    {
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            $bundlesFile = $confDir . '/bundles.php';
-            if (false === is_file($bundlesFile)) {
-                continue;
-            }
-            yield from $this->registerBundlesFromFile($bundlesFile);
-        }
-    }
-
-    protected function configureRoutes(RoutingConfigurator $routes): void
-    {
-        foreach ($this->getConfigurationDirectories() as $confDir) {
-            $this->loadRoutesConfiguration($routes, $confDir);
-        }
-    }
-
-    protected function getContainerBaseClass(): string
-    {
-        if (str_contains($this->environment, 'test')) {
-            return MockerContainer::class;
-        }
-
-        return parent::getContainerBaseClass();
-    }
-
-    private function loadRoutesConfiguration(RoutingConfigurator $routes, string $confDir): void
-    {
-        $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS);
-        $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS);
-        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS);
-    }
-
-    /**
-     * @return BundleInterface[]
-     */
-    private function registerBundlesFromFile(string $bundlesFile): iterable
-    {
-        $contents = require $bundlesFile;
-        foreach ($contents as $class => $envs) {
-            if (isset($envs['all']) || isset($envs[$this->environment])) {
-                yield new $class();
-            }
-        }
-    }
-
-    /**
-     * @return string[]
-     */
-    private function getConfigurationDirectories(): iterable
-    {
-        yield $this->getProjectDir() . '/config';
-    }
 }
diff --git a/tests/Application/Model/Shipment.php b/tests/Application/Model/Shipment.php
index e5c29d5d..2f9e07bb 100644
--- a/tests/Application/Model/Shipment.php
+++ b/tests/Application/Model/Shipment.php
@@ -9,11 +9,8 @@
 use Setono\SyliusPickupPointPlugin\Model\ShipmentInterface;
 use Sylius\Component\Core\Model\Shipment as BaseShipment;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="sylius_shipment")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shipment')]
 class Shipment extends BaseShipment implements ShipmentInterface
 {
     use PickupPointAwareTrait;
diff --git a/tests/Application/Model/ShippingMethod.php b/tests/Application/Model/ShippingMethod.php
index f379ecad..dfe76f28 100644
--- a/tests/Application/Model/ShippingMethod.php
+++ b/tests/Application/Model/ShippingMethod.php
@@ -9,11 +9,8 @@
 use Setono\SyliusPickupPointPlugin\Model\ShippingMethodInterface;
 use Sylius\Component\Core\Model\ShippingMethod as BaseShippingMethod;
 
-/**
- * @ORM\Entity()
- *
- * @ORM\Table(name="sylius_shipping_method")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shipping_method')]
 class ShippingMethod extends BaseShippingMethod implements ShippingMethodInterface
 {
     use PickupPointProviderAwareTrait;
diff --git a/tests/Application/assets/admin/entry.js b/tests/Application/assets/admin/entry.js
index 635f5acc..77914cf0 100644
--- a/tests/Application/assets/admin/entry.js
+++ b/tests/Application/assets/admin/entry.js
@@ -1 +1 @@
-import 'sylius/bundle/AdminBundle/Resources/private/entry';
+import '@sylius-ui/admin';
diff --git a/tests/Application/assets/shop/entry.js b/tests/Application/assets/shop/entry.js
index aadc3174..b6c8b037 100644
--- a/tests/Application/assets/shop/entry.js
+++ b/tests/Application/assets/shop/entry.js
@@ -1 +1 @@
-import 'sylius/bundle/ShopBundle/Resources/private/entry';
+import '@sylius-ui/shop';
diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
index d461970a..f9086c8d 100644
--- a/tests/Application/config/bundles.php
+++ b/tests/Application/config/bundles.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-return [
+$bundles = [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -30,14 +30,8 @@
     Sylius\Bundle\CoreBundle\SyliusCoreBundle::class => ['all' => true],
     Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
     Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
-    winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
-    Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true],
-    Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
-    JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
-    FOS\RestBundle\FOSRestBundle::class => ['all' => true],
     Knp\Bundle\GaufretteBundle\KnpGaufretteBundle::class => ['all' => true],
     Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
-    League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
     Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
     Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true],
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
@@ -47,21 +41,33 @@
     Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
     Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
-    Setono\SyliusPickupPointPlugin\SetonoSyliusPickupPointPlugin::class => ['all' => true],
-    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
-    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
-    Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+    ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
+    Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
     BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
-    SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
-    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true],
-    Setono\GlsWebserviceBundle\SetonoGlsWebserviceBundle::class => ['all' => true],
-    Setono\PostNordBundle\SetonoPostNordBundle::class => ['all' => true],
-    Setono\DAOBundle\SetonoDAOBundle::class => ['all' => true],
-    Setono\CoolRunnerBundle\SetonoCoolRunnerBundle::class => ['all' => true],
-    Setono\BudbeeBundle\SetonoBudbeeBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
-    Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
+    League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
+    Sylius\TwigExtra\Symfony\SyliusTwigExtraBundle::class => ['all' => true],
+    Sylius\TwigHooks\SyliusTwigHooksBundle::class => ['all' => true],
+    Symfony\UX\Icons\UXIconsBundle::class => ['all' => true],
+    Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
+    Symfony\UX\LiveComponent\LiveComponentBundle::class => ['all' => true],
+    Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true],
+    Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
+    Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true],
+    DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
+    Setono\GlsWebserviceBundle\SetonoGlsWebserviceBundle::class => ['all' => true],
+    Setono\SyliusPickupPointPlugin\SetonoSyliusPickupPointPlugin::class => ['all' => true],
 ];
+
+// Filter out bundles whose class is missing — needed for the `static-code-analysis`
+// CI matrix which removes `sylius/sylius` (and with it many transitively-installed
+// bundles) before booting the kernel.
+return array_filter(
+    $bundles,
+    static fn (string $class): bool => class_exists($class),
+    \ARRAY_FILTER_USE_KEY,
+);
diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml
index 2f6645c0..f55710bc 100644
--- a/tests/Application/config/packages/_sylius.yaml
+++ b/tests/Application/config/packages/_sylius.yaml
@@ -1,11 +1,13 @@
 imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
+    - { resource: "@SyliusPayumBundle/Resources/config/app/config.yaml" }
     - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
 
 parameters:
     sylius_core.public_dir: '%kernel.project_dir%/public'
+    sylius.form.type.checkout_select_shipping.validation_groups: ['sylius', 'checkout_select_shipping']
 
 sylius_shop:
     product_grid:
diff --git a/tests/Application/config/packages/api_platform.yaml b/tests/Application/config/packages/api_platform.yaml
index 26def491..e6f25fbb 100644
--- a/tests/Application/config/packages/api_platform.yaml
+++ b/tests/Application/config/packages/api_platform.yaml
@@ -1,8 +1,9 @@
 api_platform:
     mapping:
         paths:
-            - '%kernel.project_dir%/../../vendor/sylius/sylius/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources'
+            - '%kernel.project_dir%/../../vendor/sylius/sylius/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform'
             - '%kernel.project_dir%/config/api_platform'
+            - '%kernel.project_dir%/src/Entity'
     patch_formats:
         json: ['application/merge-patch+json']
     swagger:
diff --git a/tests/Application/config/packages/buzz.yaml b/tests/Application/config/packages/buzz.yaml
deleted file mode 100644
index 64fe575c..00000000
--- a/tests/Application/config/packages/buzz.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Read more about client options at: https://github.com/kriswallsmith/Buzz/blob/master/doc/client.md
-services:
-    _defaults:
-        public: false
-
-    # Tell the auto wire system to use "FileGetContents" client as default client.
-    # Set this to any of the other clients below (e.g. Curl or MultiCurl) to use a different default client.
-    Buzz\Client\BuzzClientInterface: '@buzz.client.file_get_contents'
-    Buzz\Client\BatchClientInterface: '@buzz.client.multi_curl'
-
-    # Register alias for PSR-18
-    Psr\Http\Client\ClientInterface: '@Buzz\Client\BuzzClientInterface'
-
-    # Clients
-    buzz.client.file_get_contents:
-        class: Buzz\Client\FileGetContents
-        arguments:
-            - '@Psr\Http\Message\ResponseFactoryInterface'
-            -
-                timeout: 10
-                allow_redirects: false
-
-    buzz.client.curl:
-        class: Buzz\Client\Curl
-        arguments:
-            - '@Psr\Http\Message\ResponseFactoryInterface'
-            -
-                timeout: 10
-                allow_redirects: false
-
-    buzz.client.multi_curl:
-        class: Buzz\Client\MultiCurl
-        arguments:
-            - '@Psr\Http\Message\ResponseFactoryInterface'
-            -
-                timeout: 10
-                allow_redirects: false
-
-    # Browser
-    Buzz\Browser:
-        arguments: ['@Buzz\Client\BuzzClientInterface', '@Psr\Http\Message\RequestFactoryInterface']
-        calls:
-            - ['addMiddleware', ['@buzz.middleware.content_length']]
-            - ['addMiddleware', ['@buzz.middleware.logger']]
-
-    # Middleware
-    buzz.middleware.content_length:
-        class: Buzz\Middleware\ContentLengthMiddleware
-
-    buzz.middleware.logger:
-        class: Buzz\Middleware\LoggerMiddleware
-        arguments: ['@?logger']
-        tags:
-            - { name: monolog.logger, channel: buzz }
diff --git a/tests/Application/config/packages/dev/framework.yaml b/tests/Application/config/packages/dev/framework.yaml
deleted file mode 100644
index 4b116def..00000000
--- a/tests/Application/config/packages/dev/framework.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-framework:
-    profiler: { only_exceptions: false }
diff --git a/tests/Application/config/packages/dev/jms_serializer.yaml b/tests/Application/config/packages/dev/jms_serializer.yaml
deleted file mode 100644
index 2f32a9b1..00000000
--- a/tests/Application/config/packages/dev/jms_serializer.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-jms_serializer:
-    visitors:
-        json_serialization:
-            options:
-                - JSON_PRETTY_PRINT
-                - JSON_UNESCAPED_SLASHES
-                - JSON_PRESERVE_ZERO_FRACTION
-        json_deserialization:
-            options:
-                - JSON_PRETTY_PRINT
-                - JSON_UNESCAPED_SLASHES
-                - JSON_PRESERVE_ZERO_FRACTION
diff --git a/tests/Application/config/packages/dev/monolog.yaml b/tests/Application/config/packages/dev/monolog.yaml
deleted file mode 100644
index da2b092d..00000000
--- a/tests/Application/config/packages/dev/monolog.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-monolog:
-    handlers:
-        main:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
-        firephp:
-            type: firephp
-            level: info
diff --git a/tests/Application/config/packages/dev/routing.yaml b/tests/Application/config/packages/dev/routing.yaml
deleted file mode 100644
index 4116679a..00000000
--- a/tests/Application/config/packages/dev/routing.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-framework:
-    router:
-        strict_requirements: true
diff --git a/tests/Application/config/packages/dev/web_profiler.yaml b/tests/Application/config/packages/dev/web_profiler.yaml
deleted file mode 100644
index 1f1cb2bb..00000000
--- a/tests/Application/config/packages/dev/web_profiler.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-web_profiler:
-    toolbar: true
-    intercept_redirects: false
diff --git a/tests/Application/config/packages/doctrine.yaml b/tests/Application/config/packages/doctrine.yaml
index 66aa54d1..ee541341 100644
--- a/tests/Application/config/packages/doctrine.yaml
+++ b/tests/Application/config/packages/doctrine.yaml
@@ -10,16 +10,48 @@ doctrine:
         driver: 'pdo_mysql'
         server_version: '5.7'
         charset: UTF8
+        use_savepoints: true
 
         url: '%env(resolve:DATABASE_URL)%'
+
     orm:
-        auto_generate_proxy_classes: '%kernel.debug%'
-        naming_strategy: doctrine.orm.naming_strategy.underscore
-        auto_mapping: true
         mappings:
             App:
+                type: attribute
                 is_bundle: false
-                type: annotation
                 dir: '%kernel.project_dir%/Model'
                 prefix: 'Setono\SyliusPickupPointPlugin\Tests\Application\Model'
                 alias: App
+
+when@prod:
+    doctrine:
+        orm:
+            metadata_cache_driver:
+                type: service
+                id: doctrine.system_cache_provider
+            query_cache_driver:
+                type: service
+                id: doctrine.system_cache_provider
+            result_cache_driver:
+                type: service
+                id: doctrine.result_cache_provider
+
+    services:
+        doctrine.result_cache_provider:
+            class: Symfony\Component\Cache\DoctrineProvider
+            public: false
+            arguments:
+                - '@doctrine.result_cache_pool'
+        doctrine.system_cache_provider:
+            class: Symfony\Component\Cache\DoctrineProvider
+            public: false
+            arguments:
+                - '@doctrine.system_cache_pool'
+
+    framework:
+        cache:
+            pools:
+                doctrine.result_cache_pool:
+                    adapter: cache.app
+                doctrine.system_cache_pool:
+                    adapter: cache.system
diff --git a/tests/Application/config/packages/doctrine_migrations.yaml b/tests/Application/config/packages/doctrine_migrations.yaml
index cdbc01ae..ec356494 100644
--- a/tests/Application/config/packages/doctrine_migrations.yaml
+++ b/tests/Application/config/packages/doctrine_migrations.yaml
@@ -2,3 +2,5 @@ doctrine_migrations:
     storage:
         table_storage:
             table_name: sylius_migrations
+    migrations_paths:
+        'App\Migrations': '%kernel.project_dir%/../../src/Migrations/'
diff --git a/tests/Application/config/packages/fos_rest.yaml b/tests/Application/config/packages/fos_rest.yaml
deleted file mode 100644
index eaebb277..00000000
--- a/tests/Application/config/packages/fos_rest.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-fos_rest:
-    exception: true
-    view:
-        formats:
-            json: true
-            xml:  true
-        empty_content: 204
-    format_listener:
-        rules:
-            - { path: '^/api/v1/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
-            - { path: '^/', stop: true }
diff --git a/tests/Application/config/packages/framework.yaml b/tests/Application/config/packages/framework.yaml
index 3df2c0ad..0ef63311 100644
--- a/tests/Application/config/packages/framework.yaml
+++ b/tests/Application/config/packages/framework.yaml
@@ -1,9 +1,24 @@
 framework:
     secret: '%env(APP_SECRET)%'
-    ide: phpstorm
-    form:
-        enabled: true
-        legacy_error_messages: false
+    ide: 'phpstorm'
+    form: true
     csrf_protection: true
     session:
         handler_id: ~
+
+when@dev:
+    framework:
+        profiler: { only_exceptions: false }
+
+when@test:
+    framework:
+        test: ~
+        session:
+            storage_factory_id: session.storage.factory.mock_file
+
+        mailer:
+            dsn: '%env(MAILER_DSN)%'
+        cache:
+            pools:
+                test.mailer_pool:
+                    adapter: cache.adapter.filesystem
diff --git a/tests/Application/config/packages/http_discovery.yaml b/tests/Application/config/packages/http_discovery.yaml
new file mode 100644
index 00000000..2a789e73
--- /dev/null
+++ b/tests/Application/config/packages/http_discovery.yaml
@@ -0,0 +1,10 @@
+services:
+    Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory'
+    Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory'
+
+    http_discovery.psr17_factory:
+        class: Http\Discovery\Psr17Factory
diff --git a/tests/Application/config/packages/jms_serializer.yaml b/tests/Application/config/packages/jms_serializer.yaml
deleted file mode 100644
index ed7bc613..00000000
--- a/tests/Application/config/packages/jms_serializer.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-jms_serializer:
-    visitors:
-        xml_serialization:
-            format_output: '%kernel.debug%'
diff --git a/tests/Application/config/packages/monolog.yaml b/tests/Application/config/packages/monolog.yaml
new file mode 100644
index 00000000..73e391ab
--- /dev/null
+++ b/tests/Application/config/packages/monolog.yaml
@@ -0,0 +1,30 @@
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+            firephp:
+                type: firephp
+                level: info
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: error
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+            nested:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
diff --git a/tests/Application/config/packages/nyholm_psr7.yaml b/tests/Application/config/packages/nyholm_psr7.yaml
deleted file mode 100644
index 761aa965..00000000
--- a/tests/Application/config/packages/nyholm_psr7.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-services:
-    _defaults:
-        public: false
-
-    # Register nyholm/psr7 services for autowiring with PSR-17 (HTTP factories)
-    Psr\Http\Message\RequestFactoryInterface: '@nyholm.psr7.psr17_factory'
-    Psr\Http\Message\ResponseFactoryInterface: '@nyholm.psr7.psr17_factory'
-    Psr\Http\Message\ServerRequestFactoryInterface: '@nyholm.psr7.psr17_factory'
-    Psr\Http\Message\StreamFactoryInterface: '@nyholm.psr7.psr17_factory'
-    Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory'
-    Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory'
-
-    nyholm.psr7.psr17_factory:
-        class: Nyholm\Psr7\Factory\Psr17Factory
diff --git a/tests/Application/config/packages/prod/doctrine.yaml b/tests/Application/config/packages/prod/doctrine.yaml
deleted file mode 100644
index 2f16f0fd..00000000
--- a/tests/Application/config/packages/prod/doctrine.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-doctrine:
-    orm:
-        metadata_cache_driver:
-            type: service
-            id: doctrine.system_cache_provider
-        query_cache_driver:
-            type: service
-            id: doctrine.system_cache_provider
-        result_cache_driver:
-            type: service
-            id: doctrine.result_cache_provider
-
-services:
-    doctrine.result_cache_provider:
-        class: Symfony\Component\Cache\DoctrineProvider
-        public: false
-        arguments:
-            - '@doctrine.result_cache_pool'
-    doctrine.system_cache_provider:
-        class: Symfony\Component\Cache\DoctrineProvider
-        public: false
-        arguments:
-            - '@doctrine.system_cache_pool'
-
-framework:
-    cache:
-        pools:
-            doctrine.result_cache_pool:
-                adapter: cache.app
-            doctrine.system_cache_pool:
-                adapter: cache.system
diff --git a/tests/Application/config/packages/prod/jms_serializer.yaml b/tests/Application/config/packages/prod/jms_serializer.yaml
deleted file mode 100644
index c2881820..00000000
--- a/tests/Application/config/packages/prod/jms_serializer.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-jms_serializer:
-    visitors:
-        json_serialization:
-            options:
-                - JSON_UNESCAPED_SLASHES
-                - JSON_PRESERVE_ZERO_FRACTION
-        json_deserialization:
-            options:
-                - JSON_UNESCAPED_SLASHES
-                - JSON_PRESERVE_ZERO_FRACTION
diff --git a/tests/Application/config/packages/prod/monolog.yaml b/tests/Application/config/packages/prod/monolog.yaml
deleted file mode 100644
index 64612114..00000000
--- a/tests/Application/config/packages/prod/monolog.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-monolog:
-    handlers:
-        main:
-            type: fingers_crossed
-            action_level: error
-            handler: nested
-        nested:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
diff --git a/tests/Application/config/packages/prod/setono_sylius_pickup_point.yaml b/tests/Application/config/packages/prod/setono_sylius_pickup_point.yaml
deleted file mode 100644
index 96b5b662..00000000
--- a/tests/Application/config/packages/prod/setono_sylius_pickup_point.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-setono_sylius_pickup_point:
-    providers:
-        faker: false
diff --git a/tests/Application/config/packages/routing.yaml b/tests/Application/config/packages/routing.yaml
index 368bc7f4..d0c2c76b 100644
--- a/tests/Application/config/packages/routing.yaml
+++ b/tests/Application/config/packages/routing.yaml
@@ -1,3 +1,8 @@
 framework:
     router:
-        strict_requirements: ~
+        strict_requirements: false
+        
+when@dev:
+    framework:
+        router:
+            strict_requirements: true
diff --git a/tests/Application/config/packages/security.yaml b/tests/Application/config/packages/security.yaml
index 2f5c6875..af38e750 100644
--- a/tests/Application/config/packages/security.yaml
+++ b/tests/Application/config/packages/security.yaml
@@ -1,5 +1,4 @@
 security:
-    enable_authenticator_manager: true
     providers:
         sylius_admin_user_provider:
             id: sylius.admin_user_provider.email_or_name_based
@@ -18,6 +17,7 @@ security:
             context: admin
             pattern: "%sylius.security.admin_regex%"
             provider: sylius_admin_user_provider
+            user_checker: security.user_checker.chain.admin
             form_login:
                 provider: sylius_admin_user_provider
                 login_path: sylius_admin_login
@@ -39,26 +39,28 @@ security:
                 path: sylius_admin_logout
                 target: sylius_admin_login
 
-        new_api_admin_user:
-            pattern: "%sylius.security.new_api_admin_regex%/.*"
+        api_admin:
+            pattern: "%sylius.security.api_admin_regex%/.*"
             provider: sylius_api_admin_user_provider
+            user_checker: security.user_checker.chain.api_admin
             stateless: true
             entry_point: jwt
             json_login:
-                check_path: "%sylius.security.new_api_admin_route%/authentication-token"
+                check_path: "%sylius.security.api_admin_route%/administrators/token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
                 failure_handler: lexik_jwt_authentication.handler.authentication_failure
             jwt: true
 
-        new_api_shop_user:
-            pattern: "%sylius.security.new_api_shop_regex%/.*"
+        api_shop:
+            pattern: "%sylius.security.api_shop_regex%/.*"
             provider: sylius_api_shop_user_provider
+            user_checker: security.user_checker.chain.api_shop
             stateless: true
             entry_point: jwt
             json_login:
-                check_path: "%sylius.security.new_api_shop_route%/authentication-token"
+                check_path: "%sylius.security.api_shop_route%/customers/token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
@@ -70,6 +72,7 @@ security:
             context: shop
             pattern: "%sylius.security.shop_regex%"
             provider: sylius_shop_user_provider
+            user_checker: security.user_checker.chain.shop
             form_login:
                 success_handler: sylius.authentication.success_handler
                 failure_handler: sylius.authentication.failure_handler
@@ -83,6 +86,12 @@ security:
                 enable_csrf: true
                 csrf_parameter: _csrf_shop_security_token
                 csrf_token_id: shop_authenticate
+            json_login:
+                check_path: sylius_shop_json_login_check
+                username_path: _username
+                password_path: _password
+                success_handler: sylius.authentication.success_handler
+                failure_handler: sylius.authentication.failure_handler
             remember_me:
                 secret: "%env(APP_SECRET)%"
                 name: APP_SHOP_REMEMBER_ME
@@ -93,16 +102,15 @@ security:
                 target: sylius_shop_homepage
                 invalidate_session: false
 
+        image_resolver:
+            pattern: ^/media/cache/resolve
+            security: false
+
         dev:
             pattern:  ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
     access_control:
-        - { path: "%sylius.security.admin_regex%/_partial", role: PUBLIC_ACCESS, ips: [127.0.0.1, ::1] }
-        - { path: "%sylius.security.admin_regex%/_partial", role: ROLE_NO_ACCESS }
-        - { path: "%sylius.security.shop_regex%/_partial", role: PUBLIC_ACCESS, ips: [127.0.0.1, ::1] }
-        - { path: "%sylius.security.shop_regex%/_partial", role: ROLE_NO_ACCESS }
-
         - { path: "%sylius.security.admin_regex%/forgotten-password", role: PUBLIC_ACCESS }
 
         - { path: "%sylius.security.admin_regex%/login", role: PUBLIC_ACCESS }
@@ -114,9 +122,9 @@ security:
         - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS }
         - { path: "%sylius.security.shop_regex%/account", role: ROLE_USER }
 
-        - { path: "%sylius.security.new_api_admin_route%/reset-password-requests", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
-        - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_user_account_regex%/.*", role: ROLE_USER }
-        - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_shop_regex%/.*", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_admin_route%/administrators/reset-password", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_admin_regex%/.*", role: ROLE_API_ACCESS }
+        - { path: "%sylius.security.api_admin_route%/administrators/token", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_shop_account_regex%/.*", role: ROLE_USER }
+        - { path: "%sylius.security.api_shop_route%/customers/token", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_shop_regex%/.*", role: PUBLIC_ACCESS }
diff --git a/tests/Application/config/packages/setono_budbee.yaml b/tests/Application/config/packages/setono_budbee.yaml
deleted file mode 100644
index 15cbe936..00000000
--- a/tests/Application/config/packages/setono_budbee.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-setono_budbee:
-    api_key: '%env(BUDBEE_API_KEY)%'
-    api_secret: '%env(BUDBEE_API_SECRET)%'
diff --git a/tests/Application/config/packages/setono_coolrunner.yaml b/tests/Application/config/packages/setono_coolrunner.yaml
deleted file mode 100644
index 1d842e67..00000000
--- a/tests/Application/config/packages/setono_coolrunner.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-setono_coolrunner:
-    username: '%env(COOLRUNNER_USERNAME)%'
-    token: '%env(COOLRUNNER_TOKEN)%'
diff --git a/tests/Application/config/packages/setono_dao.yaml b/tests/Application/config/packages/setono_dao.yaml
deleted file mode 100644
index 74428422..00000000
--- a/tests/Application/config/packages/setono_dao.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-setono_dao:
-    customer_id: '%env(DAO_CUSTOMER_ID)%'
-    password: '%env(DAO_PASSWORD)%'
diff --git a/tests/Application/config/packages/setono_gls_webservice.yaml b/tests/Application/config/packages/setono_gls_webservice.yaml
deleted file mode 100644
index 5971d0bb..00000000
--- a/tests/Application/config/packages/setono_gls_webservice.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-setono_gls_webservice:
-    connection_timeout: 5
diff --git a/tests/Application/config/packages/setono_post_nord.yaml b/tests/Application/config/packages/setono_post_nord.yaml
deleted file mode 100644
index ced2841c..00000000
--- a/tests/Application/config/packages/setono_post_nord.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-setono_post_nord:
-    api_key: '%env(POST_NORD_API_KEY)%'
diff --git a/tests/Application/config/packages/setono_sylius_pickup_point.yaml b/tests/Application/config/packages/setono_sylius_pickup_point.yaml
index 0265651b..cba7c6bd 100644
--- a/tests/Application/config/packages/setono_sylius_pickup_point.yaml
+++ b/tests/Application/config/packages/setono_sylius_pickup_point.yaml
@@ -1,20 +1,62 @@
-imports:
-    - { resource: "@SetonoSyliusPickupPointPlugin/Resources/config/app/config.yaml" }
-    - { resource: "@SetonoSyliusPickupPointPlugin/Resources/config/app/fixtures.yaml" }
-
-framework:
-    cache:
-        pools:
-            setono_sylius_pickup_point.provider_cache_pool:
-                adapter: cache.app
-
 setono_sylius_pickup_point:
-    cache:
-        enabled: true
-        pool: setono_sylius_pickup_point.provider_cache_pool
-    local: true
     providers:
         faker: true
         gls: true
-        post_nord: true
-        dao: true
+
+sylius_fixtures:
+    suites:
+        default:
+            fixtures:
+                geographical:
+                    options:
+                        countries:
+                            - 'DK'
+                            - 'SE'
+                            - 'FI'
+                            - 'US'
+                            - 'FR'
+                            - 'DE'
+                            - 'AU'
+                            - 'CA'
+                            - 'MX'
+                            - 'NZ'
+                            - 'PT'
+                            - 'ES'
+                            - 'CN'
+                        zones:
+                            WORLD:
+                                name: 'World'
+                                countries:
+                                    - 'DK'
+                                    - 'SE'
+                                    - 'FI'
+                                    - 'US'
+                                    - 'FR'
+                                    - 'DE'
+                                    - 'AU'
+                                    - 'CA'
+                                    - 'MX'
+                                    - 'NZ'
+                                    - 'PT'
+                                    - 'ES'
+                                    - 'CN'
+
+                setono_sylius_pickup_point_shipping_method:
+                    options:
+                        custom:
+                            faker:
+                                code: "faker"
+                                name: "Fake delivery"
+                                enabled: true
+                                zone: "WORLD"
+                                pickup_point_provider: faker
+                                channels:
+                                    - "FASHION_WEB"
+                            gls:
+                                code: "gls"
+                                name: "GLS pickup"
+                                enabled: true
+                                zone: "WORLD"
+                                pickup_point_provider: gls
+                                channels:
+                                    - "FASHION_WEB"
diff --git a/tests/Application/config/packages/sylius_state_machine_abstraction.yaml b/tests/Application/config/packages/sylius_state_machine_abstraction.yaml
new file mode 100644
index 00000000..7f43c0b2
--- /dev/null
+++ b/tests/Application/config/packages/sylius_state_machine_abstraction.yaml
@@ -0,0 +1,6 @@
+parameters:
+    test_default_state_machine_adapter: 'symfony_workflow'
+    test_sylius_state_machine_adapter: '%env(string:default:test_default_state_machine_adapter:TEST_SYLIUS_STATE_MACHINE_ADAPTER)%'
+
+sylius_state_machine_abstraction:
+    default_adapter: '%test_sylius_state_machine_adapter%'
diff --git a/tests/Application/config/packages/sylius_theme.yaml b/tests/Application/config/packages/sylius_theme.yaml
new file mode 100644
index 00000000..cbc95baa
--- /dev/null
+++ b/tests/Application/config/packages/sylius_theme.yaml
@@ -0,0 +1,4 @@
+when@test:
+    sylius_theme:
+        sources:
+            test: ~
diff --git a/tests/Application/config/packages/test/framework.yaml b/tests/Application/config/packages/test/framework.yaml
deleted file mode 100644
index fc1d3c13..00000000
--- a/tests/Application/config/packages/test/framework.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-framework:
-    test: ~
-    session:
-        storage_factory_id: session.storage.factory.mock_file
diff --git a/tests/Application/config/packages/test/mailer.yaml b/tests/Application/config/packages/test/mailer.yaml
deleted file mode 100644
index 092eb288..00000000
--- a/tests/Application/config/packages/test/mailer.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-framework:
-    mailer:
-        dsn: 'null://null'
-    cache:
-        pools:
-            test.mailer_pool:
-                adapter: cache.adapter.filesystem
diff --git a/tests/Application/config/packages/test/monolog.yaml b/tests/Application/config/packages/test/monolog.yaml
deleted file mode 100644
index 7e2b9e3a..00000000
--- a/tests/Application/config/packages/test/monolog.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-monolog:
-    handlers:
-        main:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: error
diff --git a/tests/Application/config/packages/test/security.yaml b/tests/Application/config/packages/test/security.yaml
deleted file mode 100644
index 4071d319..00000000
--- a/tests/Application/config/packages/test/security.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-security:
-    password_hashers:
-        Sylius\Component\User\Model\UserInterface:
-            algorithm: argon2i
-            time_cost: 3
-            memory_cost: 10
diff --git a/tests/Application/config/packages/test/sylius_theme.yaml b/tests/Application/config/packages/test/sylius_theme.yaml
deleted file mode 100644
index 4d34199f..00000000
--- a/tests/Application/config/packages/test/sylius_theme.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-sylius_theme:
-    sources:
-        test: ~
diff --git a/tests/Application/config/packages/test/web_profiler.yaml b/tests/Application/config/packages/test/web_profiler.yaml
deleted file mode 100644
index 03752de2..00000000
--- a/tests/Application/config/packages/test/web_profiler.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-web_profiler:
-    toolbar: false
-    intercept_redirects: false
-
-framework:
-    profiler: { collect: false }
diff --git a/tests/Application/config/packages/validator.yaml b/tests/Application/config/packages/validator.yaml
index 61807db6..a695e1a6 100644
--- a/tests/Application/config/packages/validator.yaml
+++ b/tests/Application/config/packages/validator.yaml
@@ -1,3 +1,3 @@
 framework:
     validation:
-        enable_annotations: true
+        email_validation_mode: html5
diff --git a/tests/Application/config/packages/web_profiler.yaml b/tests/Application/config/packages/web_profiler.yaml
new file mode 100644
index 00000000..da7b5321
--- /dev/null
+++ b/tests/Application/config/packages/web_profiler.yaml
@@ -0,0 +1,12 @@
+when@dev:
+    web_profiler:
+        toolbar: true
+        intercept_redirects: false
+
+when@test:
+    web_profiler:
+        toolbar: false
+        intercept_redirects: false
+
+    framework:
+        profiler: { collect: false }
diff --git a/tests/Application/config/packages/workflow.yaml b/tests/Application/config/packages/workflow.yaml
new file mode 100644
index 00000000..2a716ff0
--- /dev/null
+++ b/tests/Application/config/packages/workflow.yaml
@@ -0,0 +1,2 @@
+framework:
+    workflows: ~
diff --git a/tests/Application/config/routes/dev/web_profiler.yaml b/tests/Application/config/routes/dev/web_profiler.yaml
deleted file mode 100644
index 3e79dc21..00000000
--- a/tests/Application/config/routes/dev/web_profiler.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-_wdt:
-    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
-    prefix:   /_wdt
-
-_profiler:
-    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
-    prefix:   /_profiler
diff --git a/tests/Application/config/routes/setono_sylius_pickup_point.yaml b/tests/Application/config/routes/setono_sylius_pickup_point.yaml
index bf90a14f..fbe51a5d 100644
--- a/tests/Application/config/routes/setono_sylius_pickup_point.yaml
+++ b/tests/Application/config/routes/setono_sylius_pickup_point.yaml
@@ -1,2 +1,2 @@
-setono_sylius_pickup_point_plugin:
-    resource: "@SetonoSyliusPickupPointPlugin/Resources/config/routing.yaml"
+setono_sylius_pickup_point:
+    resource: "@SetonoSyliusPickupPointPlugin/config/routes.yaml"
diff --git a/tests/Application/config/routes/sylius_api.yaml b/tests/Application/config/routes/sylius_api.yaml
index ae01ffce..a7504e86 100644
--- a/tests/Application/config/routes/sylius_api.yaml
+++ b/tests/Application/config/routes/sylius_api.yaml
@@ -1,3 +1,3 @@
 sylius_api:
     resource: "@SyliusApiBundle/Resources/config/routing.yml"
-    prefix: "%sylius.security.new_api_route%"
+    prefix: "%sylius.security.api_route%"
diff --git a/tests/Application/config/routes/sylius_shop.yaml b/tests/Application/config/routes/sylius_shop.yaml
index 22e7a4a9..8e3dd427 100644
--- a/tests/Application/config/routes/sylius_shop.yaml
+++ b/tests/Application/config/routes/sylius_shop.yaml
@@ -5,13 +5,16 @@ sylius_shop:
         _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
 
 sylius_shop_payum:
-    resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
+    resource: "@SyliusPayumBundle/Resources/config/routing/integrations/sylius_shop.yaml"
+
+sylius_payment_notify:
+    resource: "@SyliusPaymentBundle/Resources/config/routing/integrations/sylius.yaml"
 
 sylius_shop_default_locale:
     path: /
     methods: [GET]
     defaults:
-        _controller: sylius.controller.shop.locale_switch::switchAction
+        _controller: sylius_shop.controller.locale_switch::switchAction
 
 # see https://web.dev/change-password-url/
 sylius_shop_request_password_reset_token_redirect:
diff --git a/tests/Application/config/routes/web_profiler.yaml b/tests/Application/config/routes/web_profiler.yaml
new file mode 100644
index 00000000..e15ab243
--- /dev/null
+++ b/tests/Application/config/routes/web_profiler.yaml
@@ -0,0 +1,8 @@
+when@dev:
+    _wdt:
+        resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+        prefix:   /_wdt
+    
+    _profiler:
+        resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+        prefix:   /_profiler
diff --git a/tests/Application/config/services.yaml b/tests/Application/config/services.yaml
index 49f5ed01..615506eb 100644
--- a/tests/Application/config/services.yaml
+++ b/tests/Application/config/services.yaml
@@ -2,4 +2,3 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
     locale: en_US
-    sylius.form.type.checkout_select_shipping.validation_groups: ['sylius', 'checkout_select_shipping']
diff --git a/tests/Application/config/services_test.yaml b/tests/Application/config/services_test.yaml
deleted file mode 100644
index d9b02e3d..00000000
--- a/tests/Application/config/services_test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-imports:
-    - { resource: "../../Behat/Resources/services.xml" }
-    - { resource: "../../../vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml" }
diff --git a/tests/Application/package.json b/tests/Application/package.json
index 8f62c4c7..bdebb615 100644
--- a/tests/Application/package.json
+++ b/tests/Application/package.json
@@ -1,30 +1,20 @@
 {
-    "dependencies": {
-        "chart.js": "^3.9",
-        "jquery": "^3.6",
-        "jquery.dirtyforms": "^2.0",
-        "lightbox2": "^2.9",
-        "semantic-ui-css": "^2.2",
-        "slick-carousel": "^1.8"
-    },
-    "devDependencies": {
-        "@symfony/webpack-encore": "^1.8",
-        "eslint": "^8.18",
-        "eslint-config-airbnb-base": "^15.0",
-        "eslint-import-resolver-babel-module": "^5.3",
-        "eslint-plugin-import": "^2.26",
-        "node-sass": "^7.0",
-        "sass-loader": "^12.0"
-    },
+    "license": "UNLICENSED",
     "scripts": {
-        "dev": "encore dev",
-        "build": "encore production",
+        "build": "encore dev",
+        "build:prod": "encore production",
         "watch": "encore dev --watch"
     },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/Sylius/Sylius.git"
+    "dependencies": {
+        "@sylius-ui/admin": "file:../../vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle",
+        "@sylius-ui/shop": "file:../../vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle",
+        "@symfony/ux-autocomplete": "file:../../vendor/symfony/ux-autocomplete/assets",
+        "@symfony/ux-live-component": "file:../../vendor/symfony/ux-live-component/assets"
     },
-    "author": "Paweł Jędrzejewski",
-    "license": "MIT"
+    "devDependencies": {
+        "@hotwired/stimulus": "^3.0.0",
+        "@symfony/stimulus-bridge": "^3.2.0",
+        "@symfony/webpack-encore": "^5.0.1",
+        "tom-select": "^2.2.2"
+    }
 }
diff --git a/tests/Application/public/index.php b/tests/Application/public/index.php
index 67e8d1b5..ea7179b6 100644
--- a/tests/Application/public/index.php
+++ b/tests/Application/public/index.php
@@ -15,7 +15,10 @@
 }
 
 if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
-    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+    Request::setTrustedProxies(
+        explode(',', $trustedProxies),
+        Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO,
+    );
 }
 
 if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
diff --git a/etc/build/.gitignore b/tests/Application/src/Entity/.gitignore
similarity index 100%
rename from etc/build/.gitignore
rename to tests/Application/src/Entity/.gitignore
diff --git a/tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/_shipment.html.twig b/tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/_shipment.html.twig
deleted file mode 100644
index f9581851..00000000
--- a/tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/_shipment.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-{% import '@SyliusUi/Macro/labels.html.twig' as label %}
-
-{% set shipped = constant('Sylius\\Component\\Shipping\\Model\\Shipment::STATE_SHIPPED') %}
-
-<div class="item">
-    <div class="right floated content">
-        {% include '@SyliusAdmin/Common/Label/shipmentState.html.twig' with {'data': shipment.state} %}
-    </div>
-    <i class="large truck icon"></i>
-    <div class="content">
-        <div class="header">
-            {{ shipment.method }}
-        </div>
-        <div>
-            {% include "@SetonoSyliusPickupPointPlugin/Shop/Label/Shipment/pickupPoint.html.twig" %}
-        </div>
-        <div class="description">
-            <i class="globe icon"></i>{{ shipment.method.zone }}
-        </div>
-        {% if shipment.shippedAt is not empty %}
-            {{ 'sylius.ui.shipped_at'|trans }}: <span class="shipped-at-date">{{ shipment.shippedAt|date('d-m-Y H:i:s') }}</span>
-        {% endif %}
-    </div>
-    {% if sm_can(shipment, 'ship', 'sylius_shipment') %}
-        {{ render(path('sylius_admin_partial_shipment_ship', {'orderId': order.id, 'id': shipment.id})) }}
-    {% endif %}
-    {% if shipment.tracking is not empty %}
-        <div class="ui segment">
-            <span class="ui top attached icon label"><i class="plane icon"></i> {{ 'sylius.ui.tracking_code'|trans|upper }}</span>
-            <p>{{ shipment.tracking }}</p>
-        </div>
-    {% endif %}
-
-    {% if shipment.state == shipped %}
-        {% set path = path('sylius_admin_shipment_resend_confirmation_email', {'id': shipment.id, '_csrf_token': csrf_token(shipment.id)}) %}
-        <a href="{{ path }}" class="ui icon labeled tiny fluid button" {{ sylius_test_html_attribute('resend-shipment-confirmation-email') }}>
-            <i class="send icon"></i> {{ 'sylius.ui.resend_the_shipment_confirmation_email'|trans }}
-        </a>
-    {% endif %}
-</div>
diff --git a/tests/Application/templates/bundles/SyliusAdminBundle/ShippingMethod/_form.html.twig b/tests/Application/templates/bundles/SyliusAdminBundle/ShippingMethod/_form.html.twig
deleted file mode 100644
index 105281a7..00000000
--- a/tests/Application/templates/bundles/SyliusAdminBundle/ShippingMethod/_form.html.twig
+++ /dev/null
@@ -1,42 +0,0 @@
-{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %}
-
-<div class="ui two column stackable grid">
-    <div class="column">
-        <div class="ui segment">
-            {{ form_errors(form) }}
-            <div class="three fields">
-                {{ form_row(form.code) }}
-                {{ form_row(form.zone) }}
-                {{ form_row(form.position) }}
-            </div>
-            {{ form_row(form.enabled) }}
-            {{ form_row(form.pickupPointProvider) }}
-            <h4 class="ui dividing header">{{ 'sylius.ui.availability'|trans }}</h4>
-            {{ form_row(form.channels) }}
-            <h4 class="ui dividing header">{{ 'sylius.ui.category_requirements'|trans }}</h4>
-            {{ form_row(form.category) }}
-            {% for categoryRequirementChoiceForm in form.categoryRequirement %}
-                {{ form_row(categoryRequirementChoiceForm) }}
-            {% endfor %}
-            <h4 class="ui dividing header">{{ 'sylius.ui.taxes'|trans }}</h4>
-            {{ form_row(form.taxCategory) }}
-            <h4 class="ui dividing header">{{ 'sylius.ui.shipping_charges'|trans }}</h4>
-            {{ form_row(form.calculator) }}
-            {% for name, calculatorConfigurationPrototype in form.vars.prototypes %}
-                <div id="{{ form.calculator.vars.id }}_{{ name }}" data-container=".configuration"
-                     data-prototype="{{ form_widget(calculatorConfigurationPrototype)|e }}">
-                </div>
-            {% endfor %}
-            <div class="ui segment configuration">
-                {% if form.configuration is defined %}
-                    {% for field in form.configuration %}
-                        {{ form_row(field) }}
-                    {% endfor %}
-                {% endif %}
-            </div>
-        </div>
-    </div>
-    <div class="column">
-        {{ translationForm(form.translations) }}
-    </div>
-</div>
diff --git a/tests/Application/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig b/tests/Application/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig
deleted file mode 100644
index 8d56afdc..00000000
--- a/tests/Application/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% form_theme form.pickupPointId '@SetonoSyliusPickupPointPlugin/Form/theme.html.twig' %}
-
-<div class="ui segment">
-    <div class="ui dividing header">{{ 'sylius.ui.shipment'|trans }} #{{ loop.index }}</div>
-    <div class="ui fluid stackable items" {{ sylius_test_html_attribute('shipments') }}>
-        {{ form_errors(form.method) }}
-
-        {% for key, choice_form in form.method %}
-            {% set fee = form.method.vars.shipping_costs[choice_form.vars.value] %}
-            {% set method = form.method.vars.choices[key].data %}
-            {% include '@SyliusShop/Checkout/SelectShipping/_choice.html.twig' with {'form': choice_form, 'method': method, 'fee': fee} %}
-        {% else %}
-            {% include '@SyliusShop/Checkout/SelectShipping/_unavailable.html.twig' %}
-        {% endfor %}
-
-        {% if form.method|length %}
-            {{ form_row(form.pickupPointId) }}
-        {% endif %}
-    </div>
-</div>
diff --git a/tests/Application/templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig b/tests/Application/templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig
deleted file mode 100644
index 276ba27d..00000000
--- a/tests/Application/templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{% set state = order.shippingState %}
-{% if state != 'cart' %}
-    {% include "@SyliusShop/Common/Order/Label/ShipmentState/orderShipmentState.html.twig" %}
-{% endif %}
-{% for shipment in order.shipments %}
-    {% set state = shipment.state %}
-    <div class="ui small icon message">
-        <i class="truck icon"></i>
-        <div class="content">
-            <div class="header" id="sylius-shipping-method" {{ sylius_test_html_attribute('shipping-method') }}>
-                {{ shipment.method }}
-            </div>
-            {% include "@SetonoSyliusPickupPointPlugin/Shop/Label/Shipment/pickupPoint.html.twig" %}
-            {% if state != 'cart' %}
-                <p id="shipment-status" {{ sylius_test_html_attribute('shipment-state') }}>
-                    {% include "@SyliusShop/Common/Order/Label/ShipmentState/singleShipmentState.html.twig" with { 'state': state } %}
-                </p>
-            {% endif %}
-        </div>
-    </div>
-{% endfor %}
diff --git a/tests/Application/templates/bundles/SyliusShopBundle/Homepage/_banner.html.twig b/tests/Application/templates/bundles/SyliusShopBundle/Homepage/_banner.html.twig
deleted file mode 100644
index bb594f7a..00000000
--- a/tests/Application/templates/bundles/SyliusShopBundle/Homepage/_banner.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-<img class="ui fluid image" src="{{ asset('build/shop/images/homepage-banner.jpg', 'shop') }}" alt="Sylius">
-<div class="ui hidden divider"></div>
diff --git a/tests/Application/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_plus.html.twig b/tests/Application/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_plus.html.twig
deleted file mode 100644
index 89301cf0..00000000
--- a/tests/Application/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_plus.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="four wide column">
-    <a href="https://sylius.com/plus" target="_blank" style="display: inline-block; text-align: center;">
-        <h4 class="ui inverted header" style="color: #808080;">
-            Need even more features?
-            <div class="sub header" style="padding: 5px 0;">Check Sylius Plus out!</div>
-        </h4>
-        <img class="ui fluid image" style="max-width: 170px;"
-             src="{{ asset('build/shop/images/sylius-plus-banner.png', 'shop') }}" alt="Sylius Plus">
-    </a>
-</div>
diff --git a/tests/Application/templates/bundles/SyliusShopBundle/Layout/Header/_logo.html.twig b/tests/Application/templates/bundles/SyliusShopBundle/Layout/Header/_logo.html.twig
deleted file mode 100644
index 5043fc31..00000000
--- a/tests/Application/templates/bundles/SyliusShopBundle/Layout/Header/_logo.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="column">
-    <a href="{{ path('sylius_shop_homepage') }}">
-        <img src="{{ asset('build/shop/images/logo.png', 'shop') }}" alt="Sylius" class="ui small image"/>
-    </a>
-</div>
diff --git a/tests/Application/webpack.config.js b/tests/Application/webpack.config.js
index fae14296..313e6f36 100644
--- a/tests/Application/webpack.config.js
+++ b/tests/Application/webpack.config.js
@@ -1,47 +1,8 @@
 const path = require('path');
-const Encore = require('@symfony/webpack-encore');
+const SyliusAdmin = require('@sylius-ui/admin');
+const SyliusShop = require('@sylius-ui/shop');
 
-const syliusBundles = path.resolve(__dirname, '../../vendor/sylius/sylius/src/Sylius/Bundle/');
-const uiBundleScripts = path.resolve(syliusBundles, 'UiBundle/Resources/private/js/');
-const uiBundleResources = path.resolve(syliusBundles, 'UiBundle/Resources/private/');
-
-// Shop config
-Encore
-  .setOutputPath('public/build/shop/')
-  .setPublicPath('/build/shop')
-  .addEntry('shop-entry', './assets/shop/entry.js')
-  .disableSingleRuntimeChunk()
-  .cleanupOutputBeforeBuild()
-  .enableSourceMaps(!Encore.isProduction())
-  .enableVersioning(Encore.isProduction())
-  .enableSassLoader();
-
-const shopConfig = Encore.getWebpackConfig();
-
-shopConfig.resolve.alias['sylius/ui'] = uiBundleScripts;
-shopConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources;
-shopConfig.resolve.alias['sylius/bundle'] = syliusBundles;
-shopConfig.name = 'shop';
-
-Encore.reset();
-
-// Admin config
-Encore
-  .setOutputPath('public/build/admin/')
-  .setPublicPath('/build/admin')
-  .addEntry('admin-entry', './assets/admin/entry.js')
-  .disableSingleRuntimeChunk()
-  .cleanupOutputBeforeBuild()
-  .enableSourceMaps(!Encore.isProduction())
-  .enableVersioning(Encore.isProduction())
-  .enableSassLoader();
-
-const adminConfig = Encore.getWebpackConfig();
-
-adminConfig.resolve.alias['sylius/ui'] = uiBundleScripts;
-adminConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources;
-adminConfig.resolve.alias['sylius/bundle'] = syliusBundles;
-adminConfig.externals = Object.assign({}, adminConfig.externals, { window: 'window', document: 'document' });
-adminConfig.name = 'admin';
+const adminConfig = SyliusAdmin.getWebpackConfig(path.resolve(__dirname));
+const shopConfig = SyliusShop.getWebpackConfig(path.resolve(__dirname));
 
 module.exports = [shopConfig, adminConfig];
diff --git a/tests/Behat/Context/Setup/ShippingContext.php b/tests/Behat/Context/Setup/ShippingContext.php
deleted file mode 100644
index 54d2dd17..00000000
--- a/tests/Behat/Context/Setup/ShippingContext.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Context\Setup;
-
-use Behat\Behat\Context\Context;
-use Doctrine\ORM\EntityManagerInterface;
-use RuntimeException;
-use Setono\SyliusPickupPointPlugin\Model\ShippingMethodInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
-
-final class ShippingContext implements Context
-{
-    /** @var ServiceRegistryInterface */
-    private $providerRegistry;
-
-    /** @var EntityManagerInterface */
-    private $shippingMethodEntityManager;
-
-    public function __construct(
-        ServiceRegistryInterface $providerRegistry,
-        EntityManagerInterface $shippingMethodEntityManager,
-    ) {
-        $this->providerRegistry = $providerRegistry;
-        $this->shippingMethodEntityManager = $shippingMethodEntityManager;
-    }
-
-    /**
-     * @Given /^(shipping method "[^"]+") has the selected "([^"]+)" pickup point provider$/
-     */
-    public function theShippingMethodHasTheSelectedGlsPickupPointProvider(
-        ShippingMethodInterface $shippingMethod,
-        string $pickupPointProviderCode,
-    ): void {
-        if (!$this->providerRegistry->has($pickupPointProviderCode)) {
-            throw new RuntimeException(sprintf(
-                'PickupPoint provider with code %s was not found in registry.',
-                $pickupPointProviderCode,
-            ));
-        }
-        $shippingMethod->setPickupPointProvider($pickupPointProviderCode);
-        $this->shippingMethodEntityManager->flush();
-    }
-}
diff --git a/tests/Behat/Context/Ui/Admin/ShippingContext.php b/tests/Behat/Context/Ui/Admin/ShippingContext.php
deleted file mode 100644
index 02726dfb..00000000
--- a/tests/Behat/Context/Ui/Admin/ShippingContext.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Context\Ui\Admin;
-
-use Behat\Behat\Context\Context;
-use Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Admin\ShippingMethod\CreatePageInterface;
-
-final class ShippingContext implements Context
-{
-    private CreatePageInterface $createPage;
-
-    public function __construct(CreatePageInterface $createPage)
-    {
-        $this->createPage = $createPage;
-    }
-
-    /**
-     * @When I select :providerCode as pickup point provider
-     */
-    public function iSelectAsPickupPointProvider(string $providerCode): void
-    {
-        $this->createPage->selectPickupPointProvider($providerCode);
-    }
-}
diff --git a/tests/Behat/Context/Ui/Shop/ShippingContext.php b/tests/Behat/Context/Ui/Shop/ShippingContext.php
deleted file mode 100644
index 6c198261..00000000
--- a/tests/Behat/Context/Ui/Shop/ShippingContext.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Context\Ui\Shop;
-
-use Behat\Behat\Context\Context;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointAwareInterface;
-use Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Shop\ShippingPickup\SelectShippingPageInterface;
-use Sylius\Behat\Page\Shop\Checkout\CompletePageInterface;
-use Sylius\Behat\Service\SharedStorageInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Webmozart\Assert\Assert;
-
-final class ShippingContext implements Context
-{
-    /** @var SelectShippingPageInterface */
-    private $selectShippingPage;
-
-    /** @var CompletePageInterface */
-    private $completePage;
-
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    /** @var RepositoryInterface */
-    private $orderRepository;
-
-    public function __construct(
-        SelectShippingPageInterface $selectShippingPage,
-        CompletePageInterface $completePage,
-        SharedStorageInterface $sharedStorage,
-        RepositoryInterface $orderRepository,
-    ) {
-        $this->selectShippingPage = $selectShippingPage;
-        $this->completePage = $completePage;
-        $this->sharedStorage = $sharedStorage;
-        $this->orderRepository = $orderRepository;
-    }
-
-    /**
-     * @Given I choose the first option
-     */
-    public function iChooseTheFirstOption(): void
-    {
-        $this->selectShippingPage->chooseFirstShippingPointFromRadio();
-    }
-
-    /**
-     * @Then the shipping method should have a pickup point
-     */
-    public function theShippingMethodShouldHaveAPickupPoint(): void
-    {
-        /** @var OrderInterface $order */
-        $order = $this->orderRepository->findAll()[0];
-
-        /** @var PickupPointAwareInterface $shipment */
-        $shipment = $order->getShipments()->first();
-
-        Assert::notNull($shipment->getPickupPointId());
-    }
-
-    /**
-     * @Given I select :shippingMethod pickup point shipping method
-     */
-    public function iSelectPickupPointShippingMethod(string $shippingMethod): void
-    {
-        $this->selectShippingPage->selectPickupPointShippingMethod($shippingMethod);
-    }
-}
diff --git a/tests/Behat/Mocker/GlsProviderMocker.php b/tests/Behat/Mocker/GlsProviderMocker.php
deleted file mode 100644
index 036357b0..00000000
--- a/tests/Behat/Mocker/GlsProviderMocker.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Mocker;
-
-use Setono\SyliusPickupPointPlugin\Model\PickupPoint;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Setono\SyliusPickupPointPlugin\Provider\Provider;
-use Sylius\Component\Core\Model\OrderInterface;
-
-class GlsProviderMocker extends Provider
-{
-    public const PICKUP_POINT_ID = '001';
-
-    public function getCode(): string
-    {
-        return 'gls';
-    }
-
-    public function getName(): string
-    {
-        return 'GLS';
-    }
-
-    public function findPickupPoints(OrderInterface $order): iterable
-    {
-        return [
-            $this->findPickupPoint(new PickupPointCode('', '', '')),
-        ];
-    }
-
-    public function findPickupPoint(PickupPointCode $code): PickupPointInterface
-    {
-        $pickupPoint = new PickupPoint();
-        $pickupPoint->setCode(new PickupPointCode(self::PICKUP_POINT_ID, $this->getCode(), 'DK'));
-        $pickupPoint->setName('Somewhere');
-        $pickupPoint->setAddress('1 Rainbow str');
-        $pickupPoint->setZipCode('4499');
-        $pickupPoint->setCity('Aalborg');
-        $pickupPoint->setCountry('DK');
-        $pickupPoint->setLatitude(57.046707);
-        $pickupPoint->setLongitude(9.935932);
-
-        return $pickupPoint;
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        return [
-            $this->findPickupPoint(new PickupPointCode('', '', '')),
-        ];
-    }
-}
diff --git a/tests/Behat/Mocker/PostNordProviderMocker.php b/tests/Behat/Mocker/PostNordProviderMocker.php
deleted file mode 100644
index 2b511ce7..00000000
--- a/tests/Behat/Mocker/PostNordProviderMocker.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Mocker;
-
-use Setono\SyliusPickupPointPlugin\Model\PickupPoint;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Setono\SyliusPickupPointPlugin\Provider\Provider;
-use Sylius\Component\Core\Model\OrderInterface;
-
-class PostNordProviderMocker extends Provider
-{
-    public const PICKUP_POINT_ID = '001';
-
-    public function getCode(): string
-    {
-        return 'post_nord';
-    }
-
-    public function getName(): string
-    {
-        return 'PostNord';
-    }
-
-    public function findPickupPoints(OrderInterface $order): iterable
-    {
-        return [
-            $this->findPickupPoint(new PickupPointCode('', '', '')),
-        ];
-    }
-
-    public function findPickupPoint(PickupPointCode $code): PickupPointInterface
-    {
-        $pickupPoint = new PickupPoint();
-        $pickupPoint->setCode(new PickupPointCode(self::PICKUP_POINT_ID, $this->getCode(), 'DK'));
-        $pickupPoint->setName('Somewhere');
-        $pickupPoint->setAddress('1 Rainbow str');
-        $pickupPoint->setZipCode('4499');
-        $pickupPoint->setCity('Aalborg');
-        $pickupPoint->setCountry('DK');
-        $pickupPoint->setLatitude(57.046707);
-        $pickupPoint->setLongitude(9.935932);
-
-        return $pickupPoint;
-    }
-
-    public function findAllPickupPoints(): iterable
-    {
-        return [
-            $this->findPickupPoint(new PickupPointCode('', '', '')),
-        ];
-    }
-}
diff --git a/tests/Behat/Page/Admin/ShippingMethod/CreatePage.php b/tests/Behat/Page/Admin/ShippingMethod/CreatePage.php
deleted file mode 100644
index 24dfd97c..00000000
--- a/tests/Behat/Page/Admin/ShippingMethod/CreatePage.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Admin\ShippingMethod;
-
-use Sylius\Behat\Page\Admin\Crud\CreatePage as BaseCreatePage;
-
-final class CreatePage extends BaseCreatePage implements CreatePageInterface
-{
-    public function selectPickupPointProvider(string $providerCode): void
-    {
-        $this->getDocument()->selectFieldOption('sylius_shipping_method_pickupPointProvider', $providerCode);
-    }
-}
diff --git a/tests/Behat/Page/Admin/ShippingMethod/CreatePageInterface.php b/tests/Behat/Page/Admin/ShippingMethod/CreatePageInterface.php
deleted file mode 100644
index 80153c08..00000000
--- a/tests/Behat/Page/Admin/ShippingMethod/CreatePageInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Admin\ShippingMethod;
-
-use Sylius\Behat\Page\Admin\Crud\CreatePageInterface as BaseCreatePageInterface;
-
-interface CreatePageInterface extends BaseCreatePageInterface
-{
-    public function selectPickupPointProvider(string $providerCode): void;
-}
diff --git a/tests/Behat/Page/Shop/ShippingPickup/SelectShippingPage.php b/tests/Behat/Page/Shop/ShippingPickup/SelectShippingPage.php
deleted file mode 100644
index b9847f5f..00000000
--- a/tests/Behat/Page/Shop/ShippingPickup/SelectShippingPage.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Shop\ShippingPickup;
-
-use Sylius\Behat\Page\Shop\Checkout\SelectShippingPage as BaseSelectShippingPage;
-use Webmozart\Assert\Assert;
-
-final class SelectShippingPage extends BaseSelectShippingPage implements SelectShippingPageInterface
-{
-    public function selectPickupPointShippingMethod(string $shippingMethod): void
-    {
-        Assert::true($this->getDocument()->waitFor(15, function () use ($shippingMethod) {
-            return $this->hasElement('shipping_method_select', [
-                '%shipping_method%' => $shippingMethod,
-            ]);
-        }), sprintf('Unable to find shipping method %s', $shippingMethod));
-
-        // @todo Fix proper way?
-        sleep(1); // Workaround to render shipping method
-
-        $this->selectShippingMethod($shippingMethod);
-
-        Assert::true($this->getDocument()->waitFor(15, function () {
-            return $this->hasElement('pickup_point_field');
-        }), "Pickup point field expected to be visible, but it isn't");
-    }
-
-    public function chooseFirstShippingPointFromRadio(): void
-    {
-        $expectedFirstOptionValue = 'faker---0---US';
-
-        Assert::true($this->hasElement('pickup_point_field'));
-
-        Assert::true($this->getDocument()->waitFor(15, function () {
-            return $this->hasElement('pickup_point_radios');
-        }), 'Pickup point radios area not visible');
-
-        $this->getElement('pickup_point_radio_item', [
-            '%value%' => $expectedFirstOptionValue,
-        ])->click();
-    }
-
-    protected function getDefinedElements(): array
-    {
-        return array_merge(parent::getDefinedElements(), [
-            'pickup_point_field' => '.setono-sylius-pickup-point-field:not([style*="display: none"])',
-            'pickup_point_radios' => '.setono-sylius-pickup-point-field-choices:not([style*="display: none"])',
-
-            // Workaround: Unable to click radio item as semantic ui hide it and we can click only label
-            // 'pickup_point_radio_item' => '.setono-sylius-pickup-point-field-choice-field[value="%value%"]',
-            'pickup_point_radio_item' => '[for="sylius_checkout_select_shipping_shipments_0_pickupPointId_%value%"]',
-        ]);
-    }
-}
diff --git a/tests/Behat/Page/Shop/ShippingPickup/SelectShippingPageInterface.php b/tests/Behat/Page/Shop/ShippingPickup/SelectShippingPageInterface.php
deleted file mode 100644
index 6c5967c4..00000000
--- a/tests/Behat/Page/Shop/ShippingPickup/SelectShippingPageInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Shop\ShippingPickup;
-
-use Sylius\Behat\Page\Shop\Checkout\SelectShippingPageInterface as BaseSelectShippingPageInterface;
-
-interface SelectShippingPageInterface extends BaseSelectShippingPageInterface
-{
-    public function selectPickupPointShippingMethod(string $shippingMethod): void;
-
-    public function chooseFirstShippingPointFromRadio(): void;
-}
diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
deleted file mode 100644
index 19cb644f..00000000
--- a/tests/Behat/Resources/services.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-    <services>
-        <defaults public="true"/>
-
-        <!-- Pages -->
-        <service id="setono_sylius_pickup_point.page.admin.shipping_method.create"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Admin\ShippingMethod\CreatePage"
-                 parent="sylius.behat.page.admin.shipping_method.create" public="false"/>
-
-        <service id="setono_sylius_pickup_point.page.shop.select_shipping"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Page\Shop\ShippingPickup\SelectShippingPage"
-                 parent="sylius.behat.page.shop.checkout.select_shipping" public="false"/>
-
-        <!-- Setup -->
-        <service id="setono_sylius_pickup_point.behat.context.setup.shipping_method"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Context\Setup\ShippingContext">
-            <argument type="service" id="setono_sylius_pickup_point.registry.provider"/>
-            <argument type="service" id="sylius.manager.shipping_method"/>
-        </service>
-
-        <!-- UI -->
-        <service id="setono_sylius_pickup_point.behat.context.ui.shop.shipping"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Context\Ui\Shop\ShippingContext">
-            <argument type="service" id="setono_sylius_pickup_point.page.shop.select_shipping"/>
-            <argument type="service" id="sylius.behat.page.shop.checkout.complete"/>
-            <argument type="service" id="sylius.behat.shared_storage"/>
-            <argument type="service" id="sylius.repository.order"/>
-        </service>
-
-        <service id="setono_sylius_pickup_point.behat.context.ui.admin.shipping"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Context\Ui\Admin\ShippingContext">
-            <argument type="service" id="setono_sylius_pickup_point.page.admin.shipping_method.create"/>
-        </service>
-
-        <!-- Providers Mocks -->
-        <service id="setono_sylius_pickup_point.provider.gls"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Mocker\GlsProviderMocker">
-            <argument type="service" id="setono_gls_webservice.client"/>
-            <tag name="setono_sylius_pickup_point.provider"
-                 code="gls"
-                 label="setono_sylius_pickup_point.provider.gls" />
-        </service>
-
-        <service id="setono_sylius_pickup_point.provider.post_nord"
-                 class="Setono\SyliusPickupPointPlugin\Tests\Behat\Mocker\PostNordProviderMocker">
-            <argument type="service" id="setono_post_nord.client"/>
-            <tag name="setono_sylius_pickup_point.provider"
-                 code="post_nord"
-                 label="setono_sylius_pickup_point.provider.post_nord" />
-        </service>
-
-    </services>
-</container>
diff --git a/tests/Behat/Resources/suites.yml b/tests/Behat/Resources/suites.yml
deleted file mode 100644
index 2fe3179f..00000000
--- a/tests/Behat/Resources/suites.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-default:
-    suites:
-        ui_shipping:
-            contexts:
-                - sylius.behat.context.hook.doctrine_orm
-
-                - sylius.behat.context.transform.address
-                - sylius.behat.context.transform.lexical
-                - sylius.behat.context.transform.product
-                - sylius.behat.context.transform.shipping_method
-
-                - sylius.behat.context.setup.channel
-                - sylius.behat.context.setup.product
-                - sylius.behat.context.setup.shipping
-                - sylius.behat.context.setup.payment
-
-                - setono_sylius_pickup_point.behat.context.setup.shipping_method
-
-                - sylius.behat.context.ui.shop.cart
-                - sylius.behat.context.ui.shop.checkout
-                - sylius.behat.context.ui.shop.checkout.addressing
-                - sylius.behat.context.ui.shop.checkout.payment
-                - sylius.behat.context.ui.shop.checkout.shipping
-                - sylius.behat.context.ui.shop.currency
-                - sylius.behat.context.ui.shop.checkout.complete
-
-                - sylius.behat.context.transform.channel
-
-                - setono_sylius_pickup_point.behat.context.ui.shop.shipping
-            filters:
-                tags: "@shop_shipping_pickup"
-
-        admin_shipping:
-            contexts:
-                - sylius.behat.context.hook.doctrine_orm
-
-                - sylius.behat.context.setup.channel
-                - sylius.behat.context.setup.admin_security
-                - sylius.behat.context.setup.shipping
-                - sylius.behat.context.setup.locale
-                - sylius.behat.context.setup.zone
-
-                - sylius.behat.context.transform.channel
-                - sylius.behat.context.transform.locale
-
-                - sylius.behat.context.ui.admin.managing_shipping_methods
-                - sylius.behat.context.ui.admin.notification
-
-                - setono_sylius_pickup_point.behat.context.ui.admin.shipping
-            filters:
-                tags: "@managing_shipping_providers"
diff --git a/tests/Application/config/routes.yaml b/tests/Functional/.gitignore
similarity index 100%
rename from tests/Application/config/routes.yaml
rename to tests/Functional/.gitignore
diff --git a/tests/Functional/Admin/AdminPickupPointPagesTest.php b/tests/Functional/Admin/AdminPickupPointPagesTest.php
new file mode 100644
index 00000000..75e79fef
--- /dev/null
+++ b/tests/Functional/Admin/AdminPickupPointPagesTest.php
@@ -0,0 +1,107 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Functional\Admin;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectRepository;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use Setono\SyliusPickupPointPlugin\Model\ShipmentInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\ShippingMethodInterface;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+/**
+ * Renders the two admin pages the plugin extends, against the loaded fixtures. These cover the twig-hook
+ * wiring (the admin order-show pickup-point label and the shipping-method provider field) which unit tests
+ * cannot — e.g. they would have caught the label template referencing a `shipment` variable that the hook
+ * does not expose.
+ */
+final class AdminPickupPointPagesTest extends WebTestCase
+{
+    /**
+     * Sylius' debug error handler registers an exception handler while handling the request and never
+     * restores it. Pop it here so PHPUnit does not fail the test for leaving an exception handler
+     * registered — a hard failure since PHPUnit 11 that `failOnRisky="false"` does not suppress.
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        restore_exception_handler();
+    }
+
+    public function testTheOrderShowPageRendersTheSelectedPickupPoint(): void
+    {
+        $client = self::createClient();
+        $this->logInAsAdmin($client);
+
+        $order = $this->findOrderWithShipment();
+
+        $shipment = $order->getShipments()->first();
+        self::assertInstanceOf(ShipmentInterface::class, $shipment);
+
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = 'faker';
+        $pickupPoint->id = '42';
+        $pickupPoint->name = 'Post office #42';
+        $pickupPoint->address = 'Main Street 1';
+        $pickupPoint->zipCode = '9000';
+        $pickupPoint->city = 'Aalborg';
+        $pickupPoint->country = 'DK';
+        $shipment->setPickupPoint($pickupPoint);
+
+        /** @var EntityManagerInterface $manager */
+        $manager = self::getContainer()->get('doctrine.orm.entity_manager');
+        $manager->flush();
+
+        $client->request('GET', '/admin/orders/' . $order->getId());
+
+        self::assertResponseIsSuccessful();
+        self::assertSelectorTextContains('.setono-sylius-pickup-point-label', 'Post office #42');
+    }
+
+    public function testTheShippingMethodFormRendersThePickupPointProviderField(): void
+    {
+        $client = self::createClient();
+        $this->logInAsAdmin($client);
+
+        $shippingMethod = $this->repository('sylius.repository.shipping_method')->findOneBy([]);
+        self::assertInstanceOf(ShippingMethodInterface::class, $shippingMethod);
+
+        $client->request('GET', '/admin/shipping-methods/' . $shippingMethod->getId() . '/edit');
+
+        self::assertResponseIsSuccessful();
+        self::assertSelectorExists('[name*="pickupPointProvider"]');
+    }
+
+    private function logInAsAdmin(KernelBrowser $client): void
+    {
+        $admin = $this->repository('sylius.repository.admin_user')->findOneBy([]);
+        self::assertInstanceOf(UserInterface::class, $admin, 'No admin user found — were the test fixtures loaded?');
+
+        $client->loginUser($admin, 'admin');
+    }
+
+    private function findOrderWithShipment(): OrderInterface
+    {
+        foreach ($this->repository('sylius.repository.order')->findBy([], null, 100) as $order) {
+            if ($order instanceof OrderInterface && !$order->getShipments()->isEmpty()) {
+                return $order;
+            }
+        }
+
+        self::fail('No order with a shipment found — were the test fixtures loaded?');
+    }
+
+    private function repository(string $id): ObjectRepository
+    {
+        $repository = self::getContainer()->get($id);
+        self::assertInstanceOf(ObjectRepository::class, $repository);
+
+        return $repository;
+    }
+}
diff --git a/tests/PHPStan/console_application.php b/tests/PHPStan/console_application.php
new file mode 100644
index 00000000..af503bdc
--- /dev/null
+++ b/tests/PHPStan/console_application.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Setono\SyliusPickupPointPlugin\Tests\Application\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+
+require __DIR__ . '/../Application/config/bootstrap.php';
+
+$kernel = new Kernel('test', true);
+$kernel->boot();
+
+return new Application($kernel);
diff --git a/tests/Provider/LocalProviderTest.php b/tests/Provider/LocalProviderTest.php
deleted file mode 100644
index 237e4c64..00000000
--- a/tests/Provider/LocalProviderTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Setono\SyliusPickupPointPlugin\Tests\Provider;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Setono\SyliusPickupPointPlugin\Exception\TimeoutException;
-use Setono\SyliusPickupPointPlugin\Model\PickupPoint;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointCode;
-use Setono\SyliusPickupPointPlugin\Model\PickupPointInterface;
-use Setono\SyliusPickupPointPlugin\Provider\FakerProvider;
-use Setono\SyliusPickupPointPlugin\Provider\LocalProvider;
-use Setono\SyliusPickupPointPlugin\Provider\ProviderInterface;
-use Setono\SyliusPickupPointPlugin\Repository\PickupPointRepositoryInterface;
-use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Resource\Factory\Factory;
-
-final class LocalProviderTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @test
-     */
-    public function it_gets_code_from_decorated_provider(): void
-    {
-        $provider = $this->getProvider();
-        self::assertSame('faker', $provider->getCode());
-    }
-
-    /**
-     * @test
-     */
-    public function it_gets_name_from_decorated_provider(): void
-    {
-        $provider = $this->getProvider();
-        self::assertSame('Faker', $provider->getName());
-    }
-
-    /**
-     * @test
-     */
-    public function it_uses_local_provider_if_decorated_timeouts(): void
-    {
-        $order = $this->prophesize(OrderInterface::class);
-
-        $pickupPoint = new PickupPoint();
-        $pickupPoint->setCode(new PickupPointCode('123', 'gls', 'DK'));
-        $pickupPoint->setName('Service Point');
-        $pickupPoint->setAddress('Street 123');
-        $pickupPoint->setZipCode('1235A');
-        $pickupPoint->setCity('Great City');
-        $pickupPoint->setCountry('DK');
-
-        $repository = $this->prophesize(PickupPointRepositoryInterface::class);
-        $repository->findByOrder($order, 'timeout_provider')->willReturn([$pickupPoint]);
-
-        $provider = $this->getProvider(true, $repository->reveal());
-
-        $pickupPoints = $provider->findPickupPoints($order->reveal());
-
-        self::assertNotEmpty($pickupPoints);
-        self::assertSame($pickupPoint, self::getFirstElementOfIterable($pickupPoints));
-    }
-
-    private function getProvider(bool $timeout = false, PickupPointRepositoryInterface $pickupPointRepository = null): LocalProvider
-    {
-        $pickupPointFactory = new Factory(PickupPoint::class);
-
-        $provider = new FakerProvider($pickupPointFactory);
-        if ($timeout) {
-            $provider = new class() implements ProviderInterface {
-                public function __toString(): string
-                {
-                    return $this->getName();
-                }
-
-                public function getCode(): string
-                {
-                    return 'timeout_provider';
-                }
-
-                public function getName(): string
-                {
-                    return 'Timeout provider';
-                }
-
-                public function findPickupPoints(OrderInterface $order): iterable
-                {
-                    throw new TimeoutException();
-                }
-
-                public function findPickupPoint(PickupPointCode $code): ?PickupPointInterface
-                {
-                    throw new TimeoutException();
-                }
-
-                public function findAllPickupPoints(): iterable
-                {
-                    throw new TimeoutException();
-                }
-            };
-        }
-
-        if (null === $pickupPointRepository) {
-            $repository = $this->prophesize(PickupPointRepositoryInterface::class);
-            $pickupPointRepository = $repository->reveal();
-        }
-
-        return new LocalProvider($provider, $pickupPointRepository);
-    }
-
-    private static function getFirstElementOfIterable(iterable $list)
-    {
-        foreach ($list as $elm) {
-            return $elm;
-        }
-
-        throw new \InvalidArgumentException('No elements in $list');
-    }
-}
diff --git a/tests/Unit/DTO/PickupPointIdentifierTest.php b/tests/Unit/DTO/PickupPointIdentifierTest.php
new file mode 100644
index 00000000..82da856e
--- /dev/null
+++ b/tests/Unit/DTO/PickupPointIdentifierTest.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\DTO;
+
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPointIdentifier;
+
+final class PickupPointIdentifierTest extends TestCase
+{
+    public function testItBuildsFromACompletePickupPointFoldingCountryIntoMetadata(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = 'gls';
+        $pickupPoint->id = '12345';
+        $pickupPoint->country = 'DK';
+        $pickupPoint->metadata = ['region' => 'north'];
+
+        $identifier = PickupPointIdentifier::fromPickupPoint($pickupPoint);
+
+        self::assertNotNull($identifier);
+        self::assertSame('gls', $identifier->provider);
+        self::assertSame('12345', $identifier->id);
+        // the first-class country property travels inside the identifier's metadata
+        self::assertSame(['country' => 'DK', 'region' => 'north'], $identifier->metadata);
+    }
+
+    public function testItReturnsNullWhenProviderIsMissing(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->id = '12345';
+
+        self::assertNull(PickupPointIdentifier::fromPickupPoint($pickupPoint));
+    }
+
+    public function testItReturnsNullWhenIdIsMissing(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = 'gls';
+
+        self::assertNull(PickupPointIdentifier::fromPickupPoint($pickupPoint));
+    }
+
+    public function testItBuildsFromAnArray(): void
+    {
+        $identifier = PickupPointIdentifier::fromArray([
+            'provider' => 'gls',
+            'id' => '12345',
+            'metadata' => ['country' => 'DK'],
+        ]);
+
+        self::assertSame('gls', $identifier->provider);
+        self::assertSame('12345', $identifier->id);
+        self::assertSame(['country' => 'DK'], $identifier->metadata);
+    }
+
+    public function testFromArrayDefaultsMetadataToAnEmptyArray(): void
+    {
+        $identifier = PickupPointIdentifier::fromArray(['provider' => 'gls', 'id' => '12345']);
+
+        self::assertSame([], $identifier->metadata);
+    }
+
+    public function testFromArrayThrowsWhenProviderIsMissing(): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        PickupPointIdentifier::fromArray(['id' => '12345']);
+    }
+
+    public function testFromArrayThrowsWhenIdIsMissing(): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        PickupPointIdentifier::fromArray(['provider' => 'gls']);
+    }
+
+    public function testItSerializesToTheWireShape(): void
+    {
+        $identifier = new PickupPointIdentifier('gls', '12345', ['country' => 'DK']);
+
+        self::assertSame(
+            ['provider' => 'gls', 'id' => '12345', 'metadata' => ['country' => 'DK']],
+            $identifier->jsonSerialize(),
+        );
+    }
+
+    public function testFromArrayIsTheInverseOfJsonSerialize(): void
+    {
+        $identifier = new PickupPointIdentifier('gls', '12345', ['country' => 'DK', 'region' => 'north']);
+
+        self::assertEquals($identifier, PickupPointIdentifier::fromArray($identifier->jsonSerialize()));
+    }
+}
diff --git a/tests/Unit/DTO/PickupPointTest.php b/tests/Unit/DTO/PickupPointTest.php
new file mode 100644
index 00000000..54826c8a
--- /dev/null
+++ b/tests/Unit/DTO/PickupPointTest.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\DTO;
+
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+
+final class PickupPointTest extends TestCase
+{
+    public function testItRoundTripsThroughArrayKeepingCountryAndMetadata(): void
+    {
+        $data = [
+            'provider' => 'gls',
+            'id' => '12345',
+            'name' => 'Post office',
+            'address' => 'Some street 1',
+            'zipCode' => '9000',
+            'city' => 'Aalborg',
+            'country' => 'DK',
+            'latitude' => '57.0',
+            'longitude' => '9.9',
+            'metadata' => ['region' => 'north', 'warehouse' => 7],
+        ];
+
+        $pickupPoint = PickupPoint::fromArray($data);
+
+        self::assertSame('DK', $pickupPoint->country);
+        self::assertSame(['region' => 'north', 'warehouse' => 7], $pickupPoint->metadata);
+        self::assertSame($data, $pickupPoint->jsonSerialize());
+    }
+
+    public function testItDefaultsCountryAndMetadataWhenAbsent(): void
+    {
+        $pickupPoint = PickupPoint::fromArray(['provider' => 'gls', 'id' => '1']);
+
+        self::assertNull($pickupPoint->country);
+        self::assertSame([], $pickupPoint->metadata);
+    }
+
+    public function testItDefaultsMetadataToAnEmptyArrayWhenItIsNotAnArray(): void
+    {
+        $pickupPoint = PickupPoint::fromArray(['provider' => 'gls', 'id' => '1', 'metadata' => 'not-an-array']);
+
+        self::assertSame([], $pickupPoint->metadata);
+    }
+}
diff --git a/tests/DependencyInjection/SetonoSyliusPickupPointExtensionTest.php b/tests/Unit/DependencyInjection/SetonoSyliusPickupPointExtensionTest.php
similarity index 59%
rename from tests/DependencyInjection/SetonoSyliusPickupPointExtensionTest.php
rename to tests/Unit/DependencyInjection/SetonoSyliusPickupPointExtensionTest.php
index 4b5ce4b5..097c8456 100644
--- a/tests/DependencyInjection/SetonoSyliusPickupPointExtensionTest.php
+++ b/tests/Unit/DependencyInjection/SetonoSyliusPickupPointExtensionTest.php
@@ -2,23 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusPickupPointPlugin\Tests\DependencyInjection;
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Setono\SyliusPickupPointPlugin\DependencyInjection\SetonoSyliusPickupPointExtension;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistry;
 
 final class SetonoSyliusPickupPointExtensionTest extends AbstractExtensionTestCase
 {
     protected function getMinimalConfiguration(): array
     {
         return [
-            'cache' => [
-                'enabled' => false,
-            ],
             'providers' => [
                 'faker' => false,
-                'budbee' => false,
-                'coolrunner' => false,
                 'dao' => false,
                 'gls' => false,
                 'post_nord' => false,
@@ -33,14 +29,10 @@ protected function getContainerExtensions(): array
         ];
     }
 
-    /**
-     * @test
-     */
-    public function after_loading_the_correct_parameters_has_been_set(): void
+    public function testItRegistersTheProviderRegistry(): void
     {
         $this->load();
 
-        $this->assertContainerBuilderHasParameter('setono_sylius_pickup_point.local', true);
-        $this->assertContainerBuilderHasParameter('setono_sylius_pickup_point.cache.enabled', false);
+        $this->assertContainerBuilderHasService(ProviderRegistry::class);
     }
 }
diff --git a/tests/Unit/Encoder/PickupPointEncoderTest.php b/tests/Unit/Encoder/PickupPointEncoderTest.php
new file mode 100644
index 00000000..7a607018
--- /dev/null
+++ b/tests/Unit/Encoder/PickupPointEncoderTest.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Encoder;
+
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder;
+
+final class PickupPointEncoderTest extends TestCase
+{
+    private PickupPointEncoder $encoder;
+
+    protected function setUp(): void
+    {
+        $this->encoder = new PickupPointEncoder();
+    }
+
+    public function testItRoundTripsAFullPickupPoint(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = 'faker';
+        $pickupPoint->id = '0';
+        $pickupPoint->name = 'Post office #0';
+        $pickupPoint->address = 'Main Street 1';
+        $pickupPoint->zipCode = '9000';
+        $pickupPoint->city = 'Aalborg';
+        $pickupPoint->country = 'DK';
+        $pickupPoint->latitude = '57.0488';
+        $pickupPoint->longitude = '9.9217';
+        $pickupPoint->metadata = ['warehouse' => '42'];
+
+        self::assertEquals($pickupPoint, $this->encoder->decode($this->encoder->encode($pickupPoint)));
+    }
+
+    public function testItProducesAUrlSafeTokenEvenForNonAsciiData(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->name = 'Æøå Pakkeshop café';
+
+        self::assertSame(1, preg_match('/^[A-Za-z0-9\-_]+$/', $this->encoder->encode($pickupPoint)));
+    }
+
+    public function testItThrowsEncodingANonUtf8String(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->name = "\xFF"; // not valid UTF-8, so json_encode cannot serialize it
+
+        $this->expectException(\JsonException::class);
+
+        $this->encoder->encode($pickupPoint);
+    }
+
+    public function testItThrowsDecodingInvalidBase64(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $this->encoder->decode('!!! not base64 !!!');
+    }
+
+    public function testItThrowsDecodingATokenThatIsNotAnObject(): void
+    {
+        $token = rtrim(strtr(base64_encode('123'), '+/', '-_'), '=');
+
+        $this->expectException(InvalidArgumentException::class);
+
+        $this->encoder->decode($token);
+    }
+}
diff --git a/tests/Unit/Encoder/PickupPointIdentifierEncoderTest.php b/tests/Unit/Encoder/PickupPointIdentifierEncoderTest.php
new file mode 100644
index 00000000..0a14cef6
--- /dev/null
+++ b/tests/Unit/Encoder/PickupPointIdentifierEncoderTest.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Encoder;
+
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPointIdentifier;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointIdentifierEncoder;
+
+final class PickupPointIdentifierEncoderTest extends TestCase
+{
+    private PickupPointIdentifierEncoder $encoder;
+
+    protected function setUp(): void
+    {
+        $this->encoder = new PickupPointIdentifierEncoder();
+    }
+
+    public function testItRoundTripsAnIdentifier(): void
+    {
+        $decoded = $this->encoder->decode(
+            $this->encoder->encode(new PickupPointIdentifier('gls', '12345', ['country' => 'DK'])),
+        );
+
+        self::assertSame('gls', $decoded->provider);
+        self::assertSame('12345', $decoded->id);
+        self::assertSame(['country' => 'DK'], $decoded->metadata);
+    }
+
+    public function testItRoundTripsArbitraryMetadata(): void
+    {
+        $metadata = ['country' => 'DK', 'region' => 'north', 'warehouse' => 7];
+
+        $decoded = $this->encoder->decode(
+            $this->encoder->encode(new PickupPointIdentifier('acme', 'a-b/c', $metadata)),
+        );
+
+        self::assertSame('acme', $decoded->provider);
+        self::assertSame('a-b/c', $decoded->id);
+        self::assertSame($metadata, $decoded->metadata);
+    }
+
+    public function testItProducesAUrlSafeToken(): void
+    {
+        $token = $this->encoder->encode(new PickupPointIdentifier('gls', '12345', ['country' => 'DK']));
+
+        self::assertSame(1, preg_match('/^[A-Za-z0-9\-_]+$/', $token));
+    }
+
+    public function testItDefaultsToEmptyMetadata(): void
+    {
+        $decoded = $this->encoder->decode($this->encoder->encode(new PickupPointIdentifier('gls', '12345')));
+
+        self::assertSame([], $decoded->metadata);
+    }
+
+    public function testItThrowsWhenDecodingAMalformedToken(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $this->encoder->decode('!!! not base64 or json !!!');
+    }
+
+    public function testItThrowsWhenTheTokenLacksProviderAndId(): void
+    {
+        $json = json_encode(['foo' => 'bar'], \JSON_THROW_ON_ERROR);
+        $token = rtrim(strtr(base64_encode($json), '+/', '-_'), '=');
+
+        $this->expectException(InvalidArgumentException::class);
+
+        $this->encoder->decode($token);
+    }
+}
diff --git a/tests/Unit/Exception/NonUniqueProviderCodeExceptionTest.php b/tests/Unit/Exception/NonUniqueProviderCodeExceptionTest.php
new file mode 100644
index 00000000..8182714c
--- /dev/null
+++ b/tests/Unit/Exception/NonUniqueProviderCodeExceptionTest.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Exception;
+
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\Exception\NonUniqueProviderCodeException;
+
+final class NonUniqueProviderCodeExceptionTest extends TestCase
+{
+    public function testItIsAnInvalidArgumentException(): void
+    {
+        $exception = new NonUniqueProviderCodeException('gls');
+
+        self::assertInstanceOf(NonUniqueProviderCodeException::class, $exception);
+        self::assertInstanceOf(InvalidArgumentException::class, $exception);
+    }
+}
diff --git a/tests/Unit/Form/DataTransformer/PickupPointTransformerTest.php b/tests/Unit/Form/DataTransformer/PickupPointTransformerTest.php
new file mode 100644
index 00000000..78eb2ec8
--- /dev/null
+++ b/tests/Unit/Form/DataTransformer/PickupPointTransformerTest.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Form\DataTransformer;
+
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder;
+use Setono\SyliusPickupPointPlugin\Form\DataTransformer\PickupPointTransformer;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+final class PickupPointTransformerTest extends TestCase
+{
+    private PickupPointEncoder $encoder;
+
+    protected function setUp(): void
+    {
+        $this->encoder = new PickupPointEncoder();
+    }
+
+    public function testItTransformsNullToNull(): void
+    {
+        self::assertNull($this->transformer()->transform(null));
+    }
+
+    public function testItThrowsTransformingANonPickupPoint(): void
+    {
+        $this->expectException(TransformationFailedException::class);
+
+        $this->transformer()->transform('not a pickup point');
+    }
+
+    public function testItTransformsAPickupPointToAToken(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = 'faker';
+        $pickupPoint->id = '0';
+
+        self::assertSame($this->encoder->encode($pickupPoint), $this->transformer()->transform($pickupPoint));
+    }
+
+    public function testItReverseTransformsNullToNull(): void
+    {
+        self::assertNull($this->transformer()->reverseTransform(null));
+    }
+
+    public function testItReverseTransformsAnEmptyStringToNull(): void
+    {
+        self::assertNull($this->transformer()->reverseTransform(''));
+    }
+
+    public function testItThrowsReverseTransformingANonString(): void
+    {
+        $this->expectException(TransformationFailedException::class);
+
+        $this->transformer()->reverseTransform(123);
+    }
+
+    public function testItThrowsReverseTransformingAMalformedToken(): void
+    {
+        $this->expectException(TransformationFailedException::class);
+
+        $this->transformer()->reverseTransform('!!! not a valid token !!!');
+    }
+
+    public function testItReverseTransformsATokenBackToTheSamePickupPoint(): void
+    {
+        $pickupPoint = new PickupPoint();
+        $pickupPoint->provider = 'faker';
+        $pickupPoint->id = '0';
+        $pickupPoint->name = 'Post office #0';
+        $pickupPoint->city = 'Aalborg';
+
+        self::assertEquals(
+            $pickupPoint,
+            $this->transformer()->reverseTransform($this->encoder->encode($pickupPoint)),
+        );
+    }
+
+    private function transformer(): PickupPointTransformer
+    {
+        return new PickupPointTransformer($this->encoder);
+    }
+}
diff --git a/tests/Unit/Form/Extension/ShipmentTypeExtensionTest.php b/tests/Unit/Form/Extension/ShipmentTypeExtensionTest.php
new file mode 100644
index 00000000..652870a4
--- /dev/null
+++ b/tests/Unit/Form/Extension/ShipmentTypeExtensionTest.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Form\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Setono\SyliusPickupPointPlugin\Form\Extension\ShipmentTypeExtension;
+use Setono\SyliusPickupPointPlugin\Form\Type\PickupPointType;
+use Sylius\Bundle\CoreBundle\Form\Type\Checkout\ShipmentType;
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ShipmentTypeExtensionTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testItIsAnAbstractTypeExtension(): void
+    {
+        self::assertInstanceOf(AbstractTypeExtension::class, new ShipmentTypeExtension());
+    }
+
+    public function testItExtendsTheCheckoutShipmentType(): void
+    {
+        self::assertContains(ShipmentType::class, ShipmentTypeExtension::getExtendedTypes());
+    }
+
+    public function testItAddsThePickupPointField(): void
+    {
+        $builder = $this->prophesize(FormBuilderInterface::class);
+        $builder->add('pickupPoint', PickupPointType::class, Argument::type('array'))
+            ->shouldBeCalled()
+            ->willReturn($builder->reveal());
+
+        (new ShipmentTypeExtension())->buildForm($builder->reveal(), []);
+    }
+}
diff --git a/tests/Unit/Form/Extension/ShippingMethodChoiceTypeExtensionTest.php b/tests/Unit/Form/Extension/ShippingMethodChoiceTypeExtensionTest.php
new file mode 100644
index 00000000..6c5cba85
--- /dev/null
+++ b/tests/Unit/Form/Extension/ShippingMethodChoiceTypeExtensionTest.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Form\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodChoiceTypeExtension;
+use Setono\SyliusPickupPointPlugin\Model\PickupPointProviderAwareInterface;
+use Setono\SyliusPickupPointPlugin\Registry\ProviderRegistryInterface;
+use Sylius\Bundle\ShippingBundle\Form\Type\ShippingMethodChoiceType;
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class ShippingMethodChoiceTypeExtensionTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testItIsAnAbstractTypeExtension(): void
+    {
+        self::assertInstanceOf(AbstractTypeExtension::class, $this->createExtension());
+    }
+
+    public function testItExtendsShippingMethodChoiceType(): void
+    {
+        self::assertContains(ShippingMethodChoiceType::class, ShippingMethodChoiceTypeExtension::getExtendedTypes());
+    }
+
+    public function testItStampsTheProviderCodeOnPickupCapableMethods(): void
+    {
+        $registry = $this->prophesize(ProviderRegistryInterface::class);
+        $registry->has('faker')->willReturn(true);
+
+        $method = $this->prophesize(PickupPointProviderAwareInterface::class);
+        $method->hasPickupPointProvider()->willReturn(true);
+        $method->getPickupPointProvider()->willReturn('faker');
+
+        self::assertSame(
+            ['data-pickup-point-provider' => 'faker'],
+            ($this->choiceAttr($registry->reveal()))($method->reveal()),
+        );
+    }
+
+    public function testItStampsNothingOnMethodsWithoutAProvider(): void
+    {
+        $method = $this->prophesize(PickupPointProviderAwareInterface::class);
+        $method->hasPickupPointProvider()->willReturn(false);
+
+        self::assertSame([], ($this->choiceAttr($this->prophesize(ProviderRegistryInterface::class)->reveal()))($method->reveal()));
+    }
+
+    private function createExtension(): ShippingMethodChoiceTypeExtension
+    {
+        return new ShippingMethodChoiceTypeExtension(
+            $this->prophesize(ProviderRegistryInterface::class)->reveal(),
+        );
+    }
+
+    private function choiceAttr(ProviderRegistryInterface $registry): callable
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined('choice_attr');
+        (new ShippingMethodChoiceTypeExtension($registry))->configureOptions($resolver);
+
+        $choiceAttr = $resolver->resolve()['choice_attr'];
+        self::assertIsCallable($choiceAttr);
+
+        return $choiceAttr;
+    }
+}
diff --git a/tests/Unit/Form/Extension/ShippingMethodTypeExtensionTest.php b/tests/Unit/Form/Extension/ShippingMethodTypeExtensionTest.php
new file mode 100644
index 00000000..12995519
--- /dev/null
+++ b/tests/Unit/Form/Extension/ShippingMethodTypeExtensionTest.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Form\Extension;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Setono\SyliusPickupPointPlugin\Form\Extension\ShippingMethodTypeExtension;
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ShippingMethodTypeExtensionTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testItIsAnAbstractTypeExtension(): void
+    {
+        self::assertInstanceOf(AbstractTypeExtension::class, new ShippingMethodTypeExtension([]));
+    }
+
+    public function testItBuildsFormWithoutErrors(): void
+    {
+        $extension = new ShippingMethodTypeExtension([]);
+
+        $builder = $this->prophesize(FormBuilderInterface::class);
+        $builder->add(Argument::type('string'), Argument::type('string'), Argument::any())->willReturn($builder->reveal());
+
+        $extension->buildForm($builder->reveal(), []);
+    }
+}
diff --git a/tests/Unit/Form/Type/PickupPointTypeTest.php b/tests/Unit/Form/Type/PickupPointTypeTest.php
new file mode 100644
index 00000000..0a9aaea8
--- /dev/null
+++ b/tests/Unit/Form/Type/PickupPointTypeTest.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Form\Type;
+
+use Setono\SyliusPickupPointPlugin\DTO\PickupPoint;
+use Setono\SyliusPickupPointPlugin\Encoder\PickupPointEncoder;
+use Setono\SyliusPickupPointPlugin\Form\DataTransformer\PickupPointTransformer;
+use Setono\SyliusPickupPointPlugin\Form\Type\PickupPointType;
+use Symfony\Component\Form\PreloadedExtension;
+use Symfony\Component\Form\Test\TypeTestCase;
+
+/**
+ * Verifies — without booting the kernel — that the hidden field round-trips the chosen point through its
+ * opaque token: a submitted token decodes to the exact {@see PickupPoint} (persisted to `pickup_point`),
+ * and an existing point renders back as a token. No provider is involved.
+ */
+final class PickupPointTypeTest extends TypeTestCase
+{
+    private PickupPointEncoder $encoder;
+
+    private PickupPoint $point;
+
+    protected function setUp(): void
+    {
+        $this->encoder = new PickupPointEncoder();
+
+        $this->point = new PickupPoint();
+        $this->point->provider = 'faker';
+        $this->point->id = '0';
+        $this->point->name = 'Post office #0';
+        $this->point->country = 'DK';
+
+        parent::setUp();
+    }
+
+    public function testSubmittingATokenDecodesToThePickupPoint(): void
+    {
+        $form = $this->factory->create(PickupPointType::class);
+        $form->submit($this->encoder->encode($this->point));
+
+        self::assertTrue($form->isSynchronized());
+        self::assertEquals($this->point, $form->getData());
+    }
+
+    public function testAnExistingPickupPointRendersBackAsAToken(): void
+    {
+        $form = $this->factory->create(PickupPointType::class, $this->point);
+
+        self::assertSame($this->encoder->encode($this->point), $form->getViewData());
+    }
+
+    public function testSubmittingAnEmptyValueResultsInNull(): void
+    {
+        $form = $this->factory->create(PickupPointType::class);
+        $form->submit('');
+
+        self::assertTrue($form->isSynchronized());
+        self::assertNull($form->getData());
+    }
+
+    public function testSubmittingAMalformedTokenFailsTransformation(): void
+    {
+        $form = $this->factory->create(PickupPointType::class);
+        $form->submit('!!! not a valid token !!!');
+
+        self::assertFalse($form->isSynchronized());
+        self::assertNull($form->getData());
+    }
+
+    protected function getExtensions(): array
+    {
+        return [
+            new PreloadedExtension([
+                new PickupPointType(new PickupPointTransformer($this->encoder)),
+            ], []),
+        ];
+    }
+}
diff --git a/tests/Unit/Validator/Constraints/HasPickupPointSelectedTest.php b/tests/Unit/Validator/Constraints/HasPickupPointSelectedTest.php
new file mode 100644
index 00000000..453ecc24
--- /dev/null
+++ b/tests/Unit/Validator/Constraints/HasPickupPointSelectedTest.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Validator\Constraints;
+
+use PHPUnit\Framework\TestCase;
+use Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelected;
+use Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelectedValidator;
+use Symfony\Component\Validator\Constraint;
+
+final class HasPickupPointSelectedTest extends TestCase
+{
+    public function testItIsAConstraint(): void
+    {
+        self::assertInstanceOf(Constraint::class, new HasPickupPointSelected());
+    }
+
+    public function testItIsValidatedByTheValidatorViaTheDefaultConvention(): void
+    {
+        self::assertSame(
+            HasPickupPointSelectedValidator::class,
+            (new HasPickupPointSelected())->validatedBy(),
+        );
+    }
+
+    public function testItHasClassTarget(): void
+    {
+        self::assertSame(Constraint::CLASS_CONSTRAINT, (new HasPickupPointSelected())->getTargets());
+    }
+
+    public function testItHasMessage(): void
+    {
+        self::assertSame(
+            'setono_pickup_point.shipment.pickup_point.not_blank',
+            (new HasPickupPointSelected())->pickupPointNotBlank,
+        );
+    }
+}
diff --git a/tests/Unit/Validator/Constraints/HasPickupPointSelectedValidatorTest.php b/tests/Unit/Validator/Constraints/HasPickupPointSelectedValidatorTest.php
new file mode 100644
index 00000000..7f3d4a9a
--- /dev/null
+++ b/tests/Unit/Validator/Constraints/HasPickupPointSelectedValidatorTest.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusPickupPointPlugin\Tests\Unit\Validator\Constraints;
+
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
+use Setono\SyliusPickupPointPlugin\Model\ShipmentInterface;
+use Setono\SyliusPickupPointPlugin\Model\ShippingMethodInterface;
+use Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelected;
+use Setono\SyliusPickupPointPlugin\Validator\Constraints\HasPickupPointSelectedValidator;
+use Symfony\Component\Validator\ConstraintValidatorInterface;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+final class HasPickupPointSelectedValidatorTest extends ConstraintValidatorTestCase
+{
+    use ProphecyTrait;
+
+    public function testItDoesNotViolateWhenTheMethodHasNoPickupPointProvider(): void
+    {
+        $this->validator->validate($this->shipment(hasProvider: false, hasPickupPoint: false)->reveal(), new HasPickupPointSelected());
+
+        $this->assertNoViolation();
+    }
+
+    public function testItDoesNotViolateWhenAPickupPointIsSelected(): void
+    {
+        $this->validator->validate($this->shipment(hasProvider: true, hasPickupPoint: true)->reveal(), new HasPickupPointSelected());
+
+        $this->assertNoViolation();
+    }
+
+    public function testItViolatesWhenTheProviderIsSetButNoPickupPointIsSelected(): void
+    {
+        $constraint = new HasPickupPointSelected();
+
+        $this->validator->validate($this->shipment(hasProvider: true, hasPickupPoint: false)->reveal(), $constraint);
+
+        $this->buildViolation($constraint->pickupPointNotBlank)->assertRaised();
+    }
+
+    protected function createValidator(): ConstraintValidatorInterface
+    {
+        return new HasPickupPointSelectedValidator();
+    }
+
+    /**
+     * @return ObjectProphecy<ShipmentInterface>
+     */
+    private function shipment(bool $hasProvider, bool $hasPickupPoint): ObjectProphecy
+    {
+        $method = $this->prophesize(ShippingMethodInterface::class);
+        $method->hasPickupPointProvider()->willReturn($hasProvider);
+
+        $shipment = $this->prophesize(ShipmentInterface::class);
+        $shipment->getMethod()->willReturn($method->reveal());
+        $shipment->hasPickupPoint()->willReturn($hasPickupPoint);
+
+        return $shipment;
+    }
+}
diff --git a/translations/messages.cs.yml b/translations/messages.cs.yml
new file mode 100644
index 00000000..c8f95f18
--- /dev/null
+++ b/translations/messages.cs.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Na výdejní místo
+        loading_pickup_points: Načítání výdejních míst…
+        no_pickup_points: Pro zadanou adresu nejsou k dispozici žádná výdejní místa.
+        error_loading_pickup_points: Výdejní místa se nepodařilo načíst. Zkuste prosím znovu vybrat způsob dopravy.
+        change: Změnit
+        keep_this: Ponechat toto
+        currently: 'Aktuálně:'
+        selected: Vybráno
+    form:
+        shipment:
+            pickup_point: Výdejní místo
+            select_pickup_point: Vyberte výdejní místo
+        shipping_method:
+            pickup_point_provider: Poskytovatel výdejního místa
+            select_pickup_point_provider: Vyberte poskytovatele výdejního místa
diff --git a/translations/messages.da.yml b/translations/messages.da.yml
new file mode 100644
index 00000000..26997da8
--- /dev/null
+++ b/translations/messages.da.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Til afhentningssted
+        loading_pickup_points: Henter afhentningssteder…
+        no_pickup_points: Der er ingen afhentningssteder for den indtastede adresse.
+        error_loading_pickup_points: Vi kunne ikke hente afhentningsstederne. Prøv at vælge leveringsmetoden igen.
+        change: Skift
+        keep_this: Behold denne
+        currently: 'Nuværende:'
+        selected: Valgt
+    form:
+        shipment:
+            pickup_point: Afhentningssted
+            select_pickup_point: Vælg afhentningssted
+        shipping_method:
+            pickup_point_provider: Afhentningsudbyder
+            select_pickup_point_provider: Vælg afhentningsudbyder
diff --git a/translations/messages.de.yml b/translations/messages.de.yml
new file mode 100644
index 00000000..c4d65be6
--- /dev/null
+++ b/translations/messages.de.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: An Abholstation
+        loading_pickup_points: Abholstationen werden geladen…
+        no_pickup_points: Für die angegebene Adresse sind keine Abholstationen verfügbar.
+        error_loading_pickup_points: Die Abholstationen konnten nicht geladen werden. Bitte wählen Sie die Versandart erneut aus.
+        change: Ändern
+        keep_this: Beibehalten
+        currently: 'Aktuell:'
+        selected: Ausgewählt
+    form:
+        shipment:
+            pickup_point: Abholstation
+            select_pickup_point: Abholstation auswählen
+        shipping_method:
+            pickup_point_provider: Anbieter der Abholstation
+            select_pickup_point_provider: Anbieter der Abholstation auswählen
diff --git a/translations/messages.en.yml b/translations/messages.en.yml
new file mode 100644
index 00000000..bdda6e47
--- /dev/null
+++ b/translations/messages.en.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: To pickup point
+        loading_pickup_points: Loading pickup points…
+        no_pickup_points: No pickup points are available for the entered address.
+        error_loading_pickup_points: We could not load the pickup points. Please try selecting the shipping method again.
+        change: Change
+        keep_this: Keep this
+        currently: 'Currently:'
+        selected: Selected
+    form:
+        shipment:
+            pickup_point: Pickup point
+            select_pickup_point: Select pickup point
+        shipping_method:
+            pickup_point_provider: Pickup point provider
+            select_pickup_point_provider: Select pickup point provider
diff --git a/translations/messages.es.yml b/translations/messages.es.yml
new file mode 100644
index 00000000..0e9ce4fc
--- /dev/null
+++ b/translations/messages.es.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Al punto de recogida
+        loading_pickup_points: Cargando puntos de recogida…
+        no_pickup_points: No hay puntos de recogida disponibles para la dirección introducida.
+        error_loading_pickup_points: No hemos podido cargar los puntos de recogida. Inténtalo seleccionando de nuevo el método de envío.
+        change: Cambiar
+        keep_this: Mantener este
+        currently: 'Actual:'
+        selected: Seleccionado
+    form:
+        shipment:
+            pickup_point: Punto de recogida
+            select_pickup_point: Seleccionar punto de recogida
+        shipping_method:
+            pickup_point_provider: Proveedor de punto de recogida
+            select_pickup_point_provider: Seleccionar proveedor de punto de recogida
diff --git a/translations/messages.fi.yml b/translations/messages.fi.yml
new file mode 100644
index 00000000..e041689b
--- /dev/null
+++ b/translations/messages.fi.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Noutopisteeseen
+        loading_pickup_points: Ladataan noutopisteitä…
+        no_pickup_points: Annetulle osoitteelle ei ole saatavilla noutopisteitä.
+        error_loading_pickup_points: Noutopisteiden lataaminen epäonnistui. Yritä valita toimitustapa uudelleen.
+        change: Vaihda
+        keep_this: Pidä tämä
+        currently: 'Nykyinen:'
+        selected: Valittu
+    form:
+        shipment:
+            pickup_point: Noutopiste
+            select_pickup_point: Valitse noutopiste
+        shipping_method:
+            pickup_point_provider: Noutopisteen palveluntarjoaja
+            select_pickup_point_provider: Valitse noutopisteen palveluntarjoaja
diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml
new file mode 100644
index 00000000..f8ac9058
--- /dev/null
+++ b/translations/messages.fr.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Vers le point de retrait
+        loading_pickup_points: Chargement des points de retrait…
+        no_pickup_points: Aucun point de retrait n'est disponible pour l'adresse saisie.
+        error_loading_pickup_points: Nous n'avons pas pu charger les points de retrait. Veuillez sélectionner à nouveau le mode de livraison.
+        change: Modifier
+        keep_this: Conserver
+        currently: 'Actuel :'
+        selected: Sélectionné
+    form:
+        shipment:
+            pickup_point: Point de retrait
+            select_pickup_point: Sélectionner un point de retrait
+        shipping_method:
+            pickup_point_provider: Fournisseur de point de retrait
+            select_pickup_point_provider: Sélectionner un fournisseur de point de retrait
diff --git a/translations/messages.hu.yml b/translations/messages.hu.yml
new file mode 100644
index 00000000..8d1a636b
--- /dev/null
+++ b/translations/messages.hu.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Átvételi pontra
+        loading_pickup_points: Átvételi pontok betöltése…
+        no_pickup_points: A megadott címhez nem érhetők el átvételi pontok.
+        error_loading_pickup_points: Nem sikerült betölteni az átvételi pontokat. Kérjük, válassza ki újra a szállítási módot.
+        change: Módosítás
+        keep_this: Ennek megtartása
+        currently: 'Jelenleg:'
+        selected: Kiválasztva
+    form:
+        shipment:
+            pickup_point: Átvételi pont
+            select_pickup_point: Válasszon átvételi pontot
+        shipping_method:
+            pickup_point_provider: Átvételi pont szolgáltatója
+            select_pickup_point_provider: Válassza ki az átvételi pont szolgáltatóját
diff --git a/translations/messages.it.yml b/translations/messages.it.yml
new file mode 100644
index 00000000..a4ec01d6
--- /dev/null
+++ b/translations/messages.it.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Al punto di ritiro
+        loading_pickup_points: Caricamento dei punti di ritiro…
+        no_pickup_points: Non sono disponibili punti di ritiro per l'indirizzo inserito.
+        error_loading_pickup_points: Non è stato possibile caricare i punti di ritiro. Prova a selezionare di nuovo il metodo di spedizione.
+        change: Modifica
+        keep_this: Mantieni questo
+        currently: 'Attuale:'
+        selected: Selezionato
+    form:
+        shipment:
+            pickup_point: Punto di ritiro
+            select_pickup_point: Seleziona un punto di ritiro
+        shipping_method:
+            pickup_point_provider: Fornitore del punto di ritiro
+            select_pickup_point_provider: Seleziona un fornitore del punto di ritiro
diff --git a/translations/messages.nl.yml b/translations/messages.nl.yml
new file mode 100644
index 00000000..19e317ed
--- /dev/null
+++ b/translations/messages.nl.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Naar afhaalpunt
+        loading_pickup_points: Afhaalpunten laden…
+        no_pickup_points: Er zijn geen afhaalpunten beschikbaar voor het ingevoerde adres.
+        error_loading_pickup_points: We konden de afhaalpunten niet laden. Selecteer de verzendmethode opnieuw.
+        change: Wijzigen
+        keep_this: Deze behouden
+        currently: 'Huidig:'
+        selected: Geselecteerd
+    form:
+        shipment:
+            pickup_point: Afhaalpunt
+            select_pickup_point: Selecteer een afhaalpunt
+        shipping_method:
+            pickup_point_provider: Afhaalpuntaanbieder
+            select_pickup_point_provider: Selecteer een afhaalpuntaanbieder
diff --git a/translations/messages.no.yml b/translations/messages.no.yml
new file mode 100644
index 00000000..b1c70600
--- /dev/null
+++ b/translations/messages.no.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Til hentested
+        loading_pickup_points: Henter hentesteder…
+        no_pickup_points: Det finnes ingen hentesteder for den oppgitte adressen.
+        error_loading_pickup_points: Vi kunne ikke hente hentestedene. Prøv å velge leveringsmetode på nytt.
+        change: Endre
+        keep_this: Behold dette
+        currently: 'Nåværende:'
+        selected: Valgt
+    form:
+        shipment:
+            pickup_point: Hentested
+            select_pickup_point: Velg hentested
+        shipping_method:
+            pickup_point_provider: Leverandør av hentested
+            select_pickup_point_provider: Velg leverandør av hentested
diff --git a/translations/messages.pl.yml b/translations/messages.pl.yml
new file mode 100644
index 00000000..bb8c671e
--- /dev/null
+++ b/translations/messages.pl.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Do punktu odbioru
+        loading_pickup_points: Ładowanie punktów odbioru…
+        no_pickup_points: Brak dostępnych punktów odbioru dla podanego adresu.
+        error_loading_pickup_points: Nie udało się załadować punktów odbioru. Spróbuj ponownie wybrać metodę dostawy.
+        change: Zmień
+        keep_this: Zachowaj ten
+        currently: 'Obecnie:'
+        selected: Wybrany
+    form:
+        shipment:
+            pickup_point: Punkt odbioru
+            select_pickup_point: Wybierz punkt odbioru
+        shipping_method:
+            pickup_point_provider: Dostawca punktu odbioru
+            select_pickup_point_provider: Wybierz dostawcę punktu odbioru
diff --git a/translations/messages.pt.yml b/translations/messages.pt.yml
new file mode 100644
index 00000000..3af00044
--- /dev/null
+++ b/translations/messages.pt.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Para o ponto de recolha
+        loading_pickup_points: A carregar pontos de recolha…
+        no_pickup_points: Não há pontos de recolha disponíveis para a morada introduzida.
+        error_loading_pickup_points: Não foi possível carregar os pontos de recolha. Tente selecionar novamente o método de envio.
+        change: Alterar
+        keep_this: Manter este
+        currently: 'Atual:'
+        selected: Selecionado
+    form:
+        shipment:
+            pickup_point: Ponto de recolha
+            select_pickup_point: Selecionar ponto de recolha
+        shipping_method:
+            pickup_point_provider: Fornecedor de ponto de recolha
+            select_pickup_point_provider: Selecionar fornecedor de ponto de recolha
diff --git a/translations/messages.ro.yml b/translations/messages.ro.yml
new file mode 100644
index 00000000..e3daccb1
--- /dev/null
+++ b/translations/messages.ro.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Către punctul de ridicare
+        loading_pickup_points: Se încarcă punctele de ridicare…
+        no_pickup_points: Nu există puncte de ridicare disponibile pentru adresa introdusă.
+        error_loading_pickup_points: Nu am putut încărca punctele de ridicare. Încercați să selectați din nou metoda de livrare.
+        change: Modifică
+        keep_this: Păstrează acesta
+        currently: 'În prezent:'
+        selected: Selectat
+    form:
+        shipment:
+            pickup_point: Punct de ridicare
+            select_pickup_point: Selectați un punct de ridicare
+        shipping_method:
+            pickup_point_provider: Furnizor de puncte de ridicare
+            select_pickup_point_provider: Selectați un furnizor de puncte de ridicare
diff --git a/translations/messages.sv.yml b/translations/messages.sv.yml
new file mode 100644
index 00000000..65cdc741
--- /dev/null
+++ b/translations/messages.sv.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: Till utlämningsställe
+        loading_pickup_points: Hämtar utlämningsställen…
+        no_pickup_points: Det finns inga utlämningsställen för den angivna adressen.
+        error_loading_pickup_points: Vi kunde inte hämta utlämningsställena. Försök att välja leveranssätt igen.
+        change: Ändra
+        keep_this: Behåll detta
+        currently: 'Nuvarande:'
+        selected: Vald
+    form:
+        shipment:
+            pickup_point: Utlämningsställe
+            select_pickup_point: Välj utlämningsställe
+        shipping_method:
+            pickup_point_provider: Leverantör av utlämningsställe
+            select_pickup_point_provider: Välj leverantör av utlämningsställe
diff --git a/translations/messages.uk.yml b/translations/messages.uk.yml
new file mode 100644
index 00000000..623f401f
--- /dev/null
+++ b/translations/messages.uk.yml
@@ -0,0 +1,17 @@
+setono_sylius_pickup_point:
+    ui:
+        shipment_to: До пункту видачі
+        loading_pickup_points: Завантаження пунктів видачі…
+        no_pickup_points: Для вказаної адреси немає доступних пунктів видачі.
+        error_loading_pickup_points: Не вдалося завантажити пункти видачі. Спробуйте ще раз вибрати спосіб доставки.
+        change: Змінити
+        keep_this: Залишити цей
+        currently: 'Зараз:'
+        selected: Вибрано
+    form:
+        shipment:
+            pickup_point: Пункт видачі
+            select_pickup_point: Виберіть пункт видачі
+        shipping_method:
+            pickup_point_provider: Постачальник пункту видачі
+            select_pickup_point_provider: Виберіть постачальника пункту видачі
diff --git a/translations/validators.cs.yml b/translations/validators.cs.yml
new file mode 100644
index 00000000..1d56595b
--- /dev/null
+++ b/translations/validators.cs.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Výdejní místo nesmí být prázdné.
diff --git a/src/Resources/translations/validators.da.yml b/translations/validators.da.yml
similarity index 100%
rename from src/Resources/translations/validators.da.yml
rename to translations/validators.da.yml
diff --git a/translations/validators.de.yml b/translations/validators.de.yml
new file mode 100644
index 00000000..6ebb98d6
--- /dev/null
+++ b/translations/validators.de.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Abholstation darf nicht leer sein.
diff --git a/src/Resources/translations/validators.en.yml b/translations/validators.en.yml
similarity index 100%
rename from src/Resources/translations/validators.en.yml
rename to translations/validators.en.yml
diff --git a/translations/validators.es.yml b/translations/validators.es.yml
new file mode 100644
index 00000000..66ed27d3
--- /dev/null
+++ b/translations/validators.es.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: El punto de recogida no puede estar vacío.
diff --git a/translations/validators.fi.yml b/translations/validators.fi.yml
new file mode 100644
index 00000000..c6070056
--- /dev/null
+++ b/translations/validators.fi.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Noutopiste ei voi olla tyhjä.
diff --git a/translations/validators.fr.yml b/translations/validators.fr.yml
new file mode 100644
index 00000000..0af0db4b
--- /dev/null
+++ b/translations/validators.fr.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Le point de retrait ne peut pas être vide.
diff --git a/translations/validators.hu.yml b/translations/validators.hu.yml
new file mode 100644
index 00000000..9102b492
--- /dev/null
+++ b/translations/validators.hu.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Az átvételi pont nem lehet üres.
diff --git a/translations/validators.it.yml b/translations/validators.it.yml
new file mode 100644
index 00000000..93a0d120
--- /dev/null
+++ b/translations/validators.it.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Il punto di ritiro non può essere vuoto.
diff --git a/translations/validators.nl.yml b/translations/validators.nl.yml
new file mode 100644
index 00000000..290c1349
--- /dev/null
+++ b/translations/validators.nl.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Afhaalpunt mag niet leeg zijn.
diff --git a/translations/validators.no.yml b/translations/validators.no.yml
new file mode 100644
index 00000000..9da67923
--- /dev/null
+++ b/translations/validators.no.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Hentested kan ikke være tomt.
diff --git a/translations/validators.pl.yml b/translations/validators.pl.yml
new file mode 100644
index 00000000..f635b81a
--- /dev/null
+++ b/translations/validators.pl.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Punkt odbioru nie może być pusty.
diff --git a/translations/validators.pt.yml b/translations/validators.pt.yml
new file mode 100644
index 00000000..a0e977cf
--- /dev/null
+++ b/translations/validators.pt.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: O ponto de recolha não pode estar vazio.
diff --git a/translations/validators.ro.yml b/translations/validators.ro.yml
new file mode 100644
index 00000000..86d182e0
--- /dev/null
+++ b/translations/validators.ro.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Punctul de ridicare nu poate fi gol.
diff --git a/translations/validators.sv.yml b/translations/validators.sv.yml
new file mode 100644
index 00000000..81434a63
--- /dev/null
+++ b/translations/validators.sv.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Utlämningsställe får inte vara tomt.
diff --git a/translations/validators.uk.yml b/translations/validators.uk.yml
new file mode 100644
index 00000000..750dd4ef
--- /dev/null
+++ b/translations/validators.uk.yml
@@ -0,0 +1,4 @@
+setono_pickup_point:
+    shipment:
+        pickup_point:
+            not_blank: Пункт видачі не може бути порожнім.