diff --git a/android/app/src/main/java/chat/rocket/reactnative/Callback.java b/android/app/src/play/java/chat/rocket/reactnative/Callback.java
similarity index 100%
rename from android/app/src/main/java/chat/rocket/reactnative/Callback.java
rename to android/app/src/play/java/chat/rocket/reactnative/Callback.java
diff --git a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
index 401314d77..ac747ae9f 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
@@ -114,7 +114,7 @@ public class CustomPushNotification extends PushNotification {
         Ejson ejson = new Gson().fromJson(bundle.getString("ejson", "{}"), Ejson.class);
 
         notification
-            .setContentTitle(title)	
+            .setContentTitle(title)
             .setContentText(message)
             .setContentIntent(intent)
             .setPriority(Notification.PRIORITY_HIGH)
@@ -336,7 +336,7 @@ public class CustomPushNotification extends PushNotification {
         intent.putExtra(NOTIFICATION_ID, notificationId);
 
         PendingIntent dismissPendingIntent = PendingIntent.getBroadcast(mContext, notificationId, intent, 0);
-        
+
         notification.setDeleteIntent(dismissPendingIntent);
     }
 
diff --git a/android/app/src/play/java/chat/rocket/reactnative/Ejson.java b/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
index d5b6b0737..0c68e4755 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
@@ -9,6 +9,8 @@ public class Ejson {
     String rid;
     String type;
     Sender sender;
+    String messageId;
+    String notificationType;
 
     private String TOKEN_KEY = "reactnativemeteor_usertoken-";
     private SharedPreferences sharedPreferences = RNUserDefaultsModule.getPreferences(CustomPushNotification.reactApplicationContext);
@@ -40,4 +42,4 @@ public class Ejson {
         String username;
         String _id;
     }
-}
+}
\ No newline at end of file
diff --git a/android/app/src/main/java/chat/rocket/reactnative/LoadNotification.java b/android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java
similarity index 100%
rename from android/app/src/main/java/chat/rocket/reactnative/LoadNotification.java
rename to android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java