From 59ab986554ad4c1af53d32ebb8caa9820ae16676 Mon Sep 17 00:00:00 2001
From: Tonyo Francis <tonyo.dev@gmail.com>
Date: Wed, 6 Jun 2018 18:58:02 -0400
Subject: [PATCH] Added fetch2core to share common modules

---
 .idea/gradle.xml                              |   1 +
 fetch2/build.gradle                           |   2 +
 .../fetch2/DatabaseInstrumentedTest.java      |   1 +
 .../DownloadManagerInstrumentedTest.java      |   9 +-
 ...DownloadPriorityIteratorProcessorTest.java |  11 +-
 .../DownloadProviderInstrumentedTest.java     |   1 +
 .../com/tonyodev/fetch2/FetchBuilderTest.java |   2 +
 .../fetch2/FetchHandlerInstrumentedTest.java  |  11 +-
 .../main/java/com/tonyodev/fetch2/Fetch.kt    |   4 +-
 .../com/tonyodev/fetch2/FetchConfiguration.kt |   1 +
 .../com/tonyodev/fetch2/FetchErrorUtils.kt    |   2 +-
 .../com/tonyodev/fetch2/FetchExtentions.kt    |   2 +
 .../tonyodev/fetch2/FileServerDownloader.kt   |   4 -
 .../fetch2/HttpUrlConnectionDownloader.kt     |   7 +-
 .../main/java/com/tonyodev/fetch2/Request.kt  |   2 +-
 .../com/tonyodev/fetch2/database/Converter.kt |   3 +
 .../fetch2/database/DatabaseManager.kt        |   2 +-
 .../fetch2/database/DatabaseManagerImpl.kt    |   2 +-
 .../tonyodev/fetch2/database/DownloadInfo.kt  |   4 +
 .../fetch2/downloader/DownloadManagerImpl.kt  |   5 +-
 .../downloader/ParallelFileDownloaderImpl.kt  |   5 +-
 .../SequentialFileDownloaderImpl.kt           |   1 +
 .../tonyodev/fetch2/fetch/FetchHandlerImpl.kt |   1 +
 .../com/tonyodev/fetch2/fetch/FetchImpl.kt    |   4 +
 .../fetch2/fetch/FetchModulesBuilder.kt       |   3 +-
 .../fetch2/helper/FileDownloaderDelegate.kt   |   2 +
 .../helper/PriorityListProcessorImpl.kt       |   6 +-
 .../fetch2/provider/NetworkInfoProvider.kt    |   4 +-
 .../java/com/tonyodev/fetch2/util/Defaults.kt |   8 +-
 .../com/tonyodev/fetch2/util/FetchUtils.kt    | 208 +-----------------
 .../tonyodev/fetch2/util/InterruptMonitor.kt  |   7 -
 fetch2core/.gitignore                         |   1 +
 fetch2core/build.gradle                       |  78 +++++++
 fetch2core/proguard-rules.pro                 |  21 ++
 .../fetch2core/ExampleInstrumentedTest.java   |  26 +++
 fetch2core/src/main/AndroidManifest.xml       |   7 +
 .../tonyodev/fetch2core}/AndroidExtentions.kt |   3 +-
 .../tonyodev/fetch2core}/AverageCalculator.kt |   2 +-
 .../com/tonyodev/fetch2core}/Downloader.kt    |   3 +-
 .../com/tonyodev/fetch2core}/ErrorStrings.kt  |   2 +-
 .../tonyodev/fetch2core/FetchCoreDefaults.kt  |   6 +
 .../com/tonyodev/fetch2core/FetchCoreUtils.kt | 207 +++++++++++++++++
 .../com/tonyodev/fetch2core}/FetchLogger.kt   |   4 +-
 .../fetch2core/FileServerDownloader.kt        |   3 +
 .../java/com/tonyodev/fetch2core}/Func.kt     |   2 +-
 .../java/com/tonyodev/fetch2core}/Func2.kt    |   2 +-
 .../tonyodev/fetch2core}/HandlerWrapper.kt    |   2 +-
 .../tonyodev/fetch2core/InterruptMonitor.kt   |   5 +
 .../java/com/tonyodev/fetch2core}/Logger.kt   |   2 +-
 fetch2core/src/main/res/values/strings.xml    |   3 +
 .../tonyodev/fetch2core/ExampleUnitTest.java  |  17 ++
 fetch2downloaders/build.gradle                |   2 +-
 .../fetch2downloaders/OkHttpDownloader.kt     |   8 +-
 fetch2fileserver/build.gradle                 |   2 +-
 .../AbstractFetchFileServerDelegate.kt        |   2 +-
 .../fetch2fileserver/FetchFileServer.kt       |   2 +-
 .../FetchFileServerDelegate.kt                |   2 +-
 .../FetchFileServerDownloader.kt              |   7 +-
 .../FetchFileServerExtensions.kt              |   2 +-
 .../fetch2fileserver/FetchFileServerImpl.kt   |   7 +-
 .../fetch2fileserver/FetchFileServerLogger.kt |   3 +-
 .../tonyodev/fetch2fileserver/FileResource.kt |   5 +-
 .../provider/FetchFileResourceProvider.kt     |   3 +-
 .../provider/FileResourceProviderDelegate.kt  |   2 +-
 .../java/com/tonyodev/fetch2rx/RxFetch.kt     |   1 +
 .../java/com/tonyodev/fetch2rx/RxFetchImpl.kt |   8 +-
 .../tonyodev/fetchmigrator/FetchMigrator.kt   |   2 +-
 .../main/java/com/tonyodev/fetchapp/App.java  |   2 +-
 .../main/java/com/tonyodev/fetchapp/Data.java |   1 -
 .../fetchapp/DownloadListActivity.java        |   2 +-
 .../tonyodev/fetchapp/FileServerActivity.java |  10 +-
 settings.gradle                               |   2 +-
 72 files changed, 499 insertions(+), 297 deletions(-)
 delete mode 100644 fetch2/src/main/java/com/tonyodev/fetch2/FileServerDownloader.kt
 delete mode 100644 fetch2/src/main/java/com/tonyodev/fetch2/util/InterruptMonitor.kt
 create mode 100644 fetch2core/.gitignore
 create mode 100644 fetch2core/build.gradle
 create mode 100644 fetch2core/proguard-rules.pro
 create mode 100644 fetch2core/src/androidTest/java/com/tonyodev/fetch2core/ExampleInstrumentedTest.java
 create mode 100644 fetch2core/src/main/AndroidManifest.xml
 rename {fetch2/src/main/java/com/tonyodev/fetch2/util => fetch2core/src/main/java/com/tonyodev/fetch2core}/AndroidExtentions.kt (95%)
 rename {fetch2/src/main/java/com/tonyodev/fetch2/util => fetch2core/src/main/java/com/tonyodev/fetch2core}/AverageCalculator.kt (99%)
 rename {fetch2/src/main/java/com/tonyodev/fetch2 => fetch2core/src/main/java/com/tonyodev/fetch2core}/Downloader.kt (99%)
 rename {fetch2/src/main/java/com/tonyodev/fetch2/util => fetch2core/src/main/java/com/tonyodev/fetch2core}/ErrorStrings.kt (97%)
 create mode 100644 fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreDefaults.kt
 create mode 100644 fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreUtils.kt
 rename {fetch2/src/main/java/com/tonyodev/fetch2 => fetch2core/src/main/java/com/tonyodev/fetch2core}/FetchLogger.kt (90%)
 create mode 100644 fetch2core/src/main/java/com/tonyodev/fetch2core/FileServerDownloader.kt
 rename {fetch2/src/main/java/com/tonyodev/fetch2 => fetch2core/src/main/java/com/tonyodev/fetch2core}/Func.kt (91%)
 rename {fetch2/src/main/java/com/tonyodev/fetch2 => fetch2core/src/main/java/com/tonyodev/fetch2core}/Func2.kt (92%)
 rename {fetch2/src/main/java/com/tonyodev/fetch2/fetch => fetch2core/src/main/java/com/tonyodev/fetch2core}/HandlerWrapper.kt (98%)
 create mode 100644 fetch2core/src/main/java/com/tonyodev/fetch2core/InterruptMonitor.kt
 rename {fetch2/src/main/java/com/tonyodev/fetch2 => fetch2core/src/main/java/com/tonyodev/fetch2core}/Logger.kt (95%)
 create mode 100644 fetch2core/src/main/res/values/strings.xml
 create mode 100644 fetch2core/src/test/java/com/tonyodev/fetch2core/ExampleUnitTest.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bbbac7e9..da00f930 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,6 +9,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/fetch2" />
+            <option value="$PROJECT_DIR$/fetch2core" />
             <option value="$PROJECT_DIR$/fetch2downloaders" />
             <option value="$PROJECT_DIR$/fetch2fileserver" />
             <option value="$PROJECT_DIR$/fetch2rx" />
