diff --git a/ccm-cms-types-article/src/main/java/org/librecms/article/Article.java b/ccm-cms-types-article/src/main/java/org/librecms/article/Article.java
index 5205fa232..e1fbf39ab 100644
--- a/ccm-cms-types-article/src/main/java/org/librecms/article/Article.java
+++ b/ccm-cms-types-article/src/main/java/org/librecms/article/Article.java
@@ -22,13 +22,13 @@ import static org.librecms.article.ArticleConstants.*;
 
 import org.hibernate.envers.Audited;
 
-import org.libreccm.cms.contentsection.ContentItem;
+import org.librecms.contentsection.ContentItem;
 
 import java.io.Serializable;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import org.libreccm.cms.contenttypes.GenericArticle;
+import org.librecms.contenttypes.GenericArticle;
 
 /**
  * This type simply exposes the {@link GenericArticle} type from the
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/Cms.java b/ccm-cms/src/main/java/org/librecms/Cms.java
similarity index 97%
rename from ccm-cms/src/main/java/org/libreccm/cms/Cms.java
rename to ccm-cms/src/main/java/org/librecms/Cms.java
index f92879165..0e5952000 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/Cms.java
+++ b/ccm-cms/src/main/java/org/librecms/Cms.java
@@ -1,7 +1,7 @@
 /**
  * Add your license here, for example LGPL
  */
-package org.libreccm.cms;
+package org.librecms;
 
 import org.libreccm.modules.CcmModule;
 import org.libreccm.modules.InitEvent;
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/CmsConstants.java b/ccm-cms/src/main/java/org/librecms/CmsConstants.java
similarity index 97%
rename from ccm-cms/src/main/java/org/libreccm/cms/CmsConstants.java
rename to ccm-cms/src/main/java/org/librecms/CmsConstants.java
index 104000165..4f9bfd3d6 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/CmsConstants.java
+++ b/ccm-cms/src/main/java/org/librecms/CmsConstants.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms;
+package org.librecms;
 
 /**
  *
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItem.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
similarity index 98%
rename from ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItem.java
rename to ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
index c43b40209..a49e644ad 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItem.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
 import org.hibernate.envers.Audited;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
 import org.libreccm.core.CcmObject;
 import org.libreccm.l10n.LocalizedString;
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItemMode.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemMode.java
similarity index 95%
rename from ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItemMode.java
rename to ccm-cms/src/main/java/org/librecms/contentsection/ContentItemMode.java
index afdff3ba9..25b5cd12a 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItemMode.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemMode.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
 /**
  *
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItemVersion.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemVersion.java
similarity index 95%
rename from ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItemVersion.java
rename to ccm-cms/src/main/java/org/librecms/contentsection/ContentItemVersion.java
index c762153b3..245622e51 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentItemVersion.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemVersion.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
 /**
  *
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentSection.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
similarity index 98%
rename from ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentSection.java
rename to ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
index 92bff1628..687d297ec 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentSection.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
 import org.libreccm.core.Group;
 import org.libreccm.web.CcmApplication;
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentType.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java
similarity index 98%
rename from ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentType.java
rename to ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java
index cbebb8442..7977ed1fd 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/contentsection/ContentType.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
 import org.libreccm.core.CcmObject;
 import org.libreccm.l10n.LocalizedString;
diff --git a/ccm-cms/src/main/java/org/libreccm/cms/contenttypes/GenericArticle.java b/ccm-cms/src/main/java/org/librecms/contenttypes/GenericArticle.java
similarity index 95%
rename from ccm-cms/src/main/java/org/libreccm/cms/contenttypes/GenericArticle.java
rename to ccm-cms/src/main/java/org/librecms/contenttypes/GenericArticle.java
index 9aaf5e237..58391f568 100644
--- a/ccm-cms/src/main/java/org/libreccm/cms/contenttypes/GenericArticle.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/GenericArticle.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contenttypes;
+package org.librecms.contenttypes;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -28,9 +28,9 @@ import javax.persistence.JoinTable;
 import javax.persistence.Table;
 import org.hibernate.envers.Audited;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
-import org.libreccm.cms.contentsection.ContentItem;
+import org.librecms.contentsection.ContentItem;
 import org.libreccm.l10n.LocalizedString;
 
 /**
diff --git a/ccm-cms/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule b/ccm-cms/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule
index 67d5c4e45..8f5b28553 100644
--- a/ccm-cms/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule
+++ b/ccm-cms/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule
@@ -1 +1 @@
-org.libreccm.cms.Cms
+org.librecms.Cms
diff --git a/ccm-cms/src/main/resources/module-info/org.librecms.ccm-cms.properties b/ccm-cms/src/main/resources/module-info/org.librecms.ccm-cms.properties
new file mode 100644
index 000000000..4d28ad9cc
--- /dev/null
+++ b/ccm-cms/src/main/resources/module-info/org.librecms.ccm-cms.properties
@@ -0,0 +1,4 @@
+groupId=${project.groupId}
+artifactId=${project.artifactId}
+version=${project.version}
+build.date=${timestamp}
\ No newline at end of file
diff --git a/ccm-cms/src/test/java/org/libreccm/cms/CmsTest.java b/ccm-cms/src/test/java/org/librecms/CmsTest.java
similarity index 98%
rename from ccm-cms/src/test/java/org/libreccm/cms/CmsTest.java
rename to ccm-cms/src/test/java/org/librecms/CmsTest.java
index 30861055d..183ae1ca6 100644
--- a/ccm-cms/src/test/java/org/libreccm/cms/CmsTest.java
+++ b/ccm-cms/src/test/java/org/librecms/CmsTest.java
@@ -1,7 +1,9 @@
 /*
  * ToDo: Add your license
  */
-package org.libreccm.cms;
+package org.librecms;
+
+import org.librecms.Cms;
 
 import static org.hamcrest.CoreMatchers.*;