diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
index 5a92ebc..58f49e8 100644
--- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
+++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
@@ -2,8 +2,8 @@ package greenify.client.controller;
 
 import com.sun.javafx.scene.control.skin.ButtonSkin;
 import greenify.client.Application;
-import greenify.client.Friend;
-import greenify.client.Hints;
+import greenify.client.features.Friend;
+import greenify.client.features.Hints;
 import greenify.client.rest.UserService;
 import javafx.animation.FadeTransition;
 import javafx.animation.KeyFrame;
diff --git a/src/Client/src/main/java/greenify/client/Friend.java b/src/Client/src/main/java/greenify/client/features/Friend.java
similarity index 97%
rename from src/Client/src/main/java/greenify/client/Friend.java
rename to src/Client/src/main/java/greenify/client/features/Friend.java
index 0ec4bf4..e3d0018 100644
--- a/src/Client/src/main/java/greenify/client/Friend.java
+++ b/src/Client/src/main/java/greenify/client/features/Friend.java
@@ -1,4 +1,4 @@
-package greenify.client;
+package greenify.client.features;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
diff --git a/src/Client/src/main/java/greenify/client/Hints.java b/src/Client/src/main/java/greenify/client/features/Hints.java
similarity index 99%
rename from src/Client/src/main/java/greenify/client/Hints.java
rename to src/Client/src/main/java/greenify/client/features/Hints.java
index cc7f053..b88021d 100644
--- a/src/Client/src/main/java/greenify/client/Hints.java
+++ b/src/Client/src/main/java/greenify/client/features/Hints.java
@@ -1,4 +1,4 @@
-package greenify.client;
+package greenify.client.features;
 
 import java.util.ArrayList;
 import java.util.Random;
diff --git a/src/Client/src/test/java/FriendTest.java b/src/Client/src/test/java/FriendTest.java
index 15cd2f9..32abeb1 100644
--- a/src/Client/src/test/java/FriendTest.java
+++ b/src/Client/src/test/java/FriendTest.java
@@ -1,6 +1,6 @@
 import static org.junit.Assert.assertEquals;
 
-import greenify.client.Friend;
+import greenify.client.features.Friend;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 
diff --git a/src/Client/src/test/java/HintsTest.java b/src/Client/src/test/java/HintsTest.java
index 5964852..b4d637e 100644
--- a/src/Client/src/test/java/HintsTest.java
+++ b/src/Client/src/test/java/HintsTest.java
@@ -2,7 +2,7 @@ import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
-import greenify.client.Hints;
+import greenify.client.features.Hints;
 import org.junit.Test;
 
 public class HintsTest {
diff --git a/src/Common/src/test/java/ApplicationExceptionTest.java b/src/Common/src/test/java/ApplicationExceptionTest.java
new file mode 100644
index 0000000..82020e7
--- /dev/null
+++ b/src/Common/src/test/java/ApplicationExceptionTest.java
@@ -0,0 +1,21 @@
+import static org.junit.Assert.assertEquals;
+
+import greenify.common.ApplicationException;
+import org.junit.Test;
+
+public class ApplicationExceptionTest {
+
+    @Test
+    public void setAndGetTest() {
+        ApplicationException ex = new ApplicationException("This is an exception");
+        assertEquals(ex.getMessage(), "This is an exception");
+    }
+
+    @Test
+    public void equalsTest() {
+        ApplicationException ex = new ApplicationException("This is an exception");
+        ApplicationException test = new ApplicationException("This is an exception");
+        assertEquals(ex.getMessage(), test.getMessage());
+    }
+
+}