diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 71d6ce6..ee9c969 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,3 +25,13 @@ jobs:
     - name: Test with Maven
       run: mvn -B test --file pom.xml
 
+    - name: Build site + JavaDocs & JaCoCo
+      run: mvn clean verify site
+
+    - name: Deploy to Github Pages
+      uses: peaceiris/actions-gh-pages@v4
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: target/site/
+        publish_branch: gh-pages
+
diff --git a/pom.xml b/pom.xml
index bff6a52..133a526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,51 +20,21 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.14.1</version>
         </dependency>
- 
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.12.0</version>
-        </dependency>
 
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
             <version>25.0.1</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>25.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-web</artifactId>
-            <version>25.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-swing</artifactId>
-            <version>25.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-media</artifactId>
-            <version>25.0.1</version>
-        </dependency>
   
          <dependency>
               <groupId>org.junit.jupiter</groupId>
               <artifactId>junit-jupiter</artifactId>
               <version>6.0.1</version>
             <scope>test</scope>
-         </dependency>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
     <build>
 
@@ -82,32 +52,61 @@
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
                     <configuration>
-                        <mainClass>edu.ntnu.idi.idatt.gui.javafx</mainClass>
+                        <mainClass>edu.ntnu.idi.idatt.Launcher</mainClass>
                     </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId> <!-- Lett running fra ide -->
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.6.3</version> <!-- Sjekkk versjon her -->
-                <configuration>
-                    <mainClass>edu.ntnu.idi.idatt.Main</mainClass>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId> <!-- Skippe manifest.mf declaration her -->
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version> <!-- SJEKK VERSJON HER Å -->
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>edu.ntnu.idi.idatt.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
+      <plugin> <!-- JavaDoc generation plugin -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.12.0</version>
+      </plugin>
+
+
+    <plugin>
+      <groupId>org.jacoco</groupId>
+      <artifactId>jacoco-maven-plugin</artifactId>
+      <version>0.8.14</version>
+      
+      <executions>
+        <!-- 1. Attach JaCoCo agent before tests -->
+        <execution>
+          <id>prepare-agent</id>
+          <goals>
+            <goal>prepare-agent</goal>
+          </goals>
+        </execution>
+
+        <!-- 2. Generate report after tests -->
+        <execution>
+          <id>report</id>
+          <phase>verify</phase>
+          <goals>
+            <goal>report</goal>
+          </goals>
+        </execution>
+      </executions>
+      </plugin> 
+
+      <plugin> <!-- Display site folder -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>4.0.0-M9</version>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId> <!-- Skippe manifest.mf declaration her -->
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.3.0</version>
+          <configuration>
+            <archive>
+              <manifest>
+                <addClasspath>true</addClasspath>
+                <mainClass>edu.ntnu.idi.idatt.Launcher</mainClass>
+              </manifest>
+            </archive>
+          </configuration>
+      </plugin>
 
        </plugins>
     </build>
