diff --git a/data/build.gradle b/data/build.gradle
index 5a45c98f..1c9fe8c0 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -10,6 +10,9 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
+
+        buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
+        buildConfigField "String", "MIXPANEL_API_KEY", "\"${System.getenv("MIXPANEL_API_KEY")}\""
     }
 
     productFlavors {
@@ -27,6 +30,7 @@ dependencies {
     // dagger
     implementation "com.google.dagger:dagger:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
     compileOnly "javax.annotation:jsr250-api:1.0"
 
diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
similarity index 92%
rename from data/src/noAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
rename to data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
index c2d36d08..4fb79b2f 100644
--- a/data/src/noAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
+++ b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
@@ -16,9 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.moez.QKSMS.common.util
+package com.moez.QKSMS.manager
 
-import com.moez.QKSMS.manager.AnalyticsManager
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
similarity index 94%
rename from data/src/withAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
rename to data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
index 3ef45cbd..1074061f 100644
--- a/data/src/withAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
+++ b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
@@ -16,15 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.moez.QKSMS.common.util
+package com.moez.QKSMS.manager
 
 import android.content.Context
 import com.amplitude.api.Amplitude
 import com.amplitude.api.AmplitudeClient
 import com.amplitude.api.Identify
 import com.mixpanel.android.mpmetrics.MixpanelAPI
-import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.data.BuildConfig
 import org.json.JSONArray
 import org.json.JSONObject
 import timber.log.Timber
@@ -48,9 +47,9 @@ class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsMana
 
         amplitude.logEvent(event, propertiesJson)
 
-        synchronized(mixpanel, {
+        synchronized(mixpanel) {
             mixpanel.track(event, propertiesJson)
-        })
+        }
     }
 
     override fun setUserProperty(key: String, value: Any) {
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 875465a7..eb333987 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -17,9 +17,7 @@ android {
         versionName "3.3.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
         buildConfigField "String", "BUGSNAG_API_KEY", "\"${System.getenv("BUGSNAG_API_KEY")}\""
-        buildConfigField "String", "MIXPANEL_API_KEY", "\"${System.getenv("MIXPANEL_API_KEY")}\""
     }
 
     signingConfigs {
@@ -101,7 +99,9 @@ dependencies {
 
     // exoplayer
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
-    implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
+    implementation("com.google.android.exoplayer:exoplayer-ui:$exoplayer_version", {
+        exclude group: "com.android.support", module: "support-media-compat"
+    })
 
     // rxbinding
     implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxbinding_version"
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
index 904b8014..9fa721ab 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
@@ -25,9 +25,9 @@ import android.content.Context
 import android.preference.PreferenceManager
 import com.f2prateek.rx.preferences2.RxSharedPreferences
 import com.moez.QKSMS.common.ViewModelFactory
-import com.moez.QKSMS.common.util.AnalyticsManagerImpl
 import com.moez.QKSMS.common.util.NotificationManagerImpl
 import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.AnalyticsManagerImpl
 import com.moez.QKSMS.manager.ExternalBlockingManager
 import com.moez.QKSMS.manager.ExternalBlockingManagerImpl
 import com.moez.QKSMS.manager.KeyManager