refactor package layout

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistViewTest.java

@@ -11,7 +11,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.Artist;
+import de.thpeetz.kontor.data.comics.Artist;
+import de.thpeetz.kontor.views.comics.ArtistForm;
+import de.thpeetz.kontor.views.comics.ArtistView;
 
 @SpringBootTest
 class ArtistViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistformTest.java

@@ -8,7 +8,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import de.thpeetz.kontor.comics.data.Artist;
+import de.thpeetz.kontor.data.comics.Artist;
+import de.thpeetz.kontor.views.comics.ArtistForm;
 
 @SpringBootTest
 class ArtistformTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.Comic;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.views.comics.ComicForm;
+import de.thpeetz.kontor.views.comics.ComicView;
 
 @SpringBootTest
 public class ComicViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicWorkViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.ComicWork;
+import de.thpeetz.kontor.data.comics.ComicWork;
+import de.thpeetz.kontor.views.comics.ComicWorkForm;
+import de.thpeetz.kontor.views.comics.ComicWorkView;
 
 @SpringBootTest
 class ComicWorkViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/IssueViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.Issue;
+import de.thpeetz.kontor.data.comics.Issue;
+import de.thpeetz.kontor.views.comics.IssueForm;
+import de.thpeetz.kontor.views.comics.IssueView;
 
 @SpringBootTest
 public class IssueViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/PublisherViewTest.java

@@ -11,7 +11,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.Publisher;
+import de.thpeetz.kontor.data.comics.Publisher;
+import de.thpeetz.kontor.views.comics.PublisherForm;
+import de.thpeetz.kontor.views.comics.PublisherView;
 
 @SpringBootTest
 class PublisherViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/StoryArcViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.StoryArc;
+import de.thpeetz.kontor.data.comics.StoryArc;
+import de.thpeetz.kontor.views.comics.StoryArcForm;
+import de.thpeetz.kontor.views.comics.StoryArcView;
 
 @SpringBootTest
 class StoryArcViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/TradePaperbackViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.TradePaperback;
+import de.thpeetz.kontor.data.comics.TradePaperback;
+import de.thpeetz.kontor.views.comics.TradePaperBackForm;
+import de.thpeetz.kontor.views.comics.TradePaperbackView;
 
 @SpringBootTest
 class TradePaperbackViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/VolumeViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.Volume;
+import de.thpeetz.kontor.data.comics.Volume;
+import de.thpeetz.kontor.views.comics.VolumeForm;
+import de.thpeetz.kontor.views.comics.VolumeView;
 
 @SpringBootTest
 class VolumeViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/WorktypeViewTest.java

@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.comics.data.Worktype;
+import de.thpeetz.kontor.data.comics.Worktype;
+import de.thpeetz.kontor.views.comics.WorktypeForm;
+import de.thpeetz.kontor.views.comics.WorktypeView;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardSetViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.data.tysc.CardSet;
+import de.thpeetz.kontor.views.tysc.CardSetForm;
+import de.thpeetz.kontor.views.tysc.CardSetView;
 
 @SpringBootTest
 class CardSetViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.Card;
+import de.thpeetz.kontor.data.tysc.Card;
+import de.thpeetz.kontor.views.tysc.CardForm;
+import de.thpeetz.kontor.views.tysc.CardView;
 
 @SpringBootTest
 class CardViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/FieldPositionViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.FieldPosition;
+import de.thpeetz.kontor.data.tysc.FieldPosition;
+import de.thpeetz.kontor.views.tysc.PositionForm;
+import de.thpeetz.kontor.views.tysc.PositionView;
 
 @SpringBootTest
 class FieldPositionViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/PlayerViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.Player;
+import de.thpeetz.kontor.data.tysc.Player;
+import de.thpeetz.kontor.views.tysc.PlayerForm;
+import de.thpeetz.kontor.views.tysc.PlayerView;
 
 @SpringBootTest
 class PlayerViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/RoosterViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.data.tysc.Rooster;
+import de.thpeetz.kontor.views.tysc.RoosterForm;
+import de.thpeetz.kontor.views.tysc.RoosterView;
 
 @SpringBootTest
 class RoosterViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/SportViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.Sport;
