diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
index 79e15130ee..900126b780 100644
--- a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
  org.jkiss.dbeaver.net.ssh
 Export-Package: io.cloudbeaver,
+ io.cloudbeaver.auth,
  io.cloudbeaver.auth.provider,
  io.cloudbeaver.auth.provider.local,
  io.cloudbeaver.server,
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderAssumer.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderAssumer.java
deleted file mode 100644
index ada3bd8226..0000000000
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderAssumer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2021 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.cloudbeaver;
-
-import io.cloudbeaver.model.session.WebAuthInfo;
-import org.jkiss.dbeaver.DBException;
-
-import java.util.Map;
-
-/**
- * Auth provider which can assume authentication from another authentication (federated)
- */
-public interface DBWAuthProviderAssumer {
-
-    WebAuthInfo assumeAuthentication(WebAuthInfo authInfo, Map<String, Object> authAttrs)
-        throws DBException;
-
-}
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProvider.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProvider.java
similarity index 98%
rename from server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProvider.java
rename to server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProvider.java
index 2dc8b83ac5..0711bb06d1 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProvider.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver;
+package io.cloudbeaver.auth;
 
 import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderExternal.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProviderExternal.java
similarity index 95%
rename from server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderExternal.java
rename to server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProviderExternal.java
index dcd744f9fd..7d7c80f602 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderExternal.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProviderExternal.java
@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver;
+package io.cloudbeaver.auth;
 
+import io.cloudbeaver.DBWSecurityController;
+import io.cloudbeaver.DBWUserIdentity;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.user.WebUser;
 import org.jkiss.code.NotNull;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderFederated.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProviderFederated.java
similarity index 97%
rename from server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderFederated.java
rename to server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProviderFederated.java
index a2647faf53..fbef04e242 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/DBWAuthProviderFederated.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/DBWAuthProviderFederated.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver;
+package io.cloudbeaver.auth;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.java
index 4344365c16..c74eb2cd56 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.java
@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.auth.provider;
 
-import io.cloudbeaver.DBWAuthProviderExternal;
+import io.cloudbeaver.auth.DBWAuthProviderExternal;
 import io.cloudbeaver.model.user.WebUser;
 import org.jkiss.dbeaver.model.access.DBASession;
 import org.jkiss.utils.CommonUtils;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/local/LocalAuthProvider.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/local/LocalAuthProvider.java
index 8bbdc50bb5..341de096d7 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/local/LocalAuthProvider.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/auth/provider/local/LocalAuthProvider.java
@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.auth.provider.local;
 
-import io.cloudbeaver.DBWAuthProvider;
+import io.cloudbeaver.auth.DBWAuthProvider;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.registry.WebAuthProviderPropertyEncryption;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebAuthInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebAuthInfo.java
index 6021ef9c44..ff6c25433c 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebAuthInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebAuthInfo.java
@@ -16,8 +16,8 @@
  */
 package io.cloudbeaver.model.session;
 
-import io.cloudbeaver.DBWAuthProvider;
 import io.cloudbeaver.DBWUserIdentity;
+import io.cloudbeaver.auth.DBWAuthProvider;
 import io.cloudbeaver.model.user.WebAuthProviderConfiguration;
 import io.cloudbeaver.model.user.WebUser;
 import io.cloudbeaver.model.user.WebUserOriginInfo;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderConfiguration.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderConfiguration.java
index bfbf2a7ad6..5dfcc8a1b5 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderConfiguration.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderConfiguration.java
@@ -16,8 +16,8 @@
  */
 package io.cloudbeaver.model.user;
 
-import io.cloudbeaver.DBWAuthProvider;
-import io.cloudbeaver.DBWAuthProviderFederated;
+import io.cloudbeaver.auth.DBWAuthProvider;
+import io.cloudbeaver.auth.DBWAuthProviderFederated;
 import io.cloudbeaver.auth.provider.AuthProviderConfig;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import org.jkiss.dbeaver.DBException;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebUserOriginInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebUserOriginInfo.java
index b291dcab21..26c1d66d10 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebUserOriginInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebUserOriginInfo.java
@@ -16,10 +16,10 @@
  */
 package io.cloudbeaver.model.user;
 
-import io.cloudbeaver.DBWAuthProvider;
-import io.cloudbeaver.DBWAuthProviderExternal;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebServiceUtils;
+import io.cloudbeaver.auth.DBWAuthProvider;
+import io.cloudbeaver.auth.DBWAuthProviderExternal;
 import io.cloudbeaver.auth.provider.local.LocalAuthProvider;
 import io.cloudbeaver.model.WebObjectOrigin;
 import io.cloudbeaver.model.WebPropertyInfo;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java
index 6e3a442aa2..e9cc455679 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java
@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.registry;
 
-import io.cloudbeaver.DBWAuthProvider;
+import io.cloudbeaver.auth.DBWAuthProvider;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
index 6bda03b633..5f99e70ab6 100644
--- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
+++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
@@ -16,7 +16,12 @@
  */
 package io.cloudbeaver.service.auth.impl;
 
-import io.cloudbeaver.*;
+import io.cloudbeaver.DBWConstants;
+import io.cloudbeaver.DBWSecurityController;
+import io.cloudbeaver.DBWUserIdentity;
+import io.cloudbeaver.DBWebException;
+import io.cloudbeaver.auth.DBWAuthProvider;
+import io.cloudbeaver.auth.DBWAuthProviderExternal;
 import io.cloudbeaver.auth.provider.local.LocalAuthProvider;
 import io.cloudbeaver.model.session.WebAuthInfo;
 import io.cloudbeaver.model.session.WebSession;