diff --git a/src/main/java/eu/mulk/mulkcms2/entity/Comment.java b/src/main/java/eu/mulk/mulkcms2/comments/Comment.java
similarity index 92%
rename from src/main/java/eu/mulk/mulkcms2/entity/Comment.java
rename to src/main/java/eu/mulk/mulkcms2/comments/Comment.java
index 0e3cb16..d14fef6 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/Comment.java
+++ b/src/main/java/eu/mulk/mulkcms2/comments/Comment.java
@@ -1,5 +1,6 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.comments;
 
+import eu.mulk.mulkcms2.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/entity/CommentRevision.java b/src/main/java/eu/mulk/mulkcms2/comments/CommentRevision.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/entity/CommentRevision.java
rename to src/main/java/eu/mulk/mulkcms2/comments/CommentRevision.java
index 920bff6..9d543b9 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/CommentRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/comments/CommentRevision.java
@@ -1,7 +1,8 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.comments;
 
 import com.vladmihalcea.hibernate.type.basic.Inet;
 import com.vladmihalcea.hibernate.type.basic.PostgreSQLInetType;
+import eu.mulk.mulkcms2.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/entity/UsedTransactionKey.java b/src/main/java/eu/mulk/mulkcms2/comments/UsedTransactionKey.java
similarity index 91%
rename from src/main/java/eu/mulk/mulkcms2/entity/UsedTransactionKey.java
rename to src/main/java/eu/mulk/mulkcms2/comments/UsedTransactionKey.java
index f1a6f68..133ce5a 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/UsedTransactionKey.java
+++ b/src/main/java/eu/mulk/mulkcms2/comments/UsedTransactionKey.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.comments;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/Journal.java b/src/main/java/eu/mulk/mulkcms2/journal/Journal.java
similarity index 94%
rename from src/main/java/eu/mulk/mulkcms2/entity/Journal.java
rename to src/main/java/eu/mulk/mulkcms2/journal/Journal.java
index 865f3af..44fe2a4 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/Journal.java
+++ b/src/main/java/eu/mulk/mulkcms2/journal/Journal.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.journal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/JournalEntry.java b/src/main/java/eu/mulk/mulkcms2/journal/JournalEntry.java
similarity index 92%
rename from src/main/java/eu/mulk/mulkcms2/entity/JournalEntry.java
rename to src/main/java/eu/mulk/mulkcms2/journal/JournalEntry.java
index 7dedf02..bc54845 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/JournalEntry.java
+++ b/src/main/java/eu/mulk/mulkcms2/journal/JournalEntry.java
@@ -1,5 +1,6 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.journal;
 
+import eu.mulk.mulkcms2.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/entity/JournalEntryPK.java b/src/main/java/eu/mulk/mulkcms2/journal/JournalEntryPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/JournalEntryPK.java
rename to src/main/java/eu/mulk/mulkcms2/journal/JournalEntryPK.java
index 2d00c6e..1c9d063 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/JournalEntryPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/journal/JournalEntryPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.journal;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalCategory.java b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalCategory.java
similarity index 92%
rename from src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalCategory.java
rename to src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalCategory.java
index b2837c7..0e6108e 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalCategory.java
+++ b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalCategory.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalComment.java b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalComment.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalComment.java
rename to src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalComment.java
index 00144fe..eecc1e6 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalComment.java
+++ b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalComment.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalEntry.java b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalEntry.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalEntry.java
rename to src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalEntry.java
index dd905d1..f736357 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalEntry.java
+++ b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalEntry.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalPingback.java b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalPingback.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalPingback.java
rename to src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalPingback.java
index a629a78..f32ae07 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalPingback.java
+++ b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalPingback.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalTrackback.java b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalTrackback.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalTrackback.java
rename to src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalTrackback.java
index 6bd0920..4329965 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalTrackback.java
+++ b/src/main/java/eu/mulk/mulkcms2/legacyjournal/LegacyJournalTrackback.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.legacyjournal;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/Article.java b/src/main/java/eu/mulk/mulkcms2/pages/Article.java
similarity index 92%
rename from src/main/java/eu/mulk/mulkcms2/entity/Article.java
rename to src/main/java/eu/mulk/mulkcms2/pages/Article.java
index 8d3aa7e..7f83a12 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/Article.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/Article.java
@@ -1,5 +1,7 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
+import eu.mulk.mulkcms2.comments.Comment;
+import eu.mulk.mulkcms2.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/entity/ArticleAlias.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleAlias.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleAlias.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleAlias.java
index 7974d5e..d983eac 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleAlias.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleAlias.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTip.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTip.java
similarity index 86%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTip.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTip.java
index eacc151..f7d5404 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTip.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTip.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
@@ -6,10 +6,12 @@
 import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.Table;
+import org.hibernate.annotations.Immutable;
 
 @Entity
 @Table(name = "article_branch_tips", schema = "public", catalog = "mulkcms")
 @IdClass(ArticleBranchTipPK.class)
+@Immutable
 public class ArticleBranchTip extends PanacheEntityBase {
 
   @Column(name = "article", nullable = true)
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTipPK.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTipPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTipPK.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTipPK.java
index 6472a8d..2bb6039 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTipPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleBranchTipPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticleCommentCount.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleCommentCount.java
similarity index 84%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleCommentCount.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleCommentCount.java
index 4ec408d..612f26c 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleCommentCount.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleCommentCount.java
@@ -1,13 +1,15 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import org.hibernate.annotations.Immutable;
 
 @Entity
 @Table(name = "article_comment_counts", schema = "public", catalog = "mulkcms")
+@Immutable
 public class ArticleCommentCount extends PanacheEntityBase {
 
   @Column(name = "article", nullable = true)
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticlePublishingDate.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticlePublishingDate.java
similarity index 85%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticlePublishingDate.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticlePublishingDate.java
index 39d0c4a..8f3c7d1 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticlePublishingDate.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticlePublishingDate.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
@@ -6,9 +6,11 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import org.hibernate.annotations.Immutable;
 
 @Entity
 @Table(name = "article_publishing_dates", schema = "public", catalog = "mulkcms")
+@Immutable
 public class ArticlePublishingDate extends PanacheEntityBase {
 
   @Column(name = "article", nullable = true)
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevision.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevision.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleRevision.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleRevision.java
index f9ed05c..9d1f95b 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevision.java
@@ -1,5 +1,6 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
+import eu.mulk.mulkcms2.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/entity/ArticleRevisionCharacteristic.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristic.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristic.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristic.java
index cd7c302..d6a0a67 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristic.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristic.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristicPK.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristicPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristicPK.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristicPK.java
index edaaff1..9423ee4 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristicPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleRevisionCharacteristicPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/ArticleType.java b/src/main/java/eu/mulk/mulkcms2/pages/ArticleType.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/entity/ArticleType.java
rename to src/main/java/eu/mulk/mulkcms2/pages/ArticleType.java
index 0a98680..2f0eccb 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/ArticleType.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/ArticleType.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/CachedPage.java b/src/main/java/eu/mulk/mulkcms2/pages/CachedPage.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/entity/CachedPage.java
rename to src/main/java/eu/mulk/mulkcms2/pages/CachedPage.java
index 36fff48..7723588 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/CachedPage.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/CachedPage.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/CachedPagePK.java b/src/main/java/eu/mulk/mulkcms2/pages/CachedPagePK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/CachedPagePK.java
rename to src/main/java/eu/mulk/mulkcms2/pages/CachedPagePK.java
index e4b6fc3..e3fc089 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/CachedPagePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/CachedPagePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/Category.java b/src/main/java/eu/mulk/mulkcms2/pages/Category.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/Category.java
rename to src/main/java/eu/mulk/mulkcms2/pages/Category.java
index 08c473b..06e2429 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/Category.java
+++ b/src/main/java/eu/mulk/mulkcms2/pages/Category.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.pages;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Set;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificate.java b/src/main/java/eu/mulk/mulkcms2/users/LoginCertificate.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/LoginCertificate.java
rename to src/main/java/eu/mulk/mulkcms2/users/LoginCertificate.java
index 0218aec..4d6b148 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificate.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/LoginCertificate.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificatePK.java b/src/main/java/eu/mulk/mulkcms2/users/LoginCertificatePK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/LoginCertificatePK.java
rename to src/main/java/eu/mulk/mulkcms2/users/LoginCertificatePK.java
index 4ab6ad9..0293cd7 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificatePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/LoginCertificatePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/OpenId.java b/src/main/java/eu/mulk/mulkcms2/users/OpenId.java
similarity index 95%
rename from src/main/java/eu/mulk/mulkcms2/entity/OpenId.java
rename to src/main/java/eu/mulk/mulkcms2/users/OpenId.java
index 444bf3e..a25730a 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/OpenId.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/OpenId.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/OpenIdPK.java b/src/main/java/eu/mulk/mulkcms2/users/OpenIdPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/OpenIdPK.java
rename to src/main/java/eu/mulk/mulkcms2/users/OpenIdPK.java
index 7ce0693..8f5ac05 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/OpenIdPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/OpenIdPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/Password.java b/src/main/java/eu/mulk/mulkcms2/users/Password.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/Password.java
rename to src/main/java/eu/mulk/mulkcms2/users/Password.java
index c1505f2..b6156ce 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/Password.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/Password.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/PasswordPK.java b/src/main/java/eu/mulk/mulkcms2/users/PasswordPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/PasswordPK.java
rename to src/main/java/eu/mulk/mulkcms2/users/PasswordPK.java
index f9fc7f6..ca964b9 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/PasswordPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/PasswordPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/User.java b/src/main/java/eu/mulk/mulkcms2/users/User.java
similarity index 92%
rename from src/main/java/eu/mulk/mulkcms2/entity/User.java
rename to src/main/java/eu/mulk/mulkcms2/users/User.java
index 3c606b9..62679c6 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/User.java
@@ -1,5 +1,7 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
+import eu.mulk.mulkcms2.comments.CommentRevision;
+import eu.mulk.mulkcms2.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/entity/UserPermission.java b/src/main/java/eu/mulk/mulkcms2/users/UserPermission.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/UserPermission.java
rename to src/main/java/eu/mulk/mulkcms2/users/UserPermission.java
index 8290f8f..1ab5e8c 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/UserPermission.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/UserPermission.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/UserPermissionPK.java b/src/main/java/eu/mulk/mulkcms2/users/UserPermissionPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/UserPermissionPK.java
rename to src/main/java/eu/mulk/mulkcms2/users/UserPermissionPK.java
index fd0e89d..4cb74b1 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/UserPermissionPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/UserPermissionPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/UserSetting.java b/src/main/java/eu/mulk/mulkcms2/users/UserSetting.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/UserSetting.java
rename to src/main/java/eu/mulk/mulkcms2/users/UserSetting.java
index 1ecd781..66742c7 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/UserSetting.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/UserSetting.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import javax.persistence.Column;
diff --git a/src/main/java/eu/mulk/mulkcms2/entity/UserSettingPK.java b/src/main/java/eu/mulk/mulkcms2/users/UserSettingPK.java
similarity index 96%
rename from src/main/java/eu/mulk/mulkcms2/entity/UserSettingPK.java
rename to src/main/java/eu/mulk/mulkcms2/users/UserSettingPK.java
index 5530750..4514fe2 100644
--- a/src/main/java/eu/mulk/mulkcms2/entity/UserSettingPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/users/UserSettingPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.mulkcms2.entity;
+package eu.mulk.mulkcms2.users;
 
 import java.io.Serializable;
 import java.util.Objects;