diff --git a/packages/common/CHANGELOG.md b/packages/oid4vci-common/CHANGELOG.md
similarity index 100%
rename from packages/common/CHANGELOG.md
rename to packages/oid4vci-common/CHANGELOG.md
diff --git a/packages/common/LICENSE b/packages/oid4vci-common/LICENSE
similarity index 100%
rename from packages/common/LICENSE
rename to packages/oid4vci-common/LICENSE
diff --git a/packages/common/lib/__tests__/CredentialOfferUtil.spec.ts b/packages/oid4vci-common/lib/__tests__/CredentialOfferUtil.spec.ts
similarity index 100%
rename from packages/common/lib/__tests__/CredentialOfferUtil.spec.ts
rename to packages/oid4vci-common/lib/__tests__/CredentialOfferUtil.spec.ts
diff --git a/packages/common/lib/__tests__/Encoding.spec.ts b/packages/oid4vci-common/lib/__tests__/Encoding.spec.ts
similarity index 100%
rename from packages/common/lib/__tests__/Encoding.spec.ts
rename to packages/oid4vci-common/lib/__tests__/Encoding.spec.ts
diff --git a/packages/common/lib/__tests__/IssuerMetadataUtils.spec.ts b/packages/oid4vci-common/lib/__tests__/IssuerMetadataUtils.spec.ts
similarity index 100%
rename from packages/common/lib/__tests__/IssuerMetadataUtils.spec.ts
rename to packages/oid4vci-common/lib/__tests__/IssuerMetadataUtils.spec.ts
diff --git a/packages/common/lib/__tests__/randomBytes.spec.ts b/packages/oid4vci-common/lib/__tests__/randomBytes.spec.ts
similarity index 100%
rename from packages/common/lib/__tests__/randomBytes.spec.ts
rename to packages/oid4vci-common/lib/__tests__/randomBytes.spec.ts
diff --git a/packages/common/lib/events/index.ts b/packages/oid4vci-common/lib/events/index.ts
similarity index 100%
rename from packages/common/lib/events/index.ts
rename to packages/oid4vci-common/lib/events/index.ts
diff --git a/packages/common/lib/experimental/holder-vci.ts b/packages/oid4vci-common/lib/experimental/holder-vci.ts
similarity index 100%
rename from packages/common/lib/experimental/holder-vci.ts
rename to packages/oid4vci-common/lib/experimental/holder-vci.ts
diff --git a/packages/common/lib/functions/AuthorizationResponseUtil.ts b/packages/oid4vci-common/lib/functions/AuthorizationResponseUtil.ts
similarity index 100%
rename from packages/common/lib/functions/AuthorizationResponseUtil.ts
rename to packages/oid4vci-common/lib/functions/AuthorizationResponseUtil.ts
diff --git a/packages/common/lib/functions/CredentialOfferUtil.ts b/packages/oid4vci-common/lib/functions/CredentialOfferUtil.ts
similarity index 100%
rename from packages/common/lib/functions/CredentialOfferUtil.ts
rename to packages/oid4vci-common/lib/functions/CredentialOfferUtil.ts
diff --git a/packages/common/lib/functions/CredentialRequestUtil.ts b/packages/oid4vci-common/lib/functions/CredentialRequestUtil.ts
similarity index 100%
rename from packages/common/lib/functions/CredentialRequestUtil.ts
rename to packages/oid4vci-common/lib/functions/CredentialRequestUtil.ts
diff --git a/packages/common/lib/functions/CredentialResponseUtil.ts b/packages/oid4vci-common/lib/functions/CredentialResponseUtil.ts
similarity index 100%
rename from packages/common/lib/functions/CredentialResponseUtil.ts
rename to packages/oid4vci-common/lib/functions/CredentialResponseUtil.ts
diff --git a/packages/common/lib/functions/DPoP.ts b/packages/oid4vci-common/lib/functions/DPoP.ts
similarity index 100%
rename from packages/common/lib/functions/DPoP.ts
rename to packages/oid4vci-common/lib/functions/DPoP.ts
diff --git a/packages/common/lib/functions/Encoding.ts b/packages/oid4vci-common/lib/functions/Encoding.ts
similarity index 100%
rename from packages/common/lib/functions/Encoding.ts
rename to packages/oid4vci-common/lib/functions/Encoding.ts
diff --git a/packages/common/lib/functions/FormatUtils.ts b/packages/oid4vci-common/lib/functions/FormatUtils.ts
similarity index 100%
rename from packages/common/lib/functions/FormatUtils.ts
rename to packages/oid4vci-common/lib/functions/FormatUtils.ts
diff --git a/packages/common/lib/functions/HttpUtils.ts b/packages/oid4vci-common/lib/functions/HttpUtils.ts
similarity index 100%
rename from packages/common/lib/functions/HttpUtils.ts
rename to packages/oid4vci-common/lib/functions/HttpUtils.ts
diff --git a/packages/common/lib/functions/IssuerMetadataUtils.ts b/packages/oid4vci-common/lib/functions/IssuerMetadataUtils.ts
similarity index 100%
rename from packages/common/lib/functions/IssuerMetadataUtils.ts
rename to packages/oid4vci-common/lib/functions/IssuerMetadataUtils.ts
diff --git a/packages/common/lib/functions/JwkThumbprint.ts b/packages/oid4vci-common/lib/functions/JwkThumbprint.ts
similarity index 100%
rename from packages/common/lib/functions/JwkThumbprint.ts
rename to packages/oid4vci-common/lib/functions/JwkThumbprint.ts
diff --git a/packages/common/lib/functions/JwtIssuer.ts b/packages/oid4vci-common/lib/functions/JwtIssuer.ts
similarity index 100%
rename from packages/common/lib/functions/JwtIssuer.ts
rename to packages/oid4vci-common/lib/functions/JwtIssuer.ts
diff --git a/packages/common/lib/functions/JwtVerifier.ts b/packages/oid4vci-common/lib/functions/JwtVerifier.ts
similarity index 100%
rename from packages/common/lib/functions/JwtVerifier.ts
rename to packages/oid4vci-common/lib/functions/JwtVerifier.ts
diff --git a/packages/common/lib/functions/ProofUtil.ts b/packages/oid4vci-common/lib/functions/ProofUtil.ts
similarity index 100%
rename from packages/common/lib/functions/ProofUtil.ts
rename to packages/oid4vci-common/lib/functions/ProofUtil.ts
diff --git a/packages/common/lib/functions/RandomUtils.ts b/packages/oid4vci-common/lib/functions/RandomUtils.ts
similarity index 100%
rename from packages/common/lib/functions/RandomUtils.ts
rename to packages/oid4vci-common/lib/functions/RandomUtils.ts
diff --git a/packages/common/lib/functions/TypeConversionUtils.ts b/packages/oid4vci-common/lib/functions/TypeConversionUtils.ts
similarity index 100%
rename from packages/common/lib/functions/TypeConversionUtils.ts
rename to packages/oid4vci-common/lib/functions/TypeConversionUtils.ts
diff --git a/packages/common/lib/functions/index.ts b/packages/oid4vci-common/lib/functions/index.ts
similarity index 100%
rename from packages/common/lib/functions/index.ts
rename to packages/oid4vci-common/lib/functions/index.ts
diff --git a/packages/common/lib/functions/jwtUtils.ts b/packages/oid4vci-common/lib/functions/jwtUtils.ts
similarity index 100%
rename from packages/common/lib/functions/jwtUtils.ts
rename to packages/oid4vci-common/lib/functions/jwtUtils.ts
diff --git a/packages/common/lib/functions/randomBytes.js b/packages/oid4vci-common/lib/functions/randomBytes.js
similarity index 100%
rename from packages/common/lib/functions/randomBytes.js
rename to packages/oid4vci-common/lib/functions/randomBytes.js
diff --git a/packages/common/lib/index.ts b/packages/oid4vci-common/lib/index.ts
similarity index 100%
rename from packages/common/lib/index.ts
rename to packages/oid4vci-common/lib/index.ts
diff --git a/packages/common/lib/types/Authorization.types.ts b/packages/oid4vci-common/lib/types/Authorization.types.ts
similarity index 100%
rename from packages/common/lib/types/Authorization.types.ts
rename to packages/oid4vci-common/lib/types/Authorization.types.ts
diff --git a/packages/common/lib/types/CredentialIssuance.types.ts b/packages/oid4vci-common/lib/types/CredentialIssuance.types.ts
similarity index 100%
rename from packages/common/lib/types/CredentialIssuance.types.ts
rename to packages/oid4vci-common/lib/types/CredentialIssuance.types.ts
diff --git a/packages/common/lib/types/Generic.types.ts b/packages/oid4vci-common/lib/types/Generic.types.ts
similarity index 100%
rename from packages/common/lib/types/Generic.types.ts
rename to packages/oid4vci-common/lib/types/Generic.types.ts
diff --git a/packages/common/lib/types/Jwt.types.ts b/packages/oid4vci-common/lib/types/Jwt.types.ts
similarity index 100%
rename from packages/common/lib/types/Jwt.types.ts
rename to packages/oid4vci-common/lib/types/Jwt.types.ts
diff --git a/packages/common/lib/types/OpenID4VCIErrors.ts b/packages/oid4vci-common/lib/types/OpenID4VCIErrors.ts
similarity index 100%
rename from packages/common/lib/types/OpenID4VCIErrors.ts
rename to packages/oid4vci-common/lib/types/OpenID4VCIErrors.ts
diff --git a/packages/common/lib/types/OpenID4VCIVersions.types.ts b/packages/oid4vci-common/lib/types/OpenID4VCIVersions.types.ts
similarity index 100%
rename from packages/common/lib/types/OpenID4VCIVersions.types.ts
rename to packages/oid4vci-common/lib/types/OpenID4VCIVersions.types.ts
diff --git a/packages/common/lib/types/QRCode.types.ts b/packages/oid4vci-common/lib/types/QRCode.types.ts
similarity index 100%
rename from packages/common/lib/types/QRCode.types.ts
rename to packages/oid4vci-common/lib/types/QRCode.types.ts
diff --git a/packages/common/lib/types/ServerMetadata.ts b/packages/oid4vci-common/lib/types/ServerMetadata.ts
similarity index 100%
rename from packages/common/lib/types/ServerMetadata.ts
rename to packages/oid4vci-common/lib/types/ServerMetadata.ts
diff --git a/packages/common/lib/types/StateManager.types.ts b/packages/oid4vci-common/lib/types/StateManager.types.ts
similarity index 100%
rename from packages/common/lib/types/StateManager.types.ts
rename to packages/oid4vci-common/lib/types/StateManager.types.ts
diff --git a/packages/common/lib/types/Token.types.ts b/packages/oid4vci-common/lib/types/Token.types.ts
similarity index 100%
rename from packages/common/lib/types/Token.types.ts
rename to packages/oid4vci-common/lib/types/Token.types.ts
diff --git a/packages/common/lib/types/index.ts b/packages/oid4vci-common/lib/types/index.ts
similarity index 100%
rename from packages/common/lib/types/index.ts
rename to packages/oid4vci-common/lib/types/index.ts
diff --git a/packages/common/lib/types/v1_0_08.types.ts b/packages/oid4vci-common/lib/types/v1_0_08.types.ts
similarity index 100%
rename from packages/common/lib/types/v1_0_08.types.ts
rename to packages/oid4vci-common/lib/types/v1_0_08.types.ts
diff --git a/packages/common/lib/types/v1_0_09.types.ts b/packages/oid4vci-common/lib/types/v1_0_09.types.ts
similarity index 100%
rename from packages/common/lib/types/v1_0_09.types.ts
rename to packages/oid4vci-common/lib/types/v1_0_09.types.ts
diff --git a/packages/common/lib/types/v1_0_11.types.ts b/packages/oid4vci-common/lib/types/v1_0_11.types.ts
similarity index 100%
rename from packages/common/lib/types/v1_0_11.types.ts
rename to packages/oid4vci-common/lib/types/v1_0_11.types.ts
diff --git a/packages/common/lib/types/v1_0_12.types.ts b/packages/oid4vci-common/lib/types/v1_0_12.types.ts
similarity index 100%
rename from packages/common/lib/types/v1_0_12.types.ts
rename to packages/oid4vci-common/lib/types/v1_0_12.types.ts
diff --git a/packages/common/lib/types/v1_0_13.types.ts b/packages/oid4vci-common/lib/types/v1_0_13.types.ts
similarity index 100%
rename from packages/common/lib/types/v1_0_13.types.ts
rename to packages/oid4vci-common/lib/types/v1_0_13.types.ts
diff --git a/packages/common/package.json b/packages/oid4vci-common/package.json
similarity index 100%
rename from packages/common/package.json
rename to packages/oid4vci-common/package.json
diff --git a/packages/common/tsconfig.json b/packages/oid4vci-common/tsconfig.json
similarity index 100%
rename from packages/common/tsconfig.json
rename to packages/oid4vci-common/tsconfig.json