diff --git a/src/main/java/edu/group5/app/App.java b/src/main/java/edu/group5/app/App.java
index dbd2319..1eba2e5 100644
--- a/src/main/java/edu/group5/app/App.java
+++ b/src/main/java/edu/group5/app/App.java
@@ -1,6 +1,6 @@
 package edu.group5.app;
 
-import edu.group5.app.control.DbWrapper;
+import edu.group5.app.control.wrapper.DbWrapper;
 
 /**
  * Hello world!
@@ -11,7 +11,7 @@ public static void main(String[] args) throws InterruptedException {
     try {
       System.out.println(db.connect());
     } catch (Exception e) {
-      e.printStackTrace();
+      e.getMessage();
     }
   }
 }
diff --git a/src/test/java/edu/group5/app/control/WrapperTest.java b/src/test/java/edu/group5/app/control/WrapperTest.java
deleted file mode 100644
index d626fd7..0000000
--- a/src/test/java/edu/group5/app/control/WrapperTest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package edu.group5.app.control;
-
-public class WrapperTest {
-  
-}
diff --git a/src/test/java/edu/group5/app/control/OrgApiWrapperTest.java b/src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java
similarity index 92%
rename from src/test/java/edu/group5/app/control/OrgApiWrapperTest.java
rename to src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java
index 53f08d7..23b30ec 100644
--- a/src/test/java/edu/group5/app/control/OrgApiWrapperTest.java
+++ b/src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java
@@ -1,4 +1,4 @@
-package edu.group5.app.control;
+package edu.group5.app.control.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,7 +30,8 @@ void init() {
   }
 
   /**
-   * Checks if inputting null as the urlString throws the expected exception during construction.
+   * Checks if inputting null as the urlString throws the expected exception
+   * during construction.
    */
   @Test
   public void nullUrlThrowsException() {
@@ -40,7 +41,8 @@ public void nullUrlThrowsException() {
   }
 
   /**
-   * Checks if inputting an empty urlString throws the expected exception during construction.
+   * Checks if inputting an empty urlString throws the expected exception during
+   * construction.
    */
   @Test
   public void emptyUrlThrowsException() {
@@ -50,7 +52,8 @@ public void emptyUrlThrowsException() {
   }
 
   /**
-   * Checks if an invalid urlString throws the expected exception during construction.
+   * Checks if an invalid urlString throws the expected exception during
+   * construction.
    */
   @Test
   public void faultyUrlThrowsException() {
@@ -60,8 +63,8 @@ public void faultyUrlThrowsException() {
   }
 
   // /**
-  //  * Checks if import returns False when there's no internet connection.
-  //  */
+  // * Checks if import returns False when there's no internet connection.
+  // */
   // @Test
   // public void noConnectionReturnsFalseImport() {
   // assertDoesNotThrow(() -> {
diff --git a/src/test/java/edu/group5/app/control/wrapper/WrapperTest.java b/src/test/java/edu/group5/app/control/wrapper/WrapperTest.java
new file mode 100644
index 0000000..cfec876
--- /dev/null
+++ b/src/test/java/edu/group5/app/control/wrapper/WrapperTest.java
@@ -0,0 +1,5 @@
+package edu.group5.app.control.wrapper;
+
+public class WrapperTest {
+
+}