diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
index ff2937dca4..8113a59e5f 100755
--- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
+++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
@@ -27,7 +27,7 @@ import org.keycloak.broker.provider.AbstractIdentityProvider;
 import org.keycloak.broker.provider.AuthenticationRequest;
 import org.keycloak.broker.provider.BrokeredIdentityContext;
 import org.keycloak.broker.provider.IdentityBrokerException;
-import org.keycloak.connections.truststore.JSSETruststoreConfigurator;
+import org.keycloak.truststore.JSSETruststoreConfigurator;
 import org.keycloak.events.Errors;
 import org.keycloak.events.EventBuilder;
 import org.keycloak.events.EventType;
diff --git a/connections/http-client/pom.xml b/connections/http-client/pom.xml
deleted file mode 100755
index 7bb0f1d7f3..0000000000
--- a/connections/http-client/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>keycloak-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-connections-http-client</artifactId>
-    <name>Keycloak Connections Apache HttpClient</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-truststore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/connections/http-client/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/connections/http-client/src/main/resources/META-INF/services/org.keycloak.provider.Spi
deleted file mode 100755
index d91ed393d1..0000000000
--- a/connections/http-client/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.connections.httpclient.HttpClientSpi
diff --git a/connections/pom.xml b/connections/pom.xml
index 7b5cf4dc40..7ec53fb17e 100755
--- a/connections/pom.xml
+++ b/connections/pom.xml
@@ -14,8 +14,6 @@
 
     <modules>
         <module>infinispan</module>
-        <module>http-client</module>
-        <module>truststore</module>
     </modules>
 
     <build>
diff --git a/connections/truststore/pom.xml b/connections/truststore/pom.xml
deleted file mode 100755
index c0d42583a9..0000000000
--- a/connections/truststore/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>keycloak-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-connections-truststore</artifactId>
-    <name>Keycloak Truststore</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/connections/truststore/src/main/resources/META-INF/services/org.keycloak.connections.truststore.TruststoreProviderFactory b/connections/truststore/src/main/resources/META-INF/services/org.keycloak.connections.truststore.TruststoreProviderFactory
deleted file mode 100644
index 5b38b43c63..0000000000
--- a/connections/truststore/src/main/resources/META-INF/services/org.keycloak.connections.truststore.TruststoreProviderFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.connections.truststore.FileTruststoreProviderFactory
\ No newline at end of file
diff --git a/connections/truststore/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/connections/truststore/src/main/resources/META-INF/services/org.keycloak.provider.Spi
deleted file mode 100644
index 3be9970d46..0000000000
--- a/connections/truststore/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.connections.truststore.TruststoreSpi
\ No newline at end of file
diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index edbbccfa69..d60e68d4e2 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -65,14 +65,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-forms-common-themes</artifactId>
         </dependency>
-         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-truststore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-http-client</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
index 0c29957f51..a4f8290aa1 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-services"/>
-        <module name="org.keycloak.keycloak-connections-truststore"/>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
         <module name="com.fasterxml.jackson.core.jackson-annotations"/>
         <module name="com.fasterxml.jackson.core.jackson-databind"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml
deleted file mode 100755
index 3188114d2b..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-http-client">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-connections-http-client}"/>
-    </resources>
-    <exports>
-        <include path="META-INF/**"/>
-    </exports>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-        <module name="org.apache.httpcomponents"/>
-        <module name="org.keycloak.keycloak-connections-truststore"/>
-    </dependencies>
-
-</module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml
deleted file mode 100755
index 23047c8779..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-truststore">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-connections-truststore}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-        <module name="org.apache.httpcomponents"/>
-    </dependencies>
-
-</module>
\ No newline at end of file
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
index 1969666560..da3d43cd48 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
@@ -11,14 +11,13 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-saml-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-services"/>
+        <module name="org.keycloak.keycloak-services" services="import"/>
         <module name="org.apache.httpcomponents" />
         <module name="org.jboss.logging"/>
         <module name="javax.ws.rs.api"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.resteasy.resteasy-crypto"/>
         <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
-        <module name="org.keycloak.keycloak-connections-http-client" services="import"/>
 
         <module name="javax.api"/>
         <module name="javax.xml.soap.api"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml
index ce78f0f4fc..a8fd65c079 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml
@@ -12,6 +12,7 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.bouncycastle" />
         <module name="javax.api"/>
+        <module name="org.apache.httpcomponents"/>
     </dependencies>
 
 </module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
