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 4554cf3..9566cd0 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.data.IPods;
-import com.dosse.airpods.pods.data.RegularPods;
-import com.dosse.airpods.pods.data.SinglePods;
+import com.dosse.airpods.pods.types.IPods;
+import com.dosse.airpods.pods.types.RegularPods;
+import com.dosse.airpods.pods.types.SinglePods;
 
 public class NotificationBuilder {
     public static final String TAG = "AirPods";
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 939cec6..1343ea4 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,19 @@
 package com.dosse.airpods.pods;
 
-import com.dosse.airpods.pods.data.AirPods1;
-import com.dosse.airpods.pods.data.AirPods2;
-import com.dosse.airpods.pods.data.AirPods3;
-import com.dosse.airpods.pods.data.AirPodsMax;
-import com.dosse.airpods.pods.data.AirPodsPro;
-import com.dosse.airpods.pods.data.BeatsFlex;
-import com.dosse.airpods.pods.data.BeatsSolo3;
-import com.dosse.airpods.pods.data.BeatsStudio3;
-import com.dosse.airpods.pods.data.BeatsX;
-import com.dosse.airpods.pods.data.IPods;
-import com.dosse.airpods.pods.data.Pod;
-import com.dosse.airpods.pods.data.Powerbeats3;
-import com.dosse.airpods.pods.data.PowerbeatsPro;
-import com.dosse.airpods.pods.data.RegularPods;
+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;
 
 /**
  * Decoding the beacon:
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/AirPods1.java b/app/src/main/java/com/dosse/airpods/pods/types/AirPods1.java
similarity index 86%
rename from app/src/main/java/com/dosse/airpods/pods/data/AirPods1.java
rename to app/src/main/java/com/dosse/airpods/pods/types/AirPods1.java
index b814bf6..dc93e82 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/AirPods1.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/AirPods1.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 public class AirPods1 extends RegularPods {
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/AirPods2.java b/app/src/main/java/com/dosse/airpods/pods/types/AirPods2.java
similarity index 86%
rename from app/src/main/java/com/dosse/airpods/pods/data/AirPods2.java
rename to app/src/main/java/com/dosse/airpods/pods/types/AirPods2.java
index f0d9133..88223cd 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/AirPods2.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/AirPods2.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 public class AirPods2 extends RegularPods {
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java b/app/src/main/java/com/dosse/airpods/pods/types/AirPods3.java
similarity index 86%
rename from app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java
rename to app/src/main/java/com/dosse/airpods/pods/types/AirPods3.java
index ea9aff1..4824ab9 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/AirPods3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/AirPods3.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 public class AirPods3 extends RegularPods {
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/AirPodsMax.java b/app/src/main/java/com/dosse/airpods/pods/types/AirPodsMax.java
similarity index 90%
rename from app/src/main/java/com/dosse/airpods/pods/data/AirPodsMax.java
rename to app/src/main/java/com/dosse/airpods/pods/types/AirPodsMax.java
index 8f1c893..27c0526 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/AirPodsMax.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/AirPodsMax.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/AirPodsPro.java b/app/src/main/java/com/dosse/airpods/pods/types/AirPodsPro.java
similarity index 95%
rename from app/src/main/java/com/dosse/airpods/pods/data/AirPodsPro.java
rename to app/src/main/java/com/dosse/airpods/pods/types/AirPodsPro.java
index 86d7227..9b7ac58 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/AirPodsPro.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/AirPodsPro.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/BeatsFlex.java b/app/src/main/java/com/dosse/airpods/pods/types/BeatsFlex.java
similarity index 91%
rename from app/src/main/java/com/dosse/airpods/pods/data/BeatsFlex.java
rename to app/src/main/java/com/dosse/airpods/pods/types/BeatsFlex.java
index 880d2fc..f5d26e3 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/BeatsFlex.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/BeatsFlex.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/BeatsSolo3.java b/app/src/main/java/com/dosse/airpods/pods/types/BeatsSolo3.java
similarity index 91%
rename from app/src/main/java/com/dosse/airpods/pods/data/BeatsSolo3.java
rename to app/src/main/java/com/dosse/airpods/pods/types/BeatsSolo3.java
index 05bccd7..f5d7d66 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/BeatsSolo3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/BeatsSolo3.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/BeatsStudio3.java b/app/src/main/java/com/dosse/airpods/pods/types/BeatsStudio3.java
similarity index 91%
rename from app/src/main/java/com/dosse/airpods/pods/data/BeatsStudio3.java
rename to app/src/main/java/com/dosse/airpods/pods/types/BeatsStudio3.java
index 56f9568..01c2800 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/BeatsStudio3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/BeatsStudio3.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/BeatsX.java b/app/src/main/java/com/dosse/airpods/pods/types/BeatsX.java
similarity index 90%
rename from app/src/main/java/com/dosse/airpods/pods/data/BeatsX.java
rename to app/src/main/java/com/dosse/airpods/pods/types/BeatsX.java
index b4c8999..cfc32f6 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/BeatsX.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/BeatsX.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/IPods.java b/app/src/main/java/com/dosse/airpods/pods/types/IPods.java
similarity index 94%
rename from app/src/main/java/com/dosse/airpods/pods/data/IPods.java
rename to app/src/main/java/com/dosse/airpods/pods/types/IPods.java
index 810034a..c2fcf65 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/IPods.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/IPods.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 public interface IPods {
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/Pod.java b/app/src/main/java/com/dosse/airpods/pods/types/Pod.java
similarity index 97%
rename from app/src/main/java/com/dosse/airpods/pods/data/Pod.java
rename to app/src/main/java/com/dosse/airpods/pods/types/Pod.java
index 29160e8..8f538bf 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/Pod.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/Pod.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import android.view.View;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/Powerbeats3.java b/app/src/main/java/com/dosse/airpods/pods/types/Powerbeats3.java
similarity index 91%
rename from app/src/main/java/com/dosse/airpods/pods/data/Powerbeats3.java
rename to app/src/main/java/com/dosse/airpods/pods/types/Powerbeats3.java
index 9aa3841..444267d 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/Powerbeats3.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/Powerbeats3.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/PowerbeatsPro.java b/app/src/main/java/com/dosse/airpods/pods/types/PowerbeatsPro.java
similarity index 95%
rename from app/src/main/java/com/dosse/airpods/pods/data/PowerbeatsPro.java
rename to app/src/main/java/com/dosse/airpods/pods/types/PowerbeatsPro.java
index aebb782..97fb61c 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/PowerbeatsPro.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/PowerbeatsPro.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/RegularPods.java b/app/src/main/java/com/dosse/airpods/pods/types/RegularPods.java
similarity index 98%
rename from app/src/main/java/com/dosse/airpods/pods/data/RegularPods.java
rename to app/src/main/java/com/dosse/airpods/pods/types/RegularPods.java
index 73f2604..c0e977d 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/RegularPods.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/RegularPods.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import com.dosse.airpods.R;
 
diff --git a/app/src/main/java/com/dosse/airpods/pods/data/SinglePods.java b/app/src/main/java/com/dosse/airpods/pods/types/SinglePods.java
similarity index 95%
rename from app/src/main/java/com/dosse/airpods/pods/data/SinglePods.java
rename to app/src/main/java/com/dosse/airpods/pods/types/SinglePods.java
index 6d3d87c..06ec37e 100644
--- a/app/src/main/java/com/dosse/airpods/pods/data/SinglePods.java
+++ b/app/src/main/java/com/dosse/airpods/pods/types/SinglePods.java
@@ -1,4 +1,4 @@
-package com.dosse.airpods.pods.data;
+package com.dosse.airpods.pods.types;
 
 import java.util.Locale;