diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml b/ccm-bundle-devel-wildfly-swarm/pom.xml
index 585f0273c..466b1417b 100644
--- a/ccm-bundle-devel-wildfly-swarm/pom.xml
+++ b/ccm-bundle-devel-wildfly-swarm/pom.xml
@@ -6,16 +6,44 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
+    <!--<parent>
         <groupId>org.libreccm</groupId>
         <artifactId>libreccm-parent</artifactId>
         <version>7.0.0-SNAPSHOT</version>
+    </parent>-->
+    
+    <parent>
+        <groupId>org.libreccm</groupId>
+        <artifactId>ccm-bundle-devel</artifactId>
+        <relativePath>../ccm-bundle-devel</relativePath>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-bundle-devel-wildfly-swarm</artifactId>
     <packaging>war</packaging>
     
+    <name>LibreCCM Devel Bundle for Wildfly Swarm</name>
+    <url>http://www.libreccm.org</url>
+    <distributionManagement>
+        <site>
+            <id>libreccm-site</id>
+            <name>LibreCCM</name>
+            <url>http://www.libreccm.org/project-sites/</url>
+        </site>
+    </distributionManagement>
+
+    <organization>
+        <name>LibreCCM Foundation</name>
+    </organization>
+
+    <licenses>
+        <license>
+            <name>LGPLv2 or newer</name>
+            <url>http://www.gnu.org/licenses/lgpl-2.0.html</url>
+        </license>
+    </licenses>
+    
     <properties>
         <failOnMissingWebXml>false</failOnMissingWebXml>
     </properties>
@@ -24,8 +52,8 @@
         <dependencies>
             <dependency>
                 <groupId>org.wildfly.swarm</groupId>
-                <artifactId>bom</artifactId>
-                <version>2017.1.1</version>
+                <artifactId>bom-all</artifactId>
+                <version>2017.11.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -33,15 +61,63 @@
     </dependencyManagement>
     
     <dependencies>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>cdi</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
             <artifactId>container</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>datasources</artifactId>
+        </dependency>
+         
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>logging</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>jaxrs</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>jaxrs-cdi</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>jsf</artifactId>
+        </dependency>
+        
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>undertow</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.4.1212.jre7</version>
+            <version>42.1.4.jre7</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -61,7 +137,7 @@
                         </goals>
                     </execution>
                 </executions>
