diff --git a/nym-vpn-api/Cargo.lock b/nym-credential-proxy/Cargo.lock
similarity index 100%
rename from nym-vpn-api/Cargo.lock
rename to nym-credential-proxy/Cargo.lock
diff --git a/nym-vpn-api/Cargo.toml b/nym-credential-proxy/Cargo.toml
similarity index 100%
rename from nym-vpn-api/Cargo.toml
rename to nym-credential-proxy/Cargo.toml
diff --git a/nym-vpn-api/vpn-api-lib-wasm/Cargo.toml b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/Cargo.toml
rename to nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml
diff --git a/nym-vpn-api/vpn-api-lib-wasm/Makefile b/nym-credential-proxy/vpn-api-lib-wasm/Makefile
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/Makefile
rename to nym-credential-proxy/vpn-api-lib-wasm/Makefile
diff --git a/nym-vpn-api/vpn-api-lib-wasm/internal-dev/bootstrap.js b/nym-credential-proxy/vpn-api-lib-wasm/internal-dev/bootstrap.js
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/internal-dev/bootstrap.js
rename to nym-credential-proxy/vpn-api-lib-wasm/internal-dev/bootstrap.js
diff --git a/nym-vpn-api/vpn-api-lib-wasm/internal-dev/index.html b/nym-credential-proxy/vpn-api-lib-wasm/internal-dev/index.html
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/internal-dev/index.html
rename to nym-credential-proxy/vpn-api-lib-wasm/internal-dev/index.html
diff --git a/nym-vpn-api/vpn-api-lib-wasm/internal-dev/index.js b/nym-credential-proxy/vpn-api-lib-wasm/internal-dev/index.js
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/internal-dev/index.js
rename to nym-credential-proxy/vpn-api-lib-wasm/internal-dev/index.js
diff --git a/nym-vpn-api/vpn-api-lib-wasm/internal-dev/package.json b/nym-credential-proxy/vpn-api-lib-wasm/internal-dev/package.json
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/internal-dev/package.json
rename to nym-credential-proxy/vpn-api-lib-wasm/internal-dev/package.json
diff --git a/nym-vpn-api/vpn-api-lib-wasm/internal-dev/webpack.config.js b/nym-credential-proxy/vpn-api-lib-wasm/internal-dev/webpack.config.js
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/internal-dev/webpack.config.js
rename to nym-credential-proxy/vpn-api-lib-wasm/internal-dev/webpack.config.js
diff --git a/nym-vpn-api/vpn-api-lib-wasm/internal-dev/yarn.lock b/nym-credential-proxy/vpn-api-lib-wasm/internal-dev/yarn.lock
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/internal-dev/yarn.lock
rename to nym-credential-proxy/vpn-api-lib-wasm/internal-dev/yarn.lock
diff --git a/nym-vpn-api/vpn-api-lib-wasm/src/error.rs b/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/src/error.rs
rename to nym-credential-proxy/vpn-api-lib-wasm/src/error.rs
diff --git a/nym-vpn-api/vpn-api-lib-wasm/src/lib.rs b/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-lib-wasm/src/lib.rs
rename to nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs
diff --git a/nym-vpn-api/vpn-api-requests/Cargo.toml b/nym-credential-proxy/vpn-api-requests/Cargo.toml
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/Cargo.toml
rename to nym-credential-proxy/vpn-api-requests/Cargo.toml
diff --git a/nym-vpn-api/vpn-api-requests/src/api/mod.rs b/nym-credential-proxy/vpn-api-requests/src/api/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/api/mod.rs
rename to nym-credential-proxy/vpn-api-requests/src/api/mod.rs
diff --git a/nym-vpn-api/vpn-api-requests/src/api/v1/mod.rs b/nym-credential-proxy/vpn-api-requests/src/api/v1/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/api/v1/mod.rs
rename to nym-credential-proxy/vpn-api-requests/src/api/v1/mod.rs
diff --git a/nym-vpn-api/vpn-api-requests/src/api/v1/ticketbook/mod.rs b/nym-credential-proxy/vpn-api-requests/src/api/v1/ticketbook/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/api/v1/ticketbook/mod.rs
rename to nym-credential-proxy/vpn-api-requests/src/api/v1/ticketbook/mod.rs
diff --git a/nym-vpn-api/vpn-api-requests/src/api/v1/ticketbook/models.rs b/nym-credential-proxy/vpn-api-requests/src/api/v1/ticketbook/models.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/api/v1/ticketbook/models.rs
rename to nym-credential-proxy/vpn-api-requests/src/api/v1/ticketbook/models.rs
diff --git a/nym-vpn-api/vpn-api-requests/src/client.rs b/nym-credential-proxy/vpn-api-requests/src/client.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/client.rs
rename to nym-credential-proxy/vpn-api-requests/src/client.rs
diff --git a/nym-vpn-api/vpn-api-requests/src/helpers.rs b/nym-credential-proxy/vpn-api-requests/src/helpers.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/helpers.rs
rename to nym-credential-proxy/vpn-api-requests/src/helpers.rs
diff --git a/nym-vpn-api/vpn-api-requests/src/lib.rs b/nym-credential-proxy/vpn-api-requests/src/lib.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-requests/src/lib.rs
rename to nym-credential-proxy/vpn-api-requests/src/lib.rs
diff --git a/nym-vpn-api/vpn-api-server/.gitignore b/nym-credential-proxy/vpn-api-server/.gitignore
similarity index 100%
rename from nym-vpn-api/vpn-api-server/.gitignore
rename to nym-credential-proxy/vpn-api-server/.gitignore
diff --git a/nym-vpn-api/vpn-api-server/Cargo.toml b/nym-credential-proxy/vpn-api-server/Cargo.toml
similarity index 100%
rename from nym-vpn-api/vpn-api-server/Cargo.toml
rename to nym-credential-proxy/vpn-api-server/Cargo.toml
diff --git a/nym-vpn-api/vpn-api-server/Dockerfile b/nym-credential-proxy/vpn-api-server/Dockerfile
similarity index 100%
rename from nym-vpn-api/vpn-api-server/Dockerfile
rename to nym-credential-proxy/vpn-api-server/Dockerfile
diff --git a/nym-vpn-api/vpn-api-server/build.rs b/nym-credential-proxy/vpn-api-server/build.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/build.rs
rename to nym-credential-proxy/vpn-api-server/build.rs
diff --git a/nym-vpn-api/vpn-api-server/migrations/01_initial.sql b/nym-credential-proxy/vpn-api-server/migrations/01_initial.sql
similarity index 100%
rename from nym-vpn-api/vpn-api-server/migrations/01_initial.sql
rename to nym-credential-proxy/vpn-api-server/migrations/01_initial.sql
diff --git a/nym-vpn-api/vpn-api-server/migrations/02_cherry_picking_chaos.sql b/nym-credential-proxy/vpn-api-server/migrations/02_cherry_picking_chaos.sql
similarity index 100%
rename from nym-vpn-api/vpn-api-server/migrations/02_cherry_picking_chaos.sql
rename to nym-credential-proxy/vpn-api-server/migrations/02_cherry_picking_chaos.sql
diff --git a/nym-vpn-api/vpn-api-server/src/cli.rs b/nym-credential-proxy/vpn-api-server/src/cli.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/cli.rs
rename to nym-credential-proxy/vpn-api-server/src/cli.rs
diff --git a/nym-vpn-api/vpn-api-server/src/config/mod.rs b/nym-credential-proxy/vpn-api-server/src/config/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/config/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/config/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/credentials/mod.rs b/nym-credential-proxy/vpn-api-server/src/credentials/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/credentials/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/credentials/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/credentials/ticketbook/mod.rs b/nym-credential-proxy/vpn-api-server/src/credentials/ticketbook/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/credentials/ticketbook/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/credentials/ticketbook/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/error.rs b/nym-credential-proxy/vpn-api-server/src/error.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/error.rs
rename to nym-credential-proxy/vpn-api-server/src/error.rs
diff --git a/nym-vpn-api/vpn-api-server/src/helpers.rs b/nym-credential-proxy/vpn-api-server/src/helpers.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/helpers.rs
rename to nym-credential-proxy/vpn-api-server/src/helpers.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/helpers.rs b/nym-credential-proxy/vpn-api-server/src/http/helpers.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/helpers.rs
rename to nym-credential-proxy/vpn-api-server/src/http/helpers.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/middleware/auth.rs b/nym-credential-proxy/vpn-api-server/src/http/middleware/auth.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/middleware/auth.rs
rename to nym-credential-proxy/vpn-api-server/src/http/middleware/auth.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/middleware/logging.rs b/nym-credential-proxy/vpn-api-server/src/http/middleware/logging.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/middleware/logging.rs
rename to nym-credential-proxy/vpn-api-server/src/http/middleware/logging.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/middleware/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/middleware/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/middleware/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/middleware/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/router/api/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/router/api/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/router/api/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/router/api/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/router/api/v1/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/router/api/v1/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/router/api/v1/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/router/api/v1/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/router/api/v1/openapi.rs b/nym-credential-proxy/vpn-api-server/src/http/router/api/v1/openapi.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/router/api/v1/openapi.rs
rename to nym-credential-proxy/vpn-api-server/src/http/router/api/v1/openapi.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/router/api/v1/ticketbook/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/router/api/v1/ticketbook/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/router/api/v1/ticketbook/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/router/api/v1/ticketbook/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/router/api/v1/ticketbook/shares.rs b/nym-credential-proxy/vpn-api-server/src/http/router/api/v1/ticketbook/shares.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/router/api/v1/ticketbook/shares.rs
rename to nym-credential-proxy/vpn-api-server/src/http/router/api/v1/ticketbook/shares.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/router/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/router/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/router/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/router/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/state/mod.rs b/nym-credential-proxy/vpn-api-server/src/http/state/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/state/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/http/state/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/http/types.rs b/nym-credential-proxy/vpn-api-server/src/http/types.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/http/types.rs
rename to nym-credential-proxy/vpn-api-server/src/http/types.rs
diff --git a/nym-vpn-api/vpn-api-server/src/main.rs b/nym-credential-proxy/vpn-api-server/src/main.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/main.rs
rename to nym-credential-proxy/vpn-api-server/src/main.rs
diff --git a/nym-vpn-api/vpn-api-server/src/nym_api_helpers.rs b/nym-credential-proxy/vpn-api-server/src/nym_api_helpers.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/nym_api_helpers.rs
rename to nym-credential-proxy/vpn-api-server/src/nym_api_helpers.rs
diff --git a/nym-vpn-api/vpn-api-server/src/storage/manager.rs b/nym-credential-proxy/vpn-api-server/src/storage/manager.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/storage/manager.rs
rename to nym-credential-proxy/vpn-api-server/src/storage/manager.rs
diff --git a/nym-vpn-api/vpn-api-server/src/storage/mod.rs b/nym-credential-proxy/vpn-api-server/src/storage/mod.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/storage/mod.rs
rename to nym-credential-proxy/vpn-api-server/src/storage/mod.rs
diff --git a/nym-vpn-api/vpn-api-server/src/storage/models.rs b/nym-credential-proxy/vpn-api-server/src/storage/models.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/storage/models.rs
rename to nym-credential-proxy/vpn-api-server/src/storage/models.rs
diff --git a/nym-vpn-api/vpn-api-server/src/tasks.rs b/nym-credential-proxy/vpn-api-server/src/tasks.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/tasks.rs
rename to nym-credential-proxy/vpn-api-server/src/tasks.rs
diff --git a/nym-vpn-api/vpn-api-server/src/webhook.rs b/nym-credential-proxy/vpn-api-server/src/webhook.rs
similarity index 100%
rename from nym-vpn-api/vpn-api-server/src/webhook.rs
rename to nym-credential-proxy/vpn-api-server/src/webhook.rs