diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Expense.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
similarity index 98%
rename from src/main/java/no/ntnu/idatt1002/demo/data/Expense.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
index 15a59f7e76e795eab11785935ba4b4c47ea0627c..74fe9d893306bba98cb37d02d9e1d411f2a86cfc 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Expense.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
 public class Expense extends Item{
     private ExpenseCategory category;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseCategory.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseCategory.java
similarity index 62%
rename from src/main/java/no/ntnu/idatt1002/demo/data/ExpenseCategory.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseCategory.java
index 0460a4004fa69e8e8b186714c508e7869968ad09..c1043a4da811ab182cca75ef49972e44a218a6f2 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseCategory.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseCategory.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
 public enum ExpenseCategory {
 
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java
new file mode 100644
index 0000000000000000000000000000000000000000..7dff587749ac662d267abb2775201b5c59995fc0
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java
@@ -0,0 +1,23 @@
+package no.ntnu.idatt1002.demo.data.Economics;
+
+import java.util.ArrayList;
+
+/**
+ *ExpenseOverview is an abstract class for storing and getting
+ * information on Expense.
+ */
+public class ExpenseOverview {
+    private ArrayList<Expense> expenses;
+
+    public ExpenseOverview(){
+        this.expenses = new ArrayList<>();
+    }
+
+    /**
+     * Class constructor that takes in an ArrayList of Expense´s as argument
+     * @param expenses   An ArrayList of the Expense´s you want to overview
+     */
+    public ExpenseOverview(ArrayList<Expense> expenses){
+        this.expenses = expenses;
+    }
+}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Income.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
similarity index 98%
rename from src/main/java/no/ntnu/idatt1002/demo/data/Income.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
index 10e2f7ae936cf79681999a5373f5e48f6b9ef147..646b1d82d10449eec9656abfcfab03e5ad7b9ff2 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Income.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
 /**
  * The Income class inherits from the Item class. The Item class additionally has a private field for an
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeCategory.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeCategory.java
similarity index 60%
rename from src/main/java/no/ntnu/idatt1002/demo/data/IncomeCategory.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeCategory.java
index 1ead533938575fd5483f2b4b32c3d00f8d7dafd0..021d993c35000429f906ecbb8ae2d85f2c681eea 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeCategory.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeCategory.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
 public enum IncomeCategory {
     SALARY,
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java
new file mode 100644
index 0000000000000000000000000000000000000000..1257d12dabc7160a46cdf158a7f60008f8aad9e4
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java
@@ -0,0 +1,26 @@
+package no.ntnu.idatt1002.demo.data.Economics;
+
+import java.util.ArrayList;
+
+/**
+ * IncomeOverview is an abstract class for storing and getting
+ * information on income.
+ */
+public class IncomeOverview extends ItemOverview {
+    private ArrayList<Income> income;
+
+    /**
+     * An "empty" class constructor.
+     */
+    public IncomeOverview(){
+        this.income = new ArrayList<>();
+    }
+
+    /**
+     * Class constructor that takes in an ArrayList of Income as argument
+     * @param income   An ArrayList of the Income you want to overview
+     */
+    public IncomeOverview(ArrayList<Income> income){
+        this.income = income;
+    }
+}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Item.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
similarity index 98%
rename from src/main/java/no/ntnu/idatt1002/demo/data/Item.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
index 562b2999c66603bdbeb78b5b3ad1f36e061c1615..94570afd7da6f0ad659cd06fabd3b00b5cb1575c 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Item.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
 /**
  * The Item class represents a good or service purchased in real life. The item belongs to a category and
@@ -7,7 +7,7 @@ package no.ntnu.idatt1002.demo.data;
  * @author HanneSofie
  *
  */
-public class Item {
+public abstract class Item {
     private String description = "";
     private double amount;
     private boolean recurring;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/ItemOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java
similarity index 87%
rename from src/main/java/no/ntnu/idatt1002/demo/data/ItemOverview.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java
index f9bfbe1cc25e6ecd9aac020520a91cd1d214e549..85cda928a4cbbe95b8e9d36957e346a5a62da924 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/ItemOverview.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java
@@ -1,11 +1,10 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
 import java.util.ArrayList;
 
 /**
- * ItemOverview is a class for storing and getting
- * information on items. It is meant for storing EITHER
- * Income or Expense
+ * ItemOverview is an abstract class for storing and getting
+ * information on items. Superclass for Income- and ExpenseOverview.
  */
 public abstract class ItemOverview {
     ArrayList<Item> items;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java
deleted file mode 100644
index d5144e70166388d31987bb01d0f862a3f808dd05..0000000000000000000000000000000000000000
--- a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.ntnu.idatt1002.demo.data;
-
-import java.util.ArrayList;
-public class ExpenseOverview {
-    private ArrayList<Expense> expenses;
-
-    public ExpenseOverview(){
-        this.expenses = new ArrayList<>();
-    }
-}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java
deleted file mode 100644
index 38e6ea00c5d871fa9be437543507277dafc0f0dd..0000000000000000000000000000000000000000
--- a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.ntnu.idatt1002.demo.data;
-
-import java.util.ArrayList;
-
-public class IncomeOverview extends ItemOverview {
-    private ArrayList<Income> income;
-
-    public IncomeOverview(){
-        this.income = new ArrayList<>();
-    }
-}
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/ExpenseTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseTest.java
similarity index 82%
rename from src/test/java/no/ntnu/idatt1002/demo/data/ExpenseTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseTest.java
index e72597e935fe46c9778707d2bd5914beb80d5e82..338f63fb563e843c1871674e6043528cc89b9894 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/ExpenseTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseTest.java
@@ -1,5 +1,7 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
+import no.ntnu.idatt1002.demo.data.Economics.Expense;
+import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeOverviewTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverviewTest.java
similarity index 88%
rename from src/test/java/no/ntnu/idatt1002/demo/data/IncomeOverviewTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverviewTest.java
index 0cc6990798ebfc6d1e575644f06bc4cbee0d5d46..d6745c0d95082f758b588e182367e5ddf8ca94cc 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeOverviewTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverviewTest.java
@@ -1,5 +1,8 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
+import no.ntnu.idatt1002.demo.data.Economics.Income;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeCategory;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeOverview;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeTest.java
similarity index 82%
rename from src/test/java/no/ntnu/idatt1002/demo/data/IncomeTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeTest.java
index 6e71180496623fbc78971c3ea22be4ab061f2f1f..f832f99af3b1676c2cef0ce8fa91a089e0e7a40b 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeTest.java
@@ -1,5 +1,7 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
+import no.ntnu.idatt1002.demo.data.Economics.Income;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeCategory;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/ItemTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ItemTest.java
similarity index 89%
rename from src/test/java/no/ntnu/idatt1002/demo/data/ItemTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/ItemTest.java
index 7ab5a18f900b32ea7ba05230739bdb74fa8c42c4..e72597803611b23ed98a04b244f0b617b19ef069 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/ItemTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ItemTest.java
@@ -1,5 +1,6 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
 
+import no.ntnu.idatt1002.demo.data.Economics.Item;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;