diff --git a/BundleClient/app/src/main/java/com/ddd/datastore/filestore/FileStoreHelper.java b/BundleClient/app/src/main/java/com/ddd/datastore/filestore/FileStoreHelper.java
index 2af3db3115..000cffaaf6 100644
--- a/BundleClient/app/src/main/java/com/ddd/datastore/filestore/FileStoreHelper.java
+++ b/BundleClient/app/src/main/java/com/ddd/datastore/filestore/FileStoreHelper.java
@@ -4,7 +4,7 @@
 import android.util.Log;
 
 import com.ddd.client.applicationdatamanager.ApplicationDataManager;
-import com.ddd.datastore.model.Metadata;
+import com.ddd.model.Metadata;
 import com.google.gson.Gson;
 
 import java.io.BufferedReader;
diff --git a/BundleClient/app/src/main/java/com/ddd/datastore/model/Metadata.java b/BundleClient/app/src/main/java/com/ddd/datastore/model/Metadata.java
deleted file mode 100644
index 54a6c88064..0000000000
--- a/BundleClient/app/src/main/java/com/ddd/datastore/model/Metadata.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ddd.datastore.model;
-
-public class Metadata {
-    //last messageId added by the app
-    public long lastAddedMessageId;
-
-    //last messageId sent successfully via DTN
-    public long lastSentMessageId;
-
-    //last messageId received via DTN
-    public long lastReceivedMessageId;
-
-    //latest messageId processed by the application
-    public long lastProcessedMessageId;
-
-    public Metadata(long lastAddedMessageId, long lastSentMessageId, long lastReceivedMessageId,
-                    long lastProcessedMessageId) {
-        this.lastAddedMessageId = lastAddedMessageId;
-        this.lastSentMessageId = lastSentMessageId;
-        this.lastReceivedMessageId = lastReceivedMessageId;
-        this.lastProcessedMessageId = lastProcessedMessageId;
-    }
-}