+import de.thpeetz.kontor.data.tysc.Sport;
+import de.thpeetz.kontor.views.tysc.SportForm;
+import de.thpeetz.kontor.views.tysc.SportView;
 
 @SpringBootTest
 class SportViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/TeamViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.Team;
+import de.thpeetz.kontor.data.tysc.Team;
+import de.thpeetz.kontor.views.tysc.TeamForm;
+import de.thpeetz.kontor.views.tysc.TeamView;
 
 @SpringBootTest
 class TeamViewTest {

kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/VendorViewTest.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.tysc.views;
+package de.thpeetz.kontor.views.tysc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import com.vaadin.flow.component.grid.Grid;
 
-import de.thpeetz.kontor.tysc.data.Vendor;
+import de.thpeetz.kontor.data.tysc.Vendor;
+import de.thpeetz.kontor.views.tysc.VendorForm;
+import de.thpeetz.kontor.views.tysc.VendorView;
 
 @SpringBootTest
 class VendorViewTest {

kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/SetupModuleBookshelf.java

@@ -1,44 +0,0 @@
-package de.thpeetz.kontor.bookshelf;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-
-import de.thpeetz.kontor.bookshelf.data.ArticleAuthorRepository;
-import de.thpeetz.kontor.bookshelf.data.AuthorRepository;
-import de.thpeetz.kontor.bookshelf.data.BookAuthorRepository;
-import de.thpeetz.kontor.bookshelf.data.BookRepository;
-import de.thpeetz.kontor.bookshelf.data.BookshelfPublisherRepository;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Component
-public class SetupModuleBookshelf implements ApplicationListener<ContextRefreshedEvent> {
-
-    boolean alreadySetup = false;
-
-    @Autowired
-    private BookshelfPublisherRepository publisherRepository;
-
-    @Autowired
-    private AuthorRepository authorRepository;
-
-    @Autowired
-    private ArticleAuthorRepository articleAuthorRepository;
-
-    @Autowired
-    private BookRepository bookRepository;
-
-    @Autowired
-    private BookAuthorRepository bookAuthorRepository;
-
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        if (alreadySetup) {
-            log.info("SetupModuleBookshelf already executed, skipping");
-            return;
-        }
-        log.info("Set up Bookshelf data");
-    }
-}

kontor-spring/src/main/java/de/thpeetz/kontor/comics/SetupModuleComics.java

@@ -1,60 +0,0 @@
-package de.thpeetz.kontor.comics;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-
-import de.thpeetz.kontor.comics.repository.ArtistRepository;
-import de.thpeetz.kontor.comics.repository.ComicRepository;
-import de.thpeetz.kontor.comics.repository.ComicWorkRepository;
-import de.thpeetz.kontor.comics.repository.IssueRepository;
-import de.thpeetz.kontor.comics.repository.PublisherRepository;
-import de.thpeetz.kontor.comics.repository.StoryArcRepository;
-import de.thpeetz.kontor.comics.repository.TradePaperbackRepository;
-import de.thpeetz.kontor.comics.repository.VolumeRepository;
-import de.thpeetz.kontor.comics.repository.WorktypeRepository;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Component
-public class SetupModuleComics implements ApplicationListener<ContextRefreshedEvent> {
-
-    boolean alreadySetup = false;
-
-    @Autowired
-    private PublisherRepository publisherRepository;
-
-    @Autowired
-    private ArtistRepository artistRepository;
-
-    @Autowired
-    private WorktypeRepository worktypeRepository;
-
-    @Autowired
-    private ComicRepository comicRepository;
-
-    @Autowired
-    private ComicWorkRepository comicWorkRepository;
-
-    @Autowired
-    private StoryArcRepository storyArcRepository;
-
-    @Autowired
-    private TradePaperbackRepository tradePaperbackRepository;
-
-    @Autowired
-    private IssueRepository issueRepository;
-
-    @Autowired
-    private VolumeRepository volumeRepository;
-
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        if (alreadySetup) {
-            log.info("SetupModuleComics already executed, skipping");
-            return;
-        }
-        log.info("Set up Comics data");
-    }
-}

kontor-spring/src/main/java/de/thpeetz/kontor/constants/AdminConstants.java