diff --git a/fetch2/build.gradle b/fetch2/build.gradle
index b2cd9ef7..d0aa2c17 100644
--- a/fetch2/build.gradle
+++ b/fetch2/build.gradle
@@ -66,6 +66,8 @@ dependencies {
     kapt "android.arch.persistence.room:compiler:$room_version"
     api "android.arch.persistence.room:runtime:$room_version"
 
+    api project(':fetch2core')
+
     testImplementation "junit:junit:$junit_version"
     androidTestImplementation "com.android.support.test:runner:$test_runner_version"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java
index 85c0e3e4..9484eb20 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java
@@ -11,6 +11,7 @@
 import com.tonyodev.fetch2.database.migration.Migration;
 import com.tonyodev.fetch2.util.FetchDatabaseExtensions;
 import com.tonyodev.fetch2.util.FetchTypeConverterExtensions;
+import com.tonyodev.fetch2core.FetchLogger;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java
index 7c475386..ed986478 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java
@@ -19,7 +19,10 @@
 import com.tonyodev.fetch2.provider.NetworkInfoProvider;
 import com.tonyodev.fetch2.util.FetchDefaults;
 import com.tonyodev.fetch2.util.FetchTypeConverterExtensions;
-import com.tonyodev.fetch2.util.FetchUtils;
+import com.tonyodev.fetch2core.Downloader;
+import com.tonyodev.fetch2core.FetchCoreDefaults;
+import com.tonyodev.fetch2core.FetchCoreUtils;
+import com.tonyodev.fetch2core.FetchLogger;
 
 import org.junit.After;
 import org.junit.Before;
@@ -49,14 +52,14 @@ public void useAppContext() throws Exception {
         FetchLogger fetchLogger = new FetchLogger(true, namespace);
         databaseManager = new DatabaseManagerImpl(appContext, namespace, fetchLogger, migrations);
         final Downloader client = FetchDefaults.getDefaultDownloader();
-        final long progessInterval = FetchDefaults.DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS;
+        final long progessInterval = FetchCoreDefaults.DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS;
         final int concurrentLimit = FetchDefaults.DEFAULT_CONCURRENT_LIMIT;
         final int bufferSize = FetchDefaults.DEFAULT_DOWNLOAD_BUFFER_SIZE_BYTES;
         final NetworkInfoProvider networkInfoProvider = new NetworkInfoProvider(appContext);
         final boolean retryOnNetworkGain = false;
         final Handler uiHandler = new Handler(Looper.getMainLooper());
         final DownloadInfoUpdater downloadInfoUpdater = new DownloadInfoUpdater(databaseManager);
-        final String tempDir = FetchUtils.getFileTempDir(appContext);
+        final String tempDir = FetchCoreUtils.getFileTempDir(appContext);
         final DownloadManagerCoordinator downloadManagerCoordinator = new DownloadManagerCoordinator(namespace);
         final ListenerCoordinator listenerCoordinator = new ListenerCoordinator(namespace);
         downloadManager = new DownloadManagerImpl(client, concurrentLimit,
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java
index 2246fde5..54ecd1da 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java
@@ -14,7 +14,11 @@
 import com.tonyodev.fetch2.downloader.DownloadManager;
 import com.tonyodev.fetch2.downloader.DownloadManagerImpl;
 import com.tonyodev.fetch2.fetch.DownloadManagerCoordinator;
-import com.tonyodev.fetch2.fetch.HandlerWrapper;
+import com.tonyodev.fetch2core.Downloader;
+import com.tonyodev.fetch2core.FetchCoreDefaults;
+import com.tonyodev.fetch2core.FetchCoreUtils;
+import com.tonyodev.fetch2core.FetchLogger;
+import com.tonyodev.fetch2core.HandlerWrapper;
 import com.tonyodev.fetch2.fetch.ListenerCoordinator;
 import com.tonyodev.fetch2.helper.DownloadInfoUpdater;
 import com.tonyodev.fetch2.helper.PriorityListProcessor;
@@ -22,7 +26,6 @@
 import com.tonyodev.fetch2.provider.DownloadProvider;
 import com.tonyodev.fetch2.provider.NetworkInfoProvider;
 import com.tonyodev.fetch2.util.FetchDefaults;
-import com.tonyodev.fetch2.util.FetchUtils;
 
 import org.junit.After;
 import org.junit.Before;
@@ -47,14 +50,14 @@ public void useAppContext() throws Exception {
         final Migration[] migrations = DownloadDatabase.getMigrations();
         final DatabaseManager databaseManager = new DatabaseManagerImpl(appContext, namespace, fetchLogger, migrations);
         final Downloader client = FetchDefaults.getDefaultDownloader();
-        final long progessInterval = FetchDefaults.DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS;
+        final long progessInterval = FetchCoreDefaults.DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS;
         final int concurrentLimit = FetchDefaults.DEFAULT_CONCURRENT_LIMIT;
         final int bufferSize = FetchDefaults.DEFAULT_DOWNLOAD_BUFFER_SIZE_BYTES;
         final NetworkInfoProvider networkInfoProvider = new NetworkInfoProvider(appContext);
         final boolean retryOnNetworkGain = false;
         final Handler uiHandler = new Handler(Looper.getMainLooper());
         final DownloadInfoUpdater downloadInfoUpdater = new DownloadInfoUpdater(databaseManager);
-        final String tempDir = FetchUtils.getFileTempDir(appContext);
+        final String tempDir = FetchCoreUtils.getFileTempDir(appContext);
         final DownloadManagerCoordinator downloadManagerCoordinator = new DownloadManagerCoordinator(namespace);
         final ListenerCoordinator listenerCoordinator = new ListenerCoordinator(namespace);
         final DownloadManager downloadManager = new DownloadManagerImpl(client, concurrentLimit,
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java
index 211b78fe..bc314a79 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java
@@ -11,6 +11,7 @@
 import com.tonyodev.fetch2.database.migration.Migration;
 import com.tonyodev.fetch2.provider.DownloadProvider;
 import com.tonyodev.fetch2.util.FetchTypeConverterExtensions;
+import com.tonyodev.fetch2core.FetchLogger;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java
index 018c9af9..820f2bf8 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java
@@ -4,6 +4,8 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.tonyodev.fetch2core.FetchLogger;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java
index f06667c3..9bc2df02 100644
--- a/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java
+++ b/fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java
@@ -17,7 +17,11 @@
 import com.tonyodev.fetch2.fetch.DownloadManagerCoordinator;
 import com.tonyodev.fetch2.fetch.FetchHandler;
 import com.tonyodev.fetch2.fetch.FetchHandlerImpl;
-import com.tonyodev.fetch2.fetch.HandlerWrapper;
+import com.tonyodev.fetch2core.Downloader;
+import com.tonyodev.fetch2core.FetchCoreDefaults;
+import com.tonyodev.fetch2core.FetchCoreUtils;
+import com.tonyodev.fetch2core.FetchLogger;
+import com.tonyodev.fetch2core.HandlerWrapper;
 import com.tonyodev.fetch2.fetch.ListenerCoordinator;
 import com.tonyodev.fetch2.helper.DownloadInfoUpdater;
 import com.tonyodev.fetch2.helper.PriorityListProcessor;
@@ -26,7 +30,6 @@
 import com.tonyodev.fetch2.provider.NetworkInfoProvider;
 import com.tonyodev.fetch2.util.FetchDefaults;
 import com.tonyodev.fetch2.util.FetchTypeConverterExtensions;
-import com.tonyodev.fetch2.util.FetchUtils;
 
 import org.junit.After;
 import org.junit.Before;
@@ -62,14 +65,14 @@ public void useAppContext() throws Exception {
         databaseManager = new DatabaseManagerImpl(appContext, namespace, fetchLogger, migrations);
         final HandlerWrapper handlerWrapper = new HandlerWrapper(namespace);
         final Downloader client = FetchDefaults.getDefaultDownloader();
-        final long progessInterval = FetchDefaults.DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS;
+        final long progessInterval = FetchCoreDefaults.DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS;
         final int concurrentLimit = FetchDefaults.DEFAULT_CONCURRENT_LIMIT;
         final int bufferSize = FetchDefaults.DEFAULT_DOWNLOAD_BUFFER_SIZE_BYTES;
         final NetworkInfoProvider networkInfoProvider = new NetworkInfoProvider(appContext);
         final boolean retryOnNetworkGain = false;
         final Handler uiHandler = new Handler(Looper.getMainLooper());
         final DownloadInfoUpdater downloadInfoUpdater = new DownloadInfoUpdater(databaseManager);
-        final String tempDir = FetchUtils.getFileTempDir(appContext);
+        final String tempDir = FetchCoreUtils.getFileTempDir(appContext);
         final DownloadManagerCoordinator downloadManagerCoordinator = new DownloadManagerCoordinator(namespace);
         final ListenerCoordinator listenerCoordinator = new ListenerCoordinator(namespace);
         final DownloadManager downloadManager = new DownloadManagerImpl(client, concurrentLimit,
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/Fetch.kt b/fetch2/src/main/java/com/tonyodev/fetch2/Fetch.kt
index b7dfb81d..a0730c47 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/Fetch.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/Fetch.kt
@@ -6,8 +6,10 @@ import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.fetch.FetchImpl
 import com.tonyodev.fetch2.fetch.FetchModulesBuilder
 import com.tonyodev.fetch2.util.DEFAULT_INSTANCE_NAMESPACE
-import com.tonyodev.fetch2.util.GLOBAL_FETCH_CONFIGURATION_NOT_SET
+import com.tonyodev.fetch2core.GLOBAL_FETCH_CONFIGURATION_NOT_SET
 import com.tonyodev.fetch2.util.createConfigWithNewNamespace
+import com.tonyodev.fetch2core.Func
+import com.tonyodev.fetch2core.Func2
 
 
 /**
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/FetchConfiguration.kt b/fetch2/src/main/java/com/tonyodev/fetch2/FetchConfiguration.kt
index b85d6369..dcb1e170 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/FetchConfiguration.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/FetchConfiguration.kt
@@ -3,6 +3,7 @@ package com.tonyodev.fetch2
 import android.content.Context
 import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
 
 /**
  * Class used to hold the configuration settings for a Fetch instance.
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/FetchErrorUtils.kt b/fetch2/src/main/java/com/tonyodev/fetch2/FetchErrorUtils.kt
index a28f8624..b8b86359 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/FetchErrorUtils.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/FetchErrorUtils.kt
@@ -2,7 +2,7 @@
 
 package com.tonyodev.fetch2
 
-import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
 import java.io.IOException
 import java.net.SocketTimeoutException
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/FetchExtentions.kt b/fetch2/src/main/java/com/tonyodev/fetch2/FetchExtentions.kt
index 3bb662f8..7fc429d5 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/FetchExtentions.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/FetchExtentions.kt
@@ -1,6 +1,8 @@
 package com.tonyodev.fetch2
 
 import com.tonyodev.fetch2.exception.FetchException
+import com.tonyodev.fetch2core.Func
+import com.tonyodev.fetch2core.Func2
 
 
 /**
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/FileServerDownloader.kt b/fetch2/src/main/java/com/tonyodev/fetch2/FileServerDownloader.kt
deleted file mode 100644
index f112fc19..00000000
--- a/fetch2/src/main/java/com/tonyodev/fetch2/FileServerDownloader.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.tonyodev.fetch2
-
-interface FileServerDownloader : Downloader {
-}
\ No newline at end of file
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/HttpUrlConnectionDownloader.kt b/fetch2/src/main/java/com/tonyodev/fetch2/HttpUrlConnectionDownloader.kt
index 82cb11bb..74c26877 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/HttpUrlConnectionDownloader.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/HttpUrlConnectionDownloader.kt
@@ -1,7 +1,8 @@
 package com.tonyodev.fetch2
 
-import com.tonyodev.fetch2.util.InterruptMonitor
-import com.tonyodev.fetch2.util.getFileMd5String
+import com.tonyodev.fetch2core.Downloader
+import com.tonyodev.fetch2core.InterruptMonitor
+import com.tonyodev.fetch2core.getFileMd5String
 import java.io.InputStream
 import java.io.OutputStream
 import java.net.HttpURLConnection
@@ -12,7 +13,7 @@ import kotlin.collections.HashMap
 /**
  * The default Downloader used by Fetch for downloading requests.
  * This downloader uses a HttpUrlConnection to perform http requests
- * @see {@link com.tonyodev.fetch2.Downloader}
+ * @see {@link com.tonyodev.fetch2core.Downloader}
  * */
 open class HttpUrlConnectionDownloader @JvmOverloads constructor(
         /**
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/Request.kt b/fetch2/src/main/java/com/tonyodev/fetch2/Request.kt
index dcca0321..1a4c8586 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/Request.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/Request.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2
 
-import com.tonyodev.fetch2.util.getUniqueId
+import com.tonyodev.fetch2core.getUniqueId
 
 /**
  * Use this class to create a request that is used by Fetch to enqueue a download and
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt
index 3234b963..88dd87ef 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt
@@ -3,6 +3,9 @@ package com.tonyodev.fetch2.database
 import android.arch.persistence.room.TypeConverter
 import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.util.EMPTY_JSON_OBJECT_STRING
+import com.tonyodev.fetch2.NetworkType
+import com.tonyodev.fetch2.Priority
+import com.tonyodev.fetch2.Status
 import org.json.JSONObject
 
 class Converter {
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManager.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManager.kt
index a352e678..384fc0a0 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManager.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManager.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2.database
 
-import com.tonyodev.fetch2.Logger
+import com.tonyodev.fetch2core.Logger
 import com.tonyodev.fetch2.Status
 import java.io.Closeable
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt
index c033a450..65c36676 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt
@@ -4,7 +4,7 @@ import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.room.Room
 import android.content.Context
 import android.database.sqlite.SQLiteException
-import com.tonyodev.fetch2.Logger
+import com.tonyodev.fetch2core.Logger
 import com.tonyodev.fetch2.Status
 import com.tonyodev.fetch2.database.migration.Migration
 import com.tonyodev.fetch2.exception.FetchException
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt
index 8d7cfbce..8c600bc8 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt
@@ -6,6 +6,10 @@ import android.arch.persistence.room.Index
 import android.arch.persistence.room.PrimaryKey
 import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2.NetworkType
+import com.tonyodev.fetch2.Priority
+import com.tonyodev.fetch2.Status
+import com.tonyodev.fetch2core.calculateProgress
 
 
 @Entity(tableName = DownloadDatabase.TABLE_NAME,
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/DownloadManagerImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/DownloadManagerImpl.kt
index de2eec6a..a8a687a4 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/DownloadManagerImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/DownloadManagerImpl.kt
@@ -10,8 +10,11 @@ import com.tonyodev.fetch2.helper.FileDownloaderDelegate
 import com.tonyodev.fetch2.fetch.ListenerCoordinator
 import com.tonyodev.fetch2.provider.NetworkInfoProvider
 import com.tonyodev.fetch2.util.getRequestForDownload
-import com.tonyodev.fetch2.util.isFetchFileServerUrl
 import com.tonyodev.fetch2.util.toDownloadInfo
+import com.tonyodev.fetch2core.Downloader
+import com.tonyodev.fetch2core.FileServerDownloader
+import com.tonyodev.fetch2core.Logger
+import com.tonyodev.fetch2core.isFetchFileServerUrl
 import java.util.concurrent.Executors
 
 class DownloadManagerImpl(private val httpDownloader: Downloader,
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/ParallelFileDownloaderImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/ParallelFileDownloaderImpl.kt
index 23098465..b253b1a4 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/ParallelFileDownloaderImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/ParallelFileDownloaderImpl.kt
@@ -1,13 +1,14 @@
 package com.tonyodev.fetch2.downloader
 
 import com.tonyodev.fetch2.Download
-import com.tonyodev.fetch2.Downloader
+import com.tonyodev.fetch2core.Downloader
 import com.tonyodev.fetch2.Error
-import com.tonyodev.fetch2.Logger
+import com.tonyodev.fetch2core.Logger
 import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.getErrorFromThrowable
 import com.tonyodev.fetch2.provider.NetworkInfoProvider
 import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
 import java.io.*
 import java.net.HttpURLConnection
 import java.util.concurrent.ExecutorService
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/SequentialFileDownloaderImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/SequentialFileDownloaderImpl.kt
index 8ba0ddac..ad094c21 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/SequentialFileDownloaderImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/SequentialFileDownloaderImpl.kt
@@ -4,6 +4,7 @@ import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.provider.NetworkInfoProvider
 import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
 import java.io.*
 import java.net.HttpURLConnection
 import kotlin.math.ceil
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchHandlerImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchHandlerImpl.kt
index c19f3938..42d4896b 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchHandlerImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchHandlerImpl.kt
@@ -6,6 +6,7 @@ import com.tonyodev.fetch2.database.DownloadInfo
 import com.tonyodev.fetch2.downloader.DownloadManager
 import com.tonyodev.fetch2.helper.PriorityListProcessor
 import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
 import java.io.File
 import java.util.*
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchImpl.kt
index 8f30f72d..e05fd7cb 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchImpl.kt
@@ -6,6 +6,10 @@ import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.getErrorFromMessage
 import com.tonyodev.fetch2.fetch.FetchModulesBuilder.Modules
+import com.tonyodev.fetch2core.Func
+import com.tonyodev.fetch2core.Func2
+import com.tonyodev.fetch2core.HandlerWrapper
+import com.tonyodev.fetch2core.Logger
 
 open class FetchImpl constructor(override val namespace: String,
                                  protected val handlerWrapper: HandlerWrapper,
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchModulesBuilder.kt b/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchModulesBuilder.kt
index 03082934..6ddc1376 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchModulesBuilder.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchModulesBuilder.kt
@@ -14,7 +14,8 @@ import com.tonyodev.fetch2.helper.PriorityListProcessor
 import com.tonyodev.fetch2.helper.PriorityListProcessorImpl
 import com.tonyodev.fetch2.provider.DownloadProvider
 import com.tonyodev.fetch2.provider.NetworkInfoProvider
-import com.tonyodev.fetch2.util.getFileTempDir
+import com.tonyodev.fetch2core.HandlerWrapper
+import com.tonyodev.fetch2core.getFileTempDir
 
 object FetchModulesBuilder {
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/helper/FileDownloaderDelegate.kt b/fetch2/src/main/java/com/tonyodev/fetch2/helper/FileDownloaderDelegate.kt
index f7ca9886..658645dc 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/helper/FileDownloaderDelegate.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/helper/FileDownloaderDelegate.kt
@@ -5,6 +5,8 @@ import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.database.DownloadInfo
 import com.tonyodev.fetch2.downloader.FileDownloader
 import com.tonyodev.fetch2.util.defaultNoError
+import com.tonyodev.fetch2.Status
+import com.tonyodev.fetch2core.Logger
 
 
 class FileDownloaderDelegate(private val downloadInfoUpdater: DownloadInfoUpdater,
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/helper/PriorityListProcessorImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/helper/PriorityListProcessorImpl.kt
index f26e871b..9c02f78d 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/helper/PriorityListProcessorImpl.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/helper/PriorityListProcessorImpl.kt
@@ -3,11 +3,13 @@ package com.tonyodev.fetch2.helper
 
 import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.downloader.DownloadManager
-import com.tonyodev.fetch2.fetch.HandlerWrapper
+import com.tonyodev.fetch2core.HandlerWrapper
 import com.tonyodev.fetch2.provider.DownloadProvider
 import com.tonyodev.fetch2.provider.NetworkInfoProvider
 import com.tonyodev.fetch2.util.PRIORITY_QUEUE_INTERVAL_IN_MILLISECONDS
-import com.tonyodev.fetch2.util.isFetchFileServerUrl
+import com.tonyodev.fetch2.NetworkType
+import com.tonyodev.fetch2core.Logger
+import com.tonyodev.fetch2core.isFetchFileServerUrl
 
 class PriorityListProcessorImpl constructor(private val handlerWrapper: HandlerWrapper,
                                             private val downloadProvider: DownloadProvider,
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/provider/NetworkInfoProvider.kt b/fetch2/src/main/java/com/tonyodev/fetch2/provider/NetworkInfoProvider.kt
index ad353ce0..06462220 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/provider/NetworkInfoProvider.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/provider/NetworkInfoProvider.kt
@@ -2,8 +2,8 @@ package com.tonyodev.fetch2.provider
 
 import android.content.Context
 import com.tonyodev.fetch2.NetworkType
-import com.tonyodev.fetch2.util.isNetworkAvailable
-import com.tonyodev.fetch2.util.isOnWiFi
+import com.tonyodev.fetch2core.isNetworkAvailable
+import com.tonyodev.fetch2core.isOnWiFi
 
 
 class NetworkInfoProvider constructor(private val context: Context) {
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/util/Defaults.kt b/fetch2/src/main/java/com/tonyodev/fetch2/util/Defaults.kt
index 8f149687..b1a812a9 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/util/Defaults.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/util/Defaults.kt
@@ -3,16 +3,16 @@
 package com.tonyodev.fetch2.util
 
 import com.tonyodev.fetch2.*
+import com.tonyodev.fetch2.NetworkType
+import com.tonyodev.fetch2.Priority
+import com.tonyodev.fetch2.Status
+import com.tonyodev.fetch2core.*
 
-
-const val DEFAULT_TAG = "fetch2"
 const val DEFAULT_GROUP_ID = 0
 const val DEFAULT_UNIQUE_IDENTIFIER = 0L
-const val DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS = 2_000L
 const val DEFAULT_DOWNLOAD_SPEED_REPORTING_INTERVAL_IN_MILLISECONDS = 1_000L
 const val DEFAULT_CONCURRENT_LIMIT = 1
 const val EMPTY_JSON_OBJECT_STRING = "{}"
-const val DEFAULT_LOGGING_ENABLED = true
 const val PRIORITY_QUEUE_INTERVAL_IN_MILLISECONDS = 500L
 const val DEFAULT_DOWNLOAD_BUFFER_SIZE_BYTES = 8192
 const val DEFAULT_AUTO_START = true
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/util/FetchUtils.kt b/fetch2/src/main/java/com/tonyodev/fetch2/util/FetchUtils.kt
index 155fa6b9..86544c1e 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/util/FetchUtils.kt
+++ b/fetch2/src/main/java/com/tonyodev/fetch2/util/FetchUtils.kt
@@ -2,19 +2,11 @@
 
 package com.tonyodev.fetch2.util
 
-import android.content.Context
-import android.net.Uri
 import com.tonyodev.fetch2.Download
-import com.tonyodev.fetch2.Downloader
+import com.tonyodev.fetch2core.Downloader
 import com.tonyodev.fetch2.FetchConfiguration
 import com.tonyodev.fetch2.Status
-import java.io.*
-import java.math.BigInteger
-import java.security.DigestInputStream
-import java.security.MessageDigest
-import java.util.concurrent.TimeUnit
-import kotlin.math.abs
-import kotlin.math.ceil
+import com.tonyodev.fetch2core.getFile
 
 
 fun canPauseDownload(download: Download): Boolean {
@@ -49,74 +41,6 @@ fun canCancelDownload(download: Download): Boolean {
     }
 }
 
-fun calculateProgress(downloaded: Long, total: Long): Int {
-    return when {
-        total < 1 -> -1
-        downloaded < 1 -> 0
-        downloaded >= total -> 100
-        else -> ((downloaded.toDouble() / total.toDouble()) * 100).toInt()
-    }
-}
-
-fun calculateEstimatedTimeRemainingInMilliseconds(downloadedBytes: Long,
-                                                  totalBytes: Long,
-                                                  downloadedBytesPerSecond: Long): Long {
-    return when {
-        totalBytes < 1 -> -1
-        downloadedBytes < 1 -> -1
-        downloadedBytesPerSecond < 1 -> -1
-        else -> {
-            val seconds = (totalBytes - downloadedBytes).toDouble() / downloadedBytesPerSecond.toDouble()
-            return abs(ceil(seconds)).toLong() * 1000
-        }
-    }
-}
-
-fun hasIntervalTimeElapsed(nanoStartTime: Long, nanoStopTime: Long,
-                           progressIntervalMilliseconds: Long): Boolean {
-    return TimeUnit.NANOSECONDS
-            .toMillis(nanoStopTime - nanoStartTime) >= progressIntervalMilliseconds
-}
-
-fun getUniqueId(url: String, file: String): Int {
-    return (url.hashCode() * 31) + file.hashCode()
-}
-
-fun getIncrementedFileIfOriginalExists(originalPath: String): File {
-    var file = File(originalPath)
-    var counter = 0
-    if (file.exists()) {
-        val parentPath = "${file.parent}/"
-        val extension = file.extension
-        val fileName: String = file.nameWithoutExtension
-        while (file.exists()) {
-            ++counter
-            val newFileName = "$fileName ($counter) "
-            file = File("$parentPath$newFileName.$extension")
-        }
-    }
-    return file
-}
-
-fun createFileIfPossible(file: File) {
-    try {
-        if (!file.exists()) {
-            if (file.parentFile != null && !file.parentFile.exists()) {
-                if (file.parentFile.mkdirs()) {
-                    file.createNewFile()
-                }
-            } else {
-                file.createNewFile()
-            }
-        }
-    } catch (e: IOException) {
-    }
-}
-
-fun getFileTempDir(context: Context): String {
-    return "${context.filesDir.absoluteFile}/_fetchData/temp"
-}
-
 fun getRequestForDownload(download: Download,
                           rangeStart: Long = -1,
                           rangeEnd: Long = -1): Downloader.ServerRequest {
@@ -132,53 +56,6 @@ fun getRequestForDownload(download: Download,
             tag = download.tag)
 }
 
-fun getFile(filePath: String): File {
-    val file = File(filePath)
-    if (!file.exists()) {
-        if (file.parentFile != null && !file.parentFile.exists()) {
-            if (file.parentFile.mkdirs()) {
-                file.createNewFile()
-            }
-        } else {
-            file.createNewFile()
-        }
-    }
-    return file
-}
-
-fun writeTextToFile(filePath: String, text: String) {
-    val file = getFile(filePath)
-    if (file.exists()) {
-        val bufferedWriter = BufferedWriter(FileWriter(file))
-        try {
-            bufferedWriter.write(text)
-        } catch (e: Exception) {
-        } finally {
-            try {
-                bufferedWriter.close()
-            } catch (e: Exception) {
-            }
-        }
-    }
-}
-
-fun getSingleLineTextFromFile(filePath: String): String? {
-    val file = getFile(filePath)
-    if (file.exists()) {
-        val bufferedReader = BufferedReader(FileReader(file))
-        try {
-            return bufferedReader.readLine()
-        } catch (e: Exception) {
-        } finally {
-            try {
-                bufferedReader.close()
-            } catch (e: Exception) {
-            }
-        }
-    }
-    return null
-}
-
 fun deleteRequestTempFiles(fileTempDir: String,
                            downloader: Downloader,
                            download: Download) {
@@ -218,83 +95,4 @@ fun createConfigWithNewNamespace(fetchConfiguration: FetchConfiguration,
             .setGlobalNetworkType(fetchConfiguration.globalNetworkType)
             .setLogger(fetchConfiguration.logger)
             .build()
-}
-
-//eg: fetchlocal://192.168.0.1:80/45
-//eg: fetchlocal://192.168.0.1:80/file.txt
-fun isFetchFileServerUrl(url: String): Boolean {
-    return url.startsWith("fetchlocal://")
-            && getFetchFileServerHostAddress(url).isNotEmpty()
-            && getFetchFileServerPort(url) > -1
-}
-
-fun getFetchFileServerPort(url: String): Int {
-    val colonIndex = url.lastIndexOf(":")
-    val modifiedUrl = url.substring(colonIndex + 1, url.length)
-    val firstSeparatorIndex = modifiedUrl.indexOf("/")
-    return if (firstSeparatorIndex == -1) {
-        modifiedUrl.toInt()
-    } else {
-        modifiedUrl.substring(0, firstSeparatorIndex).toInt()
-    }
-}
-
-fun getFetchFileServerHostAddress(url: String): String {
-    val firstIndexOfDoubleSep = url.indexOf("//")
-    val colonIndex = url.lastIndexOf(":")
-    return url.substring(firstIndexOfDoubleSep + 2, colonIndex)
-}
-
-fun getFileResourceIdFromUrl(url: String): String {
-    return Uri.parse(url).lastPathSegment
-}
-
-//eg: bytes=10-
-fun getRangeForFetchFileServerRequest(range: String): Pair<Long, Long> {
-    val firstIndex = range.lastIndexOf("=")
-    val lastIndex = range.lastIndexOf("-")
-    val start = range.substring(firstIndex + 1, lastIndex).toLong()
-    val end = try {
-        range.substring(lastIndex + 1, range.length).toLong()
-    } catch (e: Exception) {
-        -1L
-    }
-    return Pair(start, end)
-}
-
-fun getMd5String(bytes: ByteArray, start: Int = 0, length: Int = bytes.size): String {
-    return try {
-        val buffer = ByteArray(8192)
-        val md = MessageDigest.getInstance("MD5")
-        val inputStream = DigestInputStream(ByteArrayInputStream(bytes, start, length), md)
-        inputStream.use { dis ->
-            while (dis.read(buffer) != -1);
-        }
-        var md5: String = BigInteger(1, md.digest()).toString(16)
-        while (md5.length < 32) {
-            md5 = "0$md5"
-        }
-        md5
-    } catch (e: Exception) {
-        ""
-    }
-}
-
-fun getFileMd5String(file: String): String? {
-    val contentFile = File(file)
-    return try {
-        val buffer = ByteArray(8192)
-        val md = MessageDigest.getInstance("MD5")
-        val inputStream = DigestInputStream(FileInputStream(contentFile), md)
-        inputStream.use { dis ->
-            while (dis.read(buffer) != -1);
-        }
-        var md5: String = BigInteger(1, md.digest()).toString(16)
-        while (md5.length < 32) {
-            md5 = "0$md5"
-        }
-        md5
-    } catch (e: Exception) {
-        null
-    }
-}
+}
\ No newline at end of file
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/util/InterruptMonitor.kt b/fetch2/src/main/java/com/tonyodev/fetch2/util/InterruptMonitor.kt
deleted file mode 100644
index 0a323b39..00000000
--- a/fetch2/src/main/java/com/tonyodev/fetch2/util/InterruptMonitor.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.tonyodev.fetch2.util
-
-/** Object used to monitor work interruption. */
-interface InterruptMonitor {
-
-    val isInterrupted: Boolean
-}
\ No newline at end of file
diff --git a/fetch2core/.gitignore b/fetch2core/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/fetch2core/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/fetch2core/build.gradle b/fetch2core/build.gradle
new file mode 100644
index 00000000..2d802244
--- /dev/null
+++ b/fetch2core/build.gradle
@@ -0,0 +1,78 @@
+apply plugin: 'com.android.library'
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-kapt'
+
+apply plugin: 'com.novoda.bintray-release'
+
+buildscript {
+    apply from: '../versions.gradle'
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$gradle_tools_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "com.novoda:bintray-release:$novoda_bintray_version"
+    }
+}
+
+android {
+    compileSdkVersion library_compile_version
+
+    defaultConfig {
+        minSdkVersion library_min_version
+        targetSdkVersion library_target_version
+        versionCode library_version_code
+        versionName library_version
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+        androidTest.java.srcDirs += 'src/androidTest/kotlin'
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.android.support:appcompat-v7:$android_support_version"
+    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "com.android.support.test:runner:$test_runner_version"
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
+}
+
+publish {
+    userOrg = 'tonyofrancis'
+    groupId = 'com.tonyodev.fetch2core'
+    artifactId = 'fetch2core'
+    publishVersion = library_version
+    desc = 'Fetch Core Library'
+    website = 'https://github.com/tonyofrancis/fetch'
+}
+
+tasks.withType(Javadoc).all {
+    enabled = false
+}
\ No newline at end of file
diff --git a/fetch2core/proguard-rules.pro b/fetch2core/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/fetch2core/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/fetch2core/src/androidTest/java/com/tonyodev/fetch2core/ExampleInstrumentedTest.java b/fetch2core/src/androidTest/java/com/tonyodev/fetch2core/ExampleInstrumentedTest.java
new file mode 100644
index 00000000..0e2fa789
--- /dev/null
+++ b/fetch2core/src/androidTest/java/com/tonyodev/fetch2core/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.tonyodev.fetch2core;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.tonyodev.fetch2core.test", appContext.getPackageName());
+    }
+}
diff --git a/fetch2core/src/main/AndroidManifest.xml b/fetch2core/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..df96eff7
--- /dev/null
+++ b/fetch2core/src/main/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tonyodev.fetch2core">
+
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+</manifest>
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/util/AndroidExtentions.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/AndroidExtentions.kt
similarity index 95%
rename from fetch2/src/main/java/com/tonyodev/fetch2/util/AndroidExtentions.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/AndroidExtentions.kt
index d7bb6e40..f04d5eea 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/util/AndroidExtentions.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/AndroidExtentions.kt
@@ -1,5 +1,6 @@
 @file:JvmName("FetchAndroidExtensions")
-package com.tonyodev.fetch2.util
+
+package com.tonyodev.fetch2core
 
 import android.content.Context
 import android.net.ConnectivityManager
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/util/AverageCalculator.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/AverageCalculator.kt
similarity index 99%
rename from fetch2/src/main/java/com/tonyodev/fetch2/util/AverageCalculator.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/AverageCalculator.kt
index 27a2ee26..7d0c1555 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/util/AverageCalculator.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/AverageCalculator.kt
@@ -1,4 +1,4 @@
-package com.tonyodev.fetch2.util
+package com.tonyodev.fetch2core
 
 class AverageCalculator @JvmOverloads constructor(
         /**
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/Downloader.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/Downloader.kt
similarity index 99%
rename from fetch2/src/main/java/com/tonyodev/fetch2/Downloader.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/Downloader.kt
index ad916821..98d0a06f 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/Downloader.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/Downloader.kt
@@ -1,6 +1,5 @@
-package com.tonyodev.fetch2
+package com.tonyodev.fetch2core
 
-import com.tonyodev.fetch2.util.InterruptMonitor
 import java.io.Closeable
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/util/ErrorStrings.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/ErrorStrings.kt
similarity index 97%
rename from fetch2/src/main/java/com/tonyodev/fetch2/util/ErrorStrings.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/ErrorStrings.kt
index ef2b0562..ca750386 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/util/ErrorStrings.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/ErrorStrings.kt
@@ -1,6 +1,6 @@
 @file:JvmName("FetchErrorStrings")
 
-package com.tonyodev.fetch2.util
+package com.tonyodev.fetch2core
 
 const val DOWNLOAD_NOT_FOUND = "fetch download not found"
 const val FAILED_TO_ENQUEUE_REQUEST = "UNIQUE constraint failed: requests._id (code 1555)"
diff --git a/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreDefaults.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreDefaults.kt
new file mode 100644
index 00000000..2dcf01de
--- /dev/null
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreDefaults.kt
@@ -0,0 +1,6 @@
+@file:JvmName("FetchCoreDefaults")
+package com.tonyodev.fetch2core
+
+const val DEFAULT_TAG = "fetch2"
+const val DEFAULT_LOGGING_ENABLED = true
+const val DEFAULT_PROGRESS_REPORTING_INTERVAL_IN_MILLISECONDS = 2_000L
\ No newline at end of file
diff --git a/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreUtils.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreUtils.kt
new file mode 100644
index 00000000..f37519e5
--- /dev/null
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchCoreUtils.kt
@@ -0,0 +1,207 @@
+@file:JvmName("FetchCoreUtils")
+
+package com.tonyodev.fetch2core
+
+import android.content.Context
+import android.net.Uri
+import java.io.*
+import java.math.BigInteger
+import java.security.DigestInputStream
+import java.security.MessageDigest
+import java.util.concurrent.TimeUnit
+import kotlin.math.abs
+import kotlin.math.ceil
+
+fun calculateProgress(downloaded: Long, total: Long): Int {
+    return when {
+        total < 1 -> -1
+        downloaded < 1 -> 0
+        downloaded >= total -> 100
+        else -> ((downloaded.toDouble() / total.toDouble()) * 100).toInt()
+    }
+}
+
+fun calculateEstimatedTimeRemainingInMilliseconds(downloadedBytes: Long,
+                                                  totalBytes: Long,
+                                                  downloadedBytesPerSecond: Long): Long {
+    return when {
+        totalBytes < 1 -> -1
+        downloadedBytes < 1 -> -1
+        downloadedBytesPerSecond < 1 -> -1
+        else -> {
+            val seconds = (totalBytes - downloadedBytes).toDouble() / downloadedBytesPerSecond.toDouble()
+            return abs(ceil(seconds)).toLong() * 1000
+        }
+    }
+}
+
+fun hasIntervalTimeElapsed(nanoStartTime: Long, nanoStopTime: Long,
+                           progressIntervalMilliseconds: Long): Boolean {
+    return TimeUnit.NANOSECONDS
+            .toMillis(nanoStopTime - nanoStartTime) >= progressIntervalMilliseconds
+}
+
+fun getUniqueId(url: String, file: String): Int {
+    return (url.hashCode() * 31) + file.hashCode()
+}
+
+fun getIncrementedFileIfOriginalExists(originalPath: String): File {
+    var file = File(originalPath)
+    var counter = 0
+    if (file.exists()) {
+        val parentPath = "${file.parent}/"
+        val extension = file.extension
+        val fileName: String = file.nameWithoutExtension
+        while (file.exists()) {
+            ++counter
+            val newFileName = "$fileName ($counter) "
+            file = File("$parentPath$newFileName.$extension")
+        }
+    }
+    return file
+}
+
+fun createFileIfPossible(file: File) {
+    try {
+        if (!file.exists()) {
+            if (file.parentFile != null && !file.parentFile.exists()) {
+                if (file.parentFile.mkdirs()) {
+                    file.createNewFile()
+                }
+            } else {
+                file.createNewFile()
+            }
+        }
+    } catch (e: IOException) {
+    }
+}
+
+fun getFileTempDir(context: Context): String {
+    return "${context.filesDir.absoluteFile}/_fetchData/temp"
+}
+
+fun getFile(filePath: String): File {
+    val file = File(filePath)
+    if (!file.exists()) {
+        if (file.parentFile != null && !file.parentFile.exists()) {
+            if (file.parentFile.mkdirs()) {
+                file.createNewFile()
+            }
+        } else {
+            file.createNewFile()
+        }
+    }
+    return file
+}
+
+fun writeTextToFile(filePath: String, text: String) {
+    val file = getFile(filePath)
+    if (file.exists()) {
+        val bufferedWriter = BufferedWriter(FileWriter(file))
+        try {
+            bufferedWriter.write(text)
+        } catch (e: Exception) {
+        } finally {
+            try {
+                bufferedWriter.close()
+            } catch (e: Exception) {
+            }
+        }
+    }
+}
+
+fun getSingleLineTextFromFile(filePath: String): String? {
+    val file = getFile(filePath)
+    if (file.exists()) {
+        val bufferedReader = BufferedReader(FileReader(file))
+        try {
+            return bufferedReader.readLine()
+        } catch (e: Exception) {
+        } finally {
+            try {
+                bufferedReader.close()
+            } catch (e: Exception) {
+            }
+        }
+    }
+    return null
+}
+
+//eg: fetchlocal://192.168.0.1:80/45
+//eg: fetchlocal://192.168.0.1:80/file.txt
+fun isFetchFileServerUrl(url: String): Boolean {
+    return url.startsWith("fetchlocal://")
+            && getFetchFileServerHostAddress(url).isNotEmpty()
+            && getFetchFileServerPort(url) > -1
+}
+
+fun getFetchFileServerPort(url: String): Int {
+    val colonIndex = url.lastIndexOf(":")
+    val modifiedUrl = url.substring(colonIndex + 1, url.length)
+    val firstSeparatorIndex = modifiedUrl.indexOf("/")
+    return if (firstSeparatorIndex == -1) {
+        modifiedUrl.toInt()
+    } else {
+        modifiedUrl.substring(0, firstSeparatorIndex).toInt()
+    }
+}
+
+fun getFetchFileServerHostAddress(url: String): String {
+    val firstIndexOfDoubleSep = url.indexOf("//")
+    val colonIndex = url.lastIndexOf(":")
+    return url.substring(firstIndexOfDoubleSep + 2, colonIndex)
+}
+
+fun getFileResourceIdFromUrl(url: String): String {
+    return Uri.parse(url).lastPathSegment
+}
+
+//eg: bytes=10-
+fun getRangeForFetchFileServerRequest(range: String): Pair<Long, Long> {
+    val firstIndex = range.lastIndexOf("=")
+    val lastIndex = range.lastIndexOf("-")
+    val start = range.substring(firstIndex + 1, lastIndex).toLong()
+    val end = try {
+        range.substring(lastIndex + 1, range.length).toLong()
+    } catch (e: Exception) {
+        -1L
+    }
+    return Pair(start, end)
+}
+
+fun getMd5String(bytes: ByteArray, start: Int = 0, length: Int = bytes.size): String {
+    return try {
+        val buffer = ByteArray(8192)
+        val md = MessageDigest.getInstance("MD5")
+        val inputStream = DigestInputStream(ByteArrayInputStream(bytes, start, length), md)
+        inputStream.use { dis ->
+            while (dis.read(buffer) != -1);
+        }
+        var md5: String = BigInteger(1, md.digest()).toString(16)
+        while (md5.length < 32) {
+            md5 = "0$md5"
+        }
+        md5
+    } catch (e: Exception) {
+        ""
+    }
+}
+
+fun getFileMd5String(file: String): String? {
+    val contentFile = File(file)
+    return try {
+        val buffer = ByteArray(8192)
+        val md = MessageDigest.getInstance("MD5")
+        val inputStream = DigestInputStream(FileInputStream(contentFile), md)
+        inputStream.use { dis ->
+            while (dis.read(buffer) != -1);
+        }
+        var md5: String = BigInteger(1, md.digest()).toString(16)
+        while (md5.length < 32) {
+            md5 = "0$md5"
+        }
+        md5
+    } catch (e: Exception) {
+        null
+    }
+}
\ No newline at end of file
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/FetchLogger.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchLogger.kt
similarity index 90%
rename from fetch2/src/main/java/com/tonyodev/fetch2/FetchLogger.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/FetchLogger.kt
index 8e9a15d5..a6bd7125 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/FetchLogger.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/FetchLogger.kt
@@ -1,8 +1,6 @@
-package com.tonyodev.fetch2
+package com.tonyodev.fetch2core
 
 import android.util.Log
-import com.tonyodev.fetch2.util.DEFAULT_LOGGING_ENABLED
-import com.tonyodev.fetch2.util.DEFAULT_TAG
 
 /**
  * The default Fetch Logger.
diff --git a/fetch2core/src/main/java/com/tonyodev/fetch2core/FileServerDownloader.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/FileServerDownloader.kt
new file mode 100644
index 00000000..e78b3223
--- /dev/null
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/FileServerDownloader.kt
@@ -0,0 +1,3 @@
+package com.tonyodev.fetch2core
+
+interface FileServerDownloader : Downloader
\ No newline at end of file
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/Func.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/Func.kt
similarity index 91%
rename from fetch2/src/main/java/com/tonyodev/fetch2/Func.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/Func.kt
index 006f65ca..e79884a8 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/Func.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/Func.kt
@@ -1,4 +1,4 @@
-package com.tonyodev.fetch2
+package com.tonyodev.fetch2core
 
 import org.jetbrains.annotations.NotNull
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/Func2.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/Func2.kt
similarity index 92%
rename from fetch2/src/main/java/com/tonyodev/fetch2/Func2.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/Func2.kt
index 73b1688f..9bae7c0b 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/Func2.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/Func2.kt
@@ -1,4 +1,4 @@
-package com.tonyodev.fetch2
+package com.tonyodev.fetch2core
 
 import org.jetbrains.annotations.Nullable
 
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/HandlerWrapper.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/HandlerWrapper.kt
similarity index 98%
rename from fetch2/src/main/java/com/tonyodev/fetch2/fetch/HandlerWrapper.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/HandlerWrapper.kt
index 888f4c12..96a59b6f 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/fetch/HandlerWrapper.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/HandlerWrapper.kt
@@ -1,4 +1,4 @@
-package com.tonyodev.fetch2.fetch
+package com.tonyodev.fetch2core
 
 import android.os.Handler
 import android.os.HandlerThread
diff --git a/fetch2core/src/main/java/com/tonyodev/fetch2core/InterruptMonitor.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/InterruptMonitor.kt
new file mode 100644
index 00000000..ed5b6978
--- /dev/null
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/InterruptMonitor.kt
@@ -0,0 +1,5 @@
+package com.tonyodev.fetch2core
+
+interface InterruptMonitor {
+    val isInterrupted: Boolean
+}
\ No newline at end of file
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/Logger.kt b/fetch2core/src/main/java/com/tonyodev/fetch2core/Logger.kt
similarity index 95%
rename from fetch2/src/main/java/com/tonyodev/fetch2/Logger.kt
rename to fetch2core/src/main/java/com/tonyodev/fetch2core/Logger.kt
index a46fe575..51b1bc6a 100644
--- a/fetch2/src/main/java/com/tonyodev/fetch2/Logger.kt
+++ b/fetch2core/src/main/java/com/tonyodev/fetch2core/Logger.kt
@@ -1,4 +1,4 @@
-package com.tonyodev.fetch2
+package com.tonyodev.fetch2core
 
 /**
  * Used to create custom loggers for Fetch.
diff --git a/fetch2core/src/main/res/values/strings.xml b/fetch2core/src/main/res/values/strings.xml
new file mode 100644
index 00000000..e6850ed9
--- /dev/null
+++ b/fetch2core/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Fetch2Core</string>
+</resources>
diff --git a/fetch2core/src/test/java/com/tonyodev/fetch2core/ExampleUnitTest.java b/fetch2core/src/test/java/com/tonyodev/fetch2core/ExampleUnitTest.java
new file mode 100644
index 00000000..3b8b095a
--- /dev/null
+++ b/fetch2core/src/test/java/com/tonyodev/fetch2core/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.tonyodev.fetch2core;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/fetch2downloaders/build.gradle b/fetch2downloaders/build.gradle
index 69413494..0da74f83 100644
--- a/fetch2downloaders/build.gradle
+++ b/fetch2downloaders/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     api "com.squareup.okhttp3:okhttp:$okhttp_version"
 
-    api project(':fetch2')
+    api project(':fetch2core')
 
     testImplementation "junit:junit:$junit_version"
     androidTestImplementation "com.android.support.test:runner:$test_runner_version"
diff --git a/fetch2downloaders/src/main/java/com/tonyodev/fetch2downloaders/OkHttpDownloader.kt b/fetch2downloaders/src/main/java/com/tonyodev/fetch2downloaders/OkHttpDownloader.kt
index 3f58e117..5c8ac4f9 100644
--- a/fetch2downloaders/src/main/java/com/tonyodev/fetch2downloaders/OkHttpDownloader.kt
+++ b/fetch2downloaders/src/main/java/com/tonyodev/fetch2downloaders/OkHttpDownloader.kt
@@ -1,8 +1,8 @@
 package com.tonyodev.fetch2downloaders
 
-import com.tonyodev.fetch2.Downloader
-import com.tonyodev.fetch2.util.InterruptMonitor
-import com.tonyodev.fetch2.util.getFileMd5String
+import com.tonyodev.fetch2core.Downloader
+import com.tonyodev.fetch2core.InterruptMonitor
+import com.tonyodev.fetch2core.getFileMd5String
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit
 /**
  * This downloader uses a OkHttpClient to perform http requests.
  * You can also pass in your custom okHttpClient for this downloader to use.
- * @see {@link com.tonyodev.fetch2.Downloader}
+ * @see {@link com.tonyodev.fetch2core.Downloader}
  * */
 open class OkHttpDownloader @JvmOverloads constructor(
         /** OkHttpClient */
diff --git a/fetch2fileserver/build.gradle b/fetch2fileserver/build.gradle
index 91f71742..45e075dc 100644
--- a/fetch2fileserver/build.gradle
+++ b/fetch2fileserver/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     kapt "android.arch.persistence.room:compiler:$room_version"
     api "android.arch.persistence.room:runtime:$room_version"
 
-    api project(':fetch2')
+    api project(':fetch2core')
 
     testImplementation "junit:junit:$junit_version"
     androidTestImplementation "com.android.support.test:runner:$test_runner_version"
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/AbstractFetchFileServerDelegate.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/AbstractFetchFileServerDelegate.kt
index 52681c32..d2b2c8a3 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/AbstractFetchFileServerDelegate.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/AbstractFetchFileServerDelegate.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2fileserver
 
-import com.tonyodev.fetch2.util.InterruptMonitor
+import com.tonyodev.fetch2core.InterruptMonitor
 import com.tonyodev.fetch2fileserver.transporter.FileRequest
 import com.tonyodev.fetch2fileserver.transporter.FileResourceTransporterWriter
 import java.io.InputStream
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServer.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServer.kt
index 869e73d6..f7cd70ad 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServer.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServer.kt
@@ -1,7 +1,7 @@
 package com.tonyodev.fetch2fileserver
 
 import android.content.Context
-import com.tonyodev.fetch2.Func
+import com.tonyodev.fetch2core.Func
 import java.net.ServerSocket
 
 /** A lightweight TCP File Server that acts like an HTTP file server
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDelegate.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDelegate.kt
index f33ea1fa..c8d1ab9f 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDelegate.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDelegate.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2fileserver
 
-import com.tonyodev.fetch2.util.InterruptMonitor
+import com.tonyodev.fetch2core.InterruptMonitor
 import com.tonyodev.fetch2fileserver.transporter.FileRequest
 import com.tonyodev.fetch2fileserver.transporter.FileResourceTransporterWriter
 import java.io.InputStream
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDownloader.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDownloader.kt
index c856c413..442ef222 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDownloader.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerDownloader.kt
@@ -1,8 +1,7 @@
 package com.tonyodev.fetch2fileserver
 
-import com.tonyodev.fetch2.Downloader
-import com.tonyodev.fetch2.FileServerDownloader
-import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
+
 import com.tonyodev.fetch2fileserver.transporter.FileRequest.Companion.TYPE_FILE
 import com.tonyodev.fetch2fileserver.transporter.FetchFileResourceTransporter
 import com.tonyodev.fetch2fileserver.transporter.FileRequest
@@ -16,7 +15,7 @@ import java.util.*
 /**
  * This downloader is used by Fetch to download files from a Fetch File Server using the
  * Fetch file server url scheme.
- * @see {@link com.tonyodev.fetch2.Downloader}
+ * @see {@link com.tonyodev.fetch2core.Downloader}
  * */
 open class FetchFileServerDownloader @JvmOverloads constructor(
 
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerExtensions.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerExtensions.kt
index caa3d641..6d70913e 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerExtensions.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerExtensions.kt
@@ -1,6 +1,6 @@
 package com.tonyodev.fetch2fileserver
 
-import com.tonyodev.fetch2.Func
+import com.tonyodev.fetch2core.Func
 
 /** Checks if a File Resource is managed by this instance.
  * @param fileResourceId file resource id
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerImpl.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerImpl.kt
index 9549bd4a..d1aa8852 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerImpl.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerImpl.kt
@@ -4,9 +4,10 @@ import android.content.Context
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.Looper
-import com.tonyodev.fetch2.FetchLogger
-import com.tonyodev.fetch2.Func
-import com.tonyodev.fetch2.util.InterruptMonitor
+
+import com.tonyodev.fetch2core.FetchLogger
+import com.tonyodev.fetch2core.Func
+import com.tonyodev.fetch2core.InterruptMonitor
 import com.tonyodev.fetch2fileserver.database.FetchFileResourceDatabase
 import com.tonyodev.fetch2fileserver.provider.FileResourceProvider
 import com.tonyodev.fetch2fileserver.provider.FileResourceProviderDelegate
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerLogger.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerLogger.kt
index 5ef6e359..47c429fc 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerLogger.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FetchFileServerLogger.kt
@@ -1,6 +1,7 @@
 package com.tonyodev.fetch2fileserver
 
-import com.tonyodev.fetch2.FetchLogger
+import com.tonyodev.fetch2core.FetchLogger
+
 
 /** Fetch File Server Default Logger*/
 open class FetchFileServerLogger(enableLogging: Boolean = true,
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FileResource.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FileResource.kt
index 151a1cad..1a0db8f5 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FileResource.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/FileResource.kt
@@ -25,8 +25,9 @@ class FileResource {
     /** Custom data that will be sent in the server response to the client if available.*/
     var customData: String = ""
 
-    /** The File Resource md5 checksum string.
-     * If provided, this is sent in the server response to the client.*/
+    /** The File Resource md5 checksum string. If Empty Fetch File Server will generate the md5
+     * checksum when added to a file server instance.
+     * This is sent in the server response to the client.*/
     var md5: String = ""
 
     override fun equals(other: Any?): Boolean {
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FetchFileResourceProvider.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FetchFileResourceProvider.kt
index 87f3c393..c8712f72 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FetchFileResourceProvider.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FetchFileResourceProvider.kt
@@ -1,8 +1,7 @@
 package com.tonyodev.fetch2fileserver.provider
 
 import android.os.Handler
-import com.tonyodev.fetch2.FetchLogger
-import com.tonyodev.fetch2.util.*
+import com.tonyodev.fetch2core.*
 import com.tonyodev.fetch2fileserver.transporter.FileRequest
 import com.tonyodev.fetch2fileserver.transporter.FileResponse
 import com.tonyodev.fetch2fileserver.transporter.FileResponse.Companion.CLOSE_CONNECTION
diff --git a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FileResourceProviderDelegate.kt b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FileResourceProviderDelegate.kt
index 91b0c87c..06b2d837 100644
--- a/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FileResourceProviderDelegate.kt
+++ b/fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/provider/FileResourceProviderDelegate.kt
@@ -2,7 +2,7 @@ package com.tonyodev.fetch2fileserver.provider
 
 import com.tonyodev.fetch2fileserver.FileResource
 import com.tonyodev.fetch2fileserver.transporter.FileRequest
-import com.tonyodev.fetch2.util.InterruptMonitor
+import com.tonyodev.fetch2core.InterruptMonitor
 import com.tonyodev.fetch2fileserver.transporter.FileResourceTransporterWriter
 import java.io.InputStream
 import java.util.*
diff --git a/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetch.kt b/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetch.kt
index f1da0d81..aa50d98d 100644
--- a/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetch.kt
+++ b/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetch.kt
@@ -5,6 +5,7 @@ import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.fetch.FetchModulesBuilder
 import com.tonyodev.fetch2.util.DEFAULT_INSTANCE_NAMESPACE
+import com.tonyodev.fetch2.Status
 
 /**
  * A light weight file download manager for Android with Rx features.
diff --git a/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetchImpl.kt b/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetchImpl.kt
index 37014fea..a06370c1 100644
--- a/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetchImpl.kt
+++ b/fetch2rx/src/main/java/com/tonyodev/fetch2rx/RxFetchImpl.kt
@@ -6,10 +6,12 @@ import com.tonyodev.fetch2.exception.FetchException
 import com.tonyodev.fetch2.fetch.FetchHandler
 import com.tonyodev.fetch2.fetch.FetchImpl
 import com.tonyodev.fetch2.fetch.FetchModulesBuilder.Modules
-import com.tonyodev.fetch2.fetch.HandlerWrapper
+import com.tonyodev.fetch2core.HandlerWrapper
 import com.tonyodev.fetch2.fetch.ListenerCoordinator
-import com.tonyodev.fetch2.util.FAILED_TO_ENQUEUE_REQUEST
-import com.tonyodev.fetch2.util.DOWNLOAD_NOT_FOUND
+import com.tonyodev.fetch2core.FAILED_TO_ENQUEUE_REQUEST
+import com.tonyodev.fetch2core.DOWNLOAD_NOT_FOUND
+import com.tonyodev.fetch2.Status
+import com.tonyodev.fetch2core.Logger
 import io.reactivex.Flowable
 import io.reactivex.android.schedulers.AndroidSchedulers
 
diff --git a/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt b/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt
index ac177615..36e1d67a 100644
--- a/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt
+++ b/fetchmigrator/src/main/java/com/tonyodev/fetchmigrator/FetchMigrator.kt
@@ -5,10 +5,10 @@ package com.tonyodev.fetchmigrator
 import android.content.Context
 import android.database.sqlite.SQLiteConstraintException
 import android.support.annotation.WorkerThread
-import com.tonyodev.fetch2.*
 import com.tonyodev.fetch2.database.DatabaseManagerImpl
 import com.tonyodev.fetch2.database.DownloadDatabase
 import com.tonyodev.fetch2.database.DownloadInfo
+import com.tonyodev.fetch2core.FetchLogger
 import com.tonyodev.fetchmigrator.fetch1.DatabaseHelper
 import com.tonyodev.fetchmigrator.fetch1.DownloadTransferPair
 import com.tonyodev.fetchmigrator.helpers.v1CursorToV2DownloadInfo
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/App.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/App.java
index cb83d277..72efcf8f 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/App.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/App.java
@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-import com.tonyodev.fetch2.Downloader;
+import com.tonyodev.fetch2core.Downloader;
 import com.tonyodev.fetch2.Fetch;
 import com.tonyodev.fetch2.FetchConfiguration;
 import com.tonyodev.fetch2downloaders.OkHttpDownloader;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java
index f0dc9f6f..01a02316 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/Data.java
@@ -9,7 +9,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 
 public final class Data {
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java
index b2d16014..ebfb9547 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/DownloadListActivity.java
@@ -14,7 +14,7 @@
 
 import com.tonyodev.fetch2.AbstractFetchListener;
 import com.tonyodev.fetch2.Download;
-import com.tonyodev.fetch2.Downloader;
+import com.tonyodev.fetch2core.Downloader;
 import com.tonyodev.fetch2.Fetch;
 import com.tonyodev.fetch2.FetchListener;
 import com.tonyodev.fetch2.NetworkType;
diff --git a/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java b/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java
index dfe507cc..8c91e733 100644
--- a/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java
+++ b/sampleApp/src/main/java/com/tonyodev/fetchapp/FileServerActivity.java
@@ -12,14 +12,13 @@
 
 import com.tonyodev.fetch2.AbstractFetchListener;
 import com.tonyodev.fetch2.Download;
-import com.tonyodev.fetch2.Downloader;
+import com.tonyodev.fetch2core.Downloader;
 import com.tonyodev.fetch2.Fetch;
 import com.tonyodev.fetch2.FetchConfiguration;
 import com.tonyodev.fetch2.FetchListener;
-import com.tonyodev.fetch2.Func;
 import com.tonyodev.fetch2.Priority;
 import com.tonyodev.fetch2.Request;
-import com.tonyodev.fetch2.util.FetchUtils;
+import com.tonyodev.fetch2core.FetchCoreUtils;
 import com.tonyodev.fetch2fileserver.FileResource;
 import com.tonyodev.fetch2fileserver.FetchFileServer;
 import com.tonyodev.fetch2fileserver.FetchFileServerDownloader;
@@ -34,10 +33,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
 
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 import timber.log.Timber;
 
 
@@ -107,7 +103,7 @@ private void addFileResourceToServer(File file, long fileLength) {
         fileResource.setName(file.getName());
         fileResource.setId(file.getAbsolutePath().hashCode());
         fileResource.setLength(fileLength);
-        final String fileMd5 = FetchUtils.getFileMd5String(file.getAbsolutePath());
+        final String fileMd5 = FetchCoreUtils.getFileMd5String(file.getAbsolutePath());
         if (fileMd5 != null) {
             fileResource.setMd5(fileMd5);
         }
diff --git a/settings.gradle b/settings.gradle
index 80653b79..4036299c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':sampleApp', ":fetch2", ":fetch2rx", ":fetch2downloaders", ":fetchmigrator", ":fetch2fileserver"
+include ':sampleApp', ':fetch2core', ":fetch2", ":fetch2rx", ":fetch2downloaders", ":fetchmigrator", ":fetch2fileserver"