diff --git a/build.gradle.kts b/build.gradle.kts
index bd9e911..9165487 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -93,10 +93,8 @@ dependencies {
     implementation("de.mkammerer:argon2-jvm:2.11")
 
 
-    // SSI Kit 2
-    implementation("id.walt.did:waltid-did:1.0.0")
-//    implementation("id.walt:waltid-ssikit2:1.0.4-SNAPSHOT")
-    // implementation id.walt:core-crypto -> provided by id.walt:waltid-ssikit2
+    // waltid-did
+    implementation("id.walt.did:waltid-did:1.0.0")//id.walt.crypto provided by id.walt.did:waltid-did
 
     // OIDC
     implementation("id.walt:waltid-openid4vc:1.2310051536.0")
diff --git a/src/main/kotlin/id/walt/service/SSIKit2WalletService.kt b/src/main/kotlin/id/walt/service/SSIKit2WalletService.kt
index 459737b..3d92a00 100644
--- a/src/main/kotlin/id/walt/service/SSIKit2WalletService.kt
+++ b/src/main/kotlin/id/walt/service/SSIKit2WalletService.kt
@@ -1,9 +1,9 @@
 package id.walt.service
 
-import id.walt.core.crypto.keys.Key
-import id.walt.core.crypto.keys.KeySerialization
-import id.walt.core.crypto.keys.KeyType
-import id.walt.core.crypto.keys.LocalKey
+import id.walt.crypto.keys.Key
+import id.walt.crypto.keys.KeySerialization
+import id.walt.crypto.keys.KeyType
+import id.walt.crypto.keys.LocalKey
 import id.walt.db.models.*
 import id.walt.did.dids.DidService
 import id.walt.did.dids.registrar.dids.DidCheqdCreateOptions
diff --git a/src/main/kotlin/id/walt/service/oidc4vc/TestCredentialWallet.kt b/src/main/kotlin/id/walt/service/oidc4vc/TestCredentialWallet.kt
index be0a82d..960b7f6 100644
--- a/src/main/kotlin/id/walt/service/oidc4vc/TestCredentialWallet.kt
+++ b/src/main/kotlin/id/walt/service/oidc4vc/TestCredentialWallet.kt
@@ -1,8 +1,8 @@
 package id.walt.service.oidc4vc
 
-import id.walt.core.crypto.keys.Key
-import id.walt.core.crypto.utils.JsonUtils.toJsonElement
-import id.walt.core.crypto.utils.JwsUtils.decodeJws
+import id.walt.crypto.keys.Key
+import id.walt.crypto.utils.JsonUtils.toJsonElement
+import id.walt.crypto.utils.JwsUtils.decodeJws
 import id.walt.did.dids.DidService
 import id.walt.oid4vc.data.OpenIDProviderMetadata
 import id.walt.oid4vc.data.dif.DescriptorMapping
diff --git a/src/main/kotlin/id/walt/web/controllers/KeyController.kt b/src/main/kotlin/id/walt/web/controllers/KeyController.kt
index f4850b7..930d502 100644
--- a/src/main/kotlin/id/walt/web/controllers/KeyController.kt
+++ b/src/main/kotlin/id/walt/web/controllers/KeyController.kt
@@ -1,6 +1,6 @@
 package id.walt.web.controllers
 
-import id.walt.core.crypto.keys.KeyType
+import id.walt.crypto.keys.KeyType
 import id.walt.web.getWalletService
 import io.github.smiley4.ktorswaggerui.dsl.delete
 import io.github.smiley4.ktorswaggerui.dsl.get