diff --git a/src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java b/src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java
deleted file mode 100644
index 4f8c5cc..0000000
--- a/src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package edu.ntnu.idi.idatt.Controller;
-
-public class exchangePageController {
-}
diff --git a/src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java b/src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java
deleted file mode 100644
index c1162c7..0000000
--- a/src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package edu.ntnu.idi.idatt.Controller;
-
-public class mainPageController {
-}
diff --git a/src/main/java/edu/ntnu/idi/idatt/Launcher.java b/src/main/java/edu/ntnu/idi/idatt/Launcher.java
new file mode 100644
index 0000000..601d11e
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt/Launcher.java
@@ -0,0 +1,30 @@
+package edu.ntnu.idi.idatt;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+
+public final class Launcher {
+
+  /**
+   * Entry point of application.
+   */
+  static void main() {
+    Application.launch(StockGame.class);
+  }
+
+  public static final class StockGame extends Application {
+
+    @Override
+    public void start(Stage stage) {
+      stage.setWidth(1200);
+      stage.setHeight(700);
+      stage.setTitle("Stock Game");
+      stage.setScene(new Scene(new VBox()));
+      stage.show();
+    }
+
+  }
+
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt/Main.java b/src/main/java/edu/ntnu/idi/idatt/Main.java
deleted file mode 100644
index a7ee785..0000000
--- a/src/main/java/edu/ntnu/idi/idatt/Main.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.ntnu.idi.idatt;
-
-public class Main {
-
-  // Logger system !!
-
-  static void main() {
-    System.out.println("Hello world!");
-  }
-
-}
diff --git a/src/main/java/edu/ntnu/idi/idatt/Observer.java b/src/main/java/edu/ntnu/idi/idatt/Observer.java
deleted file mode 100644
index 24b264b..0000000
--- a/src/main/java/edu/ntnu/idi/idatt/Observer.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package edu.ntnu.idi.idatt;
-
-public interface Observer {
-
-    void update();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java b/src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java
deleted file mode 100644
index d274afe..0000000
--- a/src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package edu.ntnu.idi.idatt.View;
-
-public class exchangePage {
-}
diff --git a/src/main/java/edu/ntnu/idi/idatt/View/mainPage.java b/src/main/java/edu/ntnu/idi/idatt/View/mainPage.java
deleted file mode 100644
index 733d0cb..0000000
--- a/src/main/java/edu/ntnu/idi/idatt/View/mainPage.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package edu.ntnu.idi.idatt.View;
-
-public class mainPage {
-}
diff --git a/src/main/java/edu/ntnu/idi/idatt/common/Observer.java b/src/main/java/edu/ntnu/idi/idatt/common/Observer.java
new file mode 100644
index 0000000..ba340a4
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt/common/Observer.java
@@ -0,0 +1,6 @@
+package edu.ntnu.idi.idatt.common;
+
+public interface Observer {
+
+  void update();
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt/Exchange.java b/src/main/java/edu/ntnu/idi/idatt/model/Exchange.java
similarity index 91%
rename from src/main/java/edu/ntnu/idi/idatt/Exchange.java
rename to src/main/java/edu/ntnu/idi/idatt/model/Exchange.java
index 7214ffa..84d2d9d 100644
--- a/src/main/java/edu/ntnu/idi/idatt/Exchange.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/Exchange.java
@@ -1,16 +1,16 @@
-package edu.ntnu.idi.idatt;
-
-import edu.ntnu.idi.idatt.file.ExchangeLoader;
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
-import edu.ntnu.idi.idatt.transaction.Purchase;
-import edu.ntnu.idi.idatt.transaction.Sale;
-import edu.ntnu.idi.idatt.transaction.Transaction;
+package edu.ntnu.idi.idatt.model;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
+
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
+import edu.ntnu.idi.idatt.model.transaction.Purchase;
+import edu.ntnu.idi.idatt.model.transaction.Sale;
+import edu.ntnu.idi.idatt.model.transaction.Transaction;
+import edu.ntnu.idi.idatt.storage.ExchangeLoader;
 
 /**
  * Exchange class
@@ -32,8 +32,8 @@ public class Exchange extends ExchangeLoader {
   /**
    * Constructor for Exchange class
    *
-   * @param name   - Name of the current stock Exchange
-   * @param stocks - List of aviable stocks for this exchange.
+   * @param name - Name of the current stock Exchange
+   * @param path - Path to .csv file.
    */
   public Exchange(String name, String path) {
     super(path);
@@ -180,7 +180,7 @@ public Transaction buy(String symbol, BigDecimal quantity, Player player) {
    * 
    * @see Sale
    *
-   * @param Share  - The instance of the sold share.
+   * @param share  - The instance of the sold share.
    * @param player - which player did this event.
    * @return The given transaction details. (Transaction).
    * @see Transaction
diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Stock.java b/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java
similarity index 98%
rename from src/main/java/edu/ntnu/idi/idatt/marked/Stock.java
rename to src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java
index d84e7bb..88bdfeb 100644
--- a/src/main/java/edu/ntnu/idi/idatt/marked/Stock.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.marked;
+package edu.ntnu.idi.idatt.model.market;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/main/java/edu/ntnu/idi/idatt/Player.java b/src/main/java/edu/ntnu/idi/idatt/model/player/Player.java
similarity index 91%
rename from src/main/java/edu/ntnu/idi/idatt/Player.java
rename to src/main/java/edu/ntnu/idi/idatt/model/player/Player.java
index 8f798e7..f75b184 100644
--- a/src/main/java/edu/ntnu/idi/idatt/Player.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/player/Player.java
@@ -1,11 +1,9 @@
-package edu.ntnu.idi.idatt;
+package edu.ntnu.idi.idatt.model.player;
 
-import edu.ntnu.idi.idatt.marked.Portfolio;
-import edu.ntnu.idi.idatt.transaction.TransactionArchive;
+import edu.ntnu.idi.idatt.model.portfolio.Portfolio;
+import edu.ntnu.idi.idatt.model.transaction.TransactionArchive;
 
 import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Map;
 
 public class Player {
 
diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java
similarity index 93%
rename from src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java
rename to src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java
index e377d5f..0b9e940 100644
--- a/src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java
@@ -1,11 +1,10 @@
-package edu.ntnu.idi.idatt.marked;
+package edu.ntnu.idi.idatt.model.portfolio;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import edu.ntnu.idi.idatt.calculator.SaleCalculator;
+import edu.ntnu.idi.idatt.service.transaction.SaleCalculator;
 
 /**
  * Portfolio class
diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Share.java b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Share.java
similarity index 91%
rename from src/main/java/edu/ntnu/idi/idatt/marked/Share.java
rename to src/main/java/edu/ntnu/idi/idatt/model/portfolio/Share.java
index 0cc7432..2bbaf0f 100644
--- a/src/main/java/edu/ntnu/idi/idatt/marked/Share.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Share.java
@@ -1,7 +1,9 @@
-package edu.ntnu.idi.idatt.marked;
+package edu.ntnu.idi.idatt.model.portfolio;
 
 import java.math.BigDecimal;
 
+import edu.ntnu.idi.idatt.model.market.Stock;
+
 /**
  * Share class
  *
diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/Purchase.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Purchase.java
similarity index 79%
rename from src/main/java/edu/ntnu/idi/idatt/transaction/Purchase.java
rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/Purchase.java
index ac9152f..6423f5c 100644
--- a/src/main/java/edu/ntnu/idi/idatt/transaction/Purchase.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Purchase.java
@@ -1,8 +1,8 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
-import edu.ntnu.idi.idatt.Player;
-import edu.ntnu.idi.idatt.calculator.PurchaseCalculator;
-import edu.ntnu.idi.idatt.marked.Share;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
+import edu.ntnu.idi.idatt.service.transaction.PurchaseCalculator;
 
 /**
  * Purchase class
diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/Sale.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Sale.java
similarity index 79%
rename from src/main/java/edu/ntnu/idi/idatt/transaction/Sale.java
rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/Sale.java
index e0b6292..d0debd8 100644
--- a/src/main/java/edu/ntnu/idi/idatt/transaction/Sale.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Sale.java
@@ -1,8 +1,8 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
-import edu.ntnu.idi.idatt.Player;
-import edu.ntnu.idi.idatt.calculator.SaleCalculator;
-import edu.ntnu.idi.idatt.marked.Share;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
+import edu.ntnu.idi.idatt.service.transaction.SaleCalculator;
 
 /**
  * Sale class
diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/Transaction.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Transaction.java
similarity index 85%
rename from src/main/java/edu/ntnu/idi/idatt/transaction/Transaction.java
rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/Transaction.java
index f28629e..e42a892 100644
--- a/src/main/java/edu/ntnu/idi/idatt/transaction/Transaction.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Transaction.java
@@ -1,8 +1,8 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
-import edu.ntnu.idi.idatt.Player;
-import edu.ntnu.idi.idatt.calculator.TransactionCalculator;
-import edu.ntnu.idi.idatt.marked.Share;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
+import edu.ntnu.idi.idatt.service.transaction.TransactionCalculator;
 
 /**
  * Transaction class
diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/TransactionArchive.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchive.java
similarity index 97%
rename from src/main/java/edu/ntnu/idi/idatt/transaction/TransactionArchive.java
rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchive.java
index e07e8c9..2dd77d4 100644
--- a/src/main/java/edu/ntnu/idi/idatt/transaction/TransactionArchive.java
+++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchive.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculator.java b/src/main/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculator.java
similarity index 93%
rename from src/main/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculator.java
rename to src/main/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculator.java
index fd7847f..e43a80f 100644
--- a/src/main/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculator.java
+++ b/src/main/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculator.java
@@ -1,9 +1,9 @@
-package edu.ntnu.idi.idatt.calculator;
-
-import edu.ntnu.idi.idatt.marked.Share;
+package edu.ntnu.idi.idatt.service.transaction;
 
 import java.math.BigDecimal;
 
+import edu.ntnu.idi.idatt.model.portfolio.Share;
+
 /**
  * PurchaseCalculator class
  *
diff --git a/src/main/java/edu/ntnu/idi/idatt/calculator/SaleCalculator.java b/src/main/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculator.java
similarity index 95%
rename from src/main/java/edu/ntnu/idi/idatt/calculator/SaleCalculator.java
rename to src/main/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculator.java
index 6c65302..8bbe827 100644
--- a/src/main/java/edu/ntnu/idi/idatt/calculator/SaleCalculator.java
+++ b/src/main/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculator.java
@@ -1,6 +1,6 @@
-package edu.ntnu.idi.idatt.calculator;
+package edu.ntnu.idi.idatt.service.transaction;
 
-import edu.ntnu.idi.idatt.marked.Share;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt/calculator/TransactionCalculator.java b/src/main/java/edu/ntnu/idi/idatt/service/transaction/TransactionCalculator.java
similarity index 92%
rename from src/main/java/edu/ntnu/idi/idatt/calculator/TransactionCalculator.java
rename to src/main/java/edu/ntnu/idi/idatt/service/transaction/TransactionCalculator.java
index fdfa9b1..8b75337 100644
--- a/src/main/java/edu/ntnu/idi/idatt/calculator/TransactionCalculator.java
+++ b/src/main/java/edu/ntnu/idi/idatt/service/transaction/TransactionCalculator.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.calculator;
+package edu.ntnu.idi.idatt.service.transaction;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java b/src/main/java/edu/ntnu/idi/idatt/storage/ExchangeLoader.java
similarity index 95%
rename from src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java
rename to src/main/java/edu/ntnu/idi/idatt/storage/ExchangeLoader.java
index 5f50a6a..71b4e18 100644
--- a/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java
+++ b/src/main/java/edu/ntnu/idi/idatt/storage/ExchangeLoader.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.file;
+package edu.ntnu.idi.idatt.storage;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
 
 public class ExchangeLoader {
 
@@ -44,7 +44,7 @@ protected ExchangeLoader(URL path) {
   /**
    * Method for loading from stocks from file
    *
-   * @return List<Stock> of loaded stocks.
+   * @return a list of loaded stocks.
    * @throws IOException on BufferedReader error
    */
   protected List<Stock> load() throws IOException {
diff --git a/src/test/java/edu/ntnu/idi/idatt/ExchangeTest.java b/src/test/java/edu/ntnu/idi/idatt/model/ExchangeTest.java
similarity index 96%
rename from src/test/java/edu/ntnu/idi/idatt/ExchangeTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/ExchangeTest.java
index 02cb3d7..3c9f878 100644
--- a/src/test/java/edu/ntnu/idi/idatt/ExchangeTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/ExchangeTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt;
+package edu.ntnu.idi.idatt.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -17,8 +17,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.marked.Stock;
-import edu.ntnu.idi.idatt.transaction.Transaction;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.transaction.Transaction;
 
 class ExchangeTest {
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/StockTest.java b/src/test/java/edu/ntnu/idi/idatt/model/market/StockTest.java
similarity index 97%
rename from src/test/java/edu/ntnu/idi/idatt/marked/StockTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/market/StockTest.java
index 941d9c5..5b27600 100644
--- a/src/test/java/edu/ntnu/idi/idatt/marked/StockTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/market/StockTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.marked;
+package edu.ntnu.idi.idatt.model.market;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/PlayerTest.java b/src/test/java/edu/ntnu/idi/idatt/model/player/PlayerTest.java
similarity index 92%
rename from src/test/java/edu/ntnu/idi/idatt/PlayerTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/player/PlayerTest.java
index e292971..16bbb95 100644
--- a/src/test/java/edu/ntnu/idi/idatt/PlayerTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/player/PlayerTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt;
+package edu.ntnu.idi.idatt.model.player;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -9,9 +9,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
-import edu.ntnu.idi.idatt.transaction.Purchase;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
+import edu.ntnu.idi.idatt.model.transaction.Purchase;
 
 class PlayerTest {
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java
similarity index 94%
rename from src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java
index e3a6898..743963f 100644
--- a/src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.marked;
+package edu.ntnu.idi.idatt.model.portfolio;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -11,7 +11,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.calculator.SaleCalculator;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.service.transaction.SaleCalculator;
 
 public class PortfolioTest {
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/ShareTest.java b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/ShareTest.java
similarity index 89%
rename from src/test/java/edu/ntnu/idi/idatt/marked/ShareTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/portfolio/ShareTest.java
index ac69822..cefea8b 100644
--- a/src/test/java/edu/ntnu/idi/idatt/marked/ShareTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/ShareTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.marked;
+package edu.ntnu.idi.idatt.model.portfolio;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -8,6 +8,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import edu.ntnu.idi.idatt.model.market.Stock;
+
 public class ShareTest {
 
   private Share share;
diff --git a/src/test/java/edu/ntnu/idi/idatt/transaction/PurchaseTest.java b/src/test/java/edu/ntnu/idi/idatt/model/transaction/PurchaseTest.java
similarity index 90%
rename from src/test/java/edu/ntnu/idi/idatt/transaction/PurchaseTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/transaction/PurchaseTest.java
index 25f9c9e..caf44c1 100644
--- a/src/test/java/edu/ntnu/idi/idatt/transaction/PurchaseTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/transaction/PurchaseTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.Player;
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 
 /**
  * Testing for Purchase class
diff --git a/src/test/java/edu/ntnu/idi/idatt/transaction/SaleTest.java b/src/test/java/edu/ntnu/idi/idatt/model/transaction/SaleTest.java
similarity index 91%
rename from src/test/java/edu/ntnu/idi/idatt/transaction/SaleTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/transaction/SaleTest.java
index 2f5523b..1bd944e 100644
--- a/src/test/java/edu/ntnu/idi/idatt/transaction/SaleTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/transaction/SaleTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -10,10 +10,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.Exchange;
-import edu.ntnu.idi.idatt.Player;
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.player.Player;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 
 /**
  * Testing for Sale class
diff --git a/src/test/java/edu/ntnu/idi/idatt/transaction/TransactionArchiveTest.java b/src/test/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchiveTest.java
similarity index 95%
rename from src/test/java/edu/ntnu/idi/idatt/transaction/TransactionArchiveTest.java
rename to src/test/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchiveTest.java
index 74930fb..32739ae 100644
--- a/src/test/java/edu/ntnu/idi/idatt/transaction/TransactionArchiveTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchiveTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.transaction;
+package edu.ntnu.idi.idatt.model.transaction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -10,8 +10,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 
 class TransactionArchiveTest {
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculatorTest.java b/src/test/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculatorTest.java
similarity index 89%
rename from src/test/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculatorTest.java
rename to src/test/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculatorTest.java
index 5d306c0..7870ea4 100644
--- a/src/test/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculatorTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculatorTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.calculator;
+package edu.ntnu.idi.idatt.service.transaction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 
 class PurchaseCalculatorTest {
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/calculator/SaleCalculatorTest.java b/src/test/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculatorTest.java
similarity index 93%
rename from src/test/java/edu/ntnu/idi/idatt/calculator/SaleCalculatorTest.java
rename to src/test/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculatorTest.java
index 3672172..eacc8e2 100644
--- a/src/test/java/edu/ntnu/idi/idatt/calculator/SaleCalculatorTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculatorTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.calculator;
+package edu.ntnu.idi.idatt.service.transaction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.marked.Share;
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 
 class SaleCalculatorTest {
 
diff --git a/src/test/java/edu/ntnu/idi/idatt/file/ExchangeLoaderTest.java b/src/test/java/edu/ntnu/idi/idatt/storage/ExchangeLoaderTest.java
similarity index 96%
rename from src/test/java/edu/ntnu/idi/idatt/file/ExchangeLoaderTest.java
rename to src/test/java/edu/ntnu/idi/idatt/storage/ExchangeLoaderTest.java
index 94f5617..d3d82d7 100644
--- a/src/test/java/edu/ntnu/idi/idatt/file/ExchangeLoaderTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt/storage/ExchangeLoaderTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.file;
+package edu.ntnu.idi.idatt.storage;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import edu.ntnu.idi.idatt.marked.Stock;
+import edu.ntnu.idi.idatt.model.market.Stock;
 
 /**
  * Test class for ExchangeLoader