-           </plugin>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off b/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off
new file mode 100644
index 000000000..5e0447046
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off
@@ -0,0 +1,19 @@
+package org.libreccm;
+
+import org.wildfly.swarm.Swarm;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CcmBundleDevel {
+    
+    public static void main(final String[] args) throws Exception {
+        
+        final Swarm swarm = new Swarm();
+        
+        swarm.start();
+        
+    }
+    
+}
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml b/ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..4927cf628
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="warn">
+            <AppenderRef ref="Console"/>
+        </Root>
+        
+        <!--<Logger name="org.hibernate"
+                level="info">
+        </Logger>
+        <Logger name="org.hibernate.SQL"
+                level="debug">
+        </Logger>
+        <Logger name="org.hibernate.type"
+                  level="trace">
+        </Logger>
+        <Logger name="org.hibernate.type.descriptor.sql"
+                level="trace">
+        </Logger>-->
+        
+        <!--<Logger name="com.arsdigita.bebop.util.Traversal"
+                level="debug">
+        </Logger>-->
+        
+        <Logger name="com.arsdigita.cms.ui.assets.AssetFolderBrowserController"
+                level="debug">
+            
+        </Logger>
+        <Logger name="com.arsdigita.cms.ui.folder.FolderBrowserTableModelBuilder"
+                level="debug">
+        </Logger>
+        
+        <Logger name="com.arsdigita.ui.admin.AdminServlet"
+                level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.ui.admin.configuration.ConfigurationTable"
+                level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.ui.admin.usersgroupsroles.UsersTable"
+                level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.cms.ui.assets.AssetPane"
+                level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.ui.login.UserLoginForm" 
+                level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.packaging.Config"
+                level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.templating.PatternStylesheetResolver"
+                level="info">
+        </Logger>
+        <Logger name="com.arsdigita.templating.SimpleURIResolver"
+                level="warn">
+        </Logger>
+        <Logger name="com.arsdigita.web.CCMDispatcherServlet"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.core.AbstractEntityRepository"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.modules.CcmIntegrator" 
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.pagemodel.PageModelManager"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.security.OneTimeAuthTokenCleaner"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.security.PermissionManager"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.security.Shiro"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.ui.admin.usersgroupsroles.RolesController"
+                level="debug">
+        </Logger>
+        <Logger name="org.librecms.contentsection.AssetRepository"
+                level="debug">
+        </Logger>
+        <Logger name="org.librecms.contentsection.ContentSectionSetup"
+                level="debug">
+        </Logger>
+        <Logger name="org.librecms.contentsection.ContentSectionServlet"
+                level="debug">
+        </Logger>
+        <Logger name="org.librecms.contentsection.rs.Images"
+                    level="debug">
+        </Logger>
+       <Logger name="com.arsdigita.web.DefaultApplicationFileResolver"
+                    level="debug">
+        </Logger>
+    </Loggers>
+</Configuration>
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini b/ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini
new file mode 100644
index 000000000..469c812fa
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini
@@ -0,0 +1,15 @@
+[main]
+
+passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher
+passwordService = org.apache.shiro.authc.credential.DefaultPasswordService
+passwordMatcher.passwordService = $passwordService
+
+ccmRealm = org.libreccm.security.CcmShiroRealm
+ccmRealm.credentialsMatcher = $passwordMatcher
+
+securityManager.realms = $ccmRealm
+securityManager.rememberMeManager.cipherKey = p5h/Aphy0gfV+XThbEPqSG4iQNh2fTNH9ZEkSBAt/Ok=
+
+cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager 
+securityManager.cacheManager = $cacheManager
+
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt b/ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt
new file mode 100644
index 000000000..221b973e1
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt
@@ -0,0 +1,65 @@
+# -*- text -*-
+# This file locates stylesheets, if you are using the
+# "PatternStylesheetResolver". Please read the Javadoc for that file for
+# the full story.
+
+# Currently the "resource" part is actually "short-circuited", see 
+# Templating#transformURL(url). As long as we store and synchronize all theme
+# files in each server's local file system, we use the direct file apprach to
+# avoid unnecessary http request and traffic between client (user) and server!
+# Additionally all modules are installed into one webapp context, so the
+# webapp tag is redundant, but sort of required by some part of the code.
+
+
+# Theme with single entry point (e.g Mandalay) managed by themedirector
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
+
+# Theme with single entry point (e.g Mandalay) unmanaged default
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+#http://::host::/::webapp::/themes/mandalay/start.xsl
+
+# Theme with single entry point (e.g Mandalay) unmanaged default
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+http://::host::/::webapp::/themes/libreccm-default/start.xsl
+
+
+
+
+# ==============================================================================
+# The following is for multi-entry themes, not used in ScientificCMS
+# ==============================================================================
+
+# Output type is for things such as text/javascript
+# NOT used by ScientificCMS, uses Mandalay only!
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
+
+# Grabs custom item xsl for CMS
+# NOT used by ScientificCMS, uses Mandalay only!
+#http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
+
+# Theme, with optional locale & prefix
+# NOT used by ScientificCMS, uses Mandalay only!
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+
+# Theme, with optional locale
+# NOT used by ScientificCMS, uses Mandalay only!
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+
+# APLAWS generic default, with locale and prefix
+# XXX change ROOT -> ccm-ldn-aplaws
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
+
+# APLAWS generic default, with locale
+# XXX change ROOT -> ccm-ldn-aplaws
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
+
+# Global default, from application's own web app
+# NOT used by ScientificCMS
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties b/ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties
new file mode 100644
index 000000000..f34883af8
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties
@@ -0,0 +1,3 @@
+version = 7.0.0-SNAPSHOT
+appname = LibreCCM
+apphomepage = http://www.libreccm.org
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml b/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 000000000..194f21e6e
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+                           http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..2afd7ee37
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+                             http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    
+    <display-name>LibreCCM Devel Bundle for Wildfly</display-name>
+    
+    <context-param>
+        <param-name>ccm.develmode</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>ccm.distribution</param-name>
+        <param-value>libreccm</param-value>
+    </context-param>
+
+    <!-- No JSESSIONID!!! -->
+    <session-config>
+        <tracking-mode>COOKIE</tracking-mode>
+        <!--<tracking-mode>URL</tracking-mode>-->
+    </session-config>
+
+    <filter>
+        <filter-name>ShiroFilter</filter-name>
+        <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>ShiroFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener>
+        <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
+    </listener>
+    
+    <!-- JAX-RS -->
+    <!--<servlet>
+        <servlet-name>javax.ws.rs.core.Application</servlet-name>
+        
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>javax.ws.rs.core.Application</servlet-name>
+        <url-pattern>/content-sections/*</url-pattern>
+    </servlet-mapping>-->
+    
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.xhtml</url-pattern>
+    </servlet-mapping>
+    
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+    <context-param>
+        <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    
+    <servlet>
+        <servlet-name>vaadin-servlet</servlet-name>
+        <servlet-class>com.vaadin.cdi.server.VaadinCDIServlet</servlet-class>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>vaadin-servlet</servlet-name>
+        <url-pattern>/vaadin/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>vaadin-servlet</servlet-name>
+        <url-pattern>/VAADIN/*</url-pattern>
+    </servlet-mapping>
+    
+</web-app>
diff --git a/pom.xml b/pom.xml
index 7a552742e..e014de955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,34 +39,41 @@
     </licenses>
 
     <modules>
+        
+        <!-- Provides basic functionality required by all modules -->
         <module>ccm-core</module>
-        <module>ccm-shortcuts</module>
+        
+        <!-- Additional modules used by most/all modules (including ccm-core) -->
         <module>ccm-testutils</module>
-        <module>ccm-docrepo</module>
+        <module>ccm-xafilesystemadapter</module>
         
-        <!-- Bundle modules -->
-        <!--<module>ccm-bundle-devel-swarm</module>-->
-        <!--<module>ccm-bundle-devel-wildfly</module>-->
-        <!--<module>ccm-test-bundle-wildfly8</module>-->
-        
-        <module>ccm-theme-foundry</module>
-        
-        <!-- Archetypes -->
-        <module>ccm-archetype-module</module>
+        <!-- CMS modules -->
         <module>ccm-cms</module>
-        <module>ccm-cms-archetype-contenttype</module>
+        
         <module>ccm-cms-types-agenda</module>
         <module>ccm-cms-types-bookmark</module>
-        <module>ccm-cms-types-minutes</module>
         <module>ccm-cms-types-decisiontree</module>
-        <module>ccm-cms-types-glossaryitem</module>
-        <module>ccm-cms-types-faqitem</module>
         <module>ccm-cms-types-externallink</module>
+        <module>ccm-cms-types-faqitem</module>
+        <module>ccm-cms-types-glossaryitem</module>
+        <module>ccm-cms-types-minutes</module>
+        
+        <!-- Miscellaneous modules  -->
+        <module>ccm-docrepo</module>
+        <module>ccm-shortcuts</module>
+        
+        <!-- Modules providing themes -->
+        <module>ccm-theme-foundry</module>
+        
+        <!-- Bundle modules -->
         <module>ccm-bundle-devel</module>
         <module>ccm-bundle-devel-wildfly-web</module>
         <module>ccm-bundle-devel-wildfly</module>
-        <!--<module>ccm-bundle-devel-wildfly-swarm</module>-->
-        <module>ccm-xafilesystemadapter</module>
+        <module>ccm-bundle-devel-wildfly-swarm</module>
+        
+        <!-- Archetypes -->
+        <module>ccm-archetype-module</module>
+        <module>ccm-cms-archetype-contenttype</module>
     </modules>
 
     <reporting>