diff --git a/src/main/java/eu/mulk/mulkcms2/comments/Comment.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java
similarity index 91%
rename from src/main/java/eu/mulk/mulkcms2/comments/Comment.java
rename to src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java
index d14fef6..4dc8d9d 100644
--- a/src/main/java/eu/mulk/mulkcms2/comments/Comment.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java
@@ -1,6 +1,6 @@
-package eu.mulk.mulkcms2.comments;
+package eu.mulk.mulkcms2.cms.comments;
 
-import eu.mulk.mulkcms2.pages.Article;
+import eu.mulk.mulkcms2.cms.pages.Article;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/comments/CommentRevision.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/comments/CommentRevision.java
rename to src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java
index 9d543b9..effa45d 100644
--- a/src/main/java/eu/mulk/mulkcms2/comments/CommentRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java
@@ -1,8 +1,8 @@
-package eu.mulk.mulkcms2.comments;
+package eu.mulk.mulkcms2.cms.comments;
 
 import com.vladmihalcea.hibernate.type.basic.Inet;
 import com.vladmihalcea.hibernate.type.basic.PostgreSQLInetType;
-import eu.mulk.mulkcms2.users.User;
+import eu.mulk.mulkcms2.cms.users.User;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/comments/UsedTransactionKey.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java
similarity index 91%
rename from src/main/java/eu/mulk/mulkcms2/comments/UsedTransactionKey.java
rename to src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java
index 133ce5a..57dd112 100644
--- a/src/main/java/eu/mulk/mulkcms2/comments/UsedTransactionKey.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.comments;
+package eu.mulk.mulkcms2.cms.comments;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/journal/Journal.java b/src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/journal/Journal.java
rename to src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java
index 44fe2a4..b3d8bf5 100644
--- a/src/main/java/eu/mulk/mulkcms2/journal/Journal.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.journal;
+package eu.mulk.mulkcms2.cms.journal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/journal/JournalEntry.java b/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java
similarity index 92%
rename from src/main/java/eu/mulk/mulkcms2/journal/JournalEntry.java
rename to src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java
index bc54845..ed4aeed 100644
--- a/src/main/java/eu/mulk/mulkcms2/journal/JournalEntry.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java
@@ -1,6 +1,6 @@
-package eu.mulk.mulkcms2.journal;
+package eu.mulk.mulkcms2.cms.journal;
 
-import eu.mulk.mulkcms2.pages.Article;
+import eu.mulk.mulkcms2.cms.pages.Article;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/eu/mulk/mulkcms2/journal/JournalEntryPK.java b/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntryPK.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/journal/JournalEntryPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntryPK.java
index 1c9d063..88eb083 100644
--- a/src/main/java/eu/mulk/mulkcms2/journal/JournalEntryPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntryPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.journal;
+package eu.mulk.mulkcms2.cms.journal;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalCategory.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java
similarity index 91%
rename from src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalCategory.java
rename to src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java
index 0e6108e..76d7b94 100644
--- a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalCategory.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.legacyjournal;
+package eu.mulk.mulkcms2.cms.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalComment.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalComment.java
rename to src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java
index eecc1e6..0e28e71 100644
--- a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalComment.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.legacyjournal;
+package eu.mulk.mulkcms2.cms.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalEntry.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalEntry.java
rename to src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java
index f736357..df2e8cf 100644
--- a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalEntry.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.legacyjournal;
+package eu.mulk.mulkcms2.cms.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalPingback.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalPingback.java
rename to src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java
index f32ae07..5052ee1 100644
--- a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalPingback.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.legacyjournal;
+package eu.mulk.mulkcms2.cms.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalTrackback.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalTrackback.java
rename to src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java
index 4329965..daf4c2d 100644
--- a/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalTrackback.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.legacyjournal;
+package eu.mulk.mulkcms2.cms.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/Article.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java
similarity index 91%
rename from src/main/java/eu/mulk/mulkcms2/pages/Article.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java
index 7f83a12..5110558 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/Article.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java
@@ -1,7 +1,7 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
-import eu.mulk.mulkcms2.comments.Comment;
-import eu.mulk.mulkcms2.journal.JournalEntry;
+import eu.mulk.mulkcms2.cms.comments.Comment;
+import eu.mulk.mulkcms2.cms.journal.JournalEntry;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
 import java.util.Set;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleAlias.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleAlias.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java
index d983eac..de8d443 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleAlias.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTip.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTip.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java
index f7d5404..0417b7d 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTip.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTipPK.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTipPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTipPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTipPK.java
index 2bb6039..2d93b54 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTipPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTipPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleCommentCount.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java
similarity index 93%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleCommentCount.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java
index 612f26c..a476188 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleCommentCount.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticlePublishingDate.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticlePublishingDate.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java
index 8f3c7d1..22abf59 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticlePublishingDate.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevision.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleRevision.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java
index 9d1f95b..ebb2b9e 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java
@@ -1,6 +1,6 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
-import eu.mulk.mulkcms2.users.User;
+import eu.mulk.mulkcms2.cms.users.User;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristic.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristic.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java
index d6a0a67..eed2fb6 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristic.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristicPK.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristicPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristicPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristicPK.java
index 9423ee4..7f9b61a 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristicPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristicPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/ArticleType.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/pages/ArticleType.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java
index 2f0eccb..7233b92 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/ArticleType.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/CachedPage.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/pages/CachedPage.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java
index 7723588..4217053 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/CachedPage.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/CachedPagePK.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPagePK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/pages/CachedPagePK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPagePK.java
index e3fc089..1a72aea 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/CachedPagePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPagePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/pages/Category.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/pages/Category.java
rename to src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java
index 31a9db7..5171453 100644
--- a/src/main/java/eu/mulk/mulkcms2/pages/Category.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.pages;
+package eu.mulk.mulkcms2.cms.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Set;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/LoginCertificate.java b/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/users/LoginCertificate.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java
index 4d6b148..4e6f047 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/LoginCertificate.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/LoginCertificatePK.java b/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificatePK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/LoginCertificatePK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificatePK.java
index 0293cd7..8bb5f44 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/LoginCertificatePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificatePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/OpenId.java b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/users/OpenId.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java
index a25730a..0cc7407 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/OpenId.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/OpenIdPK.java b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenIdPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/OpenIdPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/OpenIdPK.java
index 8f5ac05..e80fb25 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/OpenIdPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenIdPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/Password.java b/src/main/java/eu/mulk/mulkcms2/cms/users/Password.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/users/Password.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/Password.java
index b6156ce..632284e 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/Password.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/Password.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/PasswordPK.java b/src/main/java/eu/mulk/mulkcms2/cms/users/PasswordPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/PasswordPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/PasswordPK.java
index ca964b9..c43cd5e 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/PasswordPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/PasswordPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/User.java b/src/main/java/eu/mulk/mulkcms2/cms/users/User.java
similarity index 91%
rename from src/main/java/eu/mulk/mulkcms2/users/User.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/User.java
index 62679c6..a84462f 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/User.java
@@ -1,7 +1,7 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
-import eu.mulk.mulkcms2.comments.CommentRevision;
-import eu.mulk.mulkcms2.pages.ArticleRevision;
+import eu.mulk.mulkcms2.cms.comments.CommentRevision;
+import eu.mulk.mulkcms2.cms.pages.ArticleRevision;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/UserPermission.java b/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/UserPermission.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java
index 1ab5e8c..a580813 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/UserPermission.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/UserPermissionPK.java b/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermissionPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/UserPermissionPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/UserPermissionPK.java
index 4cb74b1..406178e 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/UserPermissionPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermissionPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/UserSetting.java b/src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/UserSetting.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java
index 66742c7..f4ec234 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/UserSetting.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/users/UserSettingPK.java b/src/main/java/eu/mulk/mulkcms2/cms/users/UserSettingPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/users/UserSettingPK.java
rename to src/main/java/eu/mulk/mulkcms2/cms/users/UserSettingPK.java
index 4514fe2..b7c28ea 100644
--- a/src/main/java/eu/mulk/mulkcms2/users/UserSettingPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/users/UserSettingPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.users;
+package eu.mulk.mulkcms2.cms.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/web/ExampleResource.java b/src/main/java/eu/mulk/mulkcms2/cms/web/ExampleResource.java
similarity index 86%
rename from src/main/java/eu/mulk/mulkcms2/web/ExampleResource.java
rename to src/main/java/eu/mulk/mulkcms2/cms/web/ExampleResource.java
index 4951eb4..fc504c8 100644
--- a/src/main/java/eu/mulk/mulkcms2/web/ExampleResource.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/web/ExampleResource.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.web;
+package eu.mulk.mulkcms2.cms.web;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Produces;