index 032adc7595..01b20f4fa2 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
@@ -2,7 +2,6 @@
     <deployment>
         <dependencies>
             <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
-            <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" services="import"/>
             <module name="org.keycloak.keycloak-events-email" services="import"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
index 65f86d7def..36c90f2312 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
@@ -9,9 +9,7 @@
     <dependencies>
         <module name="org.keycloak.keycloak-broker-oidc" services="import"/>
         <module name="org.keycloak.keycloak-broker-saml" services="import"/>
-        <module name="org.keycloak.keycloak-connections-http-client" services="import"/>
         <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
-        <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" services="import"/>
         <module name="org.keycloak.keycloak-events-email" services="import"/>
diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml
index f87b195177..30801ccb7b 100755
--- a/model/mongo/pom.xml
+++ b/model/mongo/pom.xml
@@ -30,7 +30,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
diff --git a/pom.xml b/pom.xml
index 6641b48474..ea2053e76c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -620,21 +620,11 @@
                 <artifactId>keycloak-connections-infinispan</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-connections-http-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-client-registration-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-connections-truststore</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-common</artifactId>
diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index 6de012faed..46a1bfd592 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>keycloak-common</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-http-client</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-services</artifactId>
diff --git a/server-spi/pom.xml b/server-spi/pom.xml
index a4a213aabd..6c038c10d0 100755
--- a/server-spi/pom.xml
+++ b/server-spi/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>jboss-logging</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java b/server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java
similarity index 100%
rename from connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java
rename to server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java
diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java b/server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java
similarity index 100%
rename from connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java
rename to server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java
diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java b/server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java
similarity index 100%
rename from connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java
rename to server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/HostnameVerificationPolicy.java b/server-spi/src/main/java/org/keycloak/truststore/HostnameVerificationPolicy.java
old mode 100644
new mode 100755
similarity index 86%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/HostnameVerificationPolicy.java
rename to server-spi/src/main/java/org/keycloak/truststore/HostnameVerificationPolicy.java
index 0b6c53b1e4..c6c81feed9
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/HostnameVerificationPolicy.java
+++ b/server-spi/src/main/java/org/keycloak/truststore/HostnameVerificationPolicy.java
@@ -1,4 +1,4 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 public enum HostnameVerificationPolicy {
 
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProvider.java b/server-spi/src/main/java/org/keycloak/truststore/TruststoreProvider.java
old mode 100644
new mode 100755
similarity index 86%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProvider.java
rename to server-spi/src/main/java/org/keycloak/truststore/TruststoreProvider.java
index 54cc6c3207..b00927181e
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProvider.java
+++ b/server-spi/src/main/java/org/keycloak/truststore/TruststoreProvider.java
@@ -1,4 +1,4 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 import org.keycloak.provider.Provider;
 
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderFactory.java b/server-spi/src/main/java/org/keycloak/truststore/TruststoreProviderFactory.java
old mode 100644
new mode 100755
similarity index 82%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderFactory.java
rename to server-spi/src/main/java/org/keycloak/truststore/TruststoreProviderFactory.java
index 10ed86750f..85355e1874
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderFactory.java
+++ b/server-spi/src/main/java/org/keycloak/truststore/TruststoreProviderFactory.java
@@ -1,4 +1,4 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 import org.keycloak.provider.ProviderFactory;
 
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreSpi.java b/server-spi/src/main/java/org/keycloak/truststore/TruststoreSpi.java
old mode 100644
new mode 100755
similarity index 93%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreSpi.java
rename to server-spi/src/main/java/org/keycloak/truststore/TruststoreSpi.java
index 385346e600..53e9ac3012
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreSpi.java
+++ b/server-spi/src/main/java/org/keycloak/truststore/TruststoreSpi.java
@@ -1,4 +1,4 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 import org.keycloak.provider.Provider;
 import org.keycloak.provider.ProviderFactory;
diff --git a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
index b72f756979..9a22e0f6a6 100755
--- a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
@@ -23,4 +23,7 @@ org.keycloak.forms.login.LoginFormsSpi
 org.keycloak.email.EmailSenderSpi
 org.keycloak.email.EmailTemplateSpi
 org.keycloak.theme.ThemeSpi
+org.keycloak.truststore.TruststoreSpi
+org.keycloak.connections.httpclient.HttpClientSpi
+
 
diff --git a/services/pom.xml b/services/pom.xml
index 9385b0bae0..1f83ab4068 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -30,10 +30,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-connections-http-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java b/services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
similarity index 98%
rename from connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
rename to services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
index 67f7cbd5d4..512b32d510 100755
--- a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
+++ b/services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
@@ -10,7 +10,7 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
-import org.keycloak.connections.truststore.TruststoreProvider;
+import org.keycloak.truststore.TruststoreProvider;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.common.util.EnvUtil;
diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java b/services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java
similarity index 100%
rename from connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java
rename to services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java
diff --git a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java
old mode 100644
new mode 100755
index 5f7f68bb9e..bbb331061d
--- a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java
+++ b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java
@@ -1,8 +1,8 @@
 package org.keycloak.email;
 
 import org.jboss.logging.Logger;
-import org.keycloak.connections.truststore.HostnameVerificationPolicy;
-import org.keycloak.connections.truststore.JSSETruststoreConfigurator;
+import org.keycloak.truststore.HostnameVerificationPolicy;
+import org.keycloak.truststore.JSSETruststoreConfigurator;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserModel;
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProvider.java b/services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java
old mode 100644
new mode 100755
similarity index 82%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProvider.java
rename to services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java
index d49ddb1c57..233ebd3ee5
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProvider.java
+++ b/services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java
@@ -1,4 +1,7 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
+
+import org.keycloak.truststore.HostnameVerificationPolicy;
+import org.keycloak.truststore.TruststoreProvider;
 
 import java.security.KeyStore;
 
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProviderFactory.java b/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java
old mode 100644
new mode 100755
similarity index 98%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProviderFactory.java
rename to services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java
index 0e2a5d3f20..9f84497cdf
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProviderFactory.java
+++ b/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java
@@ -1,4 +1,4 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/JSSETruststoreConfigurator.java b/services/src/main/java/org/keycloak/truststore/JSSETruststoreConfigurator.java
old mode 100644
new mode 100755
similarity index 94%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/JSSETruststoreConfigurator.java
rename to services/src/main/java/org/keycloak/truststore/JSSETruststoreConfigurator.java
index e323f7af19..74b6b4382a
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/JSSETruststoreConfigurator.java
+++ b/services/src/main/java/org/keycloak/truststore/JSSETruststoreConfigurator.java
@@ -1,9 +1,12 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.truststore.HostnameVerificationPolicy;
+import org.keycloak.truststore.TruststoreProvider;
+import org.keycloak.truststore.TruststoreProviderFactory;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/SSLSocketFactory.java b/services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java
old mode 100644
new mode 100755
similarity index 98%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/SSLSocketFactory.java
rename to services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java
index 86f56671e3..1a2766f614
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/SSLSocketFactory.java
+++ b/services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java
@@ -1,4 +1,4 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
 
 import org.jboss.logging.Logger;
 
diff --git a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderSingleton.java b/services/src/main/java/org/keycloak/truststore/TruststoreProviderSingleton.java
old mode 100644
new mode 100755
similarity index 78%
rename from connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderSingleton.java
rename to services/src/main/java/org/keycloak/truststore/TruststoreProviderSingleton.java
index 520e7814d1..1503664e0f
--- a/connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderSingleton.java
+++ b/services/src/main/java/org/keycloak/truststore/TruststoreProviderSingleton.java
@@ -1,4 +1,6 @@
-package org.keycloak.connections.truststore;
+package org.keycloak.truststore;
+
+import org.keycloak.truststore.TruststoreProvider;
 
 /**
  * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
diff --git a/connections/http-client/src/main/resources/META-INF/services/org.keycloak.connections.httpclient.HttpClientFactory b/services/src/main/resources/META-INF/services/org.keycloak.connections.httpclient.HttpClientFactory
similarity index 100%
rename from connections/http-client/src/main/resources/META-INF/services/org.keycloak.connections.httpclient.HttpClientFactory
rename to services/src/main/resources/META-INF/services/org.keycloak.connections.httpclient.HttpClientFactory
diff --git a/services/src/main/resources/META-INF/services/org.keycloak.truststore.TruststoreProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.truststore.TruststoreProviderFactory
new file mode 100755
index 0000000000..a154bbb0ac
--- /dev/null
+++ b/services/src/main/resources/META-INF/services/org.keycloak.truststore.TruststoreProviderFactory
@@ -0,0 +1 @@
+org.keycloak.truststore.FileTruststoreProviderFactory
\ No newline at end of file