diff --git a/ccm-bundle-devel-wildfly-web/nb-configuration.xml b/ccm-bundle-devel-wildfly-web/nb-configuration.xml
deleted file mode 100644
index d6dddb53c..000000000
--- a/ccm-bundle-devel-wildfly-web/nb-configuration.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
-        <word>libreccm</word>
-    </spellchecker-wordlist>
-</project-shared-configuration>
diff --git a/ccm-bundle-devel-wildfly-web/.gitignore b/ccm-bundle-devel-wildfly/.gitignore
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/.gitignore
rename to ccm-bundle-devel-wildfly/.gitignore
diff --git a/ccm-bundle-devel-wildfly-web/README.md b/ccm-bundle-devel-wildfly/README.md
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/README.md
rename to ccm-bundle-devel-wildfly/README.md
diff --git a/ccm-bundle-devel-wildfly-web/datasource.example.properties b/ccm-bundle-devel-wildfly/datasource.example.properties
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/datasource.example.properties
rename to ccm-bundle-devel-wildfly/datasource.example.properties
diff --git a/ccm-bundle-devel-wildfly-web/package-lock.json b/ccm-bundle-devel-wildfly/package-lock.json
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/package-lock.json
rename to ccm-bundle-devel-wildfly/package-lock.json
diff --git a/ccm-bundle-devel-wildfly-web/package.json b/ccm-bundle-devel-wildfly/package.json
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/package.json
rename to ccm-bundle-devel-wildfly/package.json
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
similarity index 99%
rename from ccm-bundle-devel-wildfly-web/pom.xml
rename to ccm-bundle-devel-wildfly/pom.xml
index 4bb2c0b93..b57e97c17 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -16,7 +16,7 @@
     </parent>
 
     <groupId>org.libreccm</groupId>
-    <artifactId>ccm-bundle-devel-wildfly-web</artifactId>
+    <artifactId>ccm-bundle-devel-wildfly</artifactId>
     <!--<version>7.0.0-SNAPSHOT</version>-->
     <packaging>war</packaging>
 
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml.releaseBackup b/ccm-bundle-devel-wildfly/pom.xml.releaseBackup
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/pom.xml.releaseBackup
rename to ccm-bundle-devel-wildfly/pom.xml.releaseBackup
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml b/ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml
rename to ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/scripts/ccm-cms/tinymce-loader.js b/ccm-bundle-devel-wildfly/src/main/resources/scripts/ccm-cms/tinymce-loader.js
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/resources/scripts/ccm-cms/tinymce-loader.js
rename to ccm-bundle-devel-wildfly/src/main/resources/scripts/ccm-cms/tinymce-loader.js
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini b/ccm-bundle-devel-wildfly/src/main/resources/shiro.ini
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini
rename to ccm-bundle-devel-wildfly/src/main/resources/shiro.ini
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/stylesheet-paths.txt b/ccm-bundle-devel-wildfly/src/main/resources/stylesheet-paths.txt
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/resources/stylesheet-paths.txt
rename to ccm-bundle-devel-wildfly/src/main/resources/stylesheet-paths.txt
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/systeminformation.properties b/ccm-bundle-devel-wildfly/src/main/resources/systeminformation.properties
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/resources/systeminformation.properties
rename to ccm-bundle-devel-wildfly/src/main/resources/systeminformation.properties
diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-pagemodelseditor.ts b/ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-pagemodelseditor.ts
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-pagemodelseditor.ts
rename to ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-pagemodelseditor.ts
diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-tinymce.ts.off b/ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-tinymce.ts.off
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-tinymce.ts.off
rename to ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms-tinymce.ts.off
diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms.ts b/ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms.ts
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms.ts
rename to ccm-bundle-devel-wildfly/src/main/typescript/ccm-cms.ts
diff --git a/ccm-bundle-devel-wildfly-web/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off b/ccm-bundle-devel-wildfly/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off
rename to ccm-bundle-devel-wildfly/src/main/typescript/tinymce.off/ccm-cms-tinymce-loader.ts.off
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/beans.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/beans.xml
rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/beans.xml
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/conf/registry/registry.properties b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/conf/registry/registry.properties
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/conf/registry/registry.properties
rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/conf/registry/registry.properties
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/faces-config.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/faces-config.xml
rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/jboss-web.xml
rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/web.xml
rename to ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/ccm-editor/ccm-editor-loader.js b/ccm-bundle-devel-wildfly/src/main/webapp/ccm-editor/ccm-editor-loader.js
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/ccm-editor/ccm-editor-loader.js
rename to ccm-bundle-devel-wildfly/src/main/webapp/ccm-editor/ccm-editor-loader.js
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/test-index.xhtml b/ccm-bundle-devel-wildfly/src/main/webapp/test-index.xhtml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/main/webapp/test-index.xhtml
rename to ccm-bundle-devel-wildfly/src/main/webapp/test-index.xhtml
diff --git a/ccm-bundle-devel-wildfly-web/src/site/apt/index.apt b/ccm-bundle-devel-wildfly/src/site/apt/index.apt
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/site/apt/index.apt
rename to ccm-bundle-devel-wildfly/src/site/apt/index.apt
diff --git a/ccm-bundle-devel-wildfly-web/src/site/site.xml b/ccm-bundle-devel-wildfly/src/site/site.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/src/site/site.xml
rename to ccm-bundle-devel-wildfly/src/site/site.xml
diff --git a/ccm-bundle-devel-wildfly-web/tsconfig.json b/ccm-bundle-devel-wildfly/tsconfig.json
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/tsconfig.json
rename to ccm-bundle-devel-wildfly/tsconfig.json
diff --git a/ccm-bundle-devel-wildfly-web/tslint.json b/ccm-bundle-devel-wildfly/tslint.json
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/tslint.json
rename to ccm-bundle-devel-wildfly/tslint.json
diff --git a/ccm-bundle-devel-wildfly-web/webpack.config.js b/ccm-bundle-devel-wildfly/webpack.config.js
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/webpack.config.js
rename to ccm-bundle-devel-wildfly/webpack.config.js
diff --git a/ccm-bundle-devel-wildfly-web/wildfly.example.properties b/ccm-bundle-devel-wildfly/wildfly.example.properties
similarity index 100%
rename from ccm-bundle-devel-wildfly-web/wildfly.example.properties
rename to ccm-bundle-devel-wildfly/wildfly.example.properties
diff --git a/pom.xml b/pom.xml
index 3ed2054f8..b4c0c7429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,6 @@
 
         <!-- Bundle modules -->
         <module>ccm-bundle-devel</module>
-        <module>ccm-bundle-devel-wildfly-web</module>
         <module>ccm-bundle-devel-wildfly</module>
         <module>ccm-bundle-devel-thorntail</module>