diff --git a/.coveragerc b/.coveragerc index eebc4cac63..8e30e7132b 100644 --- a/.coveragerc +++ b/.coveragerc @@ -24,9 +24,8 @@ include = */modules/sdk/karrio/* */modules/connectors/*/karrio/* # Server modules - */modules/core/karrio/server/* + */modules/server/karrio/server/* */apps/api/karrio/server/* - */modules/graph/karrio/server/* */modules/data/karrio/server/* */modules/events/karrio/server/* */modules/manager/karrio/server/* @@ -34,7 +33,6 @@ include = */modules/proxy/karrio/server/* */modules/pricing/karrio/server/* */modules/documents/karrio/server/* - */modules/admin/karrio/server/* precision = 2 show_missing = True skip_covered = False diff --git a/bin/build-and-release-packages b/bin/build-and-release-packages index 45bb3b5c43..e74e47d9b2 100755 --- a/bin/build-and-release-packages +++ b/bin/build-and-release-packages @@ -241,6 +241,7 @@ main() { # Define packages to build declare -a packages=( "modules/sdk:karrio" + "modules/server:karrio_server_modules" "modules/core:karrio_server_core" "modules/data:karrio_server_data" "modules/documents:karrio_server_documents" diff --git a/bin/update-package-versions b/bin/update-package-versions index bd68a2fa3a..7fe1badc6c 100755 --- a/bin/update-package-versions +++ b/bin/update-package-versions @@ -61,6 +61,7 @@ main() { # Define packages to update declare -a packages=( "modules/sdk" + "modules/server" "modules/core" "modules/data" "modules/documents" diff --git a/modules/admin/README.md b/modules/admin/README.md index 1440aefc09..f6896fe36b 100644 --- a/modules/admin/README.md +++ b/modules/admin/README.md @@ -1,10 +1,17 @@ -# karrio.server.admin +# karrio.server.admin (shim) -This package is a module of the [karrio](https://pypi.org/project/karrio.server) universal shipping API. +Starting with 2026.5.0 the source code previously packaged as +`karrio_server_admin` lives in `karrio_server_modules` (directory +`modules/server/`). This package is now a thin shim that depends on +`karrio_server_modules` to preserve backwards compatibility for pinned +installs (`pip install karrio-server-admin==...`) for one release cycle. + +Import paths are unchanged: `karrio.server.admin.*` continues to resolve +from the consolidated `modules/server/karrio/server/admin/` tree. ## Requirements -`Python 3.8+` +`Python 3.11+` ## Installation diff --git a/modules/admin/pyproject.toml b/modules/admin/pyproject.toml index 05c0dc23ac..0e933c0f59 100644 --- a/modules/admin/pyproject.toml +++ b/modules/admin/pyproject.toml @@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta" [project] name = "karrio_server_admin" -version = "2026.1.11" -description = "Multi-carrier shipping API admin module" +version = "2026.1.29" +description = "Multi-carrier shipping API admin module (shim — code lives in karrio_server_modules)" readme = "README.md" requires-python = ">=3.11" license = "LGPL-3.0" @@ -16,8 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3", ] dependencies = [ - "karrio_server_core", - "karrio_server_graph", + "karrio_server_modules", ] [project.urls] diff --git a/modules/core/MANIFEST.in b/modules/core/MANIFEST.in deleted file mode 100644 index f0363288d1..0000000000 --- a/modules/core/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -recursive-include karrio/server/user/templates * diff --git a/modules/core/README.md b/modules/core/README.md index 587f6ebc96..2391f1e547 100644 --- a/modules/core/README.md +++ b/modules/core/README.md @@ -1,6 +1,13 @@ -# karrio.server.core +# karrio.server.core (shim) -This package is a module of the [karrio](https://pypi.org/project/karrio.server) universal shipping API. +Starting with 2026.5.0 the source code previously packaged as +`karrio_server_core` lives in `karrio_server_modules` (directory +`modules/server/`). This package is now a thin shim that depends on +`karrio_server_modules` to preserve backwards compatibility for pinned +installs (`pip install karrio-server-core==...`) for one release cycle. + +Import paths are unchanged: `karrio.server.core.*` continues to resolve +from the consolidated `modules/server/karrio/server/core/` tree. ## Requirements diff --git a/modules/core/pyproject.toml b/modules/core/pyproject.toml index 88d08e25c8..e9d0d4abe3 100644 --- a/modules/core/pyproject.toml +++ b/modules/core/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "karrio_server_core" version = "2026.1.29" -description = "Multi-carrier shipping API Core module" +description = "Multi-carrier shipping API Core module (shim — code lives in karrio_server_modules)" readme = "README.md" requires-python = ">=3.11" license = "LGPL-3.0" @@ -16,13 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3", ] dependencies = [ - "karrio", - "psycopg2-binary", - "django-health-check", - "dnspython", - "psutil", - "pyyaml", - "Jinja2", + "karrio_server_modules", ] [project.urls] @@ -38,7 +32,3 @@ include-package-data = true [tool.setuptools.packages.find] exclude = ["tests.*", "tests"] namespaces = true - -[tool.setuptools.package-data] -"karrio.server.user" = ["templates/**/*"] -"*" = ["*.html", "*.txt", "*.css", "*.js", "*.png", "*.jpg", "*.gif", "*.ico"] diff --git a/modules/graph/README.md b/modules/graph/README.md index 10969b63ac..c048eb55c1 100644 --- a/modules/graph/README.md +++ b/modules/graph/README.md @@ -1,6 +1,13 @@ -# karrio.server.graph +# karrio.server.graph (shim) -This package is a module of the [karrio](https://pypi.org/project/karrio.server) universal shipping API. +Starting with 2026.5.0 the source code previously packaged as +`karrio_server_graph` lives in `karrio_server_modules` (directory +`modules/server/`). This package is now a thin shim that depends on +`karrio_server_modules` to preserve backwards compatibility for pinned +installs (`pip install karrio-server-graph==...`) for one release cycle. + +Import paths are unchanged: `karrio.server.graph.*` continues to resolve +from the consolidated `modules/server/karrio/server/graph/` tree. ## Requirements diff --git a/modules/graph/pyproject.toml b/modules/graph/pyproject.toml index dfa6180a13..a33e2b9dd9 100644 --- a/modules/graph/pyproject.toml +++ b/modules/graph/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "karrio_server_graph" version = "2026.1.29" -description = "Multi-carrier shipping API Graph module" +description = "Multi-carrier shipping API Graph module (shim — code lives in karrio_server_modules)" readme = "README.md" requires-python = ">=3.11" license = "LGPL-3.0" @@ -16,9 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3", ] dependencies = [ - "karrio_server_core", - "django-filter", - "strawberry-graphql", + "karrio_server_modules", ] [project.urls] @@ -34,7 +32,3 @@ include-package-data = true [tool.setuptools.packages.find] exclude = ["tests.*", "tests"] namespaces = true - -[tool.setuptools.package-data] -"karrio.server.graph" = ["templates/**/*"] -"*" = ["*.html", "*.txt", "*.css", "*.js", "*.png", "*.jpg", "*.gif", "*.ico"] diff --git a/modules/graph/MANIFEST.in b/modules/server/MANIFEST.in similarity index 50% rename from modules/graph/MANIFEST.in rename to modules/server/MANIFEST.in index 11d1540bf2..10ad28d71a 100644 --- a/modules/graph/MANIFEST.in +++ b/modules/server/MANIFEST.in @@ -1 +1,2 @@ +recursive-include karrio/server/user/templates * recursive-include karrio/server/graph/templates * diff --git a/modules/server/README.md b/modules/server/README.md new file mode 100644 index 0000000000..b5401ea4bc --- /dev/null +++ b/modules/server/README.md @@ -0,0 +1,27 @@ +# karrio.server (consolidated modules) + +This package consolidates the three OSS core server modules of the +[karrio](https://pypi.org/project/karrio.server) universal shipping API +into a single namespace-package install: + +- `karrio.server.core` (formerly `modules/core`) +- `karrio.server.graph` (formerly `modules/graph`) +- `karrio.server.admin` (formerly `modules/admin`) + +The distributions `karrio_server_core`, `karrio_server_graph`, and +`karrio_server_admin` are still published for one release cycle as thin +shim packages that depend on this package. Import paths +(`karrio.server.core.*`, `karrio.server.graph.*`, `karrio.server.admin.*`) +continue to resolve unchanged. + +## Requirements + +`Python 3.11+` + +## Installation + +```bash +pip install karrio.server.modules +``` + +Check the [karrio docs](https://docs.karrio.io) to get started. diff --git a/modules/admin/karrio/server/admin/__init__.py b/modules/server/karrio/server/admin/__init__.py similarity index 100% rename from modules/admin/karrio/server/admin/__init__.py rename to modules/server/karrio/server/admin/__init__.py diff --git a/modules/admin/karrio/server/admin/admin.py b/modules/server/karrio/server/admin/admin.py similarity index 100% rename from modules/admin/karrio/server/admin/admin.py rename to modules/server/karrio/server/admin/admin.py diff --git a/modules/admin/karrio/server/admin/apps.py b/modules/server/karrio/server/admin/apps.py similarity index 100% rename from modules/admin/karrio/server/admin/apps.py rename to modules/server/karrio/server/admin/apps.py diff --git a/modules/admin/karrio/server/admin/forms.py b/modules/server/karrio/server/admin/forms.py similarity index 100% rename from modules/admin/karrio/server/admin/forms.py rename to modules/server/karrio/server/admin/forms.py diff --git a/modules/admin/karrio/server/admin/migrations/0001_initial.py b/modules/server/karrio/server/admin/migrations/0001_initial.py similarity index 100% rename from modules/admin/karrio/server/admin/migrations/0001_initial.py rename to modules/server/karrio/server/admin/migrations/0001_initial.py diff --git a/modules/admin/karrio/server/admin/migrations/0002_rename_admin_task_e_queued__b1c3e3_idx_admin_task__queued__be444e_idx_and_more.py b/modules/server/karrio/server/admin/migrations/0002_rename_admin_task_e_queued__b1c3e3_idx_admin_task__queued__be444e_idx_and_more.py similarity index 100% rename from modules/admin/karrio/server/admin/migrations/0002_rename_admin_task_e_queued__b1c3e3_idx_admin_task__queued__be444e_idx_and_more.py rename to modules/server/karrio/server/admin/migrations/0002_rename_admin_task_e_queued__b1c3e3_idx_admin_task__queued__be444e_idx_and_more.py diff --git a/modules/admin/karrio/server/admin/migrations/0003_deduplicate_and_unique_task_id.py b/modules/server/karrio/server/admin/migrations/0003_deduplicate_and_unique_task_id.py similarity index 100% rename from modules/admin/karrio/server/admin/migrations/0003_deduplicate_and_unique_task_id.py rename to modules/server/karrio/server/admin/migrations/0003_deduplicate_and_unique_task_id.py diff --git a/modules/admin/karrio/server/admin/migrations/__init__.py b/modules/server/karrio/server/admin/migrations/__init__.py similarity index 100% rename from modules/admin/karrio/server/admin/migrations/__init__.py rename to modules/server/karrio/server/admin/migrations/__init__.py diff --git a/modules/admin/karrio/server/admin/models.py b/modules/server/karrio/server/admin/models.py similarity index 100% rename from modules/admin/karrio/server/admin/models.py rename to modules/server/karrio/server/admin/models.py diff --git a/modules/admin/karrio/server/admin/schema.py b/modules/server/karrio/server/admin/schema.py similarity index 100% rename from modules/admin/karrio/server/admin/schema.py rename to modules/server/karrio/server/admin/schema.py diff --git a/modules/admin/karrio/server/admin/schemas/__init__.py b/modules/server/karrio/server/admin/schemas/__init__.py similarity index 100% rename from modules/admin/karrio/server/admin/schemas/__init__.py rename to modules/server/karrio/server/admin/schemas/__init__.py diff --git a/modules/admin/karrio/server/admin/schemas/base/__init__.py b/modules/server/karrio/server/admin/schemas/base/__init__.py similarity index 100% rename from modules/admin/karrio/server/admin/schemas/base/__init__.py rename to modules/server/karrio/server/admin/schemas/base/__init__.py diff --git a/modules/admin/karrio/server/admin/schemas/base/inputs.py b/modules/server/karrio/server/admin/schemas/base/inputs.py similarity index 100% rename from modules/admin/karrio/server/admin/schemas/base/inputs.py rename to modules/server/karrio/server/admin/schemas/base/inputs.py diff --git a/modules/admin/karrio/server/admin/schemas/base/mutations.py b/modules/server/karrio/server/admin/schemas/base/mutations.py similarity index 100% rename from modules/admin/karrio/server/admin/schemas/base/mutations.py rename to modules/server/karrio/server/admin/schemas/base/mutations.py diff --git a/modules/admin/karrio/server/admin/schemas/base/types.py b/modules/server/karrio/server/admin/schemas/base/types.py similarity index 100% rename from modules/admin/karrio/server/admin/schemas/base/types.py rename to modules/server/karrio/server/admin/schemas/base/types.py diff --git a/modules/admin/karrio/server/admin/serializers.py b/modules/server/karrio/server/admin/serializers.py similarity index 100% rename from modules/admin/karrio/server/admin/serializers.py rename to modules/server/karrio/server/admin/serializers.py diff --git a/modules/admin/karrio/server/admin/signals.py b/modules/server/karrio/server/admin/signals.py similarity index 100% rename from modules/admin/karrio/server/admin/signals.py rename to modules/server/karrio/server/admin/signals.py diff --git a/modules/admin/karrio/server/admin/tests/__init__.py b/modules/server/karrio/server/admin/tests/__init__.py similarity index 100% rename from modules/admin/karrio/server/admin/tests/__init__.py rename to modules/server/karrio/server/admin/tests/__init__.py diff --git a/modules/admin/karrio/server/admin/tests/base.py b/modules/server/karrio/server/admin/tests/base.py similarity index 100% rename from modules/admin/karrio/server/admin/tests/base.py rename to modules/server/karrio/server/admin/tests/base.py diff --git a/modules/admin/karrio/server/admin/tests/test_auth.py b/modules/server/karrio/server/admin/tests/test_auth.py similarity index 100% rename from modules/admin/karrio/server/admin/tests/test_auth.py rename to modules/server/karrio/server/admin/tests/test_auth.py diff --git a/modules/admin/karrio/server/admin/tests/test_connections.py b/modules/server/karrio/server/admin/tests/test_connections.py similarity index 100% rename from modules/admin/karrio/server/admin/tests/test_connections.py rename to modules/server/karrio/server/admin/tests/test_connections.py diff --git a/modules/admin/karrio/server/admin/tests/test_markups.py b/modules/server/karrio/server/admin/tests/test_markups.py similarity index 100% rename from modules/admin/karrio/server/admin/tests/test_markups.py rename to modules/server/karrio/server/admin/tests/test_markups.py diff --git a/modules/admin/karrio/server/admin/tests/test_rate_sheets.py b/modules/server/karrio/server/admin/tests/test_rate_sheets.py similarity index 100% rename from modules/admin/karrio/server/admin/tests/test_rate_sheets.py rename to modules/server/karrio/server/admin/tests/test_rate_sheets.py diff --git a/modules/admin/karrio/server/admin/urls.py b/modules/server/karrio/server/admin/urls.py similarity index 100% rename from modules/admin/karrio/server/admin/urls.py rename to modules/server/karrio/server/admin/urls.py diff --git a/modules/admin/karrio/server/admin/utils.py b/modules/server/karrio/server/admin/utils.py similarity index 100% rename from modules/admin/karrio/server/admin/utils.py rename to modules/server/karrio/server/admin/utils.py diff --git a/modules/admin/karrio/server/admin/views.py b/modules/server/karrio/server/admin/views.py similarity index 100% rename from modules/admin/karrio/server/admin/views.py rename to modules/server/karrio/server/admin/views.py diff --git a/modules/admin/karrio/server/admin/worker/__init__.py b/modules/server/karrio/server/admin/worker/__init__.py similarity index 100% rename from modules/admin/karrio/server/admin/worker/__init__.py rename to modules/server/karrio/server/admin/worker/__init__.py diff --git a/modules/admin/karrio/server/admin/worker/models.py b/modules/server/karrio/server/admin/worker/models.py similarity index 100% rename from modules/admin/karrio/server/admin/worker/models.py rename to modules/server/karrio/server/admin/worker/models.py diff --git a/modules/admin/karrio/server/admin/worker/signals.py b/modules/server/karrio/server/admin/worker/signals.py similarity index 100% rename from modules/admin/karrio/server/admin/worker/signals.py rename to modules/server/karrio/server/admin/worker/signals.py diff --git a/modules/admin/karrio/server/admin/worker/tasks.py b/modules/server/karrio/server/admin/worker/tasks.py similarity index 100% rename from modules/admin/karrio/server/admin/worker/tasks.py rename to modules/server/karrio/server/admin/worker/tasks.py diff --git a/modules/core/karrio/server/conf.py b/modules/server/karrio/server/conf.py similarity index 100% rename from modules/core/karrio/server/conf.py rename to modules/server/karrio/server/conf.py diff --git a/modules/core/karrio/server/core/__init__.py b/modules/server/karrio/server/core/__init__.py similarity index 100% rename from modules/core/karrio/server/core/__init__.py rename to modules/server/karrio/server/core/__init__.py diff --git a/modules/core/karrio/server/core/admin.py b/modules/server/karrio/server/core/admin.py similarity index 100% rename from modules/core/karrio/server/core/admin.py rename to modules/server/karrio/server/core/admin.py diff --git a/modules/core/karrio/server/core/apps.py b/modules/server/karrio/server/core/apps.py similarity index 100% rename from modules/core/karrio/server/core/apps.py rename to modules/server/karrio/server/core/apps.py diff --git a/modules/core/karrio/server/core/authentication.py b/modules/server/karrio/server/core/authentication.py similarity index 100% rename from modules/core/karrio/server/core/authentication.py rename to modules/server/karrio/server/core/authentication.py diff --git a/modules/core/karrio/server/core/backends/__init__.py b/modules/server/karrio/server/core/backends/__init__.py similarity index 100% rename from modules/core/karrio/server/core/backends/__init__.py rename to modules/server/karrio/server/core/backends/__init__.py diff --git a/modules/core/karrio/server/core/backends/immediate.py b/modules/server/karrio/server/core/backends/immediate.py similarity index 100% rename from modules/core/karrio/server/core/backends/immediate.py rename to modules/server/karrio/server/core/backends/immediate.py diff --git a/modules/core/karrio/server/core/checks.py b/modules/server/karrio/server/core/checks.py similarity index 100% rename from modules/core/karrio/server/core/checks.py rename to modules/server/karrio/server/core/checks.py diff --git a/modules/core/karrio/server/core/config.py b/modules/server/karrio/server/core/config.py similarity index 100% rename from modules/core/karrio/server/core/config.py rename to modules/server/karrio/server/core/config.py diff --git a/modules/core/karrio/server/core/context_processors.py b/modules/server/karrio/server/core/context_processors.py similarity index 100% rename from modules/core/karrio/server/core/context_processors.py rename to modules/server/karrio/server/core/context_processors.py diff --git a/modules/core/karrio/server/core/datatypes.py b/modules/server/karrio/server/core/datatypes.py similarity index 100% rename from modules/core/karrio/server/core/datatypes.py rename to modules/server/karrio/server/core/datatypes.py diff --git a/modules/core/karrio/server/core/dataunits.py b/modules/server/karrio/server/core/dataunits.py similarity index 100% rename from modules/core/karrio/server/core/dataunits.py rename to modules/server/karrio/server/core/dataunits.py diff --git a/modules/core/karrio/server/core/exceptions.py b/modules/server/karrio/server/core/exceptions.py similarity index 100% rename from modules/core/karrio/server/core/exceptions.py rename to modules/server/karrio/server/core/exceptions.py diff --git a/modules/core/karrio/server/core/fields.py b/modules/server/karrio/server/core/fields.py similarity index 100% rename from modules/core/karrio/server/core/fields.py rename to modules/server/karrio/server/core/fields.py diff --git a/modules/core/karrio/server/core/filters.py b/modules/server/karrio/server/core/filters.py similarity index 100% rename from modules/core/karrio/server/core/filters.py rename to modules/server/karrio/server/core/filters.py diff --git a/modules/core/karrio/server/core/gateway.py b/modules/server/karrio/server/core/gateway.py similarity index 100% rename from modules/core/karrio/server/core/gateway.py rename to modules/server/karrio/server/core/gateway.py diff --git a/modules/core/karrio/server/core/hooks.py b/modules/server/karrio/server/core/hooks.py similarity index 100% rename from modules/core/karrio/server/core/hooks.py rename to modules/server/karrio/server/core/hooks.py diff --git a/modules/core/karrio/server/core/logging.py b/modules/server/karrio/server/core/logging.py similarity index 100% rename from modules/core/karrio/server/core/logging.py rename to modules/server/karrio/server/core/logging.py diff --git a/modules/core/karrio/server/core/management/__init__.py b/modules/server/karrio/server/core/management/__init__.py similarity index 100% rename from modules/core/karrio/server/core/management/__init__.py rename to modules/server/karrio/server/core/management/__init__.py diff --git a/modules/core/karrio/server/core/management/commands/__init__.py b/modules/server/karrio/server/core/management/commands/__init__.py similarity index 100% rename from modules/core/karrio/server/core/management/commands/__init__.py rename to modules/server/karrio/server/core/management/commands/__init__.py diff --git a/modules/core/karrio/server/core/management/commands/cli.py b/modules/server/karrio/server/core/management/commands/cli.py similarity index 100% rename from modules/core/karrio/server/core/management/commands/cli.py rename to modules/server/karrio/server/core/management/commands/cli.py diff --git a/modules/core/karrio/server/core/management/commands/create_oauth_client.py b/modules/server/karrio/server/core/management/commands/create_oauth_client.py similarity index 100% rename from modules/core/karrio/server/core/management/commands/create_oauth_client.py rename to modules/server/karrio/server/core/management/commands/create_oauth_client.py diff --git a/modules/core/karrio/server/core/management/commands/runserver.py b/modules/server/karrio/server/core/management/commands/runserver.py similarity index 100% rename from modules/core/karrio/server/core/management/commands/runserver.py rename to modules/server/karrio/server/core/management/commands/runserver.py diff --git a/modules/core/karrio/server/core/middleware.py b/modules/server/karrio/server/core/middleware.py similarity index 100% rename from modules/core/karrio/server/core/middleware.py rename to modules/server/karrio/server/core/middleware.py diff --git a/modules/core/karrio/server/core/migrations/0001_initial.py b/modules/server/karrio/server/core/migrations/0001_initial.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0001_initial.py rename to modules/server/karrio/server/core/migrations/0001_initial.py diff --git a/modules/core/karrio/server/core/migrations/0002_apilogindex.py b/modules/server/karrio/server/core/migrations/0002_apilogindex.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0002_apilogindex.py rename to modules/server/karrio/server/core/migrations/0002_apilogindex.py diff --git a/modules/core/karrio/server/core/migrations/0003_apilogindex_test_mode.py b/modules/server/karrio/server/core/migrations/0003_apilogindex_test_mode.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0003_apilogindex_test_mode.py rename to modules/server/karrio/server/core/migrations/0003_apilogindex_test_mode.py diff --git a/modules/core/karrio/server/core/migrations/0004_metafield.py b/modules/server/karrio/server/core/migrations/0004_metafield.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0004_metafield.py rename to modules/server/karrio/server/core/migrations/0004_metafield.py diff --git a/modules/core/karrio/server/core/migrations/0005_alter_metafield_type_alter_metafield_value.py b/modules/server/karrio/server/core/migrations/0005_alter_metafield_type_alter_metafield_value.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0005_alter_metafield_type_alter_metafield_value.py rename to modules/server/karrio/server/core/migrations/0005_alter_metafield_type_alter_metafield_value.py diff --git a/modules/core/karrio/server/core/migrations/0006_add_api_log_requested_at_index.py b/modules/server/karrio/server/core/migrations/0006_add_api_log_requested_at_index.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0006_add_api_log_requested_at_index.py rename to modules/server/karrio/server/core/migrations/0006_add_api_log_requested_at_index.py diff --git a/modules/core/karrio/server/core/migrations/0007_add_generic_fk_to_metafield.py b/modules/server/karrio/server/core/migrations/0007_add_generic_fk_to_metafield.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0007_add_generic_fk_to_metafield.py rename to modules/server/karrio/server/core/migrations/0007_add_generic_fk_to_metafield.py diff --git a/modules/core/karrio/server/core/migrations/0008_apilogindex_request_id.py b/modules/server/karrio/server/core/migrations/0008_apilogindex_request_id.py similarity index 100% rename from modules/core/karrio/server/core/migrations/0008_apilogindex_request_id.py rename to modules/server/karrio/server/core/migrations/0008_apilogindex_request_id.py diff --git a/modules/core/karrio/server/core/migrations/__init__.py b/modules/server/karrio/server/core/migrations/__init__.py similarity index 100% rename from modules/core/karrio/server/core/migrations/__init__.py rename to modules/server/karrio/server/core/migrations/__init__.py diff --git a/modules/core/karrio/server/core/models/__init__.py b/modules/server/karrio/server/core/models/__init__.py similarity index 100% rename from modules/core/karrio/server/core/models/__init__.py rename to modules/server/karrio/server/core/models/__init__.py diff --git a/modules/core/karrio/server/core/models/base.py b/modules/server/karrio/server/core/models/base.py similarity index 100% rename from modules/core/karrio/server/core/models/base.py rename to modules/server/karrio/server/core/models/base.py diff --git a/modules/core/karrio/server/core/models/entity.py b/modules/server/karrio/server/core/models/entity.py similarity index 100% rename from modules/core/karrio/server/core/models/entity.py rename to modules/server/karrio/server/core/models/entity.py diff --git a/modules/core/karrio/server/core/models/metafield.py b/modules/server/karrio/server/core/models/metafield.py similarity index 100% rename from modules/core/karrio/server/core/models/metafield.py rename to modules/server/karrio/server/core/models/metafield.py diff --git a/modules/core/karrio/server/core/models/third_party.py b/modules/server/karrio/server/core/models/third_party.py similarity index 100% rename from modules/core/karrio/server/core/models/third_party.py rename to modules/server/karrio/server/core/models/third_party.py diff --git a/modules/core/karrio/server/core/oauth_validators.py b/modules/server/karrio/server/core/oauth_validators.py similarity index 100% rename from modules/core/karrio/server/core/oauth_validators.py rename to modules/server/karrio/server/core/oauth_validators.py diff --git a/modules/core/karrio/server/core/permissions.py b/modules/server/karrio/server/core/permissions.py similarity index 100% rename from modules/core/karrio/server/core/permissions.py rename to modules/server/karrio/server/core/permissions.py diff --git a/modules/core/karrio/server/core/renderers.py b/modules/server/karrio/server/core/renderers.py similarity index 100% rename from modules/core/karrio/server/core/renderers.py rename to modules/server/karrio/server/core/renderers.py diff --git a/modules/core/karrio/server/core/router.py b/modules/server/karrio/server/core/router.py similarity index 100% rename from modules/core/karrio/server/core/router.py rename to modules/server/karrio/server/core/router.py diff --git a/modules/core/karrio/server/core/serializers.py b/modules/server/karrio/server/core/serializers.py similarity index 100% rename from modules/core/karrio/server/core/serializers.py rename to modules/server/karrio/server/core/serializers.py diff --git a/modules/core/karrio/server/core/signals.py b/modules/server/karrio/server/core/signals.py similarity index 100% rename from modules/core/karrio/server/core/signals.py rename to modules/server/karrio/server/core/signals.py diff --git a/modules/core/karrio/server/core/task_backend.py b/modules/server/karrio/server/core/task_backend.py similarity index 100% rename from modules/core/karrio/server/core/task_backend.py rename to modules/server/karrio/server/core/task_backend.py diff --git a/modules/core/karrio/server/core/telemetry.py b/modules/server/karrio/server/core/telemetry.py similarity index 100% rename from modules/core/karrio/server/core/telemetry.py rename to modules/server/karrio/server/core/telemetry.py diff --git a/modules/core/karrio/server/core/tests/__init__.py b/modules/server/karrio/server/core/tests/__init__.py similarity index 100% rename from modules/core/karrio/server/core/tests/__init__.py rename to modules/server/karrio/server/core/tests/__init__.py diff --git a/modules/core/karrio/server/core/tests/base.py b/modules/server/karrio/server/core/tests/base.py similarity index 100% rename from modules/core/karrio/server/core/tests/base.py rename to modules/server/karrio/server/core/tests/base.py diff --git a/modules/core/karrio/server/core/tests/test_constance_batch.py b/modules/server/karrio/server/core/tests/test_constance_batch.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_constance_batch.py rename to modules/server/karrio/server/core/tests/test_constance_batch.py diff --git a/modules/core/karrio/server/core/tests/test_exception_level.py b/modules/server/karrio/server/core/tests/test_exception_level.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_exception_level.py rename to modules/server/karrio/server/core/tests/test_exception_level.py diff --git a/modules/core/karrio/server/core/tests/test_references_i18n.py b/modules/server/karrio/server/core/tests/test_references_i18n.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_references_i18n.py rename to modules/server/karrio/server/core/tests/test_references_i18n.py diff --git a/modules/core/karrio/server/core/tests/test_request_id.py b/modules/server/karrio/server/core/tests/test_request_id.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_request_id.py rename to modules/server/karrio/server/core/tests/test_request_id.py diff --git a/modules/core/karrio/server/core/tests/test_resource_token.py b/modules/server/karrio/server/core/tests/test_resource_token.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_resource_token.py rename to modules/server/karrio/server/core/tests/test_resource_token.py diff --git a/modules/core/karrio/server/core/tests/test_schema_safety.py b/modules/server/karrio/server/core/tests/test_schema_safety.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_schema_safety.py rename to modules/server/karrio/server/core/tests/test_schema_safety.py diff --git a/modules/core/karrio/server/core/tests/test_sentry_shipment_context.py b/modules/server/karrio/server/core/tests/test_sentry_shipment_context.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_sentry_shipment_context.py rename to modules/server/karrio/server/core/tests/test_sentry_shipment_context.py diff --git a/modules/core/karrio/server/core/tests/test_shipment_documents.py b/modules/server/karrio/server/core/tests/test_shipment_documents.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_shipment_documents.py rename to modules/server/karrio/server/core/tests/test_shipment_documents.py diff --git a/modules/core/karrio/server/core/tests/test_task_backend.py b/modules/server/karrio/server/core/tests/test_task_backend.py similarity index 100% rename from modules/core/karrio/server/core/tests/test_task_backend.py rename to modules/server/karrio/server/core/tests/test_task_backend.py diff --git a/modules/core/karrio/server/core/urls.py b/modules/server/karrio/server/core/urls.py similarity index 100% rename from modules/core/karrio/server/core/urls.py rename to modules/server/karrio/server/core/urls.py diff --git a/modules/core/karrio/server/core/utils.py b/modules/server/karrio/server/core/utils.py similarity index 100% rename from modules/core/karrio/server/core/utils.py rename to modules/server/karrio/server/core/utils.py diff --git a/modules/core/karrio/server/core/validators.py b/modules/server/karrio/server/core/validators.py similarity index 100% rename from modules/core/karrio/server/core/validators.py rename to modules/server/karrio/server/core/validators.py diff --git a/modules/core/karrio/server/core/views/__init__.py b/modules/server/karrio/server/core/views/__init__.py similarity index 100% rename from modules/core/karrio/server/core/views/__init__.py rename to modules/server/karrio/server/core/views/__init__.py diff --git a/modules/core/karrio/server/core/views/api.py b/modules/server/karrio/server/core/views/api.py similarity index 100% rename from modules/core/karrio/server/core/views/api.py rename to modules/server/karrio/server/core/views/api.py diff --git a/modules/core/karrio/server/core/views/metadata.py b/modules/server/karrio/server/core/views/metadata.py similarity index 100% rename from modules/core/karrio/server/core/views/metadata.py rename to modules/server/karrio/server/core/views/metadata.py diff --git a/modules/core/karrio/server/core/views/oauth.py b/modules/server/karrio/server/core/views/oauth.py similarity index 100% rename from modules/core/karrio/server/core/views/oauth.py rename to modules/server/karrio/server/core/views/oauth.py diff --git a/modules/core/karrio/server/core/views/references.py b/modules/server/karrio/server/core/views/references.py similarity index 100% rename from modules/core/karrio/server/core/views/references.py rename to modules/server/karrio/server/core/views/references.py diff --git a/modules/core/karrio/server/core/views/schema.py b/modules/server/karrio/server/core/views/schema.py similarity index 100% rename from modules/core/karrio/server/core/views/schema.py rename to modules/server/karrio/server/core/views/schema.py diff --git a/modules/core/karrio/server/filters/__init__.py b/modules/server/karrio/server/filters/__init__.py similarity index 100% rename from modules/core/karrio/server/filters/__init__.py rename to modules/server/karrio/server/filters/__init__.py diff --git a/modules/core/karrio/server/filters/abstract.py b/modules/server/karrio/server/filters/abstract.py similarity index 100% rename from modules/core/karrio/server/filters/abstract.py rename to modules/server/karrio/server/filters/abstract.py diff --git a/modules/core/karrio/server/providers/__init__.py b/modules/server/karrio/server/graph/__init__.py similarity index 100% rename from modules/core/karrio/server/providers/__init__.py rename to modules/server/karrio/server/graph/__init__.py diff --git a/modules/graph/karrio/server/graph/admin.py b/modules/server/karrio/server/graph/admin.py similarity index 100% rename from modules/graph/karrio/server/graph/admin.py rename to modules/server/karrio/server/graph/admin.py diff --git a/modules/graph/karrio/server/graph/apps.py b/modules/server/karrio/server/graph/apps.py similarity index 100% rename from modules/graph/karrio/server/graph/apps.py rename to modules/server/karrio/server/graph/apps.py diff --git a/modules/graph/karrio/server/graph/forms.py b/modules/server/karrio/server/graph/forms.py similarity index 100% rename from modules/graph/karrio/server/graph/forms.py rename to modules/server/karrio/server/graph/forms.py diff --git a/modules/core/karrio/server/iam/__init__.py b/modules/server/karrio/server/graph/management/__init__.py similarity index 100% rename from modules/core/karrio/server/iam/__init__.py rename to modules/server/karrio/server/graph/management/__init__.py diff --git a/modules/core/karrio/server/iam/migrations/__init__.py b/modules/server/karrio/server/graph/management/commands/__init__.py similarity index 100% rename from modules/core/karrio/server/iam/migrations/__init__.py rename to modules/server/karrio/server/graph/management/commands/__init__.py diff --git a/modules/graph/karrio/server/graph/management/commands/export_schema.py b/modules/server/karrio/server/graph/management/commands/export_schema.py similarity index 100% rename from modules/graph/karrio/server/graph/management/commands/export_schema.py rename to modules/server/karrio/server/graph/management/commands/export_schema.py diff --git a/modules/graph/karrio/server/graph/migrations/0001_initial.py b/modules/server/karrio/server/graph/migrations/0001_initial.py similarity index 100% rename from modules/graph/karrio/server/graph/migrations/0001_initial.py rename to modules/server/karrio/server/graph/migrations/0001_initial.py diff --git a/modules/graph/karrio/server/graph/migrations/0002_auto_20210512_1353.py b/modules/server/karrio/server/graph/migrations/0002_auto_20210512_1353.py similarity index 100% rename from modules/graph/karrio/server/graph/migrations/0002_auto_20210512_1353.py rename to modules/server/karrio/server/graph/migrations/0002_auto_20210512_1353.py diff --git a/modules/graph/karrio/server/graph/migrations/0003_remove_template_customs.py b/modules/server/karrio/server/graph/migrations/0003_remove_template_customs.py similarity index 100% rename from modules/graph/karrio/server/graph/migrations/0003_remove_template_customs.py rename to modules/server/karrio/server/graph/migrations/0003_remove_template_customs.py diff --git a/modules/core/karrio/server/providers/migrations/__init__.py b/modules/server/karrio/server/graph/migrations/__init__.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/__init__.py rename to modules/server/karrio/server/graph/migrations/__init__.py diff --git a/modules/graph/karrio/server/graph/models.py b/modules/server/karrio/server/graph/models.py similarity index 100% rename from modules/graph/karrio/server/graph/models.py rename to modules/server/karrio/server/graph/models.py diff --git a/modules/graph/karrio/server/graph/schema.py b/modules/server/karrio/server/graph/schema.py similarity index 100% rename from modules/graph/karrio/server/graph/schema.py rename to modules/server/karrio/server/graph/schema.py diff --git a/modules/graph/karrio/server/graph/schemas/__init__.py b/modules/server/karrio/server/graph/schemas/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/schemas/__init__.py rename to modules/server/karrio/server/graph/schemas/__init__.py diff --git a/modules/graph/karrio/server/graph/schemas/base/__init__.py b/modules/server/karrio/server/graph/schemas/base/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/schemas/base/__init__.py rename to modules/server/karrio/server/graph/schemas/base/__init__.py diff --git a/modules/graph/karrio/server/graph/schemas/base/inputs.py b/modules/server/karrio/server/graph/schemas/base/inputs.py similarity index 100% rename from modules/graph/karrio/server/graph/schemas/base/inputs.py rename to modules/server/karrio/server/graph/schemas/base/inputs.py diff --git a/modules/graph/karrio/server/graph/schemas/base/mutations.py b/modules/server/karrio/server/graph/schemas/base/mutations.py similarity index 100% rename from modules/graph/karrio/server/graph/schemas/base/mutations.py rename to modules/server/karrio/server/graph/schemas/base/mutations.py diff --git a/modules/graph/karrio/server/graph/schemas/base/types.py b/modules/server/karrio/server/graph/schemas/base/types.py similarity index 100% rename from modules/graph/karrio/server/graph/schemas/base/types.py rename to modules/server/karrio/server/graph/schemas/base/types.py diff --git a/modules/graph/karrio/server/graph/serializers.py b/modules/server/karrio/server/graph/serializers.py similarity index 100% rename from modules/graph/karrio/server/graph/serializers.py rename to modules/server/karrio/server/graph/serializers.py diff --git a/modules/graph/karrio/server/graph/templates/graphql/graphiql.html b/modules/server/karrio/server/graph/templates/graphql/graphiql.html similarity index 100% rename from modules/graph/karrio/server/graph/templates/graphql/graphiql.html rename to modules/server/karrio/server/graph/templates/graphql/graphiql.html diff --git a/modules/graph/karrio/server/graph/templates/karrio/email_change_email.html b/modules/server/karrio/server/graph/templates/karrio/email_change_email.html similarity index 100% rename from modules/graph/karrio/server/graph/templates/karrio/email_change_email.html rename to modules/server/karrio/server/graph/templates/karrio/email_change_email.html diff --git a/modules/graph/karrio/server/graph/templates/karrio/email_change_email.txt b/modules/server/karrio/server/graph/templates/karrio/email_change_email.txt similarity index 100% rename from modules/graph/karrio/server/graph/templates/karrio/email_change_email.txt rename to modules/server/karrio/server/graph/templates/karrio/email_change_email.txt diff --git a/modules/graph/karrio/server/graph/templates/karrio/password_reset_email.html b/modules/server/karrio/server/graph/templates/karrio/password_reset_email.html similarity index 100% rename from modules/graph/karrio/server/graph/templates/karrio/password_reset_email.html rename to modules/server/karrio/server/graph/templates/karrio/password_reset_email.html diff --git a/modules/graph/karrio/server/graph/tests/__init__.py b/modules/server/karrio/server/graph/tests/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/__init__.py rename to modules/server/karrio/server/graph/tests/__init__.py diff --git a/modules/graph/karrio/server/graph/tests/base.py b/modules/server/karrio/server/graph/tests/base.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/base.py rename to modules/server/karrio/server/graph/tests/base.py diff --git a/modules/graph/karrio/server/graph/tests/test_carrier_connections.py b/modules/server/karrio/server/graph/tests/test_carrier_connections.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_carrier_connections.py rename to modules/server/karrio/server/graph/tests/test_carrier_connections.py diff --git a/modules/graph/karrio/server/graph/tests/test_metafield.py b/modules/server/karrio/server/graph/tests/test_metafield.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_metafield.py rename to modules/server/karrio/server/graph/tests/test_metafield.py diff --git a/modules/graph/karrio/server/graph/tests/test_partial_shipments.py b/modules/server/karrio/server/graph/tests/test_partial_shipments.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_partial_shipments.py rename to modules/server/karrio/server/graph/tests/test_partial_shipments.py diff --git a/modules/graph/karrio/server/graph/tests/test_pickups.py b/modules/server/karrio/server/graph/tests/test_pickups.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_pickups.py rename to modules/server/karrio/server/graph/tests/test_pickups.py diff --git a/modules/graph/karrio/server/graph/tests/test_rate_sheet_bulk_ops.py b/modules/server/karrio/server/graph/tests/test_rate_sheet_bulk_ops.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_rate_sheet_bulk_ops.py rename to modules/server/karrio/server/graph/tests/test_rate_sheet_bulk_ops.py diff --git a/modules/graph/karrio/server/graph/tests/test_rate_sheets.py b/modules/server/karrio/server/graph/tests/test_rate_sheets.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_rate_sheets.py rename to modules/server/karrio/server/graph/tests/test_rate_sheets.py diff --git a/modules/graph/karrio/server/graph/tests/test_rate_type_parse.py b/modules/server/karrio/server/graph/tests/test_rate_type_parse.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_rate_type_parse.py rename to modules/server/karrio/server/graph/tests/test_rate_type_parse.py diff --git a/modules/graph/karrio/server/graph/tests/test_registration.py b/modules/server/karrio/server/graph/tests/test_registration.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_registration.py rename to modules/server/karrio/server/graph/tests/test_registration.py diff --git a/modules/graph/karrio/server/graph/tests/test_templates.py b/modules/server/karrio/server/graph/tests/test_templates.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_templates.py rename to modules/server/karrio/server/graph/tests/test_templates.py diff --git a/modules/graph/karrio/server/graph/tests/test_user_info.py b/modules/server/karrio/server/graph/tests/test_user_info.py similarity index 100% rename from modules/graph/karrio/server/graph/tests/test_user_info.py rename to modules/server/karrio/server/graph/tests/test_user_info.py diff --git a/modules/graph/karrio/server/graph/urls.py b/modules/server/karrio/server/graph/urls.py similarity index 100% rename from modules/graph/karrio/server/graph/urls.py rename to modules/server/karrio/server/graph/urls.py diff --git a/modules/graph/karrio/server/graph/utils.py b/modules/server/karrio/server/graph/utils.py similarity index 100% rename from modules/graph/karrio/server/graph/utils.py rename to modules/server/karrio/server/graph/utils.py diff --git a/modules/graph/karrio/server/graph/views.py b/modules/server/karrio/server/graph/views.py similarity index 100% rename from modules/graph/karrio/server/graph/views.py rename to modules/server/karrio/server/graph/views.py diff --git a/modules/core/karrio/server/providers/views/__init__.py b/modules/server/karrio/server/iam/__init__.py similarity index 100% rename from modules/core/karrio/server/providers/views/__init__.py rename to modules/server/karrio/server/iam/__init__.py diff --git a/modules/core/karrio/server/iam/admin.py b/modules/server/karrio/server/iam/admin.py similarity index 100% rename from modules/core/karrio/server/iam/admin.py rename to modules/server/karrio/server/iam/admin.py diff --git a/modules/core/karrio/server/iam/apps.py b/modules/server/karrio/server/iam/apps.py similarity index 100% rename from modules/core/karrio/server/iam/apps.py rename to modules/server/karrio/server/iam/apps.py diff --git a/modules/core/karrio/server/iam/migrations/0001_initial.py b/modules/server/karrio/server/iam/migrations/0001_initial.py similarity index 100% rename from modules/core/karrio/server/iam/migrations/0001_initial.py rename to modules/server/karrio/server/iam/migrations/0001_initial.py diff --git a/modules/core/karrio/server/iam/migrations/0002_setup_carrier_permission_groups.py b/modules/server/karrio/server/iam/migrations/0002_setup_carrier_permission_groups.py similarity index 100% rename from modules/core/karrio/server/iam/migrations/0002_setup_carrier_permission_groups.py rename to modules/server/karrio/server/iam/migrations/0002_setup_carrier_permission_groups.py diff --git a/modules/core/karrio/server/iam/migrations/0003_remove_permission_groups.py b/modules/server/karrio/server/iam/migrations/0003_remove_permission_groups.py similarity index 100% rename from modules/core/karrio/server/iam/migrations/0003_remove_permission_groups.py rename to modules/server/karrio/server/iam/migrations/0003_remove_permission_groups.py diff --git a/modules/core/karrio/server/tracing/__init__.py b/modules/server/karrio/server/iam/migrations/__init__.py similarity index 100% rename from modules/core/karrio/server/tracing/__init__.py rename to modules/server/karrio/server/iam/migrations/__init__.py diff --git a/modules/core/karrio/server/iam/models.py b/modules/server/karrio/server/iam/models.py similarity index 100% rename from modules/core/karrio/server/iam/models.py rename to modules/server/karrio/server/iam/models.py diff --git a/modules/core/karrio/server/iam/permissions.py b/modules/server/karrio/server/iam/permissions.py similarity index 100% rename from modules/core/karrio/server/iam/permissions.py rename to modules/server/karrio/server/iam/permissions.py diff --git a/modules/core/karrio/server/iam/serializers.py b/modules/server/karrio/server/iam/serializers.py similarity index 100% rename from modules/core/karrio/server/iam/serializers.py rename to modules/server/karrio/server/iam/serializers.py diff --git a/modules/core/karrio/server/iam/signals.py b/modules/server/karrio/server/iam/signals.py similarity index 100% rename from modules/core/karrio/server/iam/signals.py rename to modules/server/karrio/server/iam/signals.py diff --git a/modules/core/karrio/server/iam/tests.py b/modules/server/karrio/server/iam/tests.py similarity index 100% rename from modules/core/karrio/server/iam/tests.py rename to modules/server/karrio/server/iam/tests.py diff --git a/modules/core/karrio/server/iam/views.py b/modules/server/karrio/server/iam/views.py similarity index 100% rename from modules/core/karrio/server/iam/views.py rename to modules/server/karrio/server/iam/views.py diff --git a/modules/core/karrio/server/openapi.py b/modules/server/karrio/server/openapi.py similarity index 100% rename from modules/core/karrio/server/openapi.py rename to modules/server/karrio/server/openapi.py diff --git a/modules/graph/karrio/server/graph/__init__.py b/modules/server/karrio/server/providers/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/__init__.py rename to modules/server/karrio/server/providers/__init__.py diff --git a/modules/core/karrio/server/providers/admin.py b/modules/server/karrio/server/providers/admin.py similarity index 100% rename from modules/core/karrio/server/providers/admin.py rename to modules/server/karrio/server/providers/admin.py diff --git a/modules/core/karrio/server/providers/apps.py b/modules/server/karrio/server/providers/apps.py similarity index 100% rename from modules/core/karrio/server/providers/apps.py rename to modules/server/karrio/server/providers/apps.py diff --git a/modules/core/karrio/server/providers/management/commands/migrate_rate_sheets.py b/modules/server/karrio/server/providers/management/commands/migrate_rate_sheets.py similarity index 100% rename from modules/core/karrio/server/providers/management/commands/migrate_rate_sheets.py rename to modules/server/karrio/server/providers/management/commands/migrate_rate_sheets.py diff --git a/modules/core/karrio/server/providers/migrations/0001_initial.py b/modules/server/karrio/server/providers/migrations/0001_initial.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0001_initial.py rename to modules/server/karrio/server/providers/migrations/0001_initial.py diff --git a/modules/core/karrio/server/providers/migrations/0002_carrier_active.py b/modules/server/karrio/server/providers/migrations/0002_carrier_active.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0002_carrier_active.py rename to modules/server/karrio/server/providers/migrations/0002_carrier_active.py diff --git a/modules/core/karrio/server/providers/migrations/0003_auto_20201230_0820.py b/modules/server/karrio/server/providers/migrations/0003_auto_20201230_0820.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0003_auto_20201230_0820.py rename to modules/server/karrio/server/providers/migrations/0003_auto_20201230_0820.py diff --git a/modules/core/karrio/server/providers/migrations/0004_auto_20210212_0554.py b/modules/server/karrio/server/providers/migrations/0004_auto_20210212_0554.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0004_auto_20210212_0554.py rename to modules/server/karrio/server/providers/migrations/0004_auto_20210212_0554.py diff --git a/modules/core/karrio/server/providers/migrations/0005_auto_20210212_0555.py b/modules/server/karrio/server/providers/migrations/0005_auto_20210212_0555.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0005_auto_20210212_0555.py rename to modules/server/karrio/server/providers/migrations/0005_auto_20210212_0555.py diff --git a/modules/core/karrio/server/providers/migrations/0006_australiapostsettings.py b/modules/server/karrio/server/providers/migrations/0006_australiapostsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0006_australiapostsettings.py rename to modules/server/karrio/server/providers/migrations/0006_australiapostsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0007_auto_20210213_0206.py b/modules/server/karrio/server/providers/migrations/0007_auto_20210213_0206.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0007_auto_20210213_0206.py rename to modules/server/karrio/server/providers/migrations/0007_auto_20210213_0206.py diff --git a/modules/core/karrio/server/providers/migrations/0008_auto_20210214_0409.py b/modules/server/karrio/server/providers/migrations/0008_auto_20210214_0409.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0008_auto_20210214_0409.py rename to modules/server/karrio/server/providers/migrations/0008_auto_20210214_0409.py diff --git a/modules/core/karrio/server/providers/migrations/0009_auto_20210308_0302.py b/modules/server/karrio/server/providers/migrations/0009_auto_20210308_0302.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0009_auto_20210308_0302.py rename to modules/server/karrio/server/providers/migrations/0009_auto_20210308_0302.py diff --git a/modules/core/karrio/server/providers/migrations/0010_auto_20210409_0852.py b/modules/server/karrio/server/providers/migrations/0010_auto_20210409_0852.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0010_auto_20210409_0852.py rename to modules/server/karrio/server/providers/migrations/0010_auto_20210409_0852.py diff --git a/modules/core/karrio/server/providers/migrations/0011_auto_20210409_0853.py b/modules/server/karrio/server/providers/migrations/0011_auto_20210409_0853.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0011_auto_20210409_0853.py rename to modules/server/karrio/server/providers/migrations/0011_auto_20210409_0853.py diff --git a/modules/core/karrio/server/providers/migrations/0012_alter_carrier_options.py b/modules/server/karrio/server/providers/migrations/0012_alter_carrier_options.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0012_alter_carrier_options.py rename to modules/server/karrio/server/providers/migrations/0012_alter_carrier_options.py diff --git a/modules/core/karrio/server/providers/migrations/0013_tntsettings.py b/modules/server/karrio/server/providers/migrations/0013_tntsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0013_tntsettings.py rename to modules/server/karrio/server/providers/migrations/0013_tntsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0014_auto_20210612_1608.py b/modules/server/karrio/server/providers/migrations/0014_auto_20210612_1608.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0014_auto_20210612_1608.py rename to modules/server/karrio/server/providers/migrations/0014_auto_20210612_1608.py diff --git a/modules/core/karrio/server/providers/migrations/0015_auto_20210615_1601.py b/modules/server/karrio/server/providers/migrations/0015_auto_20210615_1601.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0015_auto_20210615_1601.py rename to modules/server/karrio/server/providers/migrations/0015_auto_20210615_1601.py diff --git a/modules/core/karrio/server/providers/migrations/0016_alter_purolatorsettings_user_token.py b/modules/server/karrio/server/providers/migrations/0016_alter_purolatorsettings_user_token.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0016_alter_purolatorsettings_user_token.py rename to modules/server/karrio/server/providers/migrations/0016_alter_purolatorsettings_user_token.py diff --git a/modules/core/karrio/server/providers/migrations/0017_auto_20210805_0359.py b/modules/server/karrio/server/providers/migrations/0017_auto_20210805_0359.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0017_auto_20210805_0359.py rename to modules/server/karrio/server/providers/migrations/0017_auto_20210805_0359.py diff --git a/modules/core/karrio/server/providers/migrations/0018_alter_fedexsettings_user_key.py b/modules/server/karrio/server/providers/migrations/0018_alter_fedexsettings_user_key.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0018_alter_fedexsettings_user_key.py rename to modules/server/karrio/server/providers/migrations/0018_alter_fedexsettings_user_key.py diff --git a/modules/core/karrio/server/providers/migrations/0019_dhlpolandsettings_servicelevel.py b/modules/server/karrio/server/providers/migrations/0019_dhlpolandsettings_servicelevel.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0019_dhlpolandsettings_servicelevel.py rename to modules/server/karrio/server/providers/migrations/0019_dhlpolandsettings_servicelevel.py diff --git a/modules/core/karrio/server/providers/migrations/0020_genericsettings_labeltemplate.py b/modules/server/karrio/server/providers/migrations/0020_genericsettings_labeltemplate.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0020_genericsettings_labeltemplate.py rename to modules/server/karrio/server/providers/migrations/0020_genericsettings_labeltemplate.py diff --git a/modules/core/karrio/server/providers/migrations/0021_auto_20211231_2353.py b/modules/server/karrio/server/providers/migrations/0021_auto_20211231_2353.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0021_auto_20211231_2353.py rename to modules/server/karrio/server/providers/migrations/0021_auto_20211231_2353.py diff --git a/modules/core/karrio/server/providers/migrations/0022_carrier_metadata.py b/modules/server/karrio/server/providers/migrations/0022_carrier_metadata.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0022_carrier_metadata.py rename to modules/server/karrio/server/providers/migrations/0022_carrier_metadata.py diff --git a/modules/core/karrio/server/providers/migrations/0023_auto_20220124_1916.py b/modules/server/karrio/server/providers/migrations/0023_auto_20220124_1916.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0023_auto_20220124_1916.py rename to modules/server/karrio/server/providers/migrations/0023_auto_20220124_1916.py diff --git a/modules/core/karrio/server/providers/migrations/0024_alter_genericsettings_custom_carrier_name.py b/modules/server/karrio/server/providers/migrations/0024_alter_genericsettings_custom_carrier_name.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0024_alter_genericsettings_custom_carrier_name.py rename to modules/server/karrio/server/providers/migrations/0024_alter_genericsettings_custom_carrier_name.py diff --git a/modules/core/karrio/server/providers/migrations/0025_alter_servicelevel_service_code.py b/modules/server/karrio/server/providers/migrations/0025_alter_servicelevel_service_code.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0025_alter_servicelevel_service_code.py rename to modules/server/karrio/server/providers/migrations/0025_alter_servicelevel_service_code.py diff --git a/modules/core/karrio/server/providers/migrations/0026_auto_20220208_0132.py b/modules/server/karrio/server/providers/migrations/0026_auto_20220208_0132.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0026_auto_20220208_0132.py rename to modules/server/karrio/server/providers/migrations/0026_auto_20220208_0132.py diff --git a/modules/core/karrio/server/providers/migrations/0027_auto_20220304_1340.py b/modules/server/karrio/server/providers/migrations/0027_auto_20220304_1340.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0027_auto_20220304_1340.py rename to modules/server/karrio/server/providers/migrations/0027_auto_20220304_1340.py diff --git a/modules/core/karrio/server/providers/migrations/0028_auto_20220323_1500.py b/modules/server/karrio/server/providers/migrations/0028_auto_20220323_1500.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0028_auto_20220323_1500.py rename to modules/server/karrio/server/providers/migrations/0028_auto_20220323_1500.py diff --git a/modules/core/karrio/server/providers/migrations/0029_easypostsettings.py b/modules/server/karrio/server/providers/migrations/0029_easypostsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0029_easypostsettings.py rename to modules/server/karrio/server/providers/migrations/0029_easypostsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0030_amazonmwssettings.py b/modules/server/karrio/server/providers/migrations/0030_amazonmwssettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0030_amazonmwssettings.py rename to modules/server/karrio/server/providers/migrations/0030_amazonmwssettings.py diff --git a/modules/core/karrio/server/providers/migrations/0031_delete_amazonmwssettings.py b/modules/server/karrio/server/providers/migrations/0031_delete_amazonmwssettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0031_delete_amazonmwssettings.py rename to modules/server/karrio/server/providers/migrations/0031_delete_amazonmwssettings.py diff --git a/modules/core/karrio/server/providers/migrations/0032_alter_carrier_test.py b/modules/server/karrio/server/providers/migrations/0032_alter_carrier_test.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0032_alter_carrier_test.py rename to modules/server/karrio/server/providers/migrations/0032_alter_carrier_test.py diff --git a/modules/core/karrio/server/providers/migrations/0033_auto_20220708_1350.py b/modules/server/karrio/server/providers/migrations/0033_auto_20220708_1350.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0033_auto_20220708_1350.py rename to modules/server/karrio/server/providers/migrations/0033_auto_20220708_1350.py diff --git a/modules/core/karrio/server/providers/migrations/0034_amazonmwssettings_dpdhlsettings.py b/modules/server/karrio/server/providers/migrations/0034_amazonmwssettings_dpdhlsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0034_amazonmwssettings_dpdhlsettings.py rename to modules/server/karrio/server/providers/migrations/0034_amazonmwssettings_dpdhlsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0035_alter_carrier_capabilities.py b/modules/server/karrio/server/providers/migrations/0035_alter_carrier_capabilities.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0035_alter_carrier_capabilities.py rename to modules/server/karrio/server/providers/migrations/0035_alter_carrier_capabilities.py diff --git a/modules/core/karrio/server/providers/migrations/0036_upsfreightsettings.py b/modules/server/karrio/server/providers/migrations/0036_upsfreightsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0036_upsfreightsettings.py rename to modules/server/karrio/server/providers/migrations/0036_upsfreightsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0037_chronopostsettings.py b/modules/server/karrio/server/providers/migrations/0037_chronopostsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0037_chronopostsettings.py rename to modules/server/karrio/server/providers/migrations/0037_chronopostsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0038_alter_genericsettings_label_template.py b/modules/server/karrio/server/providers/migrations/0038_alter_genericsettings_label_template.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0038_alter_genericsettings_label_template.py rename to modules/server/karrio/server/providers/migrations/0038_alter_genericsettings_label_template.py diff --git a/modules/core/karrio/server/providers/migrations/0039_auto_20220906_0612.py b/modules/server/karrio/server/providers/migrations/0039_auto_20220906_0612.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0039_auto_20220906_0612.py rename to modules/server/karrio/server/providers/migrations/0039_auto_20220906_0612.py diff --git a/modules/core/karrio/server/providers/migrations/0040_dpdhlsettings_services.py b/modules/server/karrio/server/providers/migrations/0040_dpdhlsettings_services.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0040_dpdhlsettings_services.py rename to modules/server/karrio/server/providers/migrations/0040_dpdhlsettings_services.py diff --git a/modules/core/karrio/server/providers/migrations/0041_auto_20221105_0705.py b/modules/server/karrio/server/providers/migrations/0041_auto_20221105_0705.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0041_auto_20221105_0705.py rename to modules/server/karrio/server/providers/migrations/0041_auto_20221105_0705.py diff --git a/modules/core/karrio/server/providers/migrations/0042_auto_20221215_1642.py b/modules/server/karrio/server/providers/migrations/0042_auto_20221215_1642.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0042_auto_20221215_1642.py rename to modules/server/karrio/server/providers/migrations/0042_auto_20221215_1642.py diff --git a/modules/core/karrio/server/providers/migrations/0043_alter_genericsettings_account_number_and_more.py b/modules/server/karrio/server/providers/migrations/0043_alter_genericsettings_account_number_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0043_alter_genericsettings_account_number_and_more.py rename to modules/server/karrio/server/providers/migrations/0043_alter_genericsettings_account_number_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0044_carrier_carrier_capabilities.py b/modules/server/karrio/server/providers/migrations/0044_carrier_carrier_capabilities.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0044_carrier_carrier_capabilities.py rename to modules/server/karrio/server/providers/migrations/0044_carrier_carrier_capabilities.py diff --git a/modules/core/karrio/server/providers/migrations/0045_alter_carrier_active_alter_carrier_carrier_id.py b/modules/server/karrio/server/providers/migrations/0045_alter_carrier_active_alter_carrier_carrier_id.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0045_alter_carrier_active_alter_carrier_carrier_id.py rename to modules/server/karrio/server/providers/migrations/0045_alter_carrier_active_alter_carrier_carrier_id.py diff --git a/modules/core/karrio/server/providers/migrations/0046_remove_dpdhlsettings_signature_and_more.py b/modules/server/karrio/server/providers/migrations/0046_remove_dpdhlsettings_signature_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0046_remove_dpdhlsettings_signature_and_more.py rename to modules/server/karrio/server/providers/migrations/0046_remove_dpdhlsettings_signature_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0047_dpdsettings.py b/modules/server/karrio/server/providers/migrations/0047_dpdsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0047_dpdsettings.py rename to modules/server/karrio/server/providers/migrations/0047_dpdsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0048_servicelevel_min_weight_servicelevel_transit_days_and_more.py b/modules/server/karrio/server/providers/migrations/0048_servicelevel_min_weight_servicelevel_transit_days_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0048_servicelevel_min_weight_servicelevel_transit_days_and_more.py rename to modules/server/karrio/server/providers/migrations/0048_servicelevel_min_weight_servicelevel_transit_days_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0049_boxknightsettings_geodissettings_lapostesettings_and_more.py b/modules/server/karrio/server/providers/migrations/0049_boxknightsettings_geodissettings_lapostesettings_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0049_boxknightsettings_geodissettings_lapostesettings_and_more.py rename to modules/server/karrio/server/providers/migrations/0049_boxknightsettings_geodissettings_lapostesettings_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0050_carrier_is_system_alter_carrier_metadata_and_more.py b/modules/server/karrio/server/providers/migrations/0050_carrier_is_system_alter_carrier_metadata_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0050_carrier_is_system_alter_carrier_metadata_and_more.py rename to modules/server/karrio/server/providers/migrations/0050_carrier_is_system_alter_carrier_metadata_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0051_rename_username_upssettings_client_id_and_more.py b/modules/server/karrio/server/providers/migrations/0051_rename_username_upssettings_client_id_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0051_rename_username_upssettings_client_id_and_more.py rename to modules/server/karrio/server/providers/migrations/0051_rename_username_upssettings_client_id_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0052_alter_upssettings_account_number_and_more.py b/modules/server/karrio/server/providers/migrations/0052_alter_upssettings_account_number_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0052_alter_upssettings_account_number_and_more.py rename to modules/server/karrio/server/providers/migrations/0052_alter_upssettings_account_number_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0053_locate2usettings.py b/modules/server/karrio/server/providers/migrations/0053_locate2usettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0053_locate2usettings.py rename to modules/server/karrio/server/providers/migrations/0053_locate2usettings.py diff --git a/modules/core/karrio/server/providers/migrations/0054_zoom2usettings.py b/modules/server/karrio/server/providers/migrations/0054_zoom2usettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0054_zoom2usettings.py rename to modules/server/karrio/server/providers/migrations/0054_zoom2usettings.py diff --git a/modules/core/karrio/server/providers/migrations/0055_rename_amazonmwssettings_amazonshippingsettings_and_more.py b/modules/server/karrio/server/providers/migrations/0055_rename_amazonmwssettings_amazonshippingsettings_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0055_rename_amazonmwssettings_amazonshippingsettings_and_more.py rename to modules/server/karrio/server/providers/migrations/0055_rename_amazonmwssettings_amazonshippingsettings_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0056_asendiaussettings_geodissettings_code_client_and_more.py b/modules/server/karrio/server/providers/migrations/0056_asendiaussettings_geodissettings_code_client_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0056_asendiaussettings_geodissettings_code_client_and_more.py rename to modules/server/karrio/server/providers/migrations/0056_asendiaussettings_geodissettings_code_client_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0057_alter_servicelevel_weight_unit_belgianpostsettings.py b/modules/server/karrio/server/providers/migrations/0057_alter_servicelevel_weight_unit_belgianpostsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0057_alter_servicelevel_weight_unit_belgianpostsettings.py rename to modules/server/karrio/server/providers/migrations/0057_alter_servicelevel_weight_unit_belgianpostsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0058_alliedexpresssettings.py b/modules/server/karrio/server/providers/migrations/0058_alliedexpresssettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0058_alliedexpresssettings.py rename to modules/server/karrio/server/providers/migrations/0058_alliedexpresssettings.py diff --git a/modules/core/karrio/server/providers/migrations/0059_ratesheet.py b/modules/server/karrio/server/providers/migrations/0059_ratesheet.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0059_ratesheet.py rename to modules/server/karrio/server/providers/migrations/0059_ratesheet.py diff --git a/modules/core/karrio/server/providers/migrations/0060_belgianpostsettings_rate_sheet_and_more.py b/modules/server/karrio/server/providers/migrations/0060_belgianpostsettings_rate_sheet_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0060_belgianpostsettings_rate_sheet_and_more.py rename to modules/server/karrio/server/providers/migrations/0060_belgianpostsettings_rate_sheet_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0061_alliedexpresssettings_service_type.py b/modules/server/karrio/server/providers/migrations/0061_alliedexpresssettings_service_type.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0061_alliedexpresssettings_service_type.py rename to modules/server/karrio/server/providers/migrations/0061_alliedexpresssettings_service_type.py diff --git a/modules/core/karrio/server/providers/migrations/0062_sendlesettings_account_country_code.py b/modules/server/karrio/server/providers/migrations/0062_sendlesettings_account_country_code.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0062_sendlesettings_account_country_code.py rename to modules/server/karrio/server/providers/migrations/0062_sendlesettings_account_country_code.py diff --git a/modules/core/karrio/server/providers/migrations/0063_servicelevel_metadata.py b/modules/server/karrio/server/providers/migrations/0063_servicelevel_metadata.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0063_servicelevel_metadata.py rename to modules/server/karrio/server/providers/migrations/0063_servicelevel_metadata.py diff --git a/modules/core/karrio/server/providers/migrations/0064_alliedexpresslocalsettings.py b/modules/server/karrio/server/providers/migrations/0064_alliedexpresslocalsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0064_alliedexpresslocalsettings.py rename to modules/server/karrio/server/providers/migrations/0064_alliedexpresslocalsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0065_servicelevel_carrier_service_code_and_more.py b/modules/server/karrio/server/providers/migrations/0065_servicelevel_carrier_service_code_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0065_servicelevel_carrier_service_code_and_more.py rename to modules/server/karrio/server/providers/migrations/0065_servicelevel_carrier_service_code_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0066_rename_fedexsettings_fedexwssettings_and_more.py b/modules/server/karrio/server/providers/migrations/0066_rename_fedexsettings_fedexwssettings_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0066_rename_fedexsettings_fedexwssettings_and_more.py rename to modules/server/karrio/server/providers/migrations/0066_rename_fedexsettings_fedexwssettings_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0067_fedexsettings.py b/modules/server/karrio/server/providers/migrations/0067_fedexsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0067_fedexsettings.py rename to modules/server/karrio/server/providers/migrations/0067_fedexsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0068_fedexsettings_track_api_key_and_more.py b/modules/server/karrio/server/providers/migrations/0068_fedexsettings_track_api_key_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0068_fedexsettings_track_api_key_and_more.py rename to modules/server/karrio/server/providers/migrations/0068_fedexsettings_track_api_key_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0069_alter_canadapostsettings_contract_id_and_more.py b/modules/server/karrio/server/providers/migrations/0069_alter_canadapostsettings_contract_id_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0069_alter_canadapostsettings_contract_id_and_more.py rename to modules/server/karrio/server/providers/migrations/0069_alter_canadapostsettings_contract_id_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0070_tgesettings_alter_carrier_capabilities.py b/modules/server/karrio/server/providers/migrations/0070_tgesettings_alter_carrier_capabilities.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0070_tgesettings_alter_carrier_capabilities.py rename to modules/server/karrio/server/providers/migrations/0070_tgesettings_alter_carrier_capabilities.py diff --git a/modules/core/karrio/server/providers/migrations/0071_alter_tgesettings_my_toll_token.py b/modules/server/karrio/server/providers/migrations/0071_alter_tgesettings_my_toll_token.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0071_alter_tgesettings_my_toll_token.py rename to modules/server/karrio/server/providers/migrations/0071_alter_tgesettings_my_toll_token.py diff --git a/modules/core/karrio/server/providers/migrations/0072_rename_eshippersettings_eshipperxmlsettings_and_more.py b/modules/server/karrio/server/providers/migrations/0072_rename_eshippersettings_eshipperxmlsettings_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0072_rename_eshippersettings_eshipperxmlsettings_and_more.py rename to modules/server/karrio/server/providers/migrations/0072_rename_eshippersettings_eshipperxmlsettings_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0073_delete_eshipperxmlsettings.py b/modules/server/karrio/server/providers/migrations/0073_delete_eshipperxmlsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0073_delete_eshipperxmlsettings.py rename to modules/server/karrio/server/providers/migrations/0073_delete_eshipperxmlsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0074_eshippersettings.py b/modules/server/karrio/server/providers/migrations/0074_eshippersettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0074_eshippersettings.py rename to modules/server/karrio/server/providers/migrations/0074_eshippersettings.py diff --git a/modules/core/karrio/server/providers/migrations/0075_haypostsettings.py b/modules/server/karrio/server/providers/migrations/0075_haypostsettings.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0075_haypostsettings.py rename to modules/server/karrio/server/providers/migrations/0075_haypostsettings.py diff --git a/modules/core/karrio/server/providers/migrations/0076_rename_customer_registration_id_uspsinternationalsettings_account_number_and_more.py b/modules/server/karrio/server/providers/migrations/0076_rename_customer_registration_id_uspsinternationalsettings_account_number_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0076_rename_customer_registration_id_uspsinternationalsettings_account_number_and_more.py rename to modules/server/karrio/server/providers/migrations/0076_rename_customer_registration_id_uspsinternationalsettings_account_number_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0077_uspswtinternationalsettings_uspswtsettings_and_more.py b/modules/server/karrio/server/providers/migrations/0077_uspswtinternationalsettings_uspswtsettings_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0077_uspswtinternationalsettings_uspswtsettings_and_more.py rename to modules/server/karrio/server/providers/migrations/0077_uspswtinternationalsettings_uspswtsettings_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0078_auto_20240813_1552.py b/modules/server/karrio/server/providers/migrations/0078_auto_20240813_1552.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0078_auto_20240813_1552.py rename to modules/server/karrio/server/providers/migrations/0078_auto_20240813_1552.py diff --git a/modules/core/karrio/server/providers/migrations/0079_alter_carrier_options_alter_ratesheet_created_by.py b/modules/server/karrio/server/providers/migrations/0079_alter_carrier_options_alter_ratesheet_created_by.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0079_alter_carrier_options_alter_ratesheet_created_by.py rename to modules/server/karrio/server/providers/migrations/0079_alter_carrier_options_alter_ratesheet_created_by.py diff --git a/modules/core/karrio/server/providers/migrations/0080_alter_aramexsettings_account_country_code_and_more.py b/modules/server/karrio/server/providers/migrations/0080_alter_aramexsettings_account_country_code_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0080_alter_aramexsettings_account_country_code_and_more.py rename to modules/server/karrio/server/providers/migrations/0080_alter_aramexsettings_account_country_code_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0081_remove_alliedexpresssettings_carrier_ptr_and_more.py b/modules/server/karrio/server/providers/migrations/0081_remove_alliedexpresssettings_carrier_ptr_and_more.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0081_remove_alliedexpresssettings_carrier_ptr_and_more.py rename to modules/server/karrio/server/providers/migrations/0081_remove_alliedexpresssettings_carrier_ptr_and_more.py diff --git a/modules/core/karrio/server/providers/migrations/0082_add_zone_identifiers.py b/modules/server/karrio/server/providers/migrations/0082_add_zone_identifiers.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0082_add_zone_identifiers.py rename to modules/server/karrio/server/providers/migrations/0082_add_zone_identifiers.py diff --git a/modules/core/karrio/server/providers/migrations/0083_add_optimized_rate_sheet_structure.py b/modules/server/karrio/server/providers/migrations/0083_add_optimized_rate_sheet_structure.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0083_add_optimized_rate_sheet_structure.py rename to modules/server/karrio/server/providers/migrations/0083_add_optimized_rate_sheet_structure.py diff --git a/modules/core/karrio/server/providers/migrations/0084_alter_servicelevel_currency.py b/modules/server/karrio/server/providers/migrations/0084_alter_servicelevel_currency.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0084_alter_servicelevel_currency.py rename to modules/server/karrio/server/providers/migrations/0084_alter_servicelevel_currency.py diff --git a/modules/core/karrio/server/providers/migrations/0085_populate_dhl_parcel_de_oauth_credentials.py b/modules/server/karrio/server/providers/migrations/0085_populate_dhl_parcel_de_oauth_credentials.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0085_populate_dhl_parcel_de_oauth_credentials.py rename to modules/server/karrio/server/providers/migrations/0085_populate_dhl_parcel_de_oauth_credentials.py diff --git a/modules/core/karrio/server/providers/migrations/0086_rename_dhl_parcel_de_customer_number_to_billing_number.py b/modules/server/karrio/server/providers/migrations/0086_rename_dhl_parcel_de_customer_number_to_billing_number.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0086_rename_dhl_parcel_de_customer_number_to_billing_number.py rename to modules/server/karrio/server/providers/migrations/0086_rename_dhl_parcel_de_customer_number_to_billing_number.py diff --git a/modules/core/karrio/server/providers/migrations/0087_alter_carrier_capabilities.py b/modules/server/karrio/server/providers/migrations/0087_alter_carrier_capabilities.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0087_alter_carrier_capabilities.py rename to modules/server/karrio/server/providers/migrations/0087_alter_carrier_capabilities.py diff --git a/modules/core/karrio/server/providers/migrations/0088_servicelevel_surcharges.py b/modules/server/karrio/server/providers/migrations/0088_servicelevel_surcharges.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0088_servicelevel_surcharges.py rename to modules/server/karrio/server/providers/migrations/0088_servicelevel_surcharges.py diff --git a/modules/core/karrio/server/providers/migrations/0089_servicelevel_cost_max_volume.py b/modules/server/karrio/server/providers/migrations/0089_servicelevel_cost_max_volume.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0089_servicelevel_cost_max_volume.py rename to modules/server/karrio/server/providers/migrations/0089_servicelevel_cost_max_volume.py diff --git a/modules/core/karrio/server/providers/migrations/0090_ratesheet_surcharges_servicelevel_zone_surcharge_ids.py b/modules/server/karrio/server/providers/migrations/0090_ratesheet_surcharges_servicelevel_zone_surcharge_ids.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0090_ratesheet_surcharges_servicelevel_zone_surcharge_ids.py rename to modules/server/karrio/server/providers/migrations/0090_ratesheet_surcharges_servicelevel_zone_surcharge_ids.py diff --git a/modules/core/karrio/server/providers/migrations/0091_migrate_legacy_zones_surcharges.py b/modules/server/karrio/server/providers/migrations/0091_migrate_legacy_zones_surcharges.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0091_migrate_legacy_zones_surcharges.py rename to modules/server/karrio/server/providers/migrations/0091_migrate_legacy_zones_surcharges.py diff --git a/modules/core/karrio/server/providers/migrations/0092_add_system_brokered_connection_models_update_carrier.py b/modules/server/karrio/server/providers/migrations/0092_add_system_brokered_connection_models_update_carrier.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0092_add_system_brokered_connection_models_update_carrier.py rename to modules/server/karrio/server/providers/migrations/0092_add_system_brokered_connection_models_update_carrier.py diff --git a/modules/core/karrio/server/providers/migrations/0093_migrate_system_carriers_data.py b/modules/server/karrio/server/providers/migrations/0093_migrate_system_carriers_data.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0093_migrate_system_carriers_data.py rename to modules/server/karrio/server/providers/migrations/0093_migrate_system_carriers_data.py diff --git a/modules/core/karrio/server/providers/migrations/0094_remove_carrier_legacy_fields.py b/modules/server/karrio/server/providers/migrations/0094_remove_carrier_legacy_fields.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0094_remove_carrier_legacy_fields.py rename to modules/server/karrio/server/providers/migrations/0094_remove_carrier_legacy_fields.py diff --git a/modules/core/karrio/server/providers/migrations/0095_rename_carrier_to_carrierconnection.py b/modules/server/karrio/server/providers/migrations/0095_rename_carrier_to_carrierconnection.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0095_rename_carrier_to_carrierconnection.py rename to modules/server/karrio/server/providers/migrations/0095_rename_carrier_to_carrierconnection.py diff --git a/modules/core/karrio/server/providers/migrations/0096_ratesheet_origin_countries.py b/modules/server/karrio/server/providers/migrations/0096_ratesheet_origin_countries.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0096_ratesheet_origin_countries.py rename to modules/server/karrio/server/providers/migrations/0096_ratesheet_origin_countries.py diff --git a/modules/core/karrio/server/providers/migrations/0097_servicelevel_volumetric_weight_fields.py b/modules/server/karrio/server/providers/migrations/0097_servicelevel_volumetric_weight_fields.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0097_servicelevel_volumetric_weight_fields.py rename to modules/server/karrio/server/providers/migrations/0097_servicelevel_volumetric_weight_fields.py diff --git a/modules/core/karrio/server/providers/migrations/0098_servicelevel_features.py b/modules/server/karrio/server/providers/migrations/0098_servicelevel_features.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0098_servicelevel_features.py rename to modules/server/karrio/server/providers/migrations/0098_servicelevel_features.py diff --git a/modules/core/karrio/server/providers/migrations/0099_cleanup.py b/modules/server/karrio/server/providers/migrations/0099_cleanup.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0099_cleanup.py rename to modules/server/karrio/server/providers/migrations/0099_cleanup.py diff --git a/modules/core/karrio/server/providers/migrations/0100_migrate_dhl_parcel_de_billing_number.py b/modules/server/karrio/server/providers/migrations/0100_migrate_dhl_parcel_de_billing_number.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0100_migrate_dhl_parcel_de_billing_number.py rename to modules/server/karrio/server/providers/migrations/0100_migrate_dhl_parcel_de_billing_number.py diff --git a/modules/core/karrio/server/providers/migrations/0101_add_pickup_capability_to_dhl_parcel_de.py b/modules/server/karrio/server/providers/migrations/0101_add_pickup_capability_to_dhl_parcel_de.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0101_add_pickup_capability_to_dhl_parcel_de.py rename to modules/server/karrio/server/providers/migrations/0101_add_pickup_capability_to_dhl_parcel_de.py diff --git a/modules/core/karrio/server/providers/migrations/0102_add_pricing_config.py b/modules/server/karrio/server/providers/migrations/0102_add_pricing_config.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0102_add_pricing_config.py rename to modules/server/karrio/server/providers/migrations/0102_add_pricing_config.py diff --git a/modules/core/karrio/server/providers/migrations/0103_increase_service_field_lengths.py b/modules/server/karrio/server/providers/migrations/0103_increase_service_field_lengths.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0103_increase_service_field_lengths.py rename to modules/server/karrio/server/providers/migrations/0103_increase_service_field_lengths.py diff --git a/modules/core/karrio/server/providers/migrations/0104_merge_0103.py b/modules/server/karrio/server/providers/migrations/0104_merge_0103.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0104_merge_0103.py rename to modules/server/karrio/server/providers/migrations/0104_merge_0103.py diff --git a/modules/core/karrio/server/providers/migrations/0105_migrate_smartkargo_account_id_to_config.py b/modules/server/karrio/server/providers/migrations/0105_migrate_smartkargo_account_id_to_config.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0105_migrate_smartkargo_account_id_to_config.py rename to modules/server/karrio/server/providers/migrations/0105_migrate_smartkargo_account_id_to_config.py diff --git a/modules/core/karrio/server/providers/migrations/0106_system_rate_sheet.py b/modules/server/karrio/server/providers/migrations/0106_system_rate_sheet.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0106_system_rate_sheet.py rename to modules/server/karrio/server/providers/migrations/0106_system_rate_sheet.py diff --git a/modules/core/karrio/server/providers/migrations/0107_update_system_connection_fk.py b/modules/server/karrio/server/providers/migrations/0107_update_system_connection_fk.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0107_update_system_connection_fk.py rename to modules/server/karrio/server/providers/migrations/0107_update_system_connection_fk.py diff --git a/modules/core/karrio/server/providers/migrations/0108_clear_dhl_parcel_de_username_password.py b/modules/server/karrio/server/providers/migrations/0108_clear_dhl_parcel_de_username_password.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0108_clear_dhl_parcel_de_username_password.py rename to modules/server/karrio/server/providers/migrations/0108_clear_dhl_parcel_de_username_password.py diff --git a/modules/core/karrio/server/providers/migrations/0109_cleanup_legacy_system_rate_sheets.py b/modules/server/karrio/server/providers/migrations/0109_cleanup_legacy_system_rate_sheets.py similarity index 100% rename from modules/core/karrio/server/providers/migrations/0109_cleanup_legacy_system_rate_sheets.py rename to modules/server/karrio/server/providers/migrations/0109_cleanup_legacy_system_rate_sheets.py diff --git a/modules/core/karrio/server/tracing/migrations/__init__.py b/modules/server/karrio/server/providers/migrations/__init__.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/__init__.py rename to modules/server/karrio/server/providers/migrations/__init__.py diff --git a/modules/core/karrio/server/providers/models/__init__.py b/modules/server/karrio/server/providers/models/__init__.py similarity index 100% rename from modules/core/karrio/server/providers/models/__init__.py rename to modules/server/karrio/server/providers/models/__init__.py diff --git a/modules/core/karrio/server/providers/models/carrier.py b/modules/server/karrio/server/providers/models/carrier.py similarity index 100% rename from modules/core/karrio/server/providers/models/carrier.py rename to modules/server/karrio/server/providers/models/carrier.py diff --git a/modules/core/karrio/server/providers/models/connection.py b/modules/server/karrio/server/providers/models/connection.py similarity index 100% rename from modules/core/karrio/server/providers/models/connection.py rename to modules/server/karrio/server/providers/models/connection.py diff --git a/modules/core/karrio/server/providers/models/service.py b/modules/server/karrio/server/providers/models/service.py similarity index 100% rename from modules/core/karrio/server/providers/models/service.py rename to modules/server/karrio/server/providers/models/service.py diff --git a/modules/core/karrio/server/providers/models/sheet.py b/modules/server/karrio/server/providers/models/sheet.py similarity index 100% rename from modules/core/karrio/server/providers/models/sheet.py rename to modules/server/karrio/server/providers/models/sheet.py diff --git a/modules/core/karrio/server/providers/models/template.py b/modules/server/karrio/server/providers/models/template.py similarity index 100% rename from modules/core/karrio/server/providers/models/template.py rename to modules/server/karrio/server/providers/models/template.py diff --git a/modules/core/karrio/server/providers/models/utils.py b/modules/server/karrio/server/providers/models/utils.py similarity index 100% rename from modules/core/karrio/server/providers/models/utils.py rename to modules/server/karrio/server/providers/models/utils.py diff --git a/modules/core/karrio/server/providers/rate_sheet_datatypes.py b/modules/server/karrio/server/providers/rate_sheet_datatypes.py similarity index 100% rename from modules/core/karrio/server/providers/rate_sheet_datatypes.py rename to modules/server/karrio/server/providers/rate_sheet_datatypes.py diff --git a/modules/core/karrio/server/providers/router.py b/modules/server/karrio/server/providers/router.py similarity index 100% rename from modules/core/karrio/server/providers/router.py rename to modules/server/karrio/server/providers/router.py diff --git a/modules/core/karrio/server/providers/serializers/__init__.py b/modules/server/karrio/server/providers/serializers/__init__.py similarity index 100% rename from modules/core/karrio/server/providers/serializers/__init__.py rename to modules/server/karrio/server/providers/serializers/__init__.py diff --git a/modules/core/karrio/server/providers/serializers/base.py b/modules/server/karrio/server/providers/serializers/base.py similarity index 100% rename from modules/core/karrio/server/providers/serializers/base.py rename to modules/server/karrio/server/providers/serializers/base.py diff --git a/modules/core/karrio/server/providers/signals.py b/modules/server/karrio/server/providers/signals.py similarity index 100% rename from modules/core/karrio/server/providers/signals.py rename to modules/server/karrio/server/providers/signals.py diff --git a/modules/core/karrio/server/providers/templates/providers/oauth_callback.html b/modules/server/karrio/server/providers/templates/providers/oauth_callback.html similarity index 100% rename from modules/core/karrio/server/providers/templates/providers/oauth_callback.html rename to modules/server/karrio/server/providers/templates/providers/oauth_callback.html diff --git a/modules/core/karrio/server/providers/tests/__init__.py b/modules/server/karrio/server/providers/tests/__init__.py similarity index 100% rename from modules/core/karrio/server/providers/tests/__init__.py rename to modules/server/karrio/server/providers/tests/__init__.py diff --git a/modules/core/karrio/server/providers/tests/test_connections.py b/modules/server/karrio/server/providers/tests/test_connections.py similarity index 100% rename from modules/core/karrio/server/providers/tests/test_connections.py rename to modules/server/karrio/server/providers/tests/test_connections.py diff --git a/modules/core/karrio/server/providers/tests/test_rate_sheet_datatypes.py b/modules/server/karrio/server/providers/tests/test_rate_sheet_datatypes.py similarity index 100% rename from modules/core/karrio/server/providers/tests/test_rate_sheet_datatypes.py rename to modules/server/karrio/server/providers/tests/test_rate_sheet_datatypes.py diff --git a/modules/core/karrio/server/providers/tests/test_rate_sheet_routing.py b/modules/server/karrio/server/providers/tests/test_rate_sheet_routing.py similarity index 100% rename from modules/core/karrio/server/providers/tests/test_rate_sheet_routing.py rename to modules/server/karrio/server/providers/tests/test_rate_sheet_routing.py diff --git a/modules/core/karrio/server/providers/urls.py b/modules/server/karrio/server/providers/urls.py similarity index 100% rename from modules/core/karrio/server/providers/urls.py rename to modules/server/karrio/server/providers/urls.py diff --git a/modules/core/karrio/server/user/__init__.py b/modules/server/karrio/server/providers/views/__init__.py similarity index 100% rename from modules/core/karrio/server/user/__init__.py rename to modules/server/karrio/server/providers/views/__init__.py diff --git a/modules/core/karrio/server/providers/views/carriers.py b/modules/server/karrio/server/providers/views/carriers.py similarity index 100% rename from modules/core/karrio/server/providers/views/carriers.py rename to modules/server/karrio/server/providers/views/carriers.py diff --git a/modules/core/karrio/server/providers/views/connections.py b/modules/server/karrio/server/providers/views/connections.py similarity index 100% rename from modules/core/karrio/server/providers/views/connections.py rename to modules/server/karrio/server/providers/views/connections.py diff --git a/modules/core/karrio/server/samples.py b/modules/server/karrio/server/samples.py similarity index 100% rename from modules/core/karrio/server/samples.py rename to modules/server/karrio/server/samples.py diff --git a/modules/core/karrio/server/serializers/__init__.py b/modules/server/karrio/server/serializers/__init__.py similarity index 100% rename from modules/core/karrio/server/serializers/__init__.py rename to modules/server/karrio/server/serializers/__init__.py diff --git a/modules/core/karrio/server/serializers/abstract.py b/modules/server/karrio/server/serializers/abstract.py similarity index 100% rename from modules/core/karrio/server/serializers/abstract.py rename to modules/server/karrio/server/serializers/abstract.py diff --git a/modules/core/karrio/server/serializers/json_utils.py b/modules/server/karrio/server/serializers/json_utils.py similarity index 100% rename from modules/core/karrio/server/serializers/json_utils.py rename to modules/server/karrio/server/serializers/json_utils.py diff --git a/modules/admin/karrio/server/settings/admin.py b/modules/server/karrio/server/settings/admin.py similarity index 100% rename from modules/admin/karrio/server/settings/admin.py rename to modules/server/karrio/server/settings/admin.py diff --git a/modules/graph/karrio/server/settings/graph.py b/modules/server/karrio/server/settings/graph.py similarity index 100% rename from modules/graph/karrio/server/settings/graph.py rename to modules/server/karrio/server/settings/graph.py diff --git a/modules/core/karrio/server/user/migrations/__init__.py b/modules/server/karrio/server/tracing/__init__.py similarity index 100% rename from modules/core/karrio/server/user/migrations/__init__.py rename to modules/server/karrio/server/tracing/__init__.py diff --git a/modules/core/karrio/server/tracing/admin.py b/modules/server/karrio/server/tracing/admin.py similarity index 100% rename from modules/core/karrio/server/tracing/admin.py rename to modules/server/karrio/server/tracing/admin.py diff --git a/modules/core/karrio/server/tracing/apps.py b/modules/server/karrio/server/tracing/apps.py similarity index 100% rename from modules/core/karrio/server/tracing/apps.py rename to modules/server/karrio/server/tracing/apps.py diff --git a/modules/core/karrio/server/tracing/migrations/0001_initial.py b/modules/server/karrio/server/tracing/migrations/0001_initial.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0001_initial.py rename to modules/server/karrio/server/tracing/migrations/0001_initial.py diff --git a/modules/core/karrio/server/tracing/migrations/0002_auto_20220710_1307.py b/modules/server/karrio/server/tracing/migrations/0002_auto_20220710_1307.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0002_auto_20220710_1307.py rename to modules/server/karrio/server/tracing/migrations/0002_auto_20220710_1307.py diff --git a/modules/core/karrio/server/tracing/migrations/0003_auto_20221105_0317.py b/modules/server/karrio/server/tracing/migrations/0003_auto_20221105_0317.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0003_auto_20221105_0317.py rename to modules/server/karrio/server/tracing/migrations/0003_auto_20221105_0317.py diff --git a/modules/core/karrio/server/tracing/migrations/0004_tracingrecord_carrier_account_idx.py b/modules/server/karrio/server/tracing/migrations/0004_tracingrecord_carrier_account_idx.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0004_tracingrecord_carrier_account_idx.py rename to modules/server/karrio/server/tracing/migrations/0004_tracingrecord_carrier_account_idx.py diff --git a/modules/core/karrio/server/tracing/migrations/0005_optimise_tracingrecord_request_log_idx.py b/modules/server/karrio/server/tracing/migrations/0005_optimise_tracingrecord_request_log_idx.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0005_optimise_tracingrecord_request_log_idx.py rename to modules/server/karrio/server/tracing/migrations/0005_optimise_tracingrecord_request_log_idx.py diff --git a/modules/core/karrio/server/tracing/migrations/0006_alter_tracingrecord_options_and_more.py b/modules/server/karrio/server/tracing/migrations/0006_alter_tracingrecord_options_and_more.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0006_alter_tracingrecord_options_and_more.py rename to modules/server/karrio/server/tracing/migrations/0006_alter_tracingrecord_options_and_more.py diff --git a/modules/core/karrio/server/tracing/migrations/0007_tracingrecord_tracing_created_at_idx.py b/modules/server/karrio/server/tracing/migrations/0007_tracingrecord_tracing_created_at_idx.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0007_tracingrecord_tracing_created_at_idx.py rename to modules/server/karrio/server/tracing/migrations/0007_tracingrecord_tracing_created_at_idx.py diff --git a/modules/core/karrio/server/tracing/migrations/0008_tracingrecord_request_id_idx.py b/modules/server/karrio/server/tracing/migrations/0008_tracingrecord_request_id_idx.py similarity index 100% rename from modules/core/karrio/server/tracing/migrations/0008_tracingrecord_request_id_idx.py rename to modules/server/karrio/server/tracing/migrations/0008_tracingrecord_request_id_idx.py diff --git a/modules/graph/karrio/server/graph/management/__init__.py b/modules/server/karrio/server/tracing/migrations/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/management/__init__.py rename to modules/server/karrio/server/tracing/migrations/__init__.py diff --git a/modules/core/karrio/server/tracing/models.py b/modules/server/karrio/server/tracing/models.py similarity index 100% rename from modules/core/karrio/server/tracing/models.py rename to modules/server/karrio/server/tracing/models.py diff --git a/modules/core/karrio/server/tracing/tests.py b/modules/server/karrio/server/tracing/tests.py similarity index 100% rename from modules/core/karrio/server/tracing/tests.py rename to modules/server/karrio/server/tracing/tests.py diff --git a/modules/core/karrio/server/tracing/utils.py b/modules/server/karrio/server/tracing/utils.py similarity index 100% rename from modules/core/karrio/server/tracing/utils.py rename to modules/server/karrio/server/tracing/utils.py diff --git a/modules/graph/karrio/server/graph/management/commands/__init__.py b/modules/server/karrio/server/user/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/management/commands/__init__.py rename to modules/server/karrio/server/user/__init__.py diff --git a/modules/core/karrio/server/user/admin.py b/modules/server/karrio/server/user/admin.py similarity index 100% rename from modules/core/karrio/server/user/admin.py rename to modules/server/karrio/server/user/admin.py diff --git a/modules/core/karrio/server/user/apps.py b/modules/server/karrio/server/user/apps.py similarity index 100% rename from modules/core/karrio/server/user/apps.py rename to modules/server/karrio/server/user/apps.py diff --git a/modules/core/karrio/server/user/forms.py b/modules/server/karrio/server/user/forms.py similarity index 100% rename from modules/core/karrio/server/user/forms.py rename to modules/server/karrio/server/user/forms.py diff --git a/modules/core/karrio/server/user/migrations/0001_initial.py b/modules/server/karrio/server/user/migrations/0001_initial.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0001_initial.py rename to modules/server/karrio/server/user/migrations/0001_initial.py diff --git a/modules/core/karrio/server/user/migrations/0002_token.py b/modules/server/karrio/server/user/migrations/0002_token.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0002_token.py rename to modules/server/karrio/server/user/migrations/0002_token.py diff --git a/modules/core/karrio/server/user/migrations/0003_token_test_mode.py b/modules/server/karrio/server/user/migrations/0003_token_test_mode.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0003_token_test_mode.py rename to modules/server/karrio/server/user/migrations/0003_token_test_mode.py diff --git a/modules/core/karrio/server/user/migrations/0004_group.py b/modules/server/karrio/server/user/migrations/0004_group.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0004_group.py rename to modules/server/karrio/server/user/migrations/0004_group.py diff --git a/modules/core/karrio/server/user/migrations/0005_token_label.py b/modules/server/karrio/server/user/migrations/0005_token_label.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0005_token_label.py rename to modules/server/karrio/server/user/migrations/0005_token_label.py diff --git a/modules/core/karrio/server/user/migrations/0006_workspaceconfig.py b/modules/server/karrio/server/user/migrations/0006_workspaceconfig.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0006_workspaceconfig.py rename to modules/server/karrio/server/user/migrations/0006_workspaceconfig.py diff --git a/modules/core/karrio/server/user/migrations/0007_user_metadata.py b/modules/server/karrio/server/user/migrations/0007_user_metadata.py similarity index 100% rename from modules/core/karrio/server/user/migrations/0007_user_metadata.py rename to modules/server/karrio/server/user/migrations/0007_user_metadata.py diff --git a/modules/graph/karrio/server/graph/migrations/__init__.py b/modules/server/karrio/server/user/migrations/__init__.py similarity index 100% rename from modules/graph/karrio/server/graph/migrations/__init__.py rename to modules/server/karrio/server/user/migrations/__init__.py diff --git a/modules/core/karrio/server/user/models.py b/modules/server/karrio/server/user/models.py similarity index 100% rename from modules/core/karrio/server/user/models.py rename to modules/server/karrio/server/user/models.py diff --git a/modules/core/karrio/server/user/serializers.py b/modules/server/karrio/server/user/serializers.py similarity index 100% rename from modules/core/karrio/server/user/serializers.py rename to modules/server/karrio/server/user/serializers.py diff --git a/modules/core/karrio/server/user/templates/registration/login.html b/modules/server/karrio/server/user/templates/registration/login.html similarity index 100% rename from modules/core/karrio/server/user/templates/registration/login.html rename to modules/server/karrio/server/user/templates/registration/login.html diff --git a/modules/core/karrio/server/user/templates/registration/registration_confirm_email.html b/modules/server/karrio/server/user/templates/registration/registration_confirm_email.html similarity index 100% rename from modules/core/karrio/server/user/templates/registration/registration_confirm_email.html rename to modules/server/karrio/server/user/templates/registration/registration_confirm_email.html diff --git a/modules/core/karrio/server/user/templates/registration/registration_confirm_email.txt b/modules/server/karrio/server/user/templates/registration/registration_confirm_email.txt similarity index 100% rename from modules/core/karrio/server/user/templates/registration/registration_confirm_email.txt rename to modules/server/karrio/server/user/templates/registration/registration_confirm_email.txt diff --git a/modules/core/karrio/server/user/tests.py b/modules/server/karrio/server/user/tests.py similarity index 100% rename from modules/core/karrio/server/user/tests.py rename to modules/server/karrio/server/user/tests.py diff --git a/modules/core/karrio/server/user/urls.py b/modules/server/karrio/server/user/urls.py similarity index 100% rename from modules/core/karrio/server/user/urls.py rename to modules/server/karrio/server/user/urls.py diff --git a/modules/core/karrio/server/user/utils.py b/modules/server/karrio/server/user/utils.py similarity index 100% rename from modules/core/karrio/server/user/utils.py rename to modules/server/karrio/server/user/utils.py diff --git a/modules/core/karrio/server/user/views.py b/modules/server/karrio/server/user/views.py similarity index 100% rename from modules/core/karrio/server/user/views.py rename to modules/server/karrio/server/user/views.py diff --git a/modules/server/pyproject.toml b/modules/server/pyproject.toml new file mode 100644 index 0000000000..7c297ca3a5 --- /dev/null +++ b/modules/server/pyproject.toml @@ -0,0 +1,47 @@ +[build-system] +requires = ["setuptools>=61.0"] +build-backend = "setuptools.build_meta" + +[project] +name = "karrio_server_modules" +version = "2026.1.29" +description = "Multi-carrier shipping API consolidated server modules (core + graph + admin)" +readme = "README.md" +requires-python = ">=3.11" +license = "LGPL-3.0" +authors = [ + {name = "karrio", email = "hello@karrio.io"} +] +classifiers = [ + "Programming Language :: Python :: 3", +] +dependencies = [ + "karrio", + "psycopg2-binary", + "django-health-check", + "dnspython", + "psutil", + "pyyaml", + "Jinja2", + "django-filter", + "strawberry-graphql", +] + +[project.urls] +Homepage = "https://github.com/karrioapi/karrio" + +[tool.setuptools] +zip-safe = false +include-package-data = true + +[tool.setuptools.package-dir] +"" = "." + +[tool.setuptools.packages.find] +exclude = ["tests.*", "tests"] +namespaces = true + +[tool.setuptools.package-data] +"karrio.server.user" = ["templates/**/*"] +"karrio.server.graph" = ["templates/**/*"] +"*" = ["*.html", "*.txt", "*.css", "*.js", "*.png", "*.jpg", "*.gif", "*.ico"] diff --git a/requirements.build.txt b/requirements.build.txt index c84728d99b..efee380276 100644 --- a/requirements.build.txt +++ b/requirements.build.txt @@ -37,6 +37,7 @@ -e ./community/plugins/sapient # karrio server modules +-e ./modules/server -e ./modules/core -e ./apps/api -e ./modules/graph diff --git a/requirements.server.dev.txt b/requirements.server.dev.txt index 5c490360fc..87d447c2fb 100644 --- a/requirements.server.dev.txt +++ b/requirements.server.dev.txt @@ -6,6 +6,7 @@ djangorestframework-stubs -r requirements.sdk.dev.txt # karrio server modules +-e ./modules/server -e ./modules/core -e ./apps/api -e ./modules/graph diff --git a/ruff.toml b/ruff.toml index 547bdc1d2f..f6a16914c0 100644 --- a/ruff.toml +++ b/ruff.toml @@ -31,8 +31,8 @@ ignore = [ [lint.per-file-ignores] "*/tests/*" = ["S101", "S105", "S106", "T20"] "*/migrations/*" = ["E501"] -"modules/core/karrio/server/core/migrations/0002_apilogindex.py" = ["B023"] -"modules/core/karrio/server/core/migrations/0003_apilogindex_test_mode.py" = ["B023"] +"modules/server/karrio/server/core/migrations/0002_apilogindex.py" = ["B023"] +"modules/server/karrio/server/core/migrations/0003_apilogindex_test_mode.py" = ["B023"] "apps/api/karrio/server/urls/tokens.py" = ["UP017"] "modules/sdk/karrio/lib.py" = ["UP047"] "modules/sdk/karrio/core/units.py" = ["B008", "E741", "E743", "UP037"] @@ -41,15 +41,15 @@ ignore = [ "modules/sdk/karrio/core/utils/pipeline.py" = ["UP046"] "modules/sdk/karrio/core/utils/serializable.py" = ["UP046"] "modules/sdk/karrio/core/utils/soap.py" = ["UP031"] -"modules/core/karrio/server/core/models/entity.py" = ["DJ012"] -"modules/core/karrio/server/core/models/metafield.py" = ["DJ001"] -"modules/core/karrio/server/core/models/third_party.py" = ["DJ001"] -"modules/core/karrio/server/core/tests/__init__.py" = ["E402"] -"modules/core/karrio/server/core/tests/test_sentry_shipment_context.py" = ["S110"] -"modules/core/karrio/server/core/utils.py" = ["E402", "S105", "UP047", "I001"] -"modules/core/karrio/server/filters/__init__.py" = ["F403"] -"modules/core/karrio/server/iam/migrations/0001_initial.py" = ["I001"] -"modules/core/karrio/server/iam/migrations/0002_setup_carrier_permission_groups.py" = ["S110"] +"modules/server/karrio/server/core/models/entity.py" = ["DJ012"] +"modules/server/karrio/server/core/models/metafield.py" = ["DJ001"] +"modules/server/karrio/server/core/models/third_party.py" = ["DJ001"] +"modules/server/karrio/server/core/tests/__init__.py" = ["E402"] +"modules/server/karrio/server/core/tests/test_sentry_shipment_context.py" = ["S110"] +"modules/server/karrio/server/core/utils.py" = ["E402", "S105", "UP047", "I001"] +"modules/server/karrio/server/filters/__init__.py" = ["F403"] +"modules/server/karrio/server/iam/migrations/0001_initial.py" = ["I001"] +"modules/server/karrio/server/iam/migrations/0002_setup_carrier_permission_groups.py" = ["S110"] "modules/data/karrio/server/data/models.py" = ["DJ001"] "modules/data/karrio/server/data/resources/__init__.py" = ["F401"] "modules/data/karrio/server/events/task_definitions/data/__init__.py" = ["F401"] @@ -62,16 +62,16 @@ ignore = [ "modules/events/karrio/server/events/models.py" = ["DJ001"] "modules/events/karrio/server/events/serializers/__init__.py" = ["F403"] "modules/events/karrio/server/events/views/__init__.py" = ["F401"] -"modules/core/karrio/server/core/views/__init__.py" = ["F401"] -"modules/core/karrio/server/openapi.py" = ["F403"] -"modules/core/karrio/server/providers/migrations/*" = ["I001", "F401", "B023", "SIM105", "W292", "S608", "T201"] -"modules/core/karrio/server/providers/models/service.py" = ["DJ001"] -"modules/core/karrio/server/providers/models/sheet.py" = ["DJ008", "DJ012"] -"modules/core/karrio/server/providers/serializers/__init__.py" = ["F403"] -"modules/core/karrio/server/providers/tests/__init__.py" = ["E402", "F403"] -"modules/core/karrio/server/tracing/migrations/*" = ["I001"] -"modules/core/karrio/server/tracing/admin.py" = ["S308"] -"modules/core/karrio/server/user/migrations/*" = ["I001"] +"modules/server/karrio/server/core/views/__init__.py" = ["F401"] +"modules/server/karrio/server/openapi.py" = ["F403"] +"modules/server/karrio/server/providers/migrations/*" = ["I001", "F401", "B023", "SIM105", "W292", "S608", "T201"] +"modules/server/karrio/server/providers/models/service.py" = ["DJ001"] +"modules/server/karrio/server/providers/models/sheet.py" = ["DJ008", "DJ012"] +"modules/server/karrio/server/providers/serializers/__init__.py" = ["F403"] +"modules/server/karrio/server/providers/tests/__init__.py" = ["E402", "F403"] +"modules/server/karrio/server/tracing/migrations/*" = ["I001"] +"modules/server/karrio/server/tracing/admin.py" = ["S308"] +"modules/server/karrio/server/user/migrations/*" = ["I001"] "modules/manager/karrio/server/manager/migrations/0043_customs_duty_billing_address_and_more.py" = ["E722", "S110"] "modules/manager/karrio/server/manager/migrations/0085_fix_stale_tracker_carrier_snapshots.py" = ["T201"] "modules/manager/karrio/server/manager/tests/__init__.py" = ["E402", "F403"] @@ -79,9 +79,9 @@ ignore = [ "modules/orders/karrio/server/orders/migrations/0016_order_shipments.py" = ["S110"] "modules/orders/karrio/server/orders/models.py" = ["DJ001", "DJ012"] "modules/data/karrio/server/data/serializers/__init__.py" = ["F401", "F403", "I001"] -"modules/graph/karrio/server/graph/utils.py" = ["F403", "UP046", "UP047"] -"modules/admin/karrio/server/admin/worker/models.py" = ["DJ001"] -"modules/admin/karrio/server/admin/worker/signals.py" = ["S110"] +"modules/server/karrio/server/graph/utils.py" = ["F403", "UP046", "UP047"] +"modules/server/karrio/server/admin/worker/models.py" = ["DJ001"] +"modules/server/karrio/server/admin/worker/signals.py" = ["S110"] "modules/cli/karrio_cli/commands/codegen.py" = ["S603", "T20"] "modules/cli/karrio_cli/commands/login.py" = ["S113"] "modules/cli/karrio_cli/commands/studio.py" = ["B008", "S603"] @@ -172,7 +172,7 @@ ignore = [ "modules/connectors/ups/karrio/providers/ups/shipment/__init__.py" = ["F401", "I001"] "modules/connectors/ups/karrio/providers/ups/__init__.py" = ["F401"] "modules/connectors/dhl_parcel_de/vendors/test_tracking_live.py" = ["E722", "I001", "S318", "T20"] -"modules/admin/karrio/server/settings/admin.py" = ["F403", "F405", "I001"] +"modules/server/karrio/server/settings/admin.py" = ["F403", "F405", "I001"] "modules/huey/karrio/server/settings/huey.py" = ["F403", "F405"] "modules/huey/karrio/server/huey/configuration.py" = ["SIM105"] "modules/huey/karrio/server/huey/signals.py" = ["S110"] @@ -240,12 +240,12 @@ ignore = [ "modules/connectors/ups/karrio/providers/ups/pickup/__init__.py" = ["F401", "I001"] "modules/connectors/mydhl/tests/__init__.py" = ["E402", "F403", "I001", "W292"] "modules/connectors/dhl_parcel_de/karrio/providers/dhl_parcel_de/units.py" = ["I001", "UP006", "UP045", "UP015", "SIM102"] -"modules/core/karrio/server/providers/admin.py" = ["DJ007", "SIM118"] -"modules/core/karrio/server/providers/models/connection.py" = ["DJ001", "DJ012"] -"modules/core/karrio/server/providers/models/__init__.py" = ["F401", "I001"] -"modules/core/karrio/server/providers/migrations/0093_migrate_system_carriers_data.py" = ["F841", "S110", "S608", "SIM105"] +"modules/server/karrio/server/providers/admin.py" = ["DJ007", "SIM118"] +"modules/server/karrio/server/providers/models/connection.py" = ["DJ001", "DJ012"] +"modules/server/karrio/server/providers/models/__init__.py" = ["F401", "I001"] +"modules/server/karrio/server/providers/migrations/0093_migrate_system_carriers_data.py" = ["F841", "S110", "S608", "SIM105"] "modules/documents/karrio/server/graph/schemas/documents/inputs.py" = ["UP045"] -"modules/graph/karrio/server/graph/tests/__init__.py" = ["E402", "F403", "I001"] +"modules/server/karrio/server/graph/tests/__init__.py" = ["E402", "F403", "I001"] "modules/manager/karrio/server/manager/serializers/__init__.py" = ["E402", "F403", "F405"] "modules/events/karrio/server/events/tests/__init__.py" = ["E402", "F403", "I001"] "modules/proxy/karrio/server/proxy/tests/__init__.py" = ["E402", "F403", "I001"] diff --git a/source.requirements.insiders.txt b/source.requirements.insiders.txt index dda67b2b29..2bcad7254a 100644 --- a/source.requirements.insiders.txt +++ b/source.requirements.insiders.txt @@ -93,6 +93,7 @@ karrio_server_documents @ file://${PWD}/modules/documents karrio_server_events @ file://${PWD}/modules/events karrio_server_graph @ file://${PWD}/modules/graph karrio_server_manager @ file://${PWD}/modules/manager +karrio_server_modules @ file://${PWD}/modules/server karrio_server_orders @ file://${PWD}/modules/orders karrio_server_orgs @ file://${PWD}/ee/insiders/modules/orgs karrio_server_pricing @ file://${PWD}/modules/pricing diff --git a/source.requirements.platform.txt b/source.requirements.platform.txt index 3dd9875f92..74c47fe13e 100644 --- a/source.requirements.platform.txt +++ b/source.requirements.platform.txt @@ -94,6 +94,7 @@ karrio_server_documents @ file://${PWD}/modules/documents karrio_server_events @ file://${PWD}/modules/events karrio_server_graph @ file://${PWD}/modules/graph karrio_server_manager @ file://${PWD}/modules/manager +karrio_server_modules @ file://${PWD}/modules/server karrio_server_orders @ file://${PWD}/modules/orders karrio_server_orgs @ file://${PWD}/ee/insiders/modules/orgs karrio_server_pricing @ file://${PWD}/modules/pricing diff --git a/source.requirements.txt b/source.requirements.txt index 043d1ce2ee..9443a7dae4 100644 --- a/source.requirements.txt +++ b/source.requirements.txt @@ -84,6 +84,7 @@ karrio_server_documents @ file://${PWD}/modules/documents karrio_server_events @ file://${PWD}/modules/events karrio_server_graph @ file://${PWD}/modules/graph karrio_server_manager @ file://${PWD}/modules/manager +karrio_server_modules @ file://${PWD}/modules/server karrio_server_orders @ file://${PWD}/modules/orders karrio_server_pricing @ file://${PWD}/modules/pricing karrio_server_proxy @ file://${PWD}/modules/proxy