keycloak-uncached

diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
index 0f525e8..c69ea6b 100755
--- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
+++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
@@ -43,7 +43,7 @@
             <excludes>
                 <exclude>**/*.war</exclude>
             </excludes>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml b/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml
index 67b4312..a418265 100755
--- a/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml
+++ b/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml
@@ -43,7 +43,7 @@
             <excludes>
                 <exclude>**/*.war</exclude>
             </excludes>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
index b5f6593..8da890a 100755
--- a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
+++ b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
@@ -42,7 +42,7 @@
             <excludes>
                 <exclude>**/*.war</exclude>
             </excludes>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
index 624933a..683561b 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
@@ -41,7 +41,7 @@
             <excludes>
                 <exclude>**/*.war</exclude>
             </excludes>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
index 6ee1555..14d7a90 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
@@ -41,7 +41,7 @@
             <excludes>
                 <exclude>**/*.war</exclude>
             </excludes>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
         </fileSet>
     </fileSets>
     <files>

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index eabf75e..fe48d73 100755
--- a/distribution/server-dist/assembly.xml
+++ b/distribution/server-dist/assembly.xml
@@ -54,5 +54,12 @@
                 <include>*.*</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>src/main/modules</directory>
+            <outputDirectory>modules</outputDirectory>
+            <includes>
+                <include>layers.conf</include>
+            </includes>
+        </fileSet>
     </fileSets>
 </assembly>

diff --git a/distribution/server-dist/src/main/modules/layers.conf b/distribution/server-dist/src/main/modules/layers.conf
new file mode 100644
index 0000000..74f4485
--- /dev/null
+++ b/distribution/server-dist/src/main/modules/layers.conf
@@ -0,0 +1 @@
+layers=keycloak
\ No newline at end of file

diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index b7c250a..9d50f77 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -27,8 +27,8 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/base</directory>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/keycloak</directory>
+            <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
             <includes>
                 <include>com/google/zxing/**</include>
                 <include>org/freemarker/**</include>