diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java
index bf6e1e4..bf67367 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java
@@ -1,6 +1,20 @@
 package de.thpeetz.kontor.tysc;
 
-import de.thpeetz.kontor.tysc.data.*;
+import de.thpeetz.kontor.tysc.data.Card;
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Player;
+import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.tysc.data.Sport;
+import de.thpeetz.kontor.tysc.data.Team;
+import de.thpeetz.kontor.tysc.data.Vendor;
+import de.thpeetz.kontor.tysc.repository.CardRepository;
+import de.thpeetz.kontor.tysc.repository.CardSetRepository;
+import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
+import de.thpeetz.kontor.tysc.repository.PlayerRepository;
+import de.thpeetz.kontor.tysc.repository.RoosterRepository;
+import de.thpeetz.kontor.tysc.repository.SportRepository;
+import de.thpeetz.kontor.tysc.repository.TeamRepository;
+import de.thpeetz.kontor.tysc.repository.VendorRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/CardRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java
similarity index 75%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/CardRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java
index c894b28..09cfc08 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/CardRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java
@@ -1,7 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
+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;
@@ -15,3 +18,4 @@ public interface CardRepository extends JpaRepository<Card, String> {
         "where str(c.cardNumber) like lower(concat('%', :searchTerm, '%')) ")
     List<Card> search(@Param("searchTerm") String searchTerm);
 }
+
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/CardSetRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java
similarity index 81%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/CardSetRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java
index 237953e..3bf2901 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/CardSetRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java
@@ -1,7 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 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;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/FieldPositionRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java
similarity index 84%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/FieldPositionRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java
index 0f649cc..b018173 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/FieldPositionRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java
@@ -1,7 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 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;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/PlayerRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java
similarity index 87%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/PlayerRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java
index 8431abd..2f978f2 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/PlayerRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java
@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 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;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/RoosterRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java
similarity index 64%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/RoosterRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java
index a24dda9..b707d6e 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/RoosterRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java
@@ -1,5 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
+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;
 
@@ -7,5 +11,5 @@ 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")
     Rooster findByReferences(Player player, Team team, FieldPosition position, int year);
-    
 }
+
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/SportRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java
similarity index 86%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/SportRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java
index 35efe85..3860a68 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/SportRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java
@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 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;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/TeamRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java
similarity index 90%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/TeamRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java
index 9f518d9..c0aeae8 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/TeamRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java
@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/VendorRepository.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java
similarity index 86%
rename from springboot/src/main/java/de/thpeetz/kontor/tysc/data/VendorRepository.java
rename to springboot/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java
index 4c7a304..3195c3c 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/data/VendorRepository.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java
@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+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;
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java
index 1cfedbd..f91f55f 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java
@@ -2,14 +2,14 @@ package de.thpeetz.kontor.tysc.services;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.CardRepository;
+import de.thpeetz.kontor.tysc.repository.CardSetRepository;
+import de.thpeetz.kontor.tysc.repository.VendorRepository;
 import org.springframework.stereotype.Service;
 
 import de.thpeetz.kontor.tysc.data.Card;
-import de.thpeetz.kontor.tysc.data.CardRepository;
 import de.thpeetz.kontor.tysc.data.CardSet;
-import de.thpeetz.kontor.tysc.data.CardSetRepository;
 import de.thpeetz.kontor.tysc.data.Vendor;
-import de.thpeetz.kontor.tysc.data.VendorRepository;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
diff --git a/springboot/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java b/springboot/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java
index 05482bf..120bbfe 100644
--- a/springboot/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java
+++ b/springboot/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java
@@ -2,19 +2,19 @@ package de.thpeetz.kontor.tysc.services;
 
 import java.util.List;
 
-import de.thpeetz.kontor.tysc.data.FieldPosition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
 import de.thpeetz.kontor.tysc.data.Player;
-import de.thpeetz.kontor.tysc.data.PlayerRepository;
-import de.thpeetz.kontor.tysc.data.FieldPositionRepository;
 import de.thpeetz.kontor.tysc.data.Rooster;
-import de.thpeetz.kontor.tysc.data.RoosterRepository;
 import de.thpeetz.kontor.tysc.data.Sport;
-import de.thpeetz.kontor.tysc.data.SportRepository;
 import de.thpeetz.kontor.tysc.data.Team;
-import de.thpeetz.kontor.tysc.data.TeamRepository;
+import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
+import de.thpeetz.kontor.tysc.repository.PlayerRepository;
+import de.thpeetz.kontor.tysc.repository.RoosterRepository;
+import de.thpeetz.kontor.tysc.repository.SportRepository;
+import de.thpeetz.kontor.tysc.repository.TeamRepository;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java
index 8a8b9b7..0853371 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java
@@ -2,6 +2,7 @@ package de.thpeetz.kontor.tysc.data;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java
index 941537b..4941f6f 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java
@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.PlayerRepository;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java
index caffea4..c0e2e6c 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java
@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.RoosterRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java
index e47bb50..c045d12 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java
@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.SportRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java
index 7bd4ba2..d183b48 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java
@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.TeamRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java
index a16bd77..ea63c11 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.VendorRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/CardRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java
similarity index 82%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/CardRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java
index e2ff8b2..96f9f45 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/CardRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java
@@ -1,10 +1,14 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+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 org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/CardSetRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java
similarity index 90%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/CardSetRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java
index 71a08ba..2790087 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/CardSetRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java
@@ -1,10 +1,12 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java
similarity index 93%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java
index a9273db..3c5e26e 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java
@@ -1,10 +1,12 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
+import de.thpeetz.kontor.tysc.data.Sport;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java
similarity index 91%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java
index 7cbd540..1f602c7 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java
@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Player;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java
similarity index 80%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java
index fa56d90..a310edb 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java
@@ -1,9 +1,13 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+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.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java
similarity index 93%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java
index c0db4be..d11fd07 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java
@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Sport;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java
similarity index 92%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java
index 86f4200..83061a3 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java
@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Team;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorRepositoryTest.java b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java
similarity index 93%
rename from springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorRepositoryTest.java
rename to springboot/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java
index 9db7ef7..ef905c8 100644
--- a/springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorRepositoryTest.java
+++ b/springboot/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java
@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;