diff --git a/lib/byte-buddy-1.14.10.jar b/lib/byte-buddy-1.14.10.jar
new file mode 100644
index 0000000..30b7677
Binary files /dev/null and b/lib/byte-buddy-1.14.10.jar differ
diff --git a/lib/byte-buddy-agent-1.14.10.jar b/lib/byte-buddy-agent-1.14.10.jar
new file mode 100644
index 0000000..34260b4
Binary files /dev/null and b/lib/byte-buddy-agent-1.14.10.jar differ
diff --git a/lib/hamcrest-core-1.1.jar b/lib/hamcrest-core-1.1.jar
new file mode 100644
index 0000000..e5149be
Binary files /dev/null and b/lib/hamcrest-core-1.1.jar differ
diff --git a/lib/junit-4.10-extended-1.0.4.jar b/lib/junit-4.10-extended-1.0.4.jar
new file mode 100644
index 0000000..8982baf
Binary files /dev/null and b/lib/junit-4.10-extended-1.0.4.jar differ
diff --git a/lib/junit-4.10.jar b/lib/junit-4.10.jar
new file mode 100644
index 0000000..954851e
Binary files /dev/null and b/lib/junit-4.10.jar differ
diff --git a/lib/mockito-core-5.8.0.jar b/lib/mockito-core-5.8.0.jar
new file mode 100644
index 0000000..f623de5
Binary files /dev/null and b/lib/mockito-core-5.8.0.jar differ
diff --git a/lib/objenesis-3.3.jar b/lib/objenesis-3.3.jar
new file mode 100644
index 0000000..d660190
Binary files /dev/null and b/lib/objenesis-3.3.jar differ
diff --git a/mtcg.iml b/mtcg.iml
index 3709e7d..587fefb 100644
--- a/mtcg.iml
+++ b/mtcg.iml
@@ -1,23 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="fasterxml.jackson.core" level="project" />
-    <orderEntry type="library" name="fasterxml.jackson.core.annotations" level="project" />
-    <orderEntry type="library" name="fasterxml.jackson.core.databind" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/at/nanopenguin/mtcg/Main.java b/src/main/java/at/nanopenguin/mtcg/Main.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/Main.java
rename to src/main/java/at/nanopenguin/mtcg/Main.java
diff --git a/src/at/nanopenguin/mtcg/Pair.java b/src/main/java/at/nanopenguin/mtcg/Pair.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/Pair.java
rename to src/main/java/at/nanopenguin/mtcg/Pair.java
diff --git a/src/at/nanopenguin/mtcg/application/Battle.java b/src/main/java/at/nanopenguin/mtcg/application/Battle.java
similarity index 87%
rename from src/at/nanopenguin/mtcg/application/Battle.java
rename to src/main/java/at/nanopenguin/mtcg/application/Battle.java
index e364045..aefdebe 100644
--- a/src/at/nanopenguin/mtcg/application/Battle.java
+++ b/src/main/java/at/nanopenguin/mtcg/application/Battle.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Random;
 
 public class Battle {
-    private record RoundResult(String winnerName, Card winnerCard, String loserName, Card loserCard, boolean draw);
+    private record RoundResult(String winnerName, Card winnerCard, String loserName, Card loserCard, boolean draw) {};
     private Pair<Combatant, Combatant> combatants;
     @Getter
     private volatile List<String> log = new ArrayList<>();
@@ -40,15 +40,15 @@ public class Battle {
 
     private void playRound() {
         Pair<Card, Card> cards = new Pair<>(this.combatants.left().getCard(), this.combatants.right().getCard());
-        RoundResult result = this.fight(cards.left(), cards.right());
-        this.log.add()
+        //RoundResult result = this.fight(cards.left(), cards.right());
+        //this.log.add("");
     }
 
     private boolean fight(Card left, Card right) {
-
+        return true;
     }
 
     private String createCombatString(RoundResult result) {
-
+        return "";
     }
 }
diff --git a/src/at/nanopenguin/mtcg/application/BattleHandler.java b/src/main/java/at/nanopenguin/mtcg/application/BattleHandler.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/BattleHandler.java
rename to src/main/java/at/nanopenguin/mtcg/application/BattleHandler.java
diff --git a/src/at/nanopenguin/mtcg/application/Combatant.java b/src/main/java/at/nanopenguin/mtcg/application/Combatant.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/Combatant.java
rename to src/main/java/at/nanopenguin/mtcg/application/Combatant.java
diff --git a/src/at/nanopenguin/mtcg/application/Package.java b/src/main/java/at/nanopenguin/mtcg/application/Package.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/Package.java
rename to src/main/java/at/nanopenguin/mtcg/application/Package.java
diff --git a/src/at/nanopenguin/mtcg/application/PurchaseStatus.java b/src/main/java/at/nanopenguin/mtcg/application/PurchaseStatus.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/PurchaseStatus.java
rename to src/main/java/at/nanopenguin/mtcg/application/PurchaseStatus.java
diff --git a/src/at/nanopenguin/mtcg/application/SessionHandler.java b/src/main/java/at/nanopenguin/mtcg/application/SessionHandler.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/SessionHandler.java
rename to src/main/java/at/nanopenguin/mtcg/application/SessionHandler.java
diff --git a/src/at/nanopenguin/mtcg/application/TokenValidity.java b/src/main/java/at/nanopenguin/mtcg/application/TokenValidity.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/TokenValidity.java
rename to src/main/java/at/nanopenguin/mtcg/application/TokenValidity.java
diff --git a/src/at/nanopenguin/mtcg/application/Trade.java b/src/main/java/at/nanopenguin/mtcg/application/Trade.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/Trade.java
rename to src/main/java/at/nanopenguin/mtcg/application/Trade.java
diff --git a/src/at/nanopenguin/mtcg/application/User.java b/src/main/java/at/nanopenguin/mtcg/application/User.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/User.java
rename to src/main/java/at/nanopenguin/mtcg/application/User.java
diff --git a/src/at/nanopenguin/mtcg/application/UserCards.java b/src/main/java/at/nanopenguin/mtcg/application/UserCards.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/UserCards.java
rename to src/main/java/at/nanopenguin/mtcg/application/UserCards.java
diff --git a/src/at/nanopenguin/mtcg/application/UserInfo.java b/src/main/java/at/nanopenguin/mtcg/application/UserInfo.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/UserInfo.java
rename to src/main/java/at/nanopenguin/mtcg/application/UserInfo.java
diff --git a/src/at/nanopenguin/mtcg/application/service/CardsService.java b/src/main/java/at/nanopenguin/mtcg/application/service/CardsService.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/CardsService.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/CardsService.java
diff --git a/src/at/nanopenguin/mtcg/application/service/GameService.java b/src/main/java/at/nanopenguin/mtcg/application/service/GameService.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/GameService.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/GameService.java
diff --git a/src/at/nanopenguin/mtcg/application/service/PackagesService.java b/src/main/java/at/nanopenguin/mtcg/application/service/PackagesService.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/PackagesService.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/PackagesService.java
diff --git a/src/at/nanopenguin/mtcg/application/service/Service.java b/src/main/java/at/nanopenguin/mtcg/application/service/Service.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/Service.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/Service.java
diff --git a/src/at/nanopenguin/mtcg/application/service/TestService.java b/src/main/java/at/nanopenguin/mtcg/application/service/TestService.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/TestService.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/TestService.java
diff --git a/src/at/nanopenguin/mtcg/application/service/TradingService.java b/src/main/java/at/nanopenguin/mtcg/application/service/TradingService.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/TradingService.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/TradingService.java
diff --git a/src/at/nanopenguin/mtcg/application/service/UserService.java b/src/main/java/at/nanopenguin/mtcg/application/service/UserService.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/UserService.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/UserService.java
diff --git a/src/at/nanopenguin/mtcg/application/service/schemas/Card.java b/src/main/java/at/nanopenguin/mtcg/application/service/schemas/Card.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/schemas/Card.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/schemas/Card.java
diff --git a/src/at/nanopenguin/mtcg/application/service/schemas/TradingDeal.java b/src/main/java/at/nanopenguin/mtcg/application/service/schemas/TradingDeal.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/schemas/TradingDeal.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/schemas/TradingDeal.java
diff --git a/src/at/nanopenguin/mtcg/application/service/schemas/UserCredentials.java b/src/main/java/at/nanopenguin/mtcg/application/service/schemas/UserCredentials.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/schemas/UserCredentials.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/schemas/UserCredentials.java
diff --git a/src/at/nanopenguin/mtcg/application/service/schemas/UserData.java b/src/main/java/at/nanopenguin/mtcg/application/service/schemas/UserData.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/schemas/UserData.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/schemas/UserData.java
diff --git a/src/at/nanopenguin/mtcg/application/service/schemas/UserStats.java b/src/main/java/at/nanopenguin/mtcg/application/service/schemas/UserStats.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/application/service/schemas/UserStats.java
rename to src/main/java/at/nanopenguin/mtcg/application/service/schemas/UserStats.java
diff --git a/src/at/nanopenguin/mtcg/db/DbQuery.java b/src/main/java/at/nanopenguin/mtcg/db/DbQuery.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/DbQuery.java
rename to src/main/java/at/nanopenguin/mtcg/db/DbQuery.java
diff --git a/src/at/nanopenguin/mtcg/db/SqlArithmeticOperators.java b/src/main/java/at/nanopenguin/mtcg/db/SqlArithmeticOperators.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/SqlArithmeticOperators.java
rename to src/main/java/at/nanopenguin/mtcg/db/SqlArithmeticOperators.java
diff --git a/src/at/nanopenguin/mtcg/db/SqlCommand.java b/src/main/java/at/nanopenguin/mtcg/db/SqlCommand.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/SqlCommand.java
rename to src/main/java/at/nanopenguin/mtcg/db/SqlCommand.java
diff --git a/src/at/nanopenguin/mtcg/db/SqlComparisonOperator.java b/src/main/java/at/nanopenguin/mtcg/db/SqlComparisonOperator.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/SqlComparisonOperator.java
rename to src/main/java/at/nanopenguin/mtcg/db/SqlComparisonOperator.java
diff --git a/src/at/nanopenguin/mtcg/db/SqlCompoundOperator.java b/src/main/java/at/nanopenguin/mtcg/db/SqlCompoundOperator.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/SqlCompoundOperator.java
rename to src/main/java/at/nanopenguin/mtcg/db/SqlCompoundOperator.java
diff --git a/src/at/nanopenguin/mtcg/db/SqlOperator.java b/src/main/java/at/nanopenguin/mtcg/db/SqlOperator.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/SqlOperator.java
rename to src/main/java/at/nanopenguin/mtcg/db/SqlOperator.java
diff --git a/src/at/nanopenguin/mtcg/db/StatementExecutor.java b/src/main/java/at/nanopenguin/mtcg/db/StatementExecutor.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/StatementExecutor.java
rename to src/main/java/at/nanopenguin/mtcg/db/StatementExecutor.java
diff --git a/src/at/nanopenguin/mtcg/db/Table.java b/src/main/java/at/nanopenguin/mtcg/db/Table.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/db/Table.java
rename to src/main/java/at/nanopenguin/mtcg/db/Table.java
diff --git a/src/at/nanopenguin/mtcg/http/HttpMethod.java b/src/main/java/at/nanopenguin/mtcg/http/HttpMethod.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/HttpMethod.java
rename to src/main/java/at/nanopenguin/mtcg/http/HttpMethod.java
diff --git a/src/at/nanopenguin/mtcg/http/HttpRequest.java b/src/main/java/at/nanopenguin/mtcg/http/HttpRequest.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/HttpRequest.java
rename to src/main/java/at/nanopenguin/mtcg/http/HttpRequest.java
diff --git a/src/at/nanopenguin/mtcg/http/HttpStatus.java b/src/main/java/at/nanopenguin/mtcg/http/HttpStatus.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/HttpStatus.java
rename to src/main/java/at/nanopenguin/mtcg/http/HttpStatus.java
diff --git a/src/at/nanopenguin/mtcg/http/RequestHandler.java b/src/main/java/at/nanopenguin/mtcg/http/RequestHandler.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/RequestHandler.java
rename to src/main/java/at/nanopenguin/mtcg/http/RequestHandler.java
diff --git a/src/at/nanopenguin/mtcg/http/Response.java b/src/main/java/at/nanopenguin/mtcg/http/Response.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/Response.java
rename to src/main/java/at/nanopenguin/mtcg/http/Response.java
diff --git a/src/at/nanopenguin/mtcg/http/Route.java b/src/main/java/at/nanopenguin/mtcg/http/Route.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/Route.java
rename to src/main/java/at/nanopenguin/mtcg/http/Route.java
diff --git a/src/at/nanopenguin/mtcg/http/Router.java b/src/main/java/at/nanopenguin/mtcg/http/Router.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/Router.java
rename to src/main/java/at/nanopenguin/mtcg/http/Router.java
diff --git a/src/at/nanopenguin/mtcg/http/Server.java b/src/main/java/at/nanopenguin/mtcg/http/Server.java
similarity index 100%
rename from src/at/nanopenguin/mtcg/http/Server.java
rename to src/main/java/at/nanopenguin/mtcg/http/Server.java