diff --git a/app/build.gradle b/app/build.gradle
index 3b6a6e5fc7..141cb18c2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -117,6 +117,7 @@ if (new File(rootDir, 'extras/extras.gradle').exists()) {
 }
 
 dependencies {
+  implementation project(path: ':common:audio')
   implementation project(path: ':common:data')
   implementation project(path: ':common:networking')
   implementation project(path: ':common:pages')
diff --git a/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt b/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt
index cca7b4118d..dbbaa60906 100644
--- a/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt
+++ b/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt
@@ -1,7 +1,7 @@
 package com.quran.labs.androidquran.dao.audio
 
 import android.os.Parcelable
-import com.quran.labs.androidquran.common.QariItem
+import com.quran.labs.androidquran.common.audio.QariItem
 import com.quran.labs.androidquran.data.SuraAyah
 import kotlinx.android.parcel.Parcelize
 
diff --git a/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt b/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt
index 459a107cc2..0492f9e63c 100644
--- a/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt
+++ b/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt
@@ -3,7 +3,7 @@ package com.quran.labs.androidquran.presenter.audio
 import android.content.Context
 import android.content.Intent
 import com.quran.labs.androidquran.R
-import com.quran.labs.androidquran.common.QariItem
+import com.quran.labs.androidquran.common.audio.QariItem
 import com.quran.labs.androidquran.dao.audio.AudioPathInfo
 import com.quran.labs.androidquran.dao.audio.AudioRequest
 import com.quran.labs.androidquran.data.QuranInfo
diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/AudioManagerActivity.kt b/app/src/main/java/com/quran/labs/androidquran/ui/AudioManagerActivity.kt
index 6824057a26..80145b1ef1 100644
--- a/app/src/main/java/com/quran/labs/androidquran/ui/AudioManagerActivity.kt
+++ b/app/src/main/java/com/quran/labs/androidquran/ui/AudioManagerActivity.kt
@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.quran.labs.androidquran.QuranApplication
 import com.quran.labs.androidquran.R
-import com.quran.labs.androidquran.common.QariItem
+import com.quran.labs.androidquran.common.audio.QariItem
 import com.quran.labs.androidquran.data.QuranInfo
 import com.quran.labs.androidquran.util.AudioManagerUtils
 import com.quran.labs.androidquran.util.AudioUtils
diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java b/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java
index a6af325715..89c935ef3f 100644
--- a/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java
+++ b/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java
@@ -37,7 +37,7 @@
 import com.quran.labs.androidquran.R;
 import com.quran.labs.androidquran.SearchActivity;
 import com.quran.labs.androidquran.common.LocalTranslation;
-import com.quran.labs.androidquran.common.QariItem;
+import com.quran.labs.androidquran.common.audio.QariItem;
 import com.quran.labs.androidquran.component.activity.PagerActivityComponent;
 import com.quran.labs.androidquran.dao.audio.AudioRequest;
 import com.quran.labs.androidquran.data.Constants;
diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/SheikhAudioManagerActivity.kt b/app/src/main/java/com/quran/labs/androidquran/ui/SheikhAudioManagerActivity.kt
index f76bc697d6..2cf7934391 100644
--- a/app/src/main/java/com/quran/labs/androidquran/ui/SheikhAudioManagerActivity.kt
+++ b/app/src/main/java/com/quran/labs/androidquran/ui/SheikhAudioManagerActivity.kt
@@ -25,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.quran.labs.androidquran.QuranApplication
 import com.quran.labs.androidquran.R
-import com.quran.labs.androidquran.common.QariItem
+import com.quran.labs.androidquran.common.audio.QariItem
 import com.quran.labs.androidquran.data.QuranInfo
 import com.quran.labs.androidquran.data.SuraAyah
 import com.quran.labs.androidquran.service.QuranDownloadService
diff --git a/app/src/main/java/com/quran/labs/androidquran/util/AudioManagerUtils.java b/app/src/main/java/com/quran/labs/androidquran/util/AudioManagerUtils.java
index 4cb47fbcab..0860e89e7b 100644
--- a/app/src/main/java/com/quran/labs/androidquran/util/AudioManagerUtils.java
+++ b/app/src/main/java/com/quran/labs/androidquran/util/AudioManagerUtils.java
@@ -4,7 +4,7 @@
 import androidx.annotation.NonNull;
 import android.util.Pair;
 
-import com.quran.labs.androidquran.common.QariItem;
+import com.quran.labs.androidquran.common.audio.QariItem;
 import com.quran.labs.androidquran.data.QuranInfo;
 
 import java.io.File;
diff --git a/app/src/main/java/com/quran/labs/androidquran/util/AudioUtils.kt b/app/src/main/java/com/quran/labs/androidquran/util/AudioUtils.kt
index 16a622a8e4..e27b6e92d6 100644
--- a/app/src/main/java/com/quran/labs/androidquran/util/AudioUtils.kt
+++ b/app/src/main/java/com/quran/labs/androidquran/util/AudioUtils.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.annotation.VisibleForTesting
 import com.quran.labs.androidquran.R
-import com.quran.labs.androidquran.common.QariItem
+import com.quran.labs.androidquran.common.audio.QariItem
 import com.quran.labs.androidquran.data.QuranInfo
 import com.quran.labs.androidquran.data.SuraAyah
 import com.quran.labs.androidquran.service.AudioService
@@ -49,7 +49,9 @@ constructor(private val quranInfo: QuranInfo, private val quranFileUtils: QuranF
     val items = mutableListOf<QariItem>()
     for (i in shuyookh.indices) {
       if (hasGaplessEquivalent[i] == 0 || haveAnyFiles(context, paths[i])) {
-        items += QariItem(i, shuyookh[i], urls[i], paths[i], databases[i])
+        items += QariItem(
+            i, shuyookh[i], urls[i], paths[i], databases[i]
+        )
       }
     }
 
diff --git a/app/src/main/java/com/quran/labs/androidquran/util/QariDownloadInfo.java b/app/src/main/java/com/quran/labs/androidquran/util/QariDownloadInfo.java
index e98d315020..b397946143 100644
--- a/app/src/main/java/com/quran/labs/androidquran/util/QariDownloadInfo.java
+++ b/app/src/main/java/com/quran/labs/androidquran/util/QariDownloadInfo.java
@@ -3,7 +3,7 @@
 import android.util.Pair;
 import android.util.SparseBooleanArray;
 
-import com.quran.labs.androidquran.common.QariItem;
+import com.quran.labs.androidquran.common.audio.QariItem;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/app/src/main/java/com/quran/labs/androidquran/widgets/AudioStatusBar.java b/app/src/main/java/com/quran/labs/androidquran/widgets/AudioStatusBar.java
index 6bafeea5a5..dd6e1763a5 100644
--- a/app/src/main/java/com/quran/labs/androidquran/widgets/AudioStatusBar.java
+++ b/app/src/main/java/com/quran/labs/androidquran/widgets/AudioStatusBar.java
@@ -21,7 +21,7 @@
 import android.widget.TextView;
 
 import com.quran.labs.androidquran.R;
-import com.quran.labs.androidquran.common.QariItem;
+import com.quran.labs.androidquran.common.audio.QariItem;
 import com.quran.labs.androidquran.data.Constants;
 import com.quran.labs.androidquran.util.QuranSettings;
 import com.quran.labs.androidquran.util.QuranUtils;
diff --git a/common/audio/build.gradle b/common/audio/build.gradle
index 6697cc865d..15dc5e3428 100644
--- a/common/audio/build.gradle
+++ b/common/audio/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
   compileSdkVersion deps.android.build.compileSdkVersion
@@ -7,6 +8,10 @@ android {
     minSdkVersion deps.android.build.minSdkVersion
     targetSdkVersion deps.android.build.targetSdkVersion
   }
+
+  androidExtensions {
+    experimental = true
+  }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/quran/labs/androidquran/common/QariItem.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/QariItem.kt
similarity index 89%
rename from app/src/main/java/com/quran/labs/androidquran/common/QariItem.kt
rename to common/audio/src/main/java/com/quran/labs/androidquran/common/audio/QariItem.kt
index 853226ba2e..1816a48afc 100644
--- a/app/src/main/java/com/quran/labs/androidquran/common/QariItem.kt
+++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/QariItem.kt
@@ -1,4 +1,4 @@
-package com.quran.labs.androidquran.common
+package com.quran.labs.androidquran.common.audio
 
 import android.os.Parcelable
 import kotlinx.android.parcel.IgnoredOnParcel