diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index 98cda1f2..4c033c57 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -54,6 +54,8 @@ import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.LegacySupport;
 import org.lineageos.updater.misc.StringGenerator;
 import org.lineageos.updater.misc.Utils;
+import org.lineageos.updater.model.Update;
+import org.lineageos.updater.model.UpdateDownload;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/org/lineageos/updater/UpdatesDbHelper.java b/src/org/lineageos/updater/UpdatesDbHelper.java
index 5746e75a..97440e2c 100644
--- a/src/org/lineageos/updater/UpdatesDbHelper.java
+++ b/src/org/lineageos/updater/UpdatesDbHelper.java
@@ -22,6 +22,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 
+import org.lineageos.updater.model.UpdateDownload;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index f31b0a9e..f7f756dc 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -35,6 +35,8 @@ import org.lineageos.updater.controller.UpdaterControllerInt;
 import org.lineageos.updater.misc.BuildInfoUtils;
 import org.lineageos.updater.misc.StringGenerator;
 import org.lineageos.updater.misc.Utils;
+import org.lineageos.updater.model.UpdateDownload;
+import org.lineageos.updater.model.UpdateStatus;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/org/lineageos/updater/controller/ABUpdateInstaller.java b/src/org/lineageos/updater/controller/ABUpdateInstaller.java
index fe62bb4d..ef88a813 100644
--- a/src/org/lineageos/updater/controller/ABUpdateInstaller.java
+++ b/src/org/lineageos/updater/controller/ABUpdateInstaller.java
@@ -19,8 +19,8 @@ import android.os.UpdateEngine;
 import android.os.UpdateEngineCallback;
 import android.util.Log;
 
-import org.lineageos.updater.UpdateDownload;
-import org.lineageos.updater.UpdateStatus;
+import org.lineageos.updater.model.UpdateDownload;
+import org.lineageos.updater.model.UpdateStatus;
 import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.Utils;
 
diff --git a/src/org/lineageos/updater/controller/UpdaterController.java b/src/org/lineageos/updater/controller/UpdaterController.java
index a5f565bb..f817f12e 100644
--- a/src/org/lineageos/updater/controller/UpdaterController.java
+++ b/src/org/lineageos/updater/controller/UpdaterController.java
@@ -23,8 +23,8 @@ import android.os.SystemClock;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
-import org.lineageos.updater.UpdateDownload;
-import org.lineageos.updater.UpdateStatus;
+import org.lineageos.updater.model.UpdateDownload;
+import org.lineageos.updater.model.UpdateStatus;
 import org.lineageos.updater.UpdatesDbHelper;
 import org.lineageos.updater.download.DownloadClient;
 import org.lineageos.updater.misc.Utils;
diff --git a/src/org/lineageos/updater/controller/UpdaterControllerInt.java b/src/org/lineageos/updater/controller/UpdaterControllerInt.java
index f82c93fc..2ef98eef 100644
--- a/src/org/lineageos/updater/controller/UpdaterControllerInt.java
+++ b/src/org/lineageos/updater/controller/UpdaterControllerInt.java
@@ -15,7 +15,7 @@
  */
 package org.lineageos.updater.controller;
 
-import org.lineageos.updater.UpdateDownload;
+import org.lineageos.updater.model.UpdateDownload;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index 8629663e..9c50aed4 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -32,8 +32,8 @@ import android.text.format.Formatter;
 import android.util.Log;
 
 import org.lineageos.updater.R;
-import org.lineageos.updater.UpdateDownload;
-import org.lineageos.updater.UpdateStatus;
+import org.lineageos.updater.model.UpdateDownload;
+import org.lineageos.updater.model.UpdateStatus;
 import org.lineageos.updater.UpdaterReceiver;
 import org.lineageos.updater.UpdatesActivity;
 import org.lineageos.updater.misc.BuildInfoUtils;
@@ -43,7 +43,6 @@ import org.lineageos.updater.misc.Utils;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.NumberFormat;
-import java.util.zip.ZipFile;
 
 public class UpdaterService extends Service {
 
diff --git a/src/org/lineageos/updater/misc/LegacySupport.java b/src/org/lineageos/updater/misc/LegacySupport.java
index 132488f7..e66470a2 100644
--- a/src/org/lineageos/updater/misc/LegacySupport.java
+++ b/src/org/lineageos/updater/misc/LegacySupport.java
@@ -20,8 +20,8 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import org.lineageos.updater.UpdateDownload;
-import org.lineageos.updater.UpdateStatus;
+import org.lineageos.updater.model.UpdateDownload;
+import org.lineageos.updater.model.UpdateStatus;
 import org.lineageos.updater.UpdatesDbHelper;
 
 import java.io.File;
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index ed13db44..2c5efecb 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -29,8 +29,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.lineageos.updater.R;
-import org.lineageos.updater.Update;
-import org.lineageos.updater.UpdateDownload;
+import org.lineageos.updater.model.Update;
+import org.lineageos.updater.model.UpdateDownload;
 import org.lineageos.updater.UpdatesDbHelper;
 import org.lineageos.updater.controller.UpdaterService;
 
diff --git a/src/org/lineageos/updater/Update.java b/src/org/lineageos/updater/model/Update.java
similarity index 98%
rename from src/org/lineageos/updater/Update.java
rename to src/org/lineageos/updater/model/Update.java
index 2eb595ba..c225feb5 100644
--- a/src/org/lineageos/updater/Update.java
+++ b/src/org/lineageos/updater/model/Update.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lineageos.updater;
+package org.lineageos.updater.model;
 
 public class Update {
 
diff --git a/src/org/lineageos/updater/UpdateDownload.java b/src/org/lineageos/updater/model/UpdateDownload.java
similarity index 98%
rename from src/org/lineageos/updater/UpdateDownload.java
rename to src/org/lineageos/updater/model/UpdateDownload.java
index b5ff65bb..c10c9cff 100644
--- a/src/org/lineageos/updater/UpdateDownload.java
+++ b/src/org/lineageos/updater/model/UpdateDownload.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lineageos.updater;
+package org.lineageos.updater.model;
 
 import java.io.File;
 
diff --git a/src/org/lineageos/updater/UpdateStatus.java b/src/org/lineageos/updater/model/UpdateStatus.java
similarity index 96%
rename from src/org/lineageos/updater/UpdateStatus.java
rename to src/org/lineageos/updater/model/UpdateStatus.java
index 5cd1db74..c8da5371 100644
--- a/src/org/lineageos/updater/UpdateStatus.java
+++ b/src/org/lineageos/updater/model/UpdateStatus.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lineageos.updater;
+package org.lineageos.updater.model;
 
 public enum UpdateStatus {
     UNKNOWN,
@@ -35,4 +35,4 @@ public enum UpdateStatus {
         public static final int INCOMPLETE = 1;
         public static final int VERIFIED = 2;
     }
-}
\ No newline at end of file
+}