@@ -1,16 +1,15 @@
-package de.thpeetz.kontor.admin;
+package de.thpeetz.kontor.constants;
 
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.RouterLink;
-import de.thpeetz.kontor.admin.views.AssignmentView;
+
-import de.thpeetz.kontor.admin.views.PermissionView;
+import de.thpeetz.kontor.views.admin.AssignmentView;
-import de.thpeetz.kontor.admin.views.ProfileView;
+import de.thpeetz.kontor.views.admin.PermissionView;
-import de.thpeetz.kontor.comics.ComicConstants;
+import de.thpeetz.kontor.views.admin.ProfileView;
-import de.thpeetz.kontor.comics.views.ComicWorkView;
+import de.thpeetz.kontor.views.comics.ComicWorkView;
-import de.thpeetz.kontor.comics.views.IssueWorkView;
+import de.thpeetz.kontor.views.comics.IssueWorkView;
-import de.thpeetz.kontor.media.MediaConstants;
+import de.thpeetz.kontor.views.media.MediaActorFileView;
-import de.thpeetz.kontor.media.views.MediaActorFileView;
 
 public class AdminConstants {
 

kontor-spring/src/main/java/de/thpeetz/kontor/constants/BookshelfConstants.java

@@ -1,13 +1,13 @@
-package de.thpeetz.kontor.bookshelf;
+package de.thpeetz.kontor.constants;
 
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.RouterLink;
 
-import de.thpeetz.kontor.bookshelf.views.ArticleView;
+import de.thpeetz.kontor.views.bookshelf.ArticleView;
-import de.thpeetz.kontor.bookshelf.views.AuthorView;
+import de.thpeetz.kontor.views.bookshelf.AuthorView;
-import de.thpeetz.kontor.bookshelf.views.BookView;
+import de.thpeetz.kontor.views.bookshelf.BookView;
-import de.thpeetz.kontor.bookshelf.views.BookshelfPublisherView;
+import de.thpeetz.kontor.views.bookshelf.BookshelfPublisherView;
 
 public class BookshelfConstants {
 

kontor-spring/src/main/java/de/thpeetz/kontor/constants/ComicConstants.java

@@ -1,20 +1,20 @@
-package de.thpeetz.kontor.comics;
+package de.thpeetz.kontor.constants;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.RouterLink;
 
-import de.thpeetz.kontor.comics.views.ArtistView;
+import de.thpeetz.kontor.views.comics.ArtistView;
-import de.thpeetz.kontor.comics.views.ComicView;
+import de.thpeetz.kontor.views.comics.ComicView;
-import de.thpeetz.kontor.comics.views.ComicWorkView;
+import de.thpeetz.kontor.views.comics.ComicWorkView;
-import de.thpeetz.kontor.comics.views.IssueView;
+import de.thpeetz.kontor.views.comics.IssueView;
-import de.thpeetz.kontor.comics.views.IssueWorkView;
+import de.thpeetz.kontor.views.comics.IssueWorkView;
-import de.thpeetz.kontor.comics.views.PublisherView;
+import de.thpeetz.kontor.views.comics.PublisherView;
-import de.thpeetz.kontor.comics.views.StoryArcView;
+import de.thpeetz.kontor.views.comics.StoryArcView;
-import de.thpeetz.kontor.comics.views.TradePaperbackView;
+import de.thpeetz.kontor.views.comics.TradePaperbackView;
-import de.thpeetz.kontor.comics.views.VolumeView;
+import de.thpeetz.kontor.views.comics.VolumeView;
-import de.thpeetz.kontor.comics.views.WorktypeView;
+import de.thpeetz.kontor.views.comics.WorktypeView;
 
 /**
  * The {@code ComicConstants} class contains constant values related to comics.

kontor-spring/src/main/java/de/thpeetz/kontor/constants/MediaConstants.java

@@ -1,11 +1,12 @@
-package de.thpeetz.kontor.media;
+package de.thpeetz.kontor.constants;
 
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.sidenav.SideNavItem;
-import de.thpeetz.kontor.media.views.MediaActorView;
+
-import de.thpeetz.kontor.media.views.MediaArticleView;
+import de.thpeetz.kontor.views.media.MediaActorView;
-import de.thpeetz.kontor.media.views.MediaFileView;
+import de.thpeetz.kontor.views.media.MediaArticleView;
-import de.thpeetz.kontor.media.views.MediaVideoView;
+import de.thpeetz.kontor.views.media.MediaFileView;
+import de.thpeetz.kontor.views.media.MediaVideoView;
 
 import java.util.ArrayList;
 

kontor-spring/src/main/java/de/thpeetz/kontor/constants/TyscConstants.java

@@ -1,17 +1,17 @@
-package de.thpeetz.kontor.tysc;
+package de.thpeetz.kontor.constants;
 
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.RouterLink;
 
-import de.thpeetz.kontor.tysc.views.CardSetView;
+import de.thpeetz.kontor.views.tysc.CardSetView;
-import de.thpeetz.kontor.tysc.views.CardView;
+import de.thpeetz.kontor.views.tysc.CardView;
-import de.thpeetz.kontor.tysc.views.PlayerView;
+import de.thpeetz.kontor.views.tysc.PlayerView;
-import de.thpeetz.kontor.tysc.views.PositionView;
+import de.thpeetz.kontor.views.tysc.PositionView;
-import de.thpeetz.kontor.tysc.views.RoosterView;
+import de.thpeetz.kontor.views.tysc.RoosterView;
-import de.thpeetz.kontor.tysc.views.SportView;
+import de.thpeetz.kontor.views.tysc.SportView;
-import de.thpeetz.kontor.tysc.views.TeamView;
+import de.thpeetz.kontor.views.tysc.TeamView;
-import de.thpeetz.kontor.tysc.views.VendorView;
+import de.thpeetz.kontor.views.tysc.VendorView;
 
 /**
  * The {@code TyscConstants} class contains constant values related to tysc.

kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Assignment.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.admin.data;
+package de.thpeetz.kontor.data.admin;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;

kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Permission.java

@@ -1,6 +1,5 @@
-package de.thpeetz.kontor.admin.data;
+package de.thpeetz.kontor.data.admin;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.OneToMany;
@@ -11,6 +10,9 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Nullable;
+
+import de.thpeetz.kontor.data.common.AbstractEntity;
+
 import java.util.List;
 
 @Slf4j

kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Profile.java

@@ -1,6 +1,5 @@
-package de.thpeetz.kontor.admin.data;
+package de.thpeetz.kontor.data.admin;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Getter;
@@ -9,6 +8,9 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Nullable;
+
+import de.thpeetz.kontor.data.common.AbstractEntity;
+
 import java.util.LinkedList;
 import java.util.List;
 

kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Token.java

@@ -1,6 +1,5 @@
-package de.thpeetz.kontor.admin.data;
+package de.thpeetz.kontor.data.admin;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;
@@ -14,6 +13,8 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import java.util.Date;
 
+import de.thpeetz.kontor.data.common.AbstractEntity;
+
 @Slf4j
 @Getter
 @Setter

kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Article.java

@@ -1,9 +1,9 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.data.bookshelf;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotEmpty;

kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthor.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.data.bookshelf;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Author.java

@@ -1,9 +1,9 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.data.bookshelf;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Book.java

@@ -1,11 +1,11 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.data.bookshelf;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotEmpty;

kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookAuthor.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.data.bookshelf;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisher.java

@@ -1,9 +1,9 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.data.bookshelf;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Artist.java

@@ -1,9 +1,9 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import io.micrometer.common.lang.Nullable;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Comic.java

@@ -1,11 +1,11 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/ComicWork.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Issue.java

@@ -1,8 +1,8 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.*;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import io.hypersistence.utils.hibernate.type.basic.YearMonthDateType;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/IssueWork.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Publisher.java

@@ -1,11 +1,12 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import de.thpeetz.kontor.common.data.AbstractEntity;
+
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/StoryArc.java

@@ -1,8 +1,9 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/TradePaperback.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Volume.java

@@ -1,11 +1,11 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.*;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;

kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Worktype.java

@@ -1,9 +1,9 @@
-package de.thpeetz.kontor.comics.data;
+package de.thpeetz.kontor.data.comics;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import io.micrometer.common.lang.Nullable;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;

kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractEntity.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.common.data;
+package de.thpeetz.kontor.data.common;
 
 import jakarta.persistence.*;
 import lombok.EqualsAndHashCode;

kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractLinkEntity.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.common.data;
+package de.thpeetz.kontor.data.common;
 
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;

kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/Mail.java

@@ -1,12 +1,13 @@
-package de.thpeetz.kontor.mailclient.data;
+package de.thpeetz.kontor.data.mailclient;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.persistence.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
+import de.thpeetz.kontor.data.common.AbstractEntity;
+
 @Data
 @EqualsAndHashCode(callSuper=false)
 @Entity

kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/MailAccount.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.mailclient.data;
+package de.thpeetz.kontor.data.mailclient;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Getter;

kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActor.java

@@ -1,6 +1,5 @@
-package de.thpeetz.kontor.media.data;
+package de.thpeetz.kontor.data.media;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotEmpty;
@@ -12,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.util.LinkedList;
 import java.util.List;
 
+import de.thpeetz.kontor.data.common.AbstractEntity;
+
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = false)

kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActorFile.java

@@ -1,8 +1,6 @@
-package de.thpeetz.kontor.media.data;
+package de.thpeetz.kontor.data.media;
 
-import de.thpeetz.kontor.comics.data.Artist;
+import de.thpeetz.kontor.data.common.AbstractEntity;
-import de.thpeetz.kontor.comics.data.Comic;
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;

kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaArticle.java

@@ -1,10 +1,9 @@
-package de.thpeetz.kontor.media.data;
+package de.thpeetz.kontor.data.media;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import jakarta.validation.constraints.NotEmpty;

kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaFile.java

@@ -1,6 +1,5 @@
-package de.thpeetz.kontor.media.data;
+package de.thpeetz.kontor.data.media;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
 import lombok.EqualsAndHashCode;
@@ -11,6 +10,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.util.LinkedList;
 import java.util.List;
 
+import de.thpeetz.kontor.data.common.AbstractEntity;
+
 @Slf4j
 @Getter
 @Setter

kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaVideo.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.media.data;
+package de.thpeetz.kontor.data.media;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Card.java

@@ -1,8 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/CardSet.java

@@ -1,8 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/FieldPosition.java

@@ -1,10 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Player.java

@@ -1,8 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Rooster.java

@@ -1,6 +1,6 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Sport.java

@@ -1,9 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Team.java

@@ -1,10 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Vendor.java

@@ -1,8 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.data.tysc;
 
 import java.util.List;
 
-import de.thpeetz.kontor.common.data.AbstractEntity;
+import de.thpeetz.kontor.data.common.AbstractEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/AddLinkFromQueue.java

@@ -1,28 +0,0 @@
-package de.thpeetz.kontor.integration.routes;
-
-import de.thpeetz.kontor.integration.services.AddLinkProcessor;
-import de.thpeetz.kontor.media.services.MediaFileService;
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class AddLinkFromQueue extends RouteBuilder {
-
-    @Autowired
-    private final MediaFileService mediaFileService;
-
-    @Autowired
-    public AddLinkFromQueue(MediaFileService mediaFileService) {
-        this.mediaFileService = mediaFileService;
-    }
-
-    @Override
-    public void configure() throws Exception {
-        from("jms:queue:add_link_file")
-                .routeId("read-queue-add-link_file")
-                .log("${body}")
-                .process(new AddLinkProcessor(mediaFileService))
-                .to("jms:queue:update_title");
-    }
-}

kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLinkAdd.java

@@ -1,9 +1,11 @@
 package de.thpeetz.kontor.integration.routes;
-import de.thpeetz.kontor.media.services.MediaFileService;
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import de.thpeetz.kontor.integration.services.AddLinkProcessor;
+import de.thpeetz.kontor.services.MediaFileService;
+
 @Component
 public class QueueMediaLinkAdd extends RouteBuilder {
 
@@ -20,6 +22,9 @@ public class QueueMediaLinkAdd extends RouteBuilder {
         from("jms:queue:media.link.add")
                 .routeId("read-queue-media-link-add")
                 .log("${body}")
+                .trace(true)
+                .process(new AddLinkProcessor(mediaFileService))
+                .to("jms:queue:media.link.update_title")
                 .to("jms:queue:media.link.add.processed");
     }
 }

kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLoFiAdd.java

@@ -1,10 +1,11 @@
 package de.thpeetz.kontor.integration.routes;
 
 import org.apache.camel.builder.RouteBuilder;
-import de.thpeetz.kontor.media.services.MediaFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import de.thpeetz.kontor.services.MediaFileService;
+
 @Component
 public class QueueMediaLoFiAdd extends RouteBuilder {
 

kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaVideoAdd.java

@@ -1,10 +1,11 @@
 package de.thpeetz.kontor.integration.routes;
 
 import org.apache.camel.builder.RouteBuilder;
-import de.thpeetz.kontor.media.services.MediaFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import de.thpeetz.kontor.services.MediaFileService;
+
 @Component
 public class QueueMediaVideoAdd extends RouteBuilder {
 

kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/ReadQueueRoute.java

@@ -1,16 +0,0 @@
-package de.thpeetz.kontor.integration.routes;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ReadQueueRoute extends RouteBuilder {
-
-    @Override
-    public void configure() throws Exception {
-        from("jms:queue:KontorMediaFile")
-                .routeId("add-link-from-queue")
-                .trace(true)
-                .log(">>> ${body}");
-    }
-}

kontor-spring/src/main/java/de/thpeetz/kontor/integration/services/AddLinkProcessor.java

@@ -2,8 +2,9 @@ package de.thpeetz.kontor.integration.services;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.thpeetz.kontor.media.data.MediaFile;
+
-import de.thpeetz.kontor.media.services.MediaFileService;
+import de.thpeetz.kontor.data.media.MediaFile;
+import de.thpeetz.kontor.services.MediaFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;

kontor-spring/src/main/java/de/thpeetz/kontor/properties/MailProperties.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.admin;
+package de.thpeetz.kontor.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/AssignmentRepository.java

@@ -1,6 +1,9 @@
-package de.thpeetz.kontor.admin.repository;
+package de.thpeetz.kontor.repository.admin;
+
+import de.thpeetz.kontor.data.admin.Assignment;
+import de.thpeetz.kontor.data.admin.Permission;
+import de.thpeetz.kontor.data.admin.Profile;
 
-import de.thpeetz.kontor.admin.data.*;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/MailAccountRepository.java

@@ -1,8 +1,9 @@
-package de.thpeetz.kontor.admin.repository;
+package de.thpeetz.kontor.repository.admin;
 
-import de.thpeetz.kontor.mailclient.data.MailAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import de.thpeetz.kontor.data.mailclient.MailAccount;
+
 
 public interface MailAccountRepository extends JpaRepository<MailAccount, String> {
 }

kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/PermissionRepository.java

@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.admin.repository;
+package de.thpeetz.kontor.repository.admin;
 
-import de.thpeetz.kontor.admin.data.Permission;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.admin.Permission;
+
 import java.util.List;
 
 public interface PermissionRepository extends JpaRepository<Permission, String> {

kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/ProfileRepository.java

@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.admin.repository;
+package de.thpeetz.kontor.repository.admin;
 
-import de.thpeetz.kontor.admin.data.Profile;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.admin.Profile;
+
 import java.util.List;
 
 public interface ProfileRepository extends JpaRepository<Profile, String> {

kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepository.java

@@ -1,9 +1,13 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.repository.bookshelf;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import de.thpeetz.kontor.data.bookshelf.Article;
+import de.thpeetz.kontor.data.bookshelf.ArticleAuthor;
+import de.thpeetz.kontor.data.bookshelf.Author;
+
 public interface ArticleAuthorRepository extends JpaRepository<ArticleAuthor, String> {
 
     List<ArticleAuthor> findByAuthor(Author author);

kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepository.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.repository.bookshelf;
 
 import java.util.List;
 
@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.bookshelf.Article;
+
 public interface ArticleRepository extends JpaRepository<Article, String> {
 
     @Query("select a from Article a " +

kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepository.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.repository.bookshelf;
 
 import java.util.List;
 
@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.bookshelf.Author;
+
 public interface AuthorRepository extends JpaRepository<Author, String> {
 
     @Query("select a from Author a " +

kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepository.java

@@ -1,9 +1,13 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.repository.bookshelf;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import de.thpeetz.kontor.data.bookshelf.Author;
+import de.thpeetz.kontor.data.bookshelf.Book;
+import de.thpeetz.kontor.data.bookshelf.BookAuthor;
+
 public interface BookAuthorRepository extends JpaRepository<BookAuthor, String> {
 
     List<BookAuthor> findByAuthor(Author author);

kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookRepository.java

@@ -1,9 +1,11 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.repository.bookshelf;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.bookshelf.Book;
+
 import java.util.List;
 
 public interface BookRepository extends JpaRepository<Book, String> {

kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepository.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.bookshelf.data;
+package de.thpeetz.kontor.repository.bookshelf;
 
 import java.util.List;
 
@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher;
+
 public interface BookshelfPublisherRepository extends JpaRepository<BookshelfPublisher, String> {
 
     @Query("select p from BookshelfPublisher p " +

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ArtistRepository.java

@@ -1,8 +1,9 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Artist;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicRepository.java

@@ -1,8 +1,10 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.data.comics.Publisher;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicWorkRepository.java

@@ -1,8 +1,12 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Artist;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.data.comics.ComicWork;
+import de.thpeetz.kontor.data.comics.Worktype;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueRepository.java

@@ -1,8 +1,10 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.data.comics.Issue;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueWorkRepository.java

@@ -1,6 +1,10 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
+
+import de.thpeetz.kontor.data.comics.Artist;
+import de.thpeetz.kontor.data.comics.Issue;
+import de.thpeetz.kontor.data.comics.IssueWork;
+import de.thpeetz.kontor.data.comics.Worktype;
 
-import de.thpeetz.kontor.comics.data.*;
 import org.springframework.data.jpa.repository.*;
 
 import java.util.*;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/PublisherRepository.java

@@ -1,8 +1,9 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Publisher;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/StoryArcRepository.java

@@ -1,8 +1,10 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.data.comics.StoryArc;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepository.java

@@ -1,8 +1,10 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.data.comics.TradePaperback;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/VolumeRepository.java

@@ -1,8 +1,10 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Comic;
+import de.thpeetz.kontor.data.comics.Volume;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface VolumeRepository extends JpaRepository<Volume, String> {

kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/WorktypeRepository.java

@@ -1,8 +1,9 @@
-package de.thpeetz.kontor.comics.repository;
+package de.thpeetz.kontor.repository.comics;
 
 import java.util.List;
 
-import de.thpeetz.kontor.comics.data.*;
+import de.thpeetz.kontor.data.comics.Worktype;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorFileRepository.java

@@ -1,8 +1,8 @@
-package de.thpeetz.kontor.media.repository;
+package de.thpeetz.kontor.repository.media;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import de.thpeetz.kontor.media.data.MediaActorFile;
+import de.thpeetz.kontor.data.media.MediaActorFile;
 
 public interface MediaActorFileRepository extends JpaRepository<MediaActorFile, String> {
 }

kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorRepository.java

@@ -1,10 +1,10 @@
-package de.thpeetz.kontor.media.repository;
+package de.thpeetz.kontor.repository.media;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import de.thpeetz.kontor.media.data.MediaActor;
+import de.thpeetz.kontor.data.media.MediaActor;
 
 import java.util.List;
 

kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaArticleRepository.java

@@ -1,10 +1,10 @@
-package de.thpeetz.kontor.media.repository;
+package de.thpeetz.kontor.repository.media;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import de.thpeetz.kontor.media.data.MediaArticle;
+import de.thpeetz.kontor.data.media.MediaArticle;
 
 import java.util.List;
 

kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaFileRepository.java

@@ -1,4 +1,4 @@
-package de.thpeetz.kontor.media.repository;
+package de.thpeetz.kontor.repository.media;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import de.thpeetz.kontor.media.data.MediaFile;
+import de.thpeetz.kontor.data.media.MediaFile;
 
 public interface MediaFileRepository extends JpaRepository<MediaFile, String> {
     @Query("select m from MediaFile m " +

kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaVideoRepository.java

@@ -1,10 +1,10 @@
-package de.thpeetz.kontor.media.repository;
+package de.thpeetz.kontor.repository.media;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import de.thpeetz.kontor.media.data.MediaVideo;
+import de.thpeetz.kontor.data.media.MediaVideo;
 
 import java.util.List;
 

kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardRepository.java

@@ -1,14 +1,15 @@
-package de.thpeetz.kontor.tysc.repository;
+package de.thpeetz.kontor.repository.tysc;
 
-import de.thpeetz.kontor.tysc.data.Card;
-import de.thpeetz.kontor.tysc.data.CardSet;
-import de.thpeetz.kontor.tysc.data.Rooster;
-import de.thpeetz.kontor.tysc.data.Vendor;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.tysc.Card;
+import de.thpeetz.kontor.data.tysc.CardSet;
+import de.thpeetz.kontor.data.tysc.Rooster;
+import de.thpeetz.kontor.data.tysc.Vendor;
+
 public interface CardRepository extends JpaRepository<Card, String> {
 
     @Query("SELECT c FROM Card c WHERE c.vendor = ?1 AND c.cardSet = ?2 and c.rooster = ?3 and c.cardNumber = ?4 and c.year = ?5")

kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardSetRepository.java

@@ -1,13 +1,14 @@
-package de.thpeetz.kontor.tysc.repository;
+package de.thpeetz.kontor.repository.tysc;
 
 import java.util.List;
 
-import de.thpeetz.kontor.tysc.data.CardSet;
-import de.thpeetz.kontor.tysc.data.Vendor;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.tysc.CardSet;
+import de.thpeetz.kontor.data.tysc.Vendor;
+
 public interface CardSetRepository extends JpaRepository<CardSet, String> {
 
     List<CardSet> findByName(String name);

kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepository.java

@@ -1,13 +1,14 @@
-package de.thpeetz.kontor.tysc.repository;
+package de.thpeetz.kontor.repository.tysc;
 
 import java.util.List;
 
-import de.thpeetz.kontor.tysc.data.FieldPosition;
-import de.thpeetz.kontor.tysc.data.Sport;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.tysc.FieldPosition;
+import de.thpeetz.kontor.data.tysc.Sport;
+
 public interface FieldPositionRepository extends JpaRepository<FieldPosition, String> {
 
     @Query("select p from FieldPosition p " +

kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/PlayerRepository.java

@@ -1,12 +1,13 @@
-package de.thpeetz.kontor.tysc.repository;
+package de.thpeetz.kontor.repository.tysc;
 
 import java.util.List;
 
-import de.thpeetz.kontor.tysc.data.Player;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.tysc.Player;
+
 public interface PlayerRepository extends JpaRepository<Player, String> {
 
     @Query("select p from Player p " +

kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/RoosterRepository.java

@@ -1,12 +1,13 @@
-package de.thpeetz.kontor.tysc.repository;
+package de.thpeetz.kontor.repository.tysc;
 
-import de.thpeetz.kontor.tysc.data.FieldPosition;
-import de.thpeetz.kontor.tysc.data.Player;
-import de.thpeetz.kontor.tysc.data.Rooster;
-import de.thpeetz.kontor.tysc.data.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import de.thpeetz.kontor.data.tysc.FieldPosition;
+import de.thpeetz.kontor.data.tysc.Player;
+import de.thpeetz.kontor.data.tysc.Rooster;
+import de.thpeetz.kontor.data.tysc.Team;
+
 public interface RoosterRepository extends JpaRepository<Rooster, String>{
 
     @Query("SELECT r FROM Rooster r WHERE r.player = ?1 AND r.team = ?2 AND r.position = ?3 AND r.year = ?4")

kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/SportRepository.java

@@ -1,12 +1,13 @@
-package de.thpeetz.kontor.tysc.repository;
+package de.thpeetz.kontor.repository.tysc;
 
 import java.util.List;
 
-import de.thpeetz.kontor.tysc.data.Sport;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import de.thpeetz.kontor.data.tysc.Sport;
+
 public interface SportRepository extends JpaRepository<Sport, String> {
         @Query("select s from Sport s " +
                         "where lower(s.name) like lower(concat('%', :searchTerm, '%')) ")