diff --git a/src/test/java/millions/CSVStockFileParserTest.java b/src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java
similarity index 96%
rename from src/test/java/millions/CSVStockFileParserTest.java
rename to src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java
index 8266d35..512cfc9 100644
--- a/src/test/java/millions/CSVStockFileParserTest.java
+++ b/src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java
@@ -1,12 +1,10 @@
-package millions;
+package millions.controller.fileIO.CSV;
 
-import millions.controller.fileIO.CSV.CSVStockFileParser;
 import millions.controller.fileIO.InvalidFormatException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 
-import java.util.ArrayList;
 import java.util.List;
 
 
diff --git a/src/test/java/millions/StockFileReaderTest.java b/src/test/java/millions/controller/fileIO/CSV/StockFileReaderTest.java
similarity index 96%
rename from src/test/java/millions/StockFileReaderTest.java
rename to src/test/java/millions/controller/fileIO/CSV/StockFileReaderTest.java
index 2bc8970..159c948 100644
--- a/src/test/java/millions/StockFileReaderTest.java
+++ b/src/test/java/millions/controller/fileIO/CSV/StockFileReaderTest.java
@@ -1,4 +1,4 @@
-package millions;
+package millions.controller.fileIO.CSV;
 
 import millions.controller.fileIO.StockFileReader;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/src/test/java/millions/ExchangeListenerTest.java b/src/test/java/millions/model/ExchangeListenerTest.java
similarity index 90%
rename from src/test/java/millions/ExchangeListenerTest.java
rename to src/test/java/millions/model/ExchangeListenerTest.java
index c47c9e8..935ab43 100644
--- a/src/test/java/millions/ExchangeListenerTest.java
+++ b/src/test/java/millions/model/ExchangeListenerTest.java
@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -6,14 +6,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import millions.model.Exchange;
-import millions.model.ExchangeListener;
-import millions.model.Player;
-import millions.model.Purchase;
-import millions.model.Sale;
-import millions.model.Share;
-import millions.model.Stock;
-import millions.model.Transaction;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/millions/ExchangeTest.java b/src/test/java/millions/model/ExchangeTest.java
similarity index 99%
rename from src/test/java/millions/ExchangeTest.java
rename to src/test/java/millions/model/ExchangeTest.java
index a17bb50..2e689a6 100644
--- a/src/test/java/millions/ExchangeTest.java
+++ b/src/test/java/millions/model/ExchangeTest.java
@@ -1,11 +1,11 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.IntStream;
-import millions.model.*;
+
 import org.junit.jupiter.api.Test;
 
 class ExchangeTest {
diff --git a/src/test/java/millions/PlayerListenerTest.java b/src/test/java/millions/model/PlayerListenerTest.java
similarity index 98%
rename from src/test/java/millions/PlayerListenerTest.java
rename to src/test/java/millions/model/PlayerListenerTest.java
index 5e2008a..71c94d6 100644
--- a/src/test/java/millions/PlayerListenerTest.java
+++ b/src/test/java/millions/model/PlayerListenerTest.java
@@ -1,11 +1,11 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import millions.model.*;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/millions/PlayerTest.java b/src/test/java/millions/model/PlayerTest.java
similarity index 97%
rename from src/test/java/millions/PlayerTest.java
rename to src/test/java/millions/model/PlayerTest.java
index 011a6fb..2cefd2d 100644
--- a/src/test/java/millions/PlayerTest.java
+++ b/src/test/java/millions/model/PlayerTest.java
@@ -1,9 +1,9 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
-import millions.model.Player;
+
 import org.junit.jupiter.api.Test;
 
 class PlayerTest {
diff --git a/src/test/java/millions/PortfolioTest.java b/src/test/java/millions/model/PortfolioTest.java
similarity index 95%
rename from src/test/java/millions/PortfolioTest.java
rename to src/test/java/millions/model/PortfolioTest.java
index b151f94..a208066 100644
--- a/src/test/java/millions/PortfolioTest.java
+++ b/src/test/java/millions/model/PortfolioTest.java
@@ -1,11 +1,9 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
-import millions.model.Portfolio;
-import millions.model.Share;
-import millions.model.Stock;
+
 import org.junit.jupiter.api.Test;
 
 class PortfolioTest {
diff --git a/src/test/java/millions/PurchaseTest.java b/src/test/java/millions/model/PurchaseTest.java
similarity index 90%
rename from src/test/java/millions/PurchaseTest.java
rename to src/test/java/millions/model/PurchaseTest.java
index 941ac87..3c76e85 100644
--- a/src/test/java/millions/PurchaseTest.java
+++ b/src/test/java/millions/model/PurchaseTest.java
@@ -1,13 +1,9 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 
-import millions.model.Player;
-import millions.model.Purchase;
-import millions.model.Share;
-import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class PurchaseTest {
diff --git a/src/test/java/millions/SaleTest.java b/src/test/java/millions/model/SaleTest.java
similarity index 88%
rename from src/test/java/millions/SaleTest.java
rename to src/test/java/millions/model/SaleTest.java
index 2d725f4..4a8a4d1 100644
--- a/src/test/java/millions/SaleTest.java
+++ b/src/test/java/millions/model/SaleTest.java
@@ -1,13 +1,9 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 
-import millions.model.Player;
-import millions.model.Sale;
-import millions.model.Share;
-import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class SaleTest {
diff --git a/src/test/java/millions/ShareTest.java b/src/test/java/millions/model/ShareTest.java
similarity index 93%
rename from src/test/java/millions/ShareTest.java
rename to src/test/java/millions/model/ShareTest.java
index 25862ee..3f82181 100644
--- a/src/test/java/millions/ShareTest.java
+++ b/src/test/java/millions/model/ShareTest.java
@@ -1,11 +1,9 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 
-import millions.model.Share;
-import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class ShareTest {
diff --git a/src/test/java/millions/StockTest.java b/src/test/java/millions/model/StockTest.java
similarity index 97%
rename from src/test/java/millions/StockTest.java
rename to src/test/java/millions/model/StockTest.java
index 452db31..c28a6bd 100644
--- a/src/test/java/millions/StockTest.java
+++ b/src/test/java/millions/model/StockTest.java
@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import millions.model.Stock;
+
 import org.junit.jupiter.api.Test;
 
 class StockTest {
diff --git a/src/test/java/millions/TransactionArchiveTest.java b/src/test/java/millions/model/TransactionArchiveTest.java
similarity index 96%
rename from src/test/java/millions/TransactionArchiveTest.java
rename to src/test/java/millions/model/TransactionArchiveTest.java
index c87ef93..426ed5b 100644
--- a/src/test/java/millions/TransactionArchiveTest.java
+++ b/src/test/java/millions/model/TransactionArchiveTest.java
@@ -1,11 +1,10 @@
-package millions;
+package millions.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import millions.model.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;