diff --git a/src/main/java/edu/group5/app/App.java b/src/main/java/edu/group5/app/App.java
index 22b3baa..be397d8 100644
--- a/src/main/java/edu/group5/app/App.java
+++ b/src/main/java/edu/group5/app/App.java
@@ -1,8 +1,6 @@
 package edu.group5.app;
 
 import edu.group5.app.control.NavigationController;
-import edu.group5.app.control.wrapper.DbWrapper;
-import edu.group5.app.control.wrapper.OrgApiWrapper;
 import edu.group5.app.model.AppState;
 import edu.group5.app.model.donation.DonationRepository;
 import edu.group5.app.model.donation.DonationService;
@@ -10,6 +8,8 @@
 import edu.group5.app.model.organization.OrganizationService;
 import edu.group5.app.model.user.UserRepository;
 import edu.group5.app.model.user.UserService;
+import edu.group5.app.model.wrapper.DbWrapper;
+import edu.group5.app.model.wrapper.OrgApiWrapper;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
diff --git a/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java b/src/main/java/edu/group5/app/model/wrapper/DbWrapper.java
similarity index 99%
rename from src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
rename to src/main/java/edu/group5/app/model/wrapper/DbWrapper.java
index 7e3adc0..073fd81 100644
--- a/src/main/java/edu/group5/app/control/wrapper/DbWrapper.java
+++ b/src/main/java/edu/group5/app/model/wrapper/DbWrapper.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import java.math.BigDecimal;
 import java.sql.Connection;
diff --git a/src/main/java/edu/group5/app/control/wrapper/OrgApiWrapper.java b/src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java
similarity index 98%
rename from src/main/java/edu/group5/app/control/wrapper/OrgApiWrapper.java
rename to src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java
index 39ac283..910b110 100644
--- a/src/main/java/edu/group5/app/control/wrapper/OrgApiWrapper.java
+++ b/src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/src/main/java/edu/group5/app/control/wrapper/Wrapper.java b/src/main/java/edu/group5/app/model/wrapper/Wrapper.java
similarity index 95%
rename from src/main/java/edu/group5/app/control/wrapper/Wrapper.java
rename to src/main/java/edu/group5/app/model/wrapper/Wrapper.java
index 992b7a9..85d8dc8 100644
--- a/src/main/java/edu/group5/app/control/wrapper/Wrapper.java
+++ b/src/main/java/edu/group5/app/model/wrapper/Wrapper.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 /**
  * An abstract class for all Wrappers of datasets.
diff --git a/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java b/src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java
similarity index 99%
rename from src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
rename to src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java
index 8c401c4..cf76092 100644
--- a/src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java
+++ b/src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -16,6 +16,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import edu.group5.app.model.wrapper.DbWrapper;
+
 public class DbWrapperDonationsTest {
   private Object[] johnDonation;
   private List<Object[]> users;
diff --git a/src/test/java/edu/group5/app/control/wrapper/DbWrapperUserTest.java b/src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java
similarity index 98%
rename from src/test/java/edu/group5/app/control/wrapper/DbWrapperUserTest.java
rename to src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java
index 10c514f..7aca3c0 100644
--- a/src/test/java/edu/group5/app/control/wrapper/DbWrapperUserTest.java
+++ b/src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import edu.group5.app.model.wrapper.DbWrapper;
 import javafx.util.converter.BigDecimalStringConverter;
 
 public class DbWrapperUserTest {
diff --git a/src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java b/src/test/java/edu/group5/app/model/wrapper/OrgApiWrapperTest.java
similarity index 97%
rename from src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java
rename to src/test/java/edu/group5/app/model/wrapper/OrgApiWrapperTest.java
index 23b30ec..0a643f2 100644
--- a/src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java
+++ b/src/test/java/edu/group5/app/model/wrapper/OrgApiWrapperTest.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -9,6 +9,8 @@
 import java.lang.IllegalArgumentException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
+import edu.group5.app.model.wrapper.OrgApiWrapper;
 import tools.jackson.core.exc.StreamReadException;
 
 /**