diff --git a/app/src/main/java/com/dosse/airpods/notification/NotificationBuilder.java b/app/src/main/java/com/dosse/airpods/notification/NotificationBuilder.java
index 9566cd0..9801db6 100644
--- a/app/src/main/java/com/dosse/airpods/notification/NotificationBuilder.java
+++ b/app/src/main/java/com/dosse/airpods/notification/NotificationBuilder.java
@@ -8,9 +8,9 @@ import androidx.core.app.NotificationCompat;
 
 import com.dosse.airpods.R;
 import com.dosse.airpods.pods.PodsStatus;
-import com.dosse.airpods.pods.types.IPods;
-import com.dosse.airpods.pods.types.RegularPods;
-import com.dosse.airpods.pods.types.SinglePods;
+import com.dosse.airpods.pods.models.IPods;
+import com.dosse.airpods.pods.models.RegularPods;
+import com.dosse.airpods.pods.models.SinglePods;
 
 public class NotificationBuilder {
     public static final String TAG = "AirPods";
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/Pod.java b/app/src/main/java/com/dosse/airpods/pods/Pod.java
similarity index 97%
rename from app/src/main/java/com/dosse/airpods/pods/types/Pod.java
rename to app/src/main/java/com/dosse/airpods/pods/Pod.java
index 8f538bf..e2306b8 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/Pod.java
+++ b/app/src/main/java/com/dosse/airpods/pods/Pod.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods;
 
 import android.view.View;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java b/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java
index 1343ea4..1937f74 100644
--- a/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java
+++ b/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java
@@ -1,19 +1,18 @@
 package com.dosse.airpods.pods;
 
-import com.dosse.airpods.pods.types.AirPods1;
-import com.dosse.airpods.pods.types.AirPods2;
-import com.dosse.airpods.pods.types.AirPods3;
-import com.dosse.airpods.pods.types.AirPodsMax;
-import com.dosse.airpods.pods.types.AirPodsPro;
-import com.dosse.airpods.pods.types.BeatsFlex;
-import com.dosse.airpods.pods.types.BeatsSolo3;
-import com.dosse.airpods.pods.types.BeatsStudio3;
-import com.dosse.airpods.pods.types.BeatsX;
-import com.dosse.airpods.pods.types.IPods;
-import com.dosse.airpods.pods.types.Pod;
-import com.dosse.airpods.pods.types.Powerbeats3;
-import com.dosse.airpods.pods.types.PowerbeatsPro;
-import com.dosse.airpods.pods.types.RegularPods;
+import com.dosse.airpods.pods.models.AirPods1;
+import com.dosse.airpods.pods.models.AirPods2;
+import com.dosse.airpods.pods.models.AirPods3;
+import com.dosse.airpods.pods.models.AirPodsMax;
+import com.dosse.airpods.pods.models.AirPodsPro;
+import com.dosse.airpods.pods.models.BeatsFlex;
+import com.dosse.airpods.pods.models.BeatsSolo3;
+import com.dosse.airpods.pods.models.BeatsStudio3;
+import com.dosse.airpods.pods.models.BeatsX;
+import com.dosse.airpods.pods.models.IPods;
+import com.dosse.airpods.pods.models.Powerbeats3;
+import com.dosse.airpods.pods.models.PowerbeatsPro;
+import com.dosse.airpods.pods.models.RegularPods;
 
 /**
  * Decoding the beacon:
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/AirPods1.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPods1.java
similarity index 63%
rename from app/src/main/java/com/dosse/airpods/pods/types/AirPods1.java
rename to app/src/main/java/com/dosse/airpods/pods/models/AirPods1.java
index dc93e82..d43988c 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/AirPods1.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPods1.java
@@ -1,4 +1,6 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
+
+import com.dosse.airpods.pods.Pod;
 
 public class AirPods1 extends RegularPods {
 
@@ -8,7 +10,7 @@ public class AirPods1 extends RegularPods {
 
     @Override
     public String getModel () {
-        return MODEL_AIRPODS_GEN1;
+        return Constants.MODEL_AIRPODS_GEN1;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/AirPods2.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPods2.java
similarity index 63%
rename from app/src/main/java/com/dosse/airpods/pods/types/AirPods2.java
rename to app/src/main/java/com/dosse/airpods/pods/models/AirPods2.java
index 88223cd..72e894e 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/AirPods2.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPods2.java
@@ -1,4 +1,6 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
+
+import com.dosse.airpods.pods.Pod;
 
 public class AirPods2 extends RegularPods {
 
@@ -8,7 +10,7 @@ public class AirPods2 extends RegularPods {
 
     @Override
     public String getModel () {
-        return MODEL_AIRPODS_GEN2;
+        return Constants.MODEL_AIRPODS_GEN2;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/AirPods3.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPods3.java
similarity index 63%
rename from app/src/main/java/com/dosse/airpods/pods/types/AirPods3.java
rename to app/src/main/java/com/dosse/airpods/pods/models/AirPods3.java
index 4824ab9..d480ad6 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/AirPods3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPods3.java
@@ -1,4 +1,6 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
+
+import com.dosse.airpods.pods.Pod;
 
 public class AirPods3 extends RegularPods {
 
@@ -8,7 +10,7 @@ public class AirPods3 extends RegularPods {
 
     @Override
     public String getModel () {
-        return MODEL_AIRPODS_GEN3;
+        return Constants.MODEL_AIRPODS_GEN3;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/AirPodsMax.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsMax.java
similarity index 74%
rename from app/src/main/java/com/dosse/airpods/pods/types/AirPodsMax.java
rename to app/src/main/java/com/dosse/airpods/pods/models/AirPodsMax.java
index 27c0526..7abd3b8 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/AirPodsMax.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsMax.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class AirPodsMax extends SinglePods {
 
@@ -15,7 +16,7 @@ public class AirPodsMax extends SinglePods {
 
     @Override
     public String getModel () {
-        return MODEL_AIRPODS_MAX;
+        return Constants.MODEL_AIRPODS_MAX;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/AirPodsPro.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro.java
similarity index 85%
rename from app/src/main/java/com/dosse/airpods/pods/types/AirPodsPro.java
rename to app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro.java
index 9b7ac58..e373adc 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/AirPodsPro.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class AirPodsPro extends RegularPods {
 
@@ -25,7 +26,7 @@ public class AirPodsPro extends RegularPods {
 
     @Override
     public String getModel () {
-        return MODEL_AIRPODS_PRO;
+        return Constants.MODEL_AIRPODS_PRO;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/BeatsFlex.java b/app/src/main/java/com/dosse/airpods/pods/models/BeatsFlex.java
similarity index 75%
rename from app/src/main/java/com/dosse/airpods/pods/types/BeatsFlex.java
rename to app/src/main/java/com/dosse/airpods/pods/models/BeatsFlex.java
index f5d26e3..79c3145 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/BeatsFlex.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/BeatsFlex.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class BeatsFlex extends SinglePods {
 
@@ -15,7 +16,7 @@ public class BeatsFlex extends SinglePods {
 
     @Override
     public String getModel () {
-        return MODEL_BEATS_FLEX;
+        return Constants.MODEL_BEATS_FLEX;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/BeatsSolo3.java b/app/src/main/java/com/dosse/airpods/pods/models/BeatsSolo3.java
similarity index 74%
rename from app/src/main/java/com/dosse/airpods/pods/types/BeatsSolo3.java
rename to app/src/main/java/com/dosse/airpods/pods/models/BeatsSolo3.java
index f5d7d66..d151083 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/BeatsSolo3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/BeatsSolo3.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class BeatsSolo3 extends SinglePods {
 
@@ -15,7 +16,7 @@ public class BeatsSolo3 extends SinglePods {
 
     @Override
     public String getModel () {
-        return MODEL_BEATS_SOLO_3;
+        return Constants.MODEL_BEATS_SOLO_3;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/BeatsStudio3.java b/app/src/main/java/com/dosse/airpods/pods/models/BeatsStudio3.java
similarity index 75%
rename from app/src/main/java/com/dosse/airpods/pods/types/BeatsStudio3.java
rename to app/src/main/java/com/dosse/airpods/pods/models/BeatsStudio3.java
index 01c2800..f8ce6e8 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/BeatsStudio3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/BeatsStudio3.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class BeatsStudio3 extends SinglePods {
 
@@ -15,7 +16,7 @@ public class BeatsStudio3 extends SinglePods {
 
     @Override
     public String getModel () {
-        return MODEL_BEATS_STUDIO_3;
+        return Constants.MODEL_BEATS_STUDIO_3;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/BeatsX.java b/app/src/main/java/com/dosse/airpods/pods/models/BeatsX.java
similarity index 74%
rename from app/src/main/java/com/dosse/airpods/pods/types/BeatsX.java
rename to app/src/main/java/com/dosse/airpods/pods/models/BeatsX.java
index cfc32f6..c800157 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/BeatsX.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/BeatsX.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class BeatsX extends SinglePods {
 
@@ -15,7 +16,7 @@ public class BeatsX extends SinglePods {
 
     @Override
     public String getModel () {
-        return MODEL_BEATS_X;
+        return Constants.MODEL_BEATS_X;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/models/Constants.java b/app/src/main/java/com/dosse/airpods/pods/models/Constants.java
new file mode 100644
index 0000000..d6eea22
--- /dev/null
+++ b/app/src/main/java/com/dosse/airpods/pods/models/Constants.java
@@ -0,0 +1,16 @@
+package com.dosse.airpods.pods.models;
+
+public final class Constants {
+    static final String MODEL_AIRPODS_GEN1 = "airpods1";
+    static final String MODEL_AIRPODS_GEN2 = "airpods2";
+    static final String MODEL_AIRPODS_GEN3 = "airpods3";
+    static final String MODEL_AIRPODS_PRO = "airpodspro";
+    static final String MODEL_AIRPODS_MAX = "airpodsmax";
+    static final String MODEL_BEATS_X = "beatsx";
+    static final String MODEL_BEATS_FLEX = "beatsflex";
+    static final String MODEL_BEATS_SOLO_3 = "beatssolo3";
+    static final String MODEL_BEATS_STUDIO_3 = "beatsstudio3";
+    static final String MODEL_POWERBEATS_3 = "powerbeats3";
+    static final String MODEL_POWERBEATS_PRO = "powerbeatspro";
+    static final String MODEL_UNKNOWN = "unknown";
+}
diff --git a/app/src/main/java/com/dosse/airpods/pods/models/IPods.java b/app/src/main/java/com/dosse/airpods/pods/models/IPods.java
new file mode 100644
index 0000000..6a0b8d0
--- /dev/null
+++ b/app/src/main/java/com/dosse/airpods/pods/models/IPods.java
@@ -0,0 +1,13 @@
+package com.dosse.airpods.pods.models;
+
+public interface IPods {
+
+    String getModel ();
+
+    boolean isSingle ();
+
+    boolean isDisconnected ();
+
+    String parseStatusForLogger ();
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/Powerbeats3.java b/app/src/main/java/com/dosse/airpods/pods/models/Powerbeats3.java
similarity index 75%
rename from app/src/main/java/com/dosse/airpods/pods/types/Powerbeats3.java
rename to app/src/main/java/com/dosse/airpods/pods/models/Powerbeats3.java
index 444267d..9ee76a9 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/Powerbeats3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/Powerbeats3.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class Powerbeats3 extends SinglePods {
 
@@ -15,7 +16,7 @@ public class Powerbeats3 extends SinglePods {
 
     @Override
     public String getModel () {
-        return MODEL_POWERBEATS_3;
+        return Constants.MODEL_POWERBEATS_3;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/PowerbeatsPro.java b/app/src/main/java/com/dosse/airpods/pods/models/PowerbeatsPro.java
similarity index 86%
rename from app/src/main/java/com/dosse/airpods/pods/types/PowerbeatsPro.java
rename to app/src/main/java/com/dosse/airpods/pods/models/PowerbeatsPro.java
index 97fb61c..44c0786 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/PowerbeatsPro.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/PowerbeatsPro.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 public class PowerbeatsPro extends RegularPods {
 
@@ -25,7 +26,7 @@ public class PowerbeatsPro extends RegularPods {
 
     @Override
     public String getModel () {
-        return MODEL_POWERBEATS_PRO;
+        return Constants.MODEL_POWERBEATS_PRO;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/RegularPods.java b/app/src/main/java/com/dosse/airpods/pods/models/RegularPods.java
similarity index 94%
rename from app/src/main/java/com/dosse/airpods/pods/types/RegularPods.java
rename to app/src/main/java/com/dosse/airpods/pods/models/RegularPods.java
index c0e977d..69cfd9b 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/RegularPods.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/RegularPods.java
@@ -1,6 +1,7 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
 
 import com.dosse.airpods.R;
+import com.dosse.airpods.pods.Pod;
 
 import java.util.Locale;
 
@@ -48,7 +49,7 @@ public class RegularPods implements IPods {
 
     @Override
     public String getModel () {
-        return MODEL_UNKNOWN;
+        return Constants.MODEL_UNKNOWN;
     }
 
     @Override
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/SinglePods.java b/app/src/main/java/com/dosse/airpods/pods/models/SinglePods.java
similarity index 92%
rename from app/src/main/java/com/dosse/airpods/pods/types/SinglePods.java
rename to app/src/main/java/com/dosse/airpods/pods/models/SinglePods.java
index 06ec37e..4a47831 100644
--- a/app/src/main/java/com/dosse/airpods/pods/types/SinglePods.java
+++ b/app/src/main/java/com/dosse/airpods/pods/models/SinglePods.java
@@ -1,4 +1,6 @@
-package com.dosse.airpods.pods.types;
+package com.dosse.airpods.pods.models;
+
+import com.dosse.airpods.pods.Pod;
 
 import java.util.Locale;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/types/IPods.java b/app/src/main/java/com/dosse/airpods/pods/types/IPods.java
deleted file mode 100644
index c2fcf65..0000000
--- a/app/src/main/java/com/dosse/airpods/pods/types/IPods.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dosse.airpods.pods.types;
-
-public interface IPods {
-
-    String MODEL_AIRPODS_GEN1 = "airpods1";
-    String MODEL_AIRPODS_GEN2 = "airpods2";
-    String MODEL_AIRPODS_GEN3 = "airpods3";
-    String MODEL_AIRPODS_PRO = "airpodspro";
-    String MODEL_AIRPODS_MAX = "airpodsmax";
-    String MODEL_BEATS_X = "beatsx";
-    String MODEL_BEATS_FLEX = "beatsflex";
-    String MODEL_BEATS_SOLO_3 = "beatssolo3";
-    String MODEL_BEATS_STUDIO_3 = "beatsstudio3";
-    String MODEL_POWERBEATS_3 = "powerbeats3";
-    String MODEL_POWERBEATS_PRO = "powerbeatspro";
-    String MODEL_UNKNOWN = "unknown";
-
-
-    String getModel ();
-
-    boolean isSingle ();
-
-    boolean isDisconnected ();
-
-    String parseStatusForLogger ();
-
-}
\ No newline at end of file