diff --git a/Backend/schafkopf-shared/src/main/kotlin/SchafkopfGameController.kt b/Backend/schafkopf-shared/src/main/kotlin/SchafkopfGameController.kt
index 5e8e854..ed87332 100644
--- a/Backend/schafkopf-shared/src/main/kotlin/SchafkopfGameController.kt
+++ b/Backend/schafkopf-shared/src/main/kotlin/SchafkopfGameController.kt
@@ -1,5 +1,7 @@
 package de.heiserer
 
+import card.CardList
+import card.CardToolkit
 import de.heiserer.cards.*
 import de.heiserer.player.Player
 
diff --git a/Backend/schafkopf-shared/src/main/kotlin/card/CardList.kt b/Backend/schafkopf-shared/src/main/kotlin/card/CardList.kt
index 4dea15e..bc58041 100644
--- a/Backend/schafkopf-shared/src/main/kotlin/card/CardList.kt
+++ b/Backend/schafkopf-shared/src/main/kotlin/card/CardList.kt
@@ -1,4 +1,8 @@
-package de.heiserer.cards
+package card
+
+import de.heiserer.cards.Card
+import de.heiserer.cards.GameType
+import de.heiserer.cards.SortedCardList
 
 interface CardList {
     fun add(card: Card)
diff --git a/Backend/schafkopf-shared/src/main/kotlin/card/CardToolkit.kt b/Backend/schafkopf-shared/src/main/kotlin/card/CardToolkit.kt
index c6dffe7..97ae695 100644
--- a/Backend/schafkopf-shared/src/main/kotlin/card/CardToolkit.kt
+++ b/Backend/schafkopf-shared/src/main/kotlin/card/CardToolkit.kt
@@ -1,9 +1,13 @@
-package de.heiserer.cards
+package card
+
+import de.heiserer.cards.Card
+import de.heiserer.cards.GameType
+import de.heiserer.cards.UnsortedCardList
 
 class CardToolkit private constructor(private val gameType: GameType) {
     private val sortedCardList = UnsortedCardList(true).asSortedCardList(gameType)
 
-    fun isTrumpf(card: Card): Boolean = card in sortedCardList.getTrumpf().getCopyOfCards()
+    fun isTrumpf(card: Card): Boolean = card in sortedCardList.getTrumpf()
 
     fun whoTricks(cards: CardList): Int {
         if(cards.size() != 4){
diff --git a/Backend/schafkopf-shared/src/main/kotlin/card/UnsortedCardList.kt b/Backend/schafkopf-shared/src/main/kotlin/card/UnsortedCardList.kt
index 4253e50..6a74449 100644
--- a/Backend/schafkopf-shared/src/main/kotlin/card/UnsortedCardList.kt
+++ b/Backend/schafkopf-shared/src/main/kotlin/card/UnsortedCardList.kt
@@ -1,5 +1,7 @@
 package de.heiserer.cards
 
+import card.CardList
+
 open class UnsortedCardList(withAllCards: Boolean = false): CardList {
     private val cards: MutableList<Card> = if(withAllCards){
         enumValues<Card>().toMutableList()
diff --git a/Backend/schafkopf-shared/src/main/kotlin/player/NPCPlayer.kt b/Backend/schafkopf-shared/src/main/kotlin/player/NPCPlayer.kt
index 4d70198..1f58261 100644
--- a/Backend/schafkopf-shared/src/main/kotlin/player/NPCPlayer.kt
+++ b/Backend/schafkopf-shared/src/main/kotlin/player/NPCPlayer.kt
@@ -1,5 +1,6 @@
 package de.heiserer.player
 
+import card.CardToolkit
 import de.heiserer.cards.*
 
 class NPCPlayer(name: String) : Player(name){
diff --git a/Backend/schafkopf-shared/src/main/kotlin/player/Player.kt b/Backend/schafkopf-shared/src/main/kotlin/player/Player.kt
index 6d860af..7c4913c 100644
--- a/Backend/schafkopf-shared/src/main/kotlin/player/Player.kt
+++ b/Backend/schafkopf-shared/src/main/kotlin/player/Player.kt
@@ -1,5 +1,6 @@
 package de.heiserer.player
 
+import card.CardToolkit
 import de.heiserer.cards.*
 
 abstract class Player(private var name: String){
diff --git a/Backend/schafkopf-shared/src/test/kotlin/CardToolkitTest.kt b/Backend/schafkopf-shared/src/test/kotlin/CardToolkitTest.kt
index 9f72a96..356fdef 100644
--- a/Backend/schafkopf-shared/src/test/kotlin/CardToolkitTest.kt
+++ b/Backend/schafkopf-shared/src/test/kotlin/CardToolkitTest.kt
@@ -1,3 +1,4 @@
+import card.CardToolkit
 import de.heiserer.cards.*
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test