diff --git a/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/GCMessageHandler.cs b/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/Abstract/GCMessageHandler.cs
similarity index 93%
rename from ZicMoove/ZicMoove.Droid/Services/GCMHandlers/GCMessageHandler.cs
rename to ZicMoove/ZicMoove.Droid/Services/GCMHandlers/Abstract/GCMessageHandler.cs
index f5ab41c1..a2bc43ca 100644
--- a/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/GCMessageHandler.cs
+++ b/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/Abstract/GCMessageHandler.cs
@@ -13,7 +13,7 @@ using ZicMoove.Droid.Interfaces;
 
 namespace ZicMoove.Droid.Services.GCMHandlers
 {
-    abstract class GCMessageHandler : IGCMessageHandler
+    public abstract class GCMessageHandler : IGCMessageHandler
     {
         protected Context context;
         protected NotificationManager notificationManager;
diff --git a/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/BookQueryGCMHandler.cs b/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/BookQueryGCMHandler.cs
index b0277b4f..ccfc13b6 100644
--- a/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/BookQueryGCMHandler.cs
+++ b/ZicMoove/ZicMoove.Droid/Services/GCMHandlers/BookQueryGCMHandler.cs
@@ -18,9 +18,10 @@ namespace ZicMoove.Droid.Services.GCMHandlers
     using Model;
     using Model.Musical;
 
-    class BookQueryGCMHandler : GCMessageHandler
+    public class BookQueryGCMHandler : GCMessageHandler
     {
-        public BookQueryGCMHandler(Context context,
+        public BookQueryGCMHandler(
+            Context context,
             NotificationManager manager,
             Notification.Builder builder) : base(context,manager,builder)
         {