diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/DefaultVaultMetadataCredentialsProvider.java b/core/src/main/java/ch/cyberduck/core/vault/DefaultVaultMetadataCredentialsProvider.java
similarity index 93%
rename from cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/DefaultVaultMetadataCredentialsProvider.java
rename to core/src/main/java/ch/cyberduck/core/vault/DefaultVaultMetadataCredentialsProvider.java
index 09678ab4e0..421655e77e 100644
--- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/DefaultVaultMetadataCredentialsProvider.java
+++ b/core/src/main/java/ch/cyberduck/core/vault/DefaultVaultMetadataCredentialsProvider.java
@@ -1,4 +1,4 @@
-package ch.cyberduck.core.cryptomator.impl;
+package ch.cyberduck.core.vault;
 
 /*
  * Copyright (c) 2002-2026 iterate GmbH. All rights reserved.
@@ -19,7 +19,6 @@ import ch.cyberduck.core.Credentials;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.LoginOptions;
 import ch.cyberduck.core.exception.LoginCanceledException;
-import ch.cyberduck.core.vault.VaultCredentials;
 
 public class DefaultVaultMetadataCredentialsProvider implements VaultMetadataCredentialsProvider {
 
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/VaultMetadataCredentialsProvider.java b/core/src/main/java/ch/cyberduck/core/vault/VaultMetadataCredentialsProvider.java
similarity index 87%
rename from cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/VaultMetadataCredentialsProvider.java
rename to core/src/main/java/ch/cyberduck/core/vault/VaultMetadataCredentialsProvider.java
index ce09c24c0c..51aa4fa0f5 100644
--- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/VaultMetadataCredentialsProvider.java
+++ b/core/src/main/java/ch/cyberduck/core/vault/VaultMetadataCredentialsProvider.java
@@ -1,4 +1,4 @@
-package ch.cyberduck.core.cryptomator.impl;
+package ch.cyberduck.core.vault;
 
 /*
  * Copyright (c) 2002-2026 iterate GmbH. All rights reserved.
@@ -15,9 +15,6 @@ package ch.cyberduck.core.cryptomator.impl;
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.vault.VaultCredentials;
-import ch.cyberduck.core.vault.VaultMetadataProvider;
-
 public interface VaultMetadataCredentialsProvider extends VaultMetadataProvider {
 
     VaultCredentials getCredentials();
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java
index d266aae573..c1506ef1b1 100644
--- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java
+++ b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java
@@ -18,7 +18,7 @@ package ch.cyberduck.core.cryptomator;
 import ch.cyberduck.core.ListProgressListener;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.Session;
-import ch.cyberduck.core.cryptomator.impl.DefaultVaultMetadataCredentialsProvider;
+import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider;
 import ch.cyberduck.core.cryptomator.impl.uvf.UVFVault;
 import ch.cyberduck.core.cryptomator.impl.v8.CryptomatorVault;
 import ch.cyberduck.core.exception.BackgroundException;
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java
index 7711bef6d4..d79f5648f9 100644
--- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java
+++ b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java
@@ -35,7 +35,7 @@ import ch.cyberduck.core.cryptomator.CryptoFilename;
 import ch.cyberduck.core.cryptomator.features.CryptoDirectoryFeature;
 import ch.cyberduck.core.cryptomator.impl.CryptoDirectoryUVFProvider;
 import ch.cyberduck.core.cryptomator.impl.CryptoFilenameV7Provider;
-import ch.cyberduck.core.cryptomator.impl.VaultMetadataCredentialsProvider;
+import ch.cyberduck.core.vault.VaultMetadataCredentialsProvider;
 import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.UnsupportedException;
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java
index 020036d080..e2b5673375 100644
--- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java
+++ b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java
@@ -35,8 +35,8 @@ import ch.cyberduck.core.cryptomator.CryptoDirectory;
 import ch.cyberduck.core.cryptomator.CryptoFilename;
 import ch.cyberduck.core.cryptomator.impl.CryptoDirectoryV8Provider;
 import ch.cyberduck.core.cryptomator.impl.CryptoFilenameV7Provider;
-import ch.cyberduck.core.cryptomator.impl.DefaultVaultMetadataCredentialsProvider;
-import ch.cyberduck.core.cryptomator.impl.VaultMetadataCredentialsProvider;
+import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider;
+import ch.cyberduck.core.vault.VaultMetadataCredentialsProvider;
 import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.LocalAccessDeniedException;
diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java
index 4d325ef070..41a15f5e86 100644
--- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java
+++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java
@@ -23,7 +23,7 @@ import ch.cyberduck.core.LoginOptions;
 import ch.cyberduck.core.NullSession;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.TestProtocol;
-import ch.cyberduck.core.cryptomator.impl.DefaultVaultMetadataCredentialsProvider;
+import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.NotfoundException;
 import ch.cyberduck.core.features.Directory;
diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java
index 116bc7cb6e..a049ba2a6b 100644
--- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java
+++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java
@@ -24,7 +24,7 @@ import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.PasswordCallback;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
-import ch.cyberduck.core.cryptomator.impl.DefaultVaultMetadataCredentialsProvider;
+import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider;
 import ch.cyberduck.core.proxy.DisabledProxyFinder;
 import ch.cyberduck.core.sftp.SFTPHomeDirectoryService;
 import ch.cyberduck.core.sftp.SFTPProtocol;