diff --git a/src/entities/MailNotification.java b/src/entities/MailNotification.java
index 884dea4..94887c6 100644
--- a/src/entities/MailNotification.java
+++ b/src/entities/MailNotification.java
@@ -1,6 +1,6 @@
 package entities;
 
-import utils.SendNotificationStrategy;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 public class MailNotification extends Notification {
     public MailNotification(String content, User user, SendNotificationStrategy strategy) {
diff --git a/src/entities/Notification.java b/src/entities/Notification.java
index dc875a1..6188577 100644
--- a/src/entities/Notification.java
+++ b/src/entities/Notification.java
@@ -2,7 +2,7 @@ package entities;
 
 import notificationsDecorations.NotificationDecoration;
 import utils.NotificationState;
-import utils.SendNotificationStrategy;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,7 +50,6 @@ public abstract class Notification {
      * PENDING -> SENT
      * SENT -> READ
      *
-     *
      */
     public void transitionState() {
         switch (state) {
@@ -61,10 +60,10 @@ public abstract class Notification {
 
     /**
      * Generates the content of the notification dynamically with the decoration (if some)
-     * @return
+     * @return content of the notification
      */
     public String getContent() {
-        if (isSendable() && !content.equals("")) {
+        if (isSendable() && !content.isEmpty()) {
             transitionState();
 
             for (final NotificationDecoration decoration : decorations)
diff --git a/src/entities/PushNotification.java b/src/entities/PushNotification.java
index 5554c7c..910a190 100644
--- a/src/entities/PushNotification.java
+++ b/src/entities/PushNotification.java
@@ -1,6 +1,6 @@
 package entities;
 
-import utils.SendNotificationStrategy;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 public class PushNotification extends Notification {
     public PushNotification(String content, User user, SendNotificationStrategy strategy) {
diff --git a/src/entities/SmsNotification.java b/src/entities/SmsNotification.java
index 9093dad..8a4e947 100644
--- a/src/entities/SmsNotification.java
+++ b/src/entities/SmsNotification.java
@@ -1,6 +1,6 @@
 package entities;
 
-import utils.SendNotificationStrategy;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 public class SmsNotification extends Notification {
 
diff --git a/src/entities/User.java b/src/entities/User.java
index 356791b..ae466ec 100644
--- a/src/entities/User.java
+++ b/src/entities/User.java
@@ -1,7 +1,7 @@
 package entities;
 
 import utils.NotificationType;
-import utils.SendNotificationStrategy;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 import java.util.List;
 
diff --git a/src/utils/DifferedSendNotificationStrategy.java b/src/notificationSendingStrategies/DifferedSendNotificationStrategy.java
similarity index 92%
rename from src/utils/DifferedSendNotificationStrategy.java
rename to src/notificationSendingStrategies/DifferedSendNotificationStrategy.java
index 6f1fc35..4093a0d 100644
--- a/src/utils/DifferedSendNotificationStrategy.java
+++ b/src/notificationSendingStrategies/DifferedSendNotificationStrategy.java
@@ -1,4 +1,4 @@
-package utils;
+package notificationSendingStrategies;
 
 public class DifferedSendNotificationStrategy implements SendNotificationStrategy {
     private int delay;
diff --git a/src/utils/FastSendNotificationStrategy.java b/src/notificationSendingStrategies/FastSendNotificationStrategy.java
similarity index 81%
rename from src/utils/FastSendNotificationStrategy.java
rename to src/notificationSendingStrategies/FastSendNotificationStrategy.java
index 552f886..4482eed 100644
--- a/src/utils/FastSendNotificationStrategy.java
+++ b/src/notificationSendingStrategies/FastSendNotificationStrategy.java
@@ -1,4 +1,4 @@
-package utils;
+package notificationSendingStrategies;
 
 public class FastSendNotificationStrategy implements SendNotificationStrategy {
     @Override
diff --git a/src/utils/SecureSendNotificationStrategy.java b/src/notificationSendingStrategies/SecureSendNotificationStrategy.java
similarity index 90%
rename from src/utils/SecureSendNotificationStrategy.java
rename to src/notificationSendingStrategies/SecureSendNotificationStrategy.java
index 2e4bafe..061b8af 100644
--- a/src/utils/SecureSendNotificationStrategy.java
+++ b/src/notificationSendingStrategies/SecureSendNotificationStrategy.java
@@ -1,4 +1,4 @@
-package utils;
+package notificationSendingStrategies;
 
 public class SecureSendNotificationStrategy implements SendNotificationStrategy {
     private int key;
diff --git a/src/utils/SendNotificationStrategy.java b/src/notificationSendingStrategies/SendNotificationStrategy.java
similarity index 69%
rename from src/utils/SendNotificationStrategy.java
rename to src/notificationSendingStrategies/SendNotificationStrategy.java
index 1177128..225f086 100644
--- a/src/utils/SendNotificationStrategy.java
+++ b/src/notificationSendingStrategies/SendNotificationStrategy.java
@@ -1,4 +1,4 @@
-package utils;
+package notificationSendingStrategies;
 
 public interface SendNotificationStrategy {
     String makeContent(String message);
diff --git a/src/utils/NotificationFactory.java b/src/utils/NotificationFactory.java
index 88e4276..821fbdb 100644
--- a/src/utils/NotificationFactory.java
+++ b/src/utils/NotificationFactory.java
@@ -1,6 +1,7 @@
 package utils;
 
 import entities.*;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 public class NotificationFactory {
     public Notification createNotification(NotificationType type, String content, User user, SendNotificationStrategy strategy) {
diff --git a/src/utils/SendNotificationFacade.java b/src/utils/SendNotificationFacade.java
index d3fb2ce..c6ddb66 100644
--- a/src/utils/SendNotificationFacade.java
+++ b/src/utils/SendNotificationFacade.java
@@ -1,6 +1,9 @@
 package utils;
 
 import entities.User;
+import notificationSendingStrategies.DifferedSendNotificationStrategy;
+import notificationSendingStrategies.SecureSendNotificationStrategy;
+import notificationSendingStrategies.SendNotificationStrategy;
 
 import java.util.Arrays;