diff --git a/.gitignore b/.gitignore
index cd5d2338..0c3075cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,7 +85,6 @@ local.properties
 *.war
 *.nar
 *.ear
-*.zip
 *.tar.gz
 *.rar
 
diff --git a/celements-calendar-gdata/pom.xml b/celements-calendar-gdata/pom.xml
index 5514ab5b..bbe0b40c 100644
--- a/celements-calendar-gdata/pom.xml
+++ b/celements-calendar-gdata/pom.xml
@@ -26,11 +26,11 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>  
   <artifactId>celements-calendar-gdata</artifactId>
-  <version>6.0-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Calendar</description>
   <repositories>
 		<repository>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.celements</groupId>
   	  <artifactId>celements-calendar</artifactId>
-  	  <version>6.0-SNAPSHOT</version>
+  	  <version>7.0-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>com.google.gdata</groupId>
diff --git a/celements-captcha/pom.xml b/celements-captcha/pom.xml
index 765a0f84..ee409588 100644
--- a/celements-captcha/pom.xml
+++ b/celements-captcha/pom.xml
@@ -26,23 +26,23 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-captcha</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements captcha implementations</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-cleverreach/pom.xml b/celements-cleverreach/pom.xml
index cc4c579d..5bf1c5a9 100644
--- a/celements-cleverreach/pom.xml
+++ b/celements-cleverreach/pom.xml
@@ -24,35 +24,35 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.3</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-cleverreach</artifactId>
-  <version>6.2-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements connector to Clever Reach API</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.4</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.13</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-css</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-mailsender</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/celements-contact/pom.xml b/celements-contact/pom.xml
index 07cfa823..415c0262 100644
--- a/celements-contact/pom.xml
+++ b/celements-contact/pom.xml
@@ -26,23 +26,23 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-contact</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Core</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-css/pom.xml b/celements-css/pom.xml
index 8c14684c..5138e208 100644
--- a/celements-css/pom.xml
+++ b/celements-css/pom.xml
@@ -3,23 +3,23 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-css</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Webtools for css handling like inliner, minifier</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-layout/component/pom.xml b/celements-layout/component/pom.xml
index 7d3218c5..0ee8c618 100644
--- a/celements-layout/component/pom.xml
+++ b/celements-layout/component/pom.xml
@@ -3,29 +3,29 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.6</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-layout</artifactId>
-  <version>6.5-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Layout</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.14</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.6</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-spring-security</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-layout/web-module/pom.xml b/celements-layout/web-module/pom.xml
index b97f541a..523aba2b 100644
--- a/celements-layout/web-module/pom.xml
+++ b/celements-layout/web-module/pom.xml
@@ -26,18 +26,18 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celementsweb</artifactId>
-    <version>6.2</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-layout-web</artifactId>
-  <version>6.5-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>Celements Layout Web</name>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-layout</artifactId>
-      <version>6.4</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/celements-mailsender/pom.xml b/celements-mailsender/pom.xml
index 5dc5a4fc..05c8ec10 100644
--- a/celements-mailsender/pom.xml
+++ b/celements-mailsender/pom.xml
@@ -4,10 +4,10 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.2</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>celements-mailsender</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <name>Celements Mail Sender</name>
   <repositories>
     <repository>
diff --git a/celements-payment/pom.xml b/celements-payment/pom.xml
index 5d33ecba..9fe9c909 100644
--- a/celements-payment/pom.xml
+++ b/celements-payment/pom.xml
@@ -26,23 +26,23 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>payment</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Payment</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/celements-payment/src/main/java/com/celements/payment/PaymentService.java b/celements-payment/src/main/java/com/celements/payment/PaymentService.java
index 3e095bb3..3622d06b 100644
--- a/celements-payment/src/main/java/com/celements/payment/PaymentService.java
+++ b/celements-payment/src/main/java/com/celements/payment/PaymentService.java
@@ -25,8 +25,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xwiki.component.annotation.Component;
@@ -36,7 +34,7 @@
 import com.celements.model.context.ModelContext;
 import com.celements.payment.exception.PaymentException;
 import com.celements.payment.raw.PaymentRawObject;
-import com.celements.web.plugin.api.CelementsWebPluginApi;
+import com.celements.web.plugin.CelementsWebPlugin;
 import com.google.common.base.Functions;
 import com.google.common.collect.Lists;
 import com.xpn.xwiki.XWikiContext;
@@ -69,9 +67,9 @@ public void executePaymentAction(Map<String, String[]> data) {
         XWikiDocument actionXdoc = getXWikiContext().getWiki().getDocument(callbackDocRef,
             getXWikiContext());
         Document actionDoc = actionXdoc.newDocument(getXWikiContext());
-        CelementsWebPluginApi celementsweb = (CelementsWebPluginApi) getXWikiContext().getWiki().getPluginApi(
-            "celementsweb", getXWikiContext());
-        celementsweb.getPlugin().executeAction(actionDoc, data, actionXdoc, getXWikiContext());
+        CelementsWebPlugin celementsweb = (CelementsWebPlugin) getXWikiContext().getWiki()
+            .getPlugin("celementsweb", getXWikiContext());
+        celementsweb.executeAction(actionDoc, data, actionXdoc, getXWikiContext());
       } else {
         LOGGER.warn("Failed to execute payment action because Payment.CallbackActions"
             + " does not exist in [" + getXWikiContext().getDatabase() + "].");
@@ -84,13 +82,9 @@ public void executePaymentAction(Map<String, String[]> data) {
   @Override
   public void storePaymentObject(final PaymentRawObject paymentObj) throws PaymentException {
     try {
-      getHibStore().executeWrite(context.getXWikiContext(), true, new HibernateCallback<Void>() {
-
-        @Override
-        public Void doInHibernate(Session session) throws HibernateException {
-          session.saveOrUpdate(paymentObj);
-          return null;
-        }
+      getHibStore().executeWrite(context.getXWikiContext(), true, (HibernateCallback<Void>) session -> {
+        session.saveOrUpdate(paymentObj);
+        return null;
       });
       LOGGER.info("storePaymentObject: '{}'", paymentObj);
     } catch (XWikiException xwe) {
diff --git a/celements-rights/pom.xml b/celements-rights/pom.xml
index 1f019c75..1a9e4845 100644
--- a/celements-rights/pom.xml
+++ b/celements-rights/pom.xml
@@ -24,17 +24,17 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-rights</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Rights</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-scheduler/pom.xml b/celements-scheduler/pom.xml
index 5e80a760..37a6a40c 100644
--- a/celements-scheduler/pom.xml
+++ b/celements-scheduler/pom.xml
@@ -25,16 +25,16 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.6</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>celements-scheduler</artifactId>
-  <version>6.3-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <name>Celements Scheduler</name>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.7</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/celements-search-lucene/pom.xml b/celements-search-lucene/pom.xml
deleted file mode 100644
index 1d4fbffc..00000000
--- a/celements-search-lucene/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
--->
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.celements</groupId>
-    <artifactId>celements</artifactId>
-    <version>6.6</version>
-  </parent>
-  <artifactId>celements-search-lucene</artifactId>
-  <version>6.4-SNAPSHOT</version>
-  <name>Celements Search Lucene</name>
-  <dependencies>
-    <dependency>
-      <groupId>com.celements</groupId>
-      <artifactId>celements-model</artifactId>
-      <version>6.6</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.celements</groupId>
-      <artifactId>celements-core</artifactId>
-      <version>6.14</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>3.4.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers</artifactId>
-      <version>3.4.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-      <version>3.4.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-parsers</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pdfbox</groupId>
-      <artifactId>jbig2-imageio</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.jai-imageio</groupId>
-      <artifactId>jai-imageio-jpeg2000</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.xerial</groupId>
-      <artifactId>sqlite-jdbc</artifactId>
-    </dependency>
-
-    <!-- For some tests we need to have the Servlet API JAR available -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <!-- required for AttachmentDataTest#getFullTextFromOpenXML, may be dropped with Java11+ -->
-    <dependency>
-      <groupId>org.apache.xmlgraphics</groupId>
-      <artifactId>batik-ext</artifactId>
-      <version>1.7</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-  <scm>
-    <connection>scm:git:git@github.com:celements/celements-features.git</connection>
-    <developerConnection>scm:git:git@github.com:celements/celements-features.git</developerConnection>
-    <url>https://github.com/celements/celements-features/celements-search-lucene</url>
-    <tag>HEAD</tag>
-  </scm>
-</project>
diff --git a/celements-search-lucene/src/main/resources/META-INF/components.txt b/celements-search-lucene/src/main/resources/META-INF/components.txt
deleted file mode 100644
index bde1c1d0..00000000
--- a/celements-search-lucene/src/main/resources/META-INF/components.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-com.xpn.xwiki.plugin.lucene.searcherProvider.SearcherProviderManager
-com.xpn.xwiki.plugin.lucene.searcherProvider.ActionExecutionEventListener
-com.xpn.xwiki.plugin.lucene.indexExtension.LuceneIndexExtensionService
-com.xpn.xwiki.plugin.lucene.searcherProvider.SearchProviderDebugScriptService
-com.xpn.xwiki.plugin.lucene.IndexRebuilder
diff --git a/celements-search/pom.xml b/celements-search/pom.xml
index 3550db33..32ff04f9 100644
--- a/celements-search/pom.xml
+++ b/celements-search/pom.xml
@@ -24,41 +24,83 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.7</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-search</artifactId>
-  <version>6.6-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Search</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.8</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.17</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-scheduler</artifactId>
+      <version>7.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Lucene dependencies -->
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>3.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers</artifactId>
+      <version>3.4.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
       <version>3.4.0</version>
     </dependency>
     <dependency>
-      <groupId>com.celements</groupId>
-      <artifactId>celements-search-lucene</artifactId>
-      <version>6.3</version>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.celements</groupId>
-      <artifactId>celements-scheduler</artifactId>
-      <version>6.2</version>
-      <scope>provided</scope>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pdfbox</groupId>
+      <artifactId>jbig2-imageio</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.github.jai-imageio</groupId>
+      <artifactId>jai-imageio-jpeg2000</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+    </dependency>
+
+    <!-- For some tests we need to have the Servlet API JAR available -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- required for AttachmentDataTest#getFullTextFromOpenXML, may be dropped with Java11+ -->
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-ext</artifactId>
+      <version>1.7</version>
+      <scope>test</scope>
     </dependency>
+    
   </dependencies>
   <scm>
     <connection>scm:git:git@github.com:celements/celements-features.git</connection>
diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/LuceneDocType.java b/celements-search/src/main/java/com/celements/search/lucene/LuceneDocType.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/celements/search/lucene/LuceneDocType.java
rename to celements-search/src/main/java/com/celements/search/lucene/LuceneDocType.java
diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java b/celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java
rename to celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java
diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java b/celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java
rename to celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java
diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java b/celements-search/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java
rename to celements-search/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java
diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java b/celements-search/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java
rename to celements-search/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java
diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java
similarity index 100%
rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java
rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java
diff --git a/celements-search-lucene/src/main/resources/META-INF/MANIFEST.MF b/celements-search/src/main/resources/META-INF/MANIFEST.MF
similarity index 92%
rename from celements-search-lucene/src/main/resources/META-INF/MANIFEST.MF
rename to celements-search/src/main/resources/META-INF/MANIFEST.MF
index 5e949512..254272e1 100644
--- a/celements-search-lucene/src/main/resources/META-INF/MANIFEST.MF
+++ b/celements-search/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Class-Path: 
-
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/celements-search/src/main/resources/META-INF/components.txt b/celements-search/src/main/resources/META-INF/components.txt
index 4fdbaf4a..66e37763 100644
--- a/celements-search/src/main/resources/META-INF/components.txt
+++ b/celements-search/src/main/resources/META-INF/components.txt
@@ -1,3 +1,8 @@
+com.xpn.xwiki.plugin.lucene.searcherProvider.SearcherProviderManager
+com.xpn.xwiki.plugin.lucene.searcherProvider.ActionExecutionEventListener
+com.xpn.xwiki.plugin.lucene.indexExtension.LuceneIndexExtensionService
+com.xpn.xwiki.plugin.lucene.searcherProvider.SearchProviderDebugScriptService
+com.xpn.xwiki.plugin.lucene.IndexRebuilder
 com.celements.search.lucene.LuceneSearchService
 com.celements.search.lucene.LuceneSearchScriptService
 com.celements.search.web.classes.WebSearchClassConfig
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java
diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java
similarity index 100%
rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java
rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java
diff --git a/celements-search-lucene/src/test/resources/html.html b/celements-search/src/test/resources/html.html
similarity index 100%
rename from celements-search-lucene/src/test/resources/html.html
rename to celements-search/src/test/resources/html.html
diff --git a/celements-search-lucene/src/test/resources/msoffice97.doc b/celements-search/src/test/resources/msoffice97.doc
similarity index 100%
rename from celements-search-lucene/src/test/resources/msoffice97.doc
rename to celements-search/src/test/resources/msoffice97.doc
diff --git a/celements-search-lucene/src/test/resources/opendocument.odt b/celements-search/src/test/resources/opendocument.odt
similarity index 100%
rename from celements-search-lucene/src/test/resources/opendocument.odt
rename to celements-search/src/test/resources/opendocument.odt
diff --git a/celements-search-lucene/src/test/resources/openxml.docx b/celements-search/src/test/resources/openxml.docx
similarity index 100%
rename from celements-search-lucene/src/test/resources/openxml.docx
rename to celements-search/src/test/resources/openxml.docx
diff --git a/celements-search-lucene/src/test/resources/pdf.pdf b/celements-search/src/test/resources/pdf.pdf
similarity index 100%
rename from celements-search-lucene/src/test/resources/pdf.pdf
rename to celements-search/src/test/resources/pdf.pdf
diff --git a/celements-search-lucene/src/test/resources/txt.txt b/celements-search/src/test/resources/txt.txt
similarity index 100%
rename from celements-search-lucene/src/test/resources/txt.txt
rename to celements-search/src/test/resources/txt.txt
diff --git a/celements-search-lucene/src/test/resources/zip.zip b/celements-search/src/test/resources/zip.zip
similarity index 100%
rename from celements-search-lucene/src/test/resources/zip.zip
rename to celements-search/src/test/resources/zip.zip
diff --git a/celements-tag/pom.xml b/celements-tag/pom.xml
index 57b02b0b..8f756d15 100644
--- a/celements-tag/pom.xml
+++ b/celements-tag/pom.xml
@@ -24,41 +24,41 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.6</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-tag</artifactId>
-  <version>6.6-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements Tags</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-xwiki-core</artifactId>
-      <version>6.9</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.6</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.14</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-search</artifactId>
-      <version>6.3</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-spring-security</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-user-manager/component/pom.xml b/celements-user-manager/component/pom.xml
index 9da4003d..b3bf6e7a 100644
--- a/celements-user-manager/component/pom.xml
+++ b/celements-user-manager/component/pom.xml
@@ -24,41 +24,41 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.6</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-user-manager</artifactId>
-  <version>6.4-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements User Manager</description>
   <dependencies>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.6</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-wiki-manager</artifactId>
-      <version>6.1</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.14</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-subsystem-migration-manager</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-mailsender</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/celements-user-manager/web-module/pom.xml b/celements-user-manager/web-module/pom.xml
index 7eed29f6..348ccdab 100644
--- a/celements-user-manager/web-module/pom.xml
+++ b/celements-user-manager/web-module/pom.xml
@@ -26,13 +26,13 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celementsweb</artifactId>
-    <version>6.2</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-user-manager-web</artifactId>
   <packaging>war</packaging>
   <name>User Manager Web-Module</name>
-  <version>6.4-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>	</description>
   <licenses>
     <license>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-user-manager</artifactId>
-      <version>6.3</version>
+      <version>7.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/celements-webdav/pom.xml b/celements-webdav/pom.xml
index 8ab93571..80396bbe 100644
--- a/celements-webdav/pom.xml
+++ b/celements-webdav/pom.xml
@@ -24,30 +24,48 @@
   <parent>
     <groupId>com.celements</groupId>
     <artifactId>celements</artifactId>
-    <version>6.0</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>celements-webdav</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
   <description>Celements WebDAV Client</description>
   <dependencies>
     <!-- provided dependencies included in web module -->
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-xwiki-core</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-model</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-core</artifactId>
-      <version>6.0</version>
+      <version>7.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-wiki-manager</artifactId>
+      <version>7.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-user-manager</artifactId>
+      <version>7.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java b/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java
index 0a9d5388..1855c09f 100644
--- a/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java
+++ b/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java
@@ -190,7 +190,8 @@ URL buildCompleteUrl(Path path) {
         if (checkNotNull(path).isAbsolute()) {
           path = Paths.get("/", baseUrl.getPath()).relativize(path);
         }
-        return UriBuilder.fromUri(baseUrl.toURI()).path(path.normalize().toString()).build().toURL();
+        return UriBuilder.fromUri(baseUrl.toURI()).path(path.normalize().toString()).build()
+            .toURL();
       } catch (URISyntaxException | UriBuilderException | MalformedURLException exc) {
         // this shouldn't happen since baseUrl and path are already well defined objects
         throw new IllegalArgumentException(MessageFormat.format("unable to build url with "