diff --git a/pom.xml b/pom.xml
index 604c85f..f65fd07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,9 @@
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
+                <configuration>
+                    <mainClass>edu.ntnu.idi.idatt2003.g40.mappe.Main</mainClass>
+                </configuration>
             </plugin>
 
             <plugin>
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java
index 186a1ba..e93f779 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java
@@ -1,9 +1,15 @@
 package edu.ntnu.idi.idatt2003.g40.mappe;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.FileConverter;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.FileParser;
+import javafx.application.Application;
+import javafx.stage.Stage;
+
 import java.io.IOException;
 import java.util.List;
 
-public class Main {
+public class Main extends Application {
   static void main() {
     FileParser parser1 = new FileParser("src/main/resources/dummydata.txt");
     FileConverter converter1 = new FileConverter();
@@ -15,4 +21,9 @@ static void main() {
       System.err.println(e.getMessage());
     }
   }
+
+  @Override
+  public void start(final Stage stage) throws Exception {
+
+  }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/controller/PlayerStatusController.java
similarity index 91%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusController.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/controller/PlayerStatusController.java
index 459ee73..aa45ab6 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/controller/PlayerStatusController.java
@@ -1,4 +1,7 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.controller;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.PlayerStatus;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
similarity index 90%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Exchange.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
index 5115125..6d5b004 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Exchange.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
@@ -1,4 +1,14 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Purchase;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Sale;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchive.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchive.java
similarity index 92%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchive.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchive.java
index 83bb7cc..d09a42a 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchive.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchive.java
@@ -1,4 +1,8 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Purchase;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Sale;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Player.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
similarity index 94%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Player.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
index fa933b9..8b997ce 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Player.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
@@ -1,4 +1,7 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.TransactionArchive;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatus.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatus.java
similarity index 92%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatus.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatus.java
index 3bd959f..edd8705 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatus.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatus.java
@@ -1,6 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
-
-import java.math.BigDecimal;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 /**
  * Enum representing a players' current status.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java
similarity index 95%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Portfolio.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java
index 25b0953..305a7e1 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Portfolio.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Purchase.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Purchase.java
similarity index 86%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Purchase.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Purchase.java
index f042cb0..af28170 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Purchase.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Purchase.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 /**
  * Purchase represents purchases the player commits.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Sale.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Sale.java
similarity index 86%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Sale.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Sale.java
index 50cbb24..7731aff 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Sale.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Sale.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 /**
  * Sale represents sales the player commits.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Share.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Share.java
similarity index 96%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Share.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Share.java
index 0373bd4..88e51eb 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Share.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Share.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Stock.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java
similarity index 97%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Stock.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java
index 9e44c68..a781ee4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Stock.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java
@@ -1,6 +1,5 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Transaction.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Transaction.java
similarity index 94%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Transaction.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Transaction.java
index 8da798a..f0b210d 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Transaction.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Transaction.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 /**
  * Transaction abstract class.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverter.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverter.java
similarity index 95%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverter.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverter.java
index 4723b7e..9a479ec 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverter.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverter.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParser.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParser.java
similarity index 98%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParser.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParser.java
index d0d0279..155d36d 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParser.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParser.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculator.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculator.java
similarity index 93%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculator.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculator.java
index 8e3cf16..49ce7c1 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculator.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculator.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculator.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculator.java
similarity index 95%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculator.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculator.java
index 8fb6227..0cba5dc 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculator.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculator.java
@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionCalculator.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/TransactionCalculator.java
similarity index 94%
rename from src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionCalculator.java
rename to src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/TransactionCalculator.java
index aa13dea..cc68306 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionCalculator.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/TransactionCalculator.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import java.math.BigDecimal;
 
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/MainTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/MainTest.java
deleted file mode 100644
index 821a3b0..0000000
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/MainTest.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class MainTest {
-    
-}
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ExchangeTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/ExchangeTest.java
similarity index 98%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ExchangeTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/ExchangeTest.java
index 5cdd13d..8f4f1a5 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ExchangeTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/ExchangeTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -9,6 +9,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchiveTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchiveTest.java
similarity index 95%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchiveTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchiveTest.java
index f447b8b..091daeb 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchiveTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchiveTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,6 +6,9 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 import org.junit.jupiter.api.Test;
 
 final class TransactionArchiveTest {
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatusTest.java
similarity index 82%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatusTest.java
index b038bb5..a9a44f5 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatusTest.java
@@ -1,5 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.controller.PlayerStatusController;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerTest.java
similarity index 94%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerTest.java
index b73f257..70dd13b 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerTest.java
@@ -1,9 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
 import org.junit.jupiter.api.Test;
 
 final class PlayerTest {
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PortfolioTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PortfolioTest.java
similarity index 96%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PortfolioTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PortfolioTest.java
index 93fa5f4..470f26a 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PortfolioTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PortfolioTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,6 +6,8 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
 import org.junit.jupiter.api.Test;
 
 final class PortfolioTest {
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PurchaseTest.java
similarity index 91%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PurchaseTest.java
index e66c84b..42caf80 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PurchaseTest.java
@@ -1,9 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/SaleTest.java
similarity index 91%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/SaleTest.java
index 996437a..22e4e4e 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/SaleTest.java
@@ -1,9 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ShareTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/ShareTest.java
similarity index 96%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ShareTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/ShareTest.java
index de9d2c1..bb78ea1 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ShareTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/ShareTest.java
@@ -1,9 +1,10 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.math.BigDecimal;
+
 import org.junit.jupiter.api.Test;
 
 final class ShareTest {
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/StockTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/StockTest.java
similarity index 98%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/StockTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/StockTest.java
index 9fa9f1a..c9552c4 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/StockTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/StockTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -7,6 +7,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverterTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverterTest.java
similarity index 93%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverterTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverterTest.java
index 6404d78..5cb5444 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverterTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverterTest.java
@@ -1,15 +1,13 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class FileConverterTest {
 
   private FileConverter converter;
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParserTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParserTest.java
similarity index 94%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParserTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParserTest.java
index 2935a30..e751602 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParserTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParserTest.java
@@ -1,10 +1,8 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculatorTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculatorTest.java
similarity index 90%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculatorTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculatorTest.java
index 543688a..98ca12b 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculatorTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculatorTest.java
@@ -1,8 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import org.junit.jupiter.api.Test;
 
 final class PurchaseCalculatorTest {
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculatorTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculatorTest.java
similarity index 92%
rename from src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculatorTest.java
rename to src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculatorTest.java
index e8a4640..d331db8 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculatorTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculatorTest.java
@@ -1,8 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import org.junit.jupiter.api.Test;
 
 final class SaleCalculatorTest {