diff --git a/pom.xml b/pom.xml
index d4d539f..58a34d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 <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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-	<groupId>com.github.thmarx.cms.modules</groupId>
+	<groupId>com.condation.cms.modules</groupId>
 	<artifactId>search-module</artifactId>
-	<version>1.2.1</version>
+	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -12,20 +12,31 @@
 		<module.name>search module</module.name>
 		<module.priority>NORMAL</module.priority>
 		
-		<cms.version>4.18.1</cms.version>
-		<lucene.version>9.11.0</lucene.version>
+		<cms.version>6.0.0-SNAPSHOT</cms.version>
+		<lucene.version>9.11.1</lucene.version>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
+	<inceptionYear>2024</inceptionYear>
+	<organization>
+		<name>CondationCMS</name>
+		<url>https://condation.com</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>GPL v3</name>
+			<url>https://www.gnu.org/licenses/gpl-3.0.html</url>
+		</license>
+	</licenses>
 	<dependencies>
 		<dependency>
-			<groupId>com.github.thmarx.cms</groupId>
+			<groupId>com.condation.cms</groupId>
 			<artifactId>cms-api</artifactId>
 			<scope>provided</scope>
 			<version>${cms.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.thmarx.cms.module.framework</groupId>
+			<groupId>com.condation.cms.module.framework</groupId>
 			<artifactId>modules-api</artifactId>
 			<scope>provided</scope>
 			<version>${cms.version}</version>
@@ -120,6 +131,32 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>2.4.0</version>
+				<configuration>
+					<verbose>false</verbose>
+					<licenseName>gpl_v3</licenseName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>first</id>
+						<goals>
+							<goal>update-file-header</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<licenseName>gpl_v3</licenseName>
+							<roots>
+								<root>src/main/java</root>
+								<root>src/resources</root>
+								<root>src/test</root>
+							</roots>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>3.7.1</version>
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/FileUtils.java b/src/main/java/com/condation/cms/modules/search/FileUtils.java
similarity index 96%
rename from src/main/java/com/github/thmarx/cms/modules/search/FileUtils.java
rename to src/main/java/com/condation/cms/modules/search/FileUtils.java
index f20d2db..e60daea 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/FileUtils.java
+++ b/src/main/java/com/condation/cms/modules/search/FileUtils.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search;
+package com.condation.cms.modules.search;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/IndexDocument.java b/src/main/java/com/condation/cms/modules/search/IndexDocument.java
similarity index 95%
rename from src/main/java/com/github/thmarx/cms/modules/search/IndexDocument.java
rename to src/main/java/com/condation/cms/modules/search/IndexDocument.java
index 49918d0..e43cb0a 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/IndexDocument.java
+++ b/src/main/java/com/condation/cms/modules/search/IndexDocument.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search;
+package com.condation.cms.modules.search;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/SearchEngine.java b/src/main/java/com/condation/cms/modules/search/SearchEngine.java
similarity index 91%
rename from src/main/java/com/github/thmarx/cms/modules/search/SearchEngine.java
rename to src/main/java/com/condation/cms/modules/search/SearchEngine.java
index 4136624..57c8740 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/SearchEngine.java
+++ b/src/main/java/com/condation/cms/modules/search/SearchEngine.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search;
+package com.condation.cms.modules.search;
 
 /*-
  * #%L
@@ -22,8 +22,8 @@
  * #L%
  */
 
-import com.github.thmarx.cms.modules.search.index.SearchIndex;
-import com.github.thmarx.cms.modules.search.index.SearchResult;
+import com.condation.cms.modules.search.index.SearchIndex;
+import com.condation.cms.modules.search.index.SearchResult;
 import com.google.common.base.Strings;
 import java.io.IOException;
 import java.nio.file.Path;
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/SearchField.java b/src/main/java/com/condation/cms/modules/search/SearchField.java
similarity index 95%
rename from src/main/java/com/github/thmarx/cms/modules/search/SearchField.java
rename to src/main/java/com/condation/cms/modules/search/SearchField.java
index 8cc4a4d..0c01da7 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/SearchField.java
+++ b/src/main/java/com/condation/cms/modules/search/SearchField.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search;
+package com.condation.cms.modules.search;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/SearchRequest.java b/src/main/java/com/condation/cms/modules/search/SearchRequest.java
similarity index 94%
rename from src/main/java/com/github/thmarx/cms/modules/search/SearchRequest.java
rename to src/main/java/com/condation/cms/modules/search/SearchRequest.java
index 0f70206..dd85927 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/SearchRequest.java
+++ b/src/main/java/com/condation/cms/modules/search/SearchRequest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search;
+package com.condation.cms.modules.search;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitor.java b/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java
similarity index 86%
rename from src/main/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitor.java
rename to src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java
index cf902b6..bb981df 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitor.java
+++ b/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.extension;
+package com.condation.cms.modules.search.extension;
 
 /*-
  * #%L
@@ -21,17 +21,17 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-import com.github.thmarx.cms.api.Constants;
-import com.github.thmarx.cms.api.content.ContentResponse;
-import com.github.thmarx.cms.api.feature.features.ContentRenderFeature;
-import com.github.thmarx.cms.api.feature.features.DBFeature;
-import com.github.thmarx.cms.api.feature.features.SitePropertiesFeature;
-import com.github.thmarx.cms.api.module.CMSModuleContext;
-import com.github.thmarx.cms.api.utils.HTTPUtil;
-import com.github.thmarx.cms.api.utils.PathUtil;
-import com.github.thmarx.cms.api.utils.SectionUtil;
-import com.github.thmarx.cms.modules.search.IndexDocument;
-import com.github.thmarx.cms.modules.search.SearchEngine;
+import com.condation.cms.api.Constants;
+import com.condation.cms.api.content.ContentResponse;
+import com.condation.cms.api.feature.features.ContentRenderFeature;
+import com.condation.cms.api.feature.features.DBFeature;
+import com.condation.cms.api.feature.features.SitePropertiesFeature;
+import com.condation.cms.api.module.CMSModuleContext;
+import com.condation.cms.api.utils.HTTPUtil;
+import com.condation.cms.api.utils.PathUtil;
+import com.condation.cms.api.utils.SectionUtil;
+import com.condation.cms.modules.search.IndexDocument;
+import com.condation.cms.modules.search.SearchEngine;
 import com.google.common.base.Strings;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchHttpExtensionPoint.java b/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java
similarity index 79%
rename from src/main/java/com/github/thmarx/cms/modules/search/extension/SearchHttpExtensionPoint.java
rename to src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java
index ada4ad9..c6e7886 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchHttpExtensionPoint.java
+++ b/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.extension;
+package com.condation.cms.modules.search.extension;
 
 /*-
  * #%L
@@ -22,10 +22,10 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.HttpHandlerExtensionPoint;
-import com.github.thmarx.cms.api.extensions.Mapping;
-import com.github.thmarx.cms.modules.search.http.SearchHandler;
-import com.github.thmarx.modules.api.annotation.Extension;
+import com.condation.cms.api.extensions.HttpHandlerExtensionPoint;
+import com.condation.cms.api.extensions.Mapping;
+import com.condation.cms.modules.search.http.SearchHandler;
+import com.condation.modules.api.annotation.Extension;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 
 /**
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchLifecycleExtension.java b/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java
similarity index 77%
rename from src/main/java/com/github/thmarx/cms/modules/search/extension/SearchLifecycleExtension.java
rename to src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java
index 15f2483..8c09762 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchLifecycleExtension.java
+++ b/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.extension;
+package com.condation.cms.modules.search.extension;
 
 /*-
  * #%L
@@ -21,16 +21,16 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-import com.github.thmarx.cms.api.eventbus.events.ContentChangedEvent;
-import com.github.thmarx.cms.api.eventbus.events.TemplateChangedEvent;
-import com.github.thmarx.cms.api.feature.features.DBFeature;
-import com.github.thmarx.cms.api.feature.features.EventBusFeature;
-import com.github.thmarx.cms.api.feature.features.SitePropertiesFeature;
-import com.github.thmarx.cms.api.module.CMSModuleContext;
-import com.github.thmarx.cms.api.module.CMSRequestContext;
-import com.github.thmarx.cms.modules.search.SearchEngine;
-import com.github.thmarx.modules.api.ModuleLifeCycleExtension;
-import com.github.thmarx.modules.api.annotation.Extension;
+import com.condation.cms.api.eventbus.events.ContentChangedEvent;
+import com.condation.cms.api.eventbus.events.TemplateChangedEvent;
+import com.condation.cms.api.feature.features.DBFeature;
+import com.condation.cms.api.feature.features.EventBusFeature;
+import com.condation.cms.api.feature.features.SitePropertiesFeature;
+import com.condation.cms.api.module.CMSModuleContext;
+import com.condation.cms.api.module.CMSRequestContext;
+import com.condation.cms.modules.search.SearchEngine;
+import com.condation.modules.api.ModuleLifeCycleExtension;
+import com.condation.modules.api.annotation.Extension;
 import java.io.IOException;
 import java.nio.file.Files;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/http/SearchHandler.java b/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java
similarity index 89%
rename from src/main/java/com/github/thmarx/cms/modules/search/http/SearchHandler.java
rename to src/main/java/com/condation/cms/modules/search/http/SearchHandler.java
index 325d87a..46a74f3 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/http/SearchHandler.java
+++ b/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.http;
+package com.condation.cms.modules.search.http;
 
 /*-
  * #%L
@@ -22,10 +22,10 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.search.SearchEngine;
-import com.github.thmarx.cms.modules.search.SearchRequest;
-import com.github.thmarx.cms.modules.search.index.SearchResult;
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.search.SearchEngine;
+import com.condation.cms.modules.search.SearchRequest;
+import com.condation.cms.modules.search.index.SearchResult;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchIndex.java b/src/main/java/com/condation/cms/modules/search/index/SearchIndex.java
similarity index 97%
rename from src/main/java/com/github/thmarx/cms/modules/search/index/SearchIndex.java
rename to src/main/java/com/condation/cms/modules/search/index/SearchIndex.java
index f6c4fdd..38970bf 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchIndex.java
+++ b/src/main/java/com/condation/cms/modules/search/index/SearchIndex.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.index;
+package com.condation.cms.modules.search.index;
 
 /*-
  * #%L
@@ -21,10 +21,10 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-import com.github.thmarx.cms.modules.search.FileUtils;
-import com.github.thmarx.cms.modules.search.IndexDocument;
-import com.github.thmarx.cms.modules.search.SearchField;
-import com.github.thmarx.cms.modules.search.SearchRequest;
+import com.condation.cms.modules.search.FileUtils;
+import com.condation.cms.modules.search.IndexDocument;
+import com.condation.cms.modules.search.SearchField;
+import com.condation.cms.modules.search.SearchRequest;
 import com.google.common.base.Strings;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchResult.java b/src/main/java/com/condation/cms/modules/search/index/SearchResult.java
similarity index 95%
rename from src/main/java/com/github/thmarx/cms/modules/search/index/SearchResult.java
rename to src/main/java/com/condation/cms/modules/search/index/SearchResult.java
index 826f0d5..8f0eb0d 100644
--- a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchResult.java
+++ b/src/main/java/com/condation/cms/modules/search/index/SearchResult.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.index;
+package com.condation.cms.modules.search.index;
 
 /*-
  * #%L
diff --git a/src/test/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitorTest.java b/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java
similarity index 95%
rename from src/test/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitorTest.java
rename to src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java
index e38eab4..66b93e1 100644
--- a/src/test/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitorTest.java
+++ b/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.search.extension;
+package com.condation.cms.modules.search;
 
 /*-
  * #%L
@@ -21,7 +21,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-import com.github.thmarx.cms.api.utils.PathUtil;
+import com.condation.cms.api.utils.PathUtil;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;