diff --git a/src/main/java/millions/controller/GameController.java b/src/main/java/millions/controller/GameController.java
index 9cc6239..f50c4f7 100644
--- a/src/main/java/millions/controller/GameController.java
+++ b/src/main/java/millions/controller/GameController.java
@@ -6,10 +6,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import millions.controller.fileIO.CSVFileHandler;
-import millions.controller.fileIO.CSVStockFileParser;
+import millions.controller.fileIO.CSV.CSVFileHandler;
 import millions.controller.fileIO.InvalidFormatException;
-import millions.controller.fileIO.StockFileReader;
 import millions.model.Exchange;
 import millions.model.Player;
 import millions.model.Stock;
diff --git a/src/main/java/millions/controller/fileIO/CSVFileHandler.java b/src/main/java/millions/controller/fileIO/CSV/CSVFileHandler.java
similarity index 87%
rename from src/main/java/millions/controller/fileIO/CSVFileHandler.java
rename to src/main/java/millions/controller/fileIO/CSV/CSVFileHandler.java
index 1a8b192..5a7d9b8 100644
--- a/src/main/java/millions/controller/fileIO/CSVFileHandler.java
+++ b/src/main/java/millions/controller/fileIO/CSV/CSVFileHandler.java
@@ -1,7 +1,7 @@
-package millions.controller.fileIO;
+package millions.controller.fileIO.CSV;
 
+import millions.controller.fileIO.InvalidFormatException;
 import millions.controller.fileIO.StockFileReader;
-import millions.controller.fileIO.CSVStockFileParser;
 import millions.model.Stock;
 
 import java.nio.file.Path;
diff --git a/src/main/java/millions/controller/fileIO/CSVStockFileParser.java b/src/main/java/millions/controller/fileIO/CSV/CSVStockFileParser.java
similarity index 91%
rename from src/main/java/millions/controller/fileIO/CSVStockFileParser.java
rename to src/main/java/millions/controller/fileIO/CSV/CSVStockFileParser.java
index 530ed02..2eab5ab 100644
--- a/src/main/java/millions/controller/fileIO/CSVStockFileParser.java
+++ b/src/main/java/millions/controller/fileIO/CSV/CSVStockFileParser.java
@@ -1,8 +1,10 @@
-package millions.controller.fileIO;
+package millions.controller.fileIO.CSV;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+
+import millions.controller.fileIO.InvalidFormatException;
 import millions.model.Stock;
 
 /** Parses CSV lines into Stock objects. */
diff --git a/src/main/java/millions/controller/fileIO/CSVStockFileWriter.java b/src/main/java/millions/controller/fileIO/CSV/CSVStockFileWriter.java
similarity index 92%
rename from src/main/java/millions/controller/fileIO/CSVStockFileWriter.java
rename to src/main/java/millions/controller/fileIO/CSV/CSVStockFileWriter.java
index 52fee6e..0233a7c 100644
--- a/src/main/java/millions/controller/fileIO/CSVStockFileWriter.java
+++ b/src/main/java/millions/controller/fileIO/CSV/CSVStockFileWriter.java
@@ -1,5 +1,6 @@
-package millions.controller.fileIO;
+package millions.controller.fileIO.CSV;
 
+import millions.controller.fileIO.StockFileWriter;
 import millions.model.Stock;
 
 import java.io.BufferedWriter;
diff --git a/src/test/java/millions/CSVStockFileParserTest.java b/src/test/java/millions/CSVStockFileParserTest.java
index e81cf60..df753aa 100644
--- a/src/test/java/millions/CSVStockFileParserTest.java
+++ b/src/test/java/millions/CSVStockFileParserTest.java
@@ -1,12 +1,9 @@
 package millions;
 
-import millions.controller.fileIO.CSVStockFileParser;
-import millions.controller.fileIO.StockFileReader;
+import millions.controller.fileIO.CSV.CSVStockFileParser;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.sql.Array;
-import java.util.ArrayList;
 import java.util.List;
 
 
diff --git a/src/test/java/millions/CSVStockFileWriterTest.java b/src/test/java/millions/CSVStockFileWriterTest.java
index 4c156a0..c6fe15a 100644
--- a/src/test/java/millions/CSVStockFileWriterTest.java
+++ b/src/test/java/millions/CSVStockFileWriterTest.java
@@ -1,6 +1,6 @@
 package millions;
 
-import millions.controller.fileIO.CSVStockFileWriter;
+import millions.controller.fileIO.CSV.CSVStockFileWriter;
 import millions.controller.fileIO.StockFileReader;
 import millions.model.Stock;