diff --git a/src/main/scala/eu/mulk/entity/Article.java b/src/main/java/eu/mulk/mulkcms2/entity/Article.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/Article.java
rename to src/main/java/eu/mulk/mulkcms2/entity/Article.java
index 8289a99..abd6036 100644
--- a/src/main/scala/eu/mulk/entity/Article.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/Article.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/scala/eu/mulk/entity/ArticleAlias.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleAlias.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/ArticleAlias.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleAlias.java
index 7599984..a7c4924 100644
--- a/src/main/scala/eu/mulk/entity/ArticleAlias.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleAlias.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/ArticleBranchTip.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTip.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/ArticleBranchTip.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTip.java
index 5bbb0a8..c061ed9 100644
--- a/src/main/scala/eu/mulk/entity/ArticleBranchTip.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTip.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/ArticleBranchTipPK.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTipPK.java
similarity index 91%
rename from src/main/scala/eu/mulk/entity/ArticleBranchTipPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTipPK.java
index bab4247..2508f87 100644
--- a/src/main/scala/eu/mulk/entity/ArticleBranchTipPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleBranchTipPK.java
@@ -1,7 +1,6 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
-import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Id;
 
diff --git a/src/main/scala/eu/mulk/entity/ArticleCommentCount.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleCommentCount.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/ArticleCommentCount.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleCommentCount.java
index 283a7f4..a12cb66 100644
--- a/src/main/scala/eu/mulk/entity/ArticleCommentCount.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleCommentCount.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/ArticlePublishingDate.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticlePublishingDate.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/ArticlePublishingDate.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticlePublishingDate.java
index cc311b7..d3a8073 100644
--- a/src/main/scala/eu/mulk/entity/ArticlePublishingDate.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticlePublishingDate.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
diff --git a/src/main/scala/eu/mulk/entity/ArticleRevision.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevision.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/ArticleRevision.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleRevision.java
index c0f8caf..9235c4c 100644
--- a/src/main/scala/eu/mulk/entity/ArticleRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevision.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
diff --git a/src/main/scala/eu/mulk/entity/ArticleRevisionCharacteristic.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristic.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/ArticleRevisionCharacteristic.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristic.java
index 8cc0661..e619c1f 100644
--- a/src/main/scala/eu/mulk/entity/ArticleRevisionCharacteristic.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristic.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/ArticleRevisionCharacteristicPK.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristicPK.java
similarity index 94%
rename from src/main/scala/eu/mulk/entity/ArticleRevisionCharacteristicPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristicPK.java
index 5e28967..2da588e 100644
--- a/src/main/scala/eu/mulk/entity/ArticleRevisionCharacteristicPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleRevisionCharacteristicPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import javax.persistence.Id;
diff --git a/src/main/scala/eu/mulk/entity/ArticleType.java b/src/main/java/eu/mulk/mulkcms2/entity/ArticleType.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/ArticleType.java
rename to src/main/java/eu/mulk/mulkcms2/entity/ArticleType.java
index 4bc5e08..e9b1b84 100644
--- a/src/main/scala/eu/mulk/entity/ArticleType.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/ArticleType.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/scala/eu/mulk/entity/CachedPage.java b/src/main/java/eu/mulk/mulkcms2/entity/CachedPage.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/CachedPage.java
rename to src/main/java/eu/mulk/mulkcms2/entity/CachedPage.java
index 0ef1d73..ac8a438 100644
--- a/src/main/scala/eu/mulk/entity/CachedPage.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/CachedPage.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.sql.Timestamp;
diff --git a/src/main/scala/eu/mulk/entity/CachedPagePK.java b/src/main/java/eu/mulk/mulkcms2/entity/CachedPagePK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/CachedPagePK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/CachedPagePK.java
index 43793bb..d22b3f7 100644
--- a/src/main/scala/eu/mulk/entity/CachedPagePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/CachedPagePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/Category.java b/src/main/java/eu/mulk/mulkcms2/entity/Category.java
similarity index 95%
rename from src/main/scala/eu/mulk/entity/Category.java
rename to src/main/java/eu/mulk/mulkcms2/entity/Category.java
index 44136be..177081c 100644
--- a/src/main/scala/eu/mulk/entity/Category.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/Category.java
@@ -1,7 +1,6 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
-import java.util.Collection;
 import java.util.Objects;
 import java.util.Set;
 import javax.persistence.Basic;
@@ -11,7 +10,6 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 @Entity
diff --git a/src/main/scala/eu/mulk/entity/Comment.java b/src/main/java/eu/mulk/mulkcms2/entity/Comment.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/Comment.java
rename to src/main/java/eu/mulk/mulkcms2/entity/Comment.java
index 4a32706..502c8b9 100644
--- a/src/main/scala/eu/mulk/entity/Comment.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/Comment.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/scala/eu/mulk/entity/CommentRevision.java b/src/main/java/eu/mulk/mulkcms2/entity/CommentRevision.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/CommentRevision.java
rename to src/main/java/eu/mulk/mulkcms2/entity/CommentRevision.java
index c5b7bcd..a984b35 100644
--- a/src/main/scala/eu/mulk/entity/CommentRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/CommentRevision.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import com.vladmihalcea.hibernate.type.basic.Inet;
 import com.vladmihalcea.hibernate.type.basic.PostgreSQLInetType;
diff --git a/src/main/scala/eu/mulk/entity/Journal.java b/src/main/java/eu/mulk/mulkcms2/entity/Journal.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/Journal.java
rename to src/main/java/eu/mulk/mulkcms2/entity/Journal.java
index 63447df..471ec46 100644
--- a/src/main/scala/eu/mulk/entity/Journal.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/Journal.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/scala/eu/mulk/entity/JournalEntry.java b/src/main/java/eu/mulk/mulkcms2/entity/JournalEntry.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/JournalEntry.java
rename to src/main/java/eu/mulk/mulkcms2/entity/JournalEntry.java
index 1c4040e..86ea6ba 100644
--- a/src/main/scala/eu/mulk/entity/JournalEntry.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/JournalEntry.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/JournalEntryPK.java b/src/main/java/eu/mulk/mulkcms2/entity/JournalEntryPK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/JournalEntryPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/JournalEntryPK.java
index 189d94f..f867d31 100644
--- a/src/main/scala/eu/mulk/entity/JournalEntryPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/JournalEntryPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/LegacyJournalCategory.java b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalCategory.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/LegacyJournalCategory.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalCategory.java
index 35b0587..88a5ed4 100644
--- a/src/main/scala/eu/mulk/entity/LegacyJournalCategory.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalCategory.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/LegacyJournalComment.java b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalComment.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/LegacyJournalComment.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalComment.java
index 8e6cc25..8516b14 100644
--- a/src/main/scala/eu/mulk/entity/LegacyJournalComment.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalComment.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/LegacyJournalEntry.java b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalEntry.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/LegacyJournalEntry.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalEntry.java
index 341fdc0..6b7e21a 100644
--- a/src/main/scala/eu/mulk/entity/LegacyJournalEntry.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalEntry.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/scala/eu/mulk/entity/LegacyJournalPingback.java b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalPingback.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/LegacyJournalPingback.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalPingback.java
index 430518c..ef35dec 100644
--- a/src/main/scala/eu/mulk/entity/LegacyJournalPingback.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalPingback.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/LegacyJournalTrackback.java b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalTrackback.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/LegacyJournalTrackback.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalTrackback.java
index 278909f..6c46bf0 100644
--- a/src/main/scala/eu/mulk/entity/LegacyJournalTrackback.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LegacyJournalTrackback.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/LoginCertificate.java b/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificate.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/LoginCertificate.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LoginCertificate.java
index 556568e..61b7185 100644
--- a/src/main/scala/eu/mulk/entity/LoginCertificate.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificate.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Arrays;
diff --git a/src/main/scala/eu/mulk/entity/LoginCertificatePK.java b/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificatePK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/LoginCertificatePK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/LoginCertificatePK.java
index b9035f5..bb74971 100644
--- a/src/main/scala/eu/mulk/entity/LoginCertificatePK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/LoginCertificatePK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/src/main/scala/eu/mulk/entity/OpenId.java b/src/main/java/eu/mulk/mulkcms2/entity/OpenId.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/OpenId.java
rename to src/main/java/eu/mulk/mulkcms2/entity/OpenId.java
index 2708640..6060712 100644
--- a/src/main/scala/eu/mulk/entity/OpenId.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/OpenId.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/OpenIdPK.java b/src/main/java/eu/mulk/mulkcms2/entity/OpenIdPK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/OpenIdPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/OpenIdPK.java
index 776911b..22b72c0 100644
--- a/src/main/scala/eu/mulk/entity/OpenIdPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/OpenIdPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/Password.java b/src/main/java/eu/mulk/mulkcms2/entity/Password.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/Password.java
rename to src/main/java/eu/mulk/mulkcms2/entity/Password.java
index 3e9d302..7a785b0 100644
--- a/src/main/scala/eu/mulk/entity/Password.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/Password.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/PasswordPK.java b/src/main/java/eu/mulk/mulkcms2/entity/PasswordPK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/PasswordPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/PasswordPK.java
index 72db872..3c7c0bb 100644
--- a/src/main/scala/eu/mulk/entity/PasswordPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/PasswordPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/UsedTransactionKey.java b/src/main/java/eu/mulk/mulkcms2/entity/UsedTransactionKey.java
similarity index 95%
rename from src/main/scala/eu/mulk/entity/UsedTransactionKey.java
rename to src/main/java/eu/mulk/mulkcms2/entity/UsedTransactionKey.java
index 8e69a4c..7d562a6 100644
--- a/src/main/scala/eu/mulk/entity/UsedTransactionKey.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/UsedTransactionKey.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/User.java b/src/main/java/eu/mulk/mulkcms2/entity/User.java
similarity index 98%
rename from src/main/scala/eu/mulk/entity/User.java
rename to src/main/java/eu/mulk/mulkcms2/entity/User.java
index c4bc27d..1c9e425 100644
--- a/src/main/scala/eu/mulk/entity/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/User.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Collection;
diff --git a/src/main/scala/eu/mulk/entity/UserPermission.java b/src/main/java/eu/mulk/mulkcms2/entity/UserPermission.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/UserPermission.java
rename to src/main/java/eu/mulk/mulkcms2/entity/UserPermission.java
index 053d790..cde34e6 100644
--- a/src/main/scala/eu/mulk/entity/UserPermission.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/UserPermission.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/UserPermissionPK.java b/src/main/java/eu/mulk/mulkcms2/entity/UserPermissionPK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/UserPermissionPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/UserPermissionPK.java
index ae3df66..085aae2 100644
--- a/src/main/scala/eu/mulk/entity/UserPermissionPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/UserPermissionPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/UserSetting.java b/src/main/java/eu/mulk/mulkcms2/entity/UserSetting.java
similarity index 97%
rename from src/main/scala/eu/mulk/entity/UserSetting.java
rename to src/main/java/eu/mulk/mulkcms2/entity/UserSetting.java
index 308c13e..5459562 100644
--- a/src/main/scala/eu/mulk/entity/UserSetting.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/UserSetting.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import java.util.Objects;
diff --git a/src/main/scala/eu/mulk/entity/UserSettingPK.java b/src/main/java/eu/mulk/mulkcms2/entity/UserSettingPK.java
similarity index 96%
rename from src/main/scala/eu/mulk/entity/UserSettingPK.java
rename to src/main/java/eu/mulk/mulkcms2/entity/UserSettingPK.java
index 64168c8..3b77247 100644
--- a/src/main/scala/eu/mulk/entity/UserSettingPK.java
+++ b/src/main/java/eu/mulk/mulkcms2/entity/UserSettingPK.java
@@ -1,4 +1,4 @@
-package eu.mulk.entity;
+package eu.mulk.mulkcms2.entity;
 
 import java.io.Serializable;
 import java.util.Objects;