diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0a5512443..18e2e22e0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
       - name: "[Test] SDK Unit Tests"
         working-directory: OneSignalSDK
         run: |
-          ./gradlew unittest:testReleaseUnitTest --console=plain
+          ./gradlew test --console=plain
       - name: Unit tests results
         if: failure()
         uses: actions/upload-artifact@v3
diff --git a/Examples/OneSignalDemo/app/agconnect-services.json b/Examples/OneSignalDemo/app/agconnect-services.json
index 97036fd5bd..62999a4e13 100644
--- a/Examples/OneSignalDemo/app/agconnect-services.json
+++ b/Examples/OneSignalDemo/app/agconnect-services.json
@@ -23,7 +23,7 @@
 		"project_id":"9105385871709201822",
 		"app_id":"102009847",
 		"api_key":"CV68fkx9E2fU8Fv/v3zbuO8+rCjJ8w6QiMha7ZJUpIGTxs08n0/ddVXbOueUKBtxf3sD+ni8WPx27htLHhtse5eP5VrT",
-		"package_name":"com.onesignal.example"
+		"package_name":"com.onesignal.sdktest"
 	},
 	"oauth_client":{
 		"client_id":"102009847",
@@ -31,7 +31,7 @@
 	},
 	"app_info":{
 		"app_id":"102009847",
-		"package_name":"com.onesignal.example"
+		"package_name":"com.onesignal.sdktest"
 	},
 	"service":{
 		"analytics":{
@@ -53,12 +53,12 @@
 	"configuration_version":"3.0",
 	"appInfos":[
 		{
-			"package_name":"com.onesignal.example",
+			"package_name":"com.onesignal.sdktest",
 			"client":{
 				"app_id":"102009847"
 			},
 			"app_info":{
-				"package_name":"com.onesignal.example",
+				"package_name":"com.onesignal.sdktest",
 				"app_id":"102009847"
 			},
 			"oauth_client":{
diff --git a/Examples/OneSignalDemo/app/build.gradle b/Examples/OneSignalDemo/app/build.gradle
index 1efc142667..30238b5616 100644
--- a/Examples/OneSignalDemo/app/build.gradle
+++ b/Examples/OneSignalDemo/app/build.gradle
@@ -30,7 +30,7 @@ android {
         huawei {
             dimension "default"
             minSdkVersion 17
-            applicationId "com.onesignal.example"
+            applicationId "com.onesignal.sdktest"
         }
     }
 
@@ -67,17 +67,13 @@ dependencies {
 
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
-    implementation('com.onesignal:OneSignal:4.8.2')
-    implementation('com.onesignal:Location:4.8.2')
-    implementation('com.onesignal:InAppMessages:4.8.2')
-
     /** START - Google Play Builds **/
-    gmsImplementation('com.onesignal:Notifications:4.8.2')
+    gmsImplementation('com.onesignal:OneSignal:5.0.0')
     /** END - Google Play Builds **/
 
     /** START - Huawei Builds **/
     // Omit Google / Firebase libraries for Huawei builds.
-    huaweiImplementation('com.onesignal:Notifications:4.8.2') {
+    huaweiImplementation('com.onesignal:OneSignal:5.0.0') {
         exclude group: 'com.google.android.gms', module: 'play-services-gcm'
         exclude group: 'com.google.android.gms', module: 'play-services-analytics'
         exclude group: 'com.google.android.gms', module: 'play-services-location'
diff --git a/Examples/OneSignalDemo/app/src/huawei/java/com/onesignal/sdktest/notification/HmsMessageServiceAppLevel.java b/Examples/OneSignalDemo/app/src/huawei/java/com/onesignal/sdktest/notification/HmsMessageServiceAppLevel.java
index 21d20f86f6..5c8fa9d583 100644
--- a/Examples/OneSignalDemo/app/src/huawei/java/com/onesignal/sdktest/notification/HmsMessageServiceAppLevel.java
+++ b/Examples/OneSignalDemo/app/src/huawei/java/com/onesignal/sdktest/notification/HmsMessageServiceAppLevel.java
@@ -1,11 +1,11 @@
 package com.onesignal.sdktest.notification;
 
 import android.os.Bundle;
+import android.util.Log;
 
 import com.huawei.hms.push.HmsMessageService;
 import com.huawei.hms.push.RemoteMessage;
-import com.onesignal.OneSignal;
-import com.onesignal.OneSignalHmsEventBridge;
+import com.onesignal.notifications.bridges.OneSignalHmsEventBridge;
 
 public class HmsMessageServiceAppLevel extends HmsMessageService {
 
@@ -19,19 +19,19 @@ public class HmsMessageServiceAppLevel extends HmsMessageService {
      */
     @Override
     public void onNewToken(String token, Bundle bundle) {
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HmsMessageServiceAppLevel onNewToken refresh token:" + token + " bundle: " + bundle);
+        Log.d("MainApplication", "HmsMessageServiceAppLevel onNewToken refresh token:" + token + " bundle: " + bundle);
 
         // Forward event on to OneSignal SDK
-        OneSignalHmsEventBridge.onNewToken(this, token, bundle);
+        OneSignalHmsEventBridge.INSTANCE.onNewToken(this, token, bundle);
     }
 
     @Deprecated
     @Override
     public void onNewToken(String token) {
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HmsMessageServiceAppLevel onNewToken refresh token:" + token);
+        Log.d("MainApplication", "HmsMessageServiceAppLevel onNewToken refresh token:" + token);
 
         // Forward event on to OneSignal SDK
-        OneSignalHmsEventBridge.onNewToken(this, token);
+        OneSignalHmsEventBridge.INSTANCE.onNewToken(this, token);
     }
 
     /**
@@ -44,18 +44,18 @@ public void onNewToken(String token) {
      */
     @Override
     public void onMessageReceived(RemoteMessage message) {
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived: " + message);
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.ttl:" + message.getTtl());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.data:" + message.getData());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.title: " + message.getNotification().getTitle());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.body: " + message.getNotification().getBody());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.icon: " + message.getNotification().getIcon());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.color: " + message.getNotification().getColor());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.channelId: " + message.getNotification().getChannelId());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.imageURL: " + message.getNotification().getImageUrl());
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onMessageReceived.tag: " + message.getNotification().getTag());
+        Log.d("MainApplication", "HMS onMessageReceived: " + message);
+        Log.d("MainApplication", "HMS onMessageReceived.ttl:" + message.getTtl());
+        Log.d("MainApplication", "HMS onMessageReceived.data:" + message.getData());
+        Log.d("MainApplication", "HMS onMessageReceived.title: " + message.getNotification().getTitle());
+        Log.d("MainApplication", "HMS onMessageReceived.body: " + message.getNotification().getBody());
+        Log.d("MainApplication", "HMS onMessageReceived.icon: " + message.getNotification().getIcon());
+        Log.d("MainApplication", "HMS onMessageReceived.color: " + message.getNotification().getColor());
+        Log.d("MainApplication", "HMS onMessageReceived.channelId: " + message.getNotification().getChannelId());
+        Log.d("MainApplication", "HMS onMessageReceived.imageURL: " + message.getNotification().getImageUrl());
+        Log.d("MainApplication", "HMS onMessageReceived.tag: " + message.getNotification().getTag());
 
         // Forward event on to OneSignal SDK
-        OneSignalHmsEventBridge.onMessageReceived(this, message);
+        OneSignalHmsEventBridge.INSTANCE.onMessageReceived(this, message);
     }
 }
diff --git a/Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml b/Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml
index 0d50ea27d9..5b65e5b0f5 100644
--- a/Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml
+++ b/Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml
@@ -272,7 +272,7 @@
 
             <!-- Aliases -->
             <LinearLayout
-                android:id="@+id/main_activity_account_linear_layout"
+                android:id="@+id/main_activity_aliases_linear_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clipChildren="false"
@@ -302,7 +302,7 @@
                     app:cardElevation="4dp">
 
                     <LinearLayout
-                        android:id="@+id/main_activity_account_details_linear_layout"
+                        android:id="@+id/main_activity_aliases_details_linear_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
@@ -412,8 +412,8 @@
                                 android:layout_alignParentStart="true"
                                 android:layout_alignParentLeft="true"
                                 android:layout_centerVertical="true"
-                                android:layout_toStartOf="@id/main_activity_account_details_app_id_text_view"
-                                android:layout_toLeftOf="@id/main_activity_account_details_app_id_text_view"
+                                android:layout_toStartOf="@id/main_activity_push_subscription_id_text_view"
+                                android:layout_toLeftOf="@id/main_activity_push_subscription_id_text_view"
                                 android:text="@string/id_colon"
                                 android:textColor="@color/colorDarkText"
                                 android:textSize="16sp" />
@@ -1184,7 +1184,7 @@
             <!-- Send In-App Messaging -->
 
             <LinearLayout
-                android:id="@+id/main_activity_in_app_messaging_linear_layout"
+                android:id="@+id/main_activity_in_app_messaging_details_linear_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
diff --git a/OneSignalSDK/onesignal/build.gradle b/OneSignalSDK/onesignal/build.gradle
index 64daa87dba..cf014d731a 100644
--- a/OneSignalSDK/onesignal/build.gradle
+++ b/OneSignalSDK/onesignal/build.gradle
@@ -1,22 +1,16 @@
 plugins {
     id 'com.android.library'
-    id 'kotlin-android'
-    id 'org.jlleitschuh.gradle.ktlint'
-    id 'io.gitlab.arturbosch.detekt'
 }
 
 android {
     compileSdkVersion rootProject.buildVersions.compileSdkVersion
     defaultConfig {
         minSdkVersion rootProject.buildVersions.minSdkVersion
-        consumerProguardFiles 'consumer-rules.pro'
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         original {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             minifyEnabled false
@@ -25,72 +19,23 @@ android {
             minifyEnabled false
         }
     }
-    testOptions {
-        unitTests.all {
-            maxParallelForks 1
-            maxHeapSize '2048m'
-        }
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
     // Forced downgrade to Java 8 so SDK is backwards compatible in consuming projects
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     namespace 'com.onesignal'
 }
 
-tasks.withType(Test) {
-    testLogging {
-        exceptionFormat "full"
-        events "started", "skipped", "passed", "failed"
-        showStandardStreams false // Enable to have logging print
-    }
+ext {
+    projectDescription = "OneSignal Android SDK - All Modules"
 }
 
-// api || implementation = compile and runtime
-
-// KEEP: version ranges, these get used in the released POM file for maven central
-// NOTE: To prevent consumers from getting alpha or beta version of dependencies listed here
-//         make sure the latest minor value is a known stable version. Using a range for the
-//         patch version is ok, since this allows getting bug fix versions.
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
-
-    compileOnly('com.amazon.device:amazon-appstore-sdk:[3.0.1, 3.0.99]')
-
-    api('androidx.legacy:legacy-support-v4') {
-        version {
-            require '[1.0.0, 1.0.99]'
-            prefer '1.0.0'
-        }
-    }
-    api('androidx.appcompat:appcompat') {
-        version {
-            require '[1.0.0, 1.3.99]'
-            prefer '1.3.1'
-        }
-    }
-
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("io.kotest:kotest-runner-junit4:$kotestVersion")
-    testImplementation("io.kotest:kotest-runner-junit4-jvm:$kotestVersion")
-    testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
-    testImplementation("io.kotest:kotest-property:$kotestVersion")
-    testImplementation("org.robolectric:robolectric:4.8.1")
-    testImplementation("androidx.test:core-ktx:1.4.0")
-    testImplementation("androidx.test:core:1.4.0")
-    testImplementation("io.mockk:mockk:1.13.2")
-    testImplementation("org.json:json:20180813")
-    testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+    api project(':OneSignal:core')
+    api project(':OneSignal:notifications')
+    api project(':OneSignal:in-app-messages')
+    api project(':OneSignal:location')
 }
 
 apply from: 'maven-push.gradle'
-
diff --git a/OneSignalSDK/onesignal/inAppMessages/.gitignore b/OneSignalSDK/onesignal/core/.gitignore
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/.gitignore
rename to OneSignalSDK/onesignal/core/.gitignore
diff --git a/OneSignalSDK/onesignal/core/build.gradle b/OneSignalSDK/onesignal/core/build.gradle
new file mode 100644
index 0000000000..db0edeb6eb
--- /dev/null
+++ b/OneSignalSDK/onesignal/core/build.gradle
@@ -0,0 +1,92 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'org.jlleitschuh.gradle.ktlint'
+    id 'io.gitlab.arturbosch.detekt'
+}
+
+android {
+    compileSdkVersion rootProject.buildVersions.compileSdkVersion
+    defaultConfig {
+        minSdkVersion rootProject.buildVersions.minSdkVersion
+        consumerProguardFiles "consumer-rules.pro"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        original {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        release {
+            minifyEnabled false
+        }
+        unity {
+            minifyEnabled false
+        }
+    }
+    testOptions {
+        unitTests.all {
+            maxParallelForks 1
+            maxHeapSize '2048m'
+        }
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    namespace 'com.onesignal.core'
+}
+
+tasks.withType(Test) {
+    testLogging {
+        exceptionFormat "full"
+        events "started", "skipped", "passed", "failed"
+        showStandardStreams false // Enable to have logging print
+    }
+}
+
+ext {
+    projectDescription = "OneSignal Android SDK - Core Module"
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+
+    compileOnly('com.amazon.device:amazon-appstore-sdk:[3.0.1, 3.0.99]')
+
+    api('androidx.legacy:legacy-support-v4') {
+        version {
+            require '[1.0.0, 1.0.99]'
+            prefer '1.0.0'
+        }
+    }
+    api('androidx.appcompat:appcompat') {
+        version {
+            require '[1.0.0, 1.3.99]'
+            prefer '1.3.1'
+        }
+    }
+
+    testImplementation("junit:junit:$junitVersion")
+    testImplementation("io.kotest:kotest-runner-junit4:$kotestVersion")
+    testImplementation("io.kotest:kotest-runner-junit4-jvm:$kotestVersion")
+    testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
+    testImplementation("io.kotest:kotest-property:$kotestVersion")
+    testImplementation("org.robolectric:robolectric:4.8.1")
+    testImplementation("androidx.test:core-ktx:1.4.0")
+    testImplementation("androidx.test:core:1.4.0")
+    testImplementation("io.mockk:mockk:1.13.2")
+    testImplementation("org.json:json:20180813")
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
+}
+
+apply from: '../maven-push.gradle'
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/consumer-rules.pro b/OneSignalSDK/onesignal/core/consumer-rules.pro
similarity index 100%
rename from OneSignalSDK/onesignal/consumer-rules.pro
rename to OneSignalSDK/onesignal/core/consumer-rules.pro
diff --git a/OneSignalSDK/onesignal/inAppMessages/proguard-rules.pro b/OneSignalSDK/onesignal/core/proguard-rules.pro
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/proguard-rules.pro
rename to OneSignalSDK/onesignal/core/proguard-rules.pro
diff --git a/OneSignalSDK/onesignal/core/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/core/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..f765cdd684
--- /dev/null
+++ b/OneSignalSDK/onesignal/core/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Required so the device can access the internet. -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <application>
+        <service
+          android:name="com.onesignal.core.services.SyncService"
+          android:stopWithTask="true"
+          android:exported="false" />
+
+        <service
+          android:name="com.onesignal.core.services.SyncJobService"
+          android:permission="android.permission.BIND_JOB_SERVICE"
+          android:exported="false" />
+
+        <activity android:name="com.onesignal.core.activities.PermissionsActivity"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:exported="false" />
+    </application>
+
+    <!-- NOTE: See release version for tags with placeholders -->
+</manifest>
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/Continue.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/Continue.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/Continue.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/Continue.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/IOneSignal.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IOneSignal.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/IOneSignal.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IOneSignal.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/OneSignal.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/OneSignal.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/AndroidSupportV4Compat.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/AndroidSupportV4Compat.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/AndroidSupportV4Compat.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/AndroidSupportV4Compat.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/AndroidUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/AndroidUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/AndroidUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/AndroidUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/DateUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/DateUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/DateUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/DateUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/DeviceUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/DeviceUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/DeviceUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/DeviceUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/IDManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/IDManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/IDManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/IDManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/JSONObjectExtensions.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONObjectExtensions.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/JSONObjectExtensions.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONObjectExtensions.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/JSONUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/JSONUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/NetworkUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/NetworkUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/NetworkUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/NetworkUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/OneSignalUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/OneSignalUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/OneSignalUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/OneSignalUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/RootToolsInternalMethods.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/RootToolsInternalMethods.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/RootToolsInternalMethods.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/RootToolsInternalMethods.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/TimeUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/TimeUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/TimeUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/TimeUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/ViewUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/ViewUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/ViewUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/ViewUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/CallbackProducer.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/CallbackProducer.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/CallbackProducer.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/CallbackProducer.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/EventProducer.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/EventProducer.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/EventProducer.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/EventProducer.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/ICallbackNotifier.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/ICallbackNotifier.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/ICallbackNotifier.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/ICallbackNotifier.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/IEventNotifier.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/IEventNotifier.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/events/IEventNotifier.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/events/IEventNotifier.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/exceptions/BackendException.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/exceptions/BackendException.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/exceptions/BackendException.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/exceptions/BackendException.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/exceptions/MainThreadException.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/exceptions/MainThreadException.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/exceptions/MainThreadException.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/exceptions/MainThreadException.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelChangedHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/IModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/IModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/IModelStoreChangeHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelStoreChangeHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/IModelStoreChangeHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelStoreChangeHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/ISingletonModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ISingletonModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/ISingletonModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ISingletonModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/ISingletonModelStoreChangeHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ISingletonModelStoreChangeHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/ISingletonModelStoreChangeHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ISingletonModelStoreChangeHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/MapModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/MapModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/MapModel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/MapModel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/Model.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/Model.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/ModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/ModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/SimpleModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SimpleModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/SimpleModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SimpleModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modules/IModule.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modules/IModule.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/modules/IModule.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modules/IModule.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/IServiceBuilder.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/IServiceBuilder.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/IServiceBuilder.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/IServiceBuilder.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/IServiceProvider.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/IServiceProvider.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/IServiceProvider.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/IServiceProvider.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/ServiceBuilder.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceBuilder.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/ServiceBuilder.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceBuilder.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/ServiceProvider.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceProvider.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/ServiceProvider.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceProvider.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/ServiceRegistration.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceRegistration.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/services/ServiceRegistration.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/services/ServiceRegistration.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/threading/ThreadUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/threading/ThreadUtils.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/threading/ThreadUtils.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/threading/ThreadUtils.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/common/threading/Waiter.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/threading/Waiter.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/common/threading/Waiter.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/threading/Waiter.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/CoreModule.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/CoreModule.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/CoreModule.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/CoreModule.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt
similarity index 99%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt
index 20c6a03249..2e402c4c37 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt
@@ -7,8 +7,8 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import com.onesignal.OneSignal
-import com.onesignal.R
 import com.onesignal.common.AndroidSupportV4Compat
+import com.onesignal.core.R
 import com.onesignal.core.internal.permissions.impl.RequestPermissionService
 
 class PermissionsActivity : Activity() {
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/AppEntryAction.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/AppEntryAction.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/AppEntryAction.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/AppEntryAction.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/IActivityLifecycleHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/IActivityLifecycleHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/IActivityLifecycleHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/IActivityLifecycleHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/IApplicationLifecycleHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/IApplicationLifecycleHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/IApplicationLifecycleHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/IApplicationLifecycleHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/IApplicationService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/IApplicationService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/IApplicationService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/IApplicationService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/impl/ISystemConditionHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ISystemConditionHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/impl/ISystemConditionHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ISystemConditionHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/backend/IParamsBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/IParamsBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/backend/IParamsBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/IParamsBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/backend/impl/ParamsBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/impl/ParamsBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/backend/impl/ParamsBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/impl/ParamsBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/background/IBackgroundManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/IBackgroundManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/background/IBackgroundManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/IBackgroundManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/background/IBackgroundService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/IBackgroundService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/background/IBackgroundService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/IBackgroundService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/ConfigModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/ConfigModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/ICursor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/ICursor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/ICursor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/ICursor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/IDatabase.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/IDatabase.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/IDatabase.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/IDatabase.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/IDatabaseProvider.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/IDatabaseProvider.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/IDatabaseProvider.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/IDatabaseProvider.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/DatabaseCursor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/DatabaseCursor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/DatabaseCursor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/DatabaseCursor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/DatabaseProvider.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/DatabaseProvider.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/DatabaseProvider.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/DatabaseProvider.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/OSDatabase.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/OSDatabase.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/OSDatabase.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/OSDatabase.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/OneSignalDbContract.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/OneSignalDbContract.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/database/impl/OneSignalDbContract.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/OneSignalDbContract.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/device/IDeviceService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/device/IDeviceService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/device/IDeviceService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/device/IDeviceService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/device/impl/DeviceService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/device/impl/DeviceService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/device/impl/DeviceService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/device/impl/DeviceService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/HttpResponse.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/HttpResponse.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/HttpResponse.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/HttpResponse.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/HttpConnectionFactory.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpConnectionFactory.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/HttpConnectionFactory.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpConnectionFactory.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/IHttpConnectionFactory.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/IHttpConnectionFactory.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/IHttpConnectionFactory.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/IHttpConnectionFactory.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/TLS12SocketFactory.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/TLS12SocketFactory.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/http/impl/TLS12SocketFactory.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/TLS12SocketFactory.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/language/ILanguageContext.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/language/ILanguageContext.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/language/ILanguageContext.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/language/ILanguageContext.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/language/impl/LanguageContext.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/language/impl/LanguageContext.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/language/impl/LanguageContext.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/language/impl/LanguageContext.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/language/impl/LanguageProviderDevice.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/language/impl/LanguageProviderDevice.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/language/impl/LanguageProviderDevice.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/language/impl/LanguageProviderDevice.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/IOperationRepo.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationRepo.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/IOperationRepo.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationRepo.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/Operation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/Operation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/Operation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/Operation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/listeners/ModelStoreListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/listeners/ModelStoreListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/listeners/ModelStoreListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/listeners/ModelStoreListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/listeners/SingletonModelStoreListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/listeners/SingletonModelStoreListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/operations/listeners/SingletonModelStoreListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/listeners/SingletonModelStoreListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt
similarity index 98%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt
index 7980d7cbd7..21575e2d7a 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/AlertDialogPrepromptForAndroidSettings.kt
@@ -29,7 +29,7 @@ package com.onesignal.core.internal.permissions
 
 import android.app.Activity
 import android.app.AlertDialog
-import com.onesignal.R
+import com.onesignal.core.R
 
 /**
  * A singleton helper which will display the fallback-to-settings alert dialog.
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/IRequestPermissionService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/IRequestPermissionService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/IRequestPermissionService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/IRequestPermissionService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/impl/RequestPermissionService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/impl/RequestPermissionService.kt
similarity index 99%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/impl/RequestPermissionService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/impl/RequestPermissionService.kt
index 2cee6487e9..88b11bfff3 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/permissions/impl/RequestPermissionService.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/permissions/impl/RequestPermissionService.kt
@@ -2,7 +2,7 @@ package com.onesignal.core.internal.permissions.impl
 
 import android.app.Activity
 import android.content.Intent
-import com.onesignal.R
+import com.onesignal.core.R
 import com.onesignal.core.activities.PermissionsActivity
 import com.onesignal.core.internal.application.IActivityLifecycleHandler
 import com.onesignal.core.internal.application.IApplicationService
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/preferences/IPreferencesService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/preferences/IPreferencesService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/preferences/IPreferencesService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/preferences/IPreferencesService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/preferences/impl/PreferencesService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/preferences/impl/PreferencesService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/preferences/impl/PreferencesService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/preferences/impl/PreferencesService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/purchases/impl/TrackAmazonPurchase.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackAmazonPurchase.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/purchases/impl/TrackAmazonPurchase.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackAmazonPurchase.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/startup/IStartableService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/startup/IStartableService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/startup/IStartableService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/startup/IStartableService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/startup/StartupService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/startup/StartupService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/startup/StartupService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/startup/StartupService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/time/ITime.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/time/ITime.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/time/ITime.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/time/ITime.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/time/impl/Time.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/time/impl/Time.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/time/impl/Time.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/time/impl/Time.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/services/SyncJobService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/services/SyncJobService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/services/SyncJobService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/services/SyncJobService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/core/services/SyncService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/services/SyncService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/core/services/SyncService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/services/SyncService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/IDebugManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/IDebugManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/IDebugManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/IDebugManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/LogLevel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/LogLevel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/LogLevel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/LogLevel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/internal/DebugManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/DebugManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/internal/DebugManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/DebugManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/internal/logging/Logging.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/Logging.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/debug/internal/logging/Logging.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/Logging.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessage.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessage.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessage.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessage.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageAction.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageAction.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageAction.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageAction.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickResult.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickResult.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickResult.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageClickResult.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageLifecycleHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageLifecycleHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessageLifecycleHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessageLifecycleHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessagesManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessagesManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/IInAppMessagesManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessagesManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/InAppMessageActionUrlType.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/InAppMessageActionUrlType.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/InAppMessageActionUrlType.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/InAppMessageActionUrlType.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/internal/MisconfiguredIAMManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/internal/MisconfiguredIAMManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/inAppMessages/internal/MisconfiguredIAMManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/internal/MisconfiguredIAMManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/internal/OneSignalImp.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal/OneSignalImp.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/internal/OneSignalImp.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal/OneSignalImp.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/location/ILocationManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/location/ILocationManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/location/ILocationManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/location/ILocationManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/location/internal/MisconfiguredLocationManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/location/internal/MisconfiguredLocationManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/location/internal/MisconfiguredLocationManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/location/internal/MisconfiguredLocationManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/BackgroundImageLayout.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/BackgroundImageLayout.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/BackgroundImageLayout.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/BackgroundImageLayout.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IActionButton.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IActionButton.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IActionButton.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IActionButton.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IMutableNotification.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IMutableNotification.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IMutableNotification.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IMutableNotification.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotification.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotification.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotification.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotification.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationAction.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationAction.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationAction.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationAction.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationClickHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationClickHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationClickHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationClickHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationClickResult.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationClickResult.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationClickResult.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationClickResult.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationReceivedEvent.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationReceivedEvent.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationReceivedEvent.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationReceivedEvent.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationWillShowInForegroundHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationWillShowInForegroundHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationWillShowInForegroundHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationWillShowInForegroundHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationsManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationsManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/INotificationsManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/INotificationsManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IPermissionChangedHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IPermissionChangedHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IPermissionChangedHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IPermissionChangedHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IRemoteNotificationReceivedHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IRemoteNotificationReceivedHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/IRemoteNotificationReceivedHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/IRemoteNotificationReceivedHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/internal/MisconfiguredNotificationsManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/internal/MisconfiguredNotificationsManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/notifications/internal/MisconfiguredNotificationsManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/notifications/internal/MisconfiguredNotificationsManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/ISessionManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/ISessionManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/ISessionManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/ISessionManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/SessionModule.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/SessionModule.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/SessionModule.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/SessionModule.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/SessionManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/SessionManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/SessionManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/SessionManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/IInfluenceManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/IInfluenceManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/IInfluenceManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/IInfluenceManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/Influence.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/Influence.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/Influence.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/Influence.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/InfluenceChannel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/InfluenceChannel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/InfluenceChannel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/InfluenceChannel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/InfluenceType.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/InfluenceType.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/InfluenceType.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/InfluenceType.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/ChannelTracker.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/ChannelTracker.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/ChannelTracker.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/ChannelTracker.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/IChannelTracker.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/IChannelTracker.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/IChannelTracker.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/IChannelTracker.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/IInfluenceDataRepository.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/IInfluenceDataRepository.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/IInfluenceDataRepository.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/IInfluenceDataRepository.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InAppMessageTracker.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InAppMessageTracker.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InAppMessageTracker.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InAppMessageTracker.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceConstants.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceConstants.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceConstants.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceConstants.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceDataRepository.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceDataRepository.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceDataRepository.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceDataRepository.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/InfluenceManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/NotificationTracker.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/NotificationTracker.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/influence/impl/NotificationTracker.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/influence/impl/NotificationTracker.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEvent.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEvent.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEvent.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEvent.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEventsController.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEventsController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEventsController.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/IOutcomeEventsController.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/CachedUniqueOutcome.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/CachedUniqueOutcome.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/CachedUniqueOutcome.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/CachedUniqueOutcome.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsPreferences.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsPreferences.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsPreferences.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsPreferences.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsRepository.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsRepository.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsRepository.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/IOutcomeEventsRepository.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeConstants.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeConstants.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeConstants.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeConstants.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEvent.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEvent.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEvent.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEvent.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventParams.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventParams.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventParams.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventParams.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsPreferences.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsPreferences.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsPreferences.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsPreferences.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsRepository.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsRepository.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsRepository.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsRepository.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSource.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSource.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSource.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSource.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSourceBody.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSourceBody.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSourceBody.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeSourceBody.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeTableProvider.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeTableProvider.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeTableProvider.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeTableProvider.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomesDbContract.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomesDbContract.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomesDbContract.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomesDbContract.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/ISessionLifecycleHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/ISessionLifecycleHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/ISessionLifecycleHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/ISessionLifecycleHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/ISessionService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/ISessionService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/ISessionService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/ISessionService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/SessionModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/SessionModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/SessionModel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/SessionModel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/SessionModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/SessionModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/SessionModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/SessionModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/impl/SessionService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/session/internal/session/impl/SessionService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/IUserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/IUserManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/UserModule.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserModule.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/UserModule.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserModule.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/EmailSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/EmailSubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/EmailSubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/EmailSubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/PushSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/PushSubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/PushSubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/PushSubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/SmsSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/SmsSubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/SmsSubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/SmsSubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/Subscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/Subscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/Subscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/Subscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt
similarity index 90%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/UserManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt
index 240a3d9a9c..eb947d435a 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/UserManager.kt
+++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt
@@ -11,6 +11,7 @@ import com.onesignal.user.internal.properties.PropertiesModel
 import com.onesignal.user.internal.properties.PropertiesModelStore
 import com.onesignal.user.internal.subscriptions.ISubscriptionManager
 import com.onesignal.user.subscriptions.IPushSubscription
+import com.onesignal.user.subscriptions.SubscriptionList
 
 internal open class UserManager(
     private val _subscriptionManager: ISubscriptionManager,
@@ -18,10 +19,23 @@ internal open class UserManager(
     private val _propertiesModelStore: PropertiesModelStore,
     private val _languageContext: ILanguageContext
 ) : IUserManager {
+
+    val externalId: String?
+        get() = _identityModel.externalId
+
     override var language: String
         get() = _languageContext.language
         set(value) { _languageContext.language = value }
 
+    val tags: Map<String, String>
+        get() = _propertiesModel.tags
+
+    val aliases: Map<String, String>
+        get() = _identityModel.filter { it.key != IdentityModel::id.name }.toMap()
+
+    val subscriptions: SubscriptionList
+        get() = _subscriptionManager.subscriptions
+
     override val pushSubscription: IPushSubscription
         get() = _subscriptionManager.subscriptions.push
 
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/IIdentityBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IIdentityBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/IIdentityBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IIdentityBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/PropertiesDeltasObject.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/PropertiesDeltasObject.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/PropertiesDeltasObject.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/PropertiesDeltasObject.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/PropertiesObject.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/PropertiesObject.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/PropertiesObject.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/PropertiesObject.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/SubscriptionObject.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/SubscriptionObject.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/SubscriptionObject.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/SubscriptionObject.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/SubscriptionObjectType.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/SubscriptionObjectType.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/SubscriptionObjectType.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/SubscriptionObjectType.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/IdentityBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/IdentityBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/IdentityBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/IdentityBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/JSONConverter.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/JSONConverter.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/JSONConverter.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/JSONConverter.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/identity/IdentityModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/identity/IdentityModel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/CreateSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/CreateSubscriptionOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/CreateSubscriptionOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/CreateSubscriptionOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteAliasOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteTagOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/RefreshUserOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/RefreshUserOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/RefreshUserOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/RefreshUserOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetAliasOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetPropertyOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/SetTagOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/TrackPurchaseOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TrackPurchaseOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/TrackPurchaseOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TrackPurchaseOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/TrackSessionEndOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TrackSessionEndOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/TrackSessionEndOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TrackSessionEndOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/TrackSessionStartOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TrackSessionStartOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/TrackSessionStartOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/TrackSessionStartOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/UpdateSubscriptionOperation.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/UpdateSubscriptionOperation.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/UpdateSubscriptionOperation.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/UpdateSubscriptionOperation.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/PropertyOperationHelper.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/PropertyOperationHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/PropertyOperationHelper.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/PropertyOperationHelper.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/SubscriptionOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/SubscriptionOperationExecutor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/SubscriptionOperationExecutor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/SubscriptionOperationExecutor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/UpdateUserOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/UpdateUserOperationExecutor.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/executors/UpdateUserOperationExecutor.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/UpdateUserOperationExecutor.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/listeners/IdentityModelStoreListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/IdentityModelStoreListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/listeners/IdentityModelStoreListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/IdentityModelStoreListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/listeners/PropertiesModelStoreListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/PropertiesModelStoreListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/listeners/PropertiesModelStoreListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/PropertiesModelStoreListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/listeners/SubscriptionModelStoreListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/SubscriptionModelStoreListener.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/operations/impl/listeners/SubscriptionModelStoreListener.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/SubscriptionModelStoreListener.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/properties/PropertiesModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/properties/PropertiesModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/properties/PropertiesModel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/properties/PropertiesModel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/properties/PropertiesModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/properties/PropertiesModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/properties/PropertiesModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/properties/PropertiesModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/ISubscriptionManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/ISubscriptionManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/ISubscriptionManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/ISubscriptionManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModelStore.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModelStore.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/impl/SubscriptionManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/impl/SubscriptionManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/subscriptions/impl/SubscriptionManager.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/impl/SubscriptionManager.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/IEmailSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/IEmailSubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/IEmailSubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/IEmailSubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/IPushSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/IPushSubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/IPushSubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/IPushSubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/ISmsSubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/ISmsSubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/ISmsSubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/ISmsSubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/ISubscription.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/ISubscription.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/ISubscription.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/ISubscription.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/ISubscriptionChangedHandler.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/ISubscriptionChangedHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/ISubscriptionChangedHandler.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/ISubscriptionChangedHandler.kt
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/SubscriptionList.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/SubscriptionList.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/java/com/onesignal/user/subscriptions/SubscriptionList.kt
rename to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/subscriptions/SubscriptionList.kt
diff --git a/OneSignalSDK/onesignal/src/main/res/anim/onesignal_fade_in.xml b/OneSignalSDK/onesignal/core/src/main/res/anim/onesignal_fade_in.xml
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/res/anim/onesignal_fade_in.xml
rename to OneSignalSDK/onesignal/core/src/main/res/anim/onesignal_fade_in.xml
diff --git a/OneSignalSDK/onesignal/src/main/res/anim/onesignal_fade_out.xml b/OneSignalSDK/onesignal/core/src/main/res/anim/onesignal_fade_out.xml
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/res/anim/onesignal_fade_out.xml
rename to OneSignalSDK/onesignal/core/src/main/res/anim/onesignal_fade_out.xml
diff --git a/OneSignalSDK/onesignal/src/main/res/raw/consumer_onesignal_keep.xml b/OneSignalSDK/onesignal/core/src/main/res/raw/consumer_onesignal_keep.xml
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/res/raw/consumer_onesignal_keep.xml
rename to OneSignalSDK/onesignal/core/src/main/res/raw/consumer_onesignal_keep.xml
diff --git a/OneSignalSDK/onesignal/src/main/res/values/strings.xml b/OneSignalSDK/onesignal/core/src/main/res/values/strings.xml
similarity index 100%
rename from OneSignalSDK/onesignal/src/main/res/values/strings.xml
rename to OneSignalSDK/onesignal/core/src/main/res/values/strings.xml
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/application/ApplicationServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/application/ApplicationServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/application/ApplicationServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/application/ApplicationServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/database/InitialOSDatabase.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/database/InitialOSDatabase.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/database/InitialOSDatabase.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/database/InitialOSDatabase.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/database/OSDatabaseTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/database/OSDatabaseTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/database/OSDatabaseTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/database/OSDatabaseTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/http/MockHttpConnectionFactory.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/MockHttpConnectionFactory.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/http/MockHttpConnectionFactory.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/MockHttpConnectionFactory.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/preferences/PreferencesServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/preferences/PreferencesServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/preferences/PreferencesServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/preferences/PreferencesServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/startup/StartupServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/startup/StartupServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/core/internal/startup/StartupServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/startup/StartupServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/extensions/ContainedRobolectricRunner.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/extensions/ContainedRobolectricRunner.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/extensions/ContainedRobolectricRunner.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/extensions/ContainedRobolectricRunner.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/extensions/RobolectricExtension.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/extensions/RobolectricExtension.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/extensions/RobolectricExtension.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/extensions/RobolectricExtension.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/AndroidMockHelper.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/AndroidMockHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/AndroidMockHelper.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/AndroidMockHelper.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/DatabaseMockHelper.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/MockHelper.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/MockHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/MockHelper.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/MockHelper.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/MockPreferencesService.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/MockPreferencesService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/MockPreferencesService.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/mocks/MockPreferencesService.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/influence/InfluenceManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/influence/InfluenceManagerTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/influence/InfluenceManagerTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/influence/InfluenceManagerTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsBackendServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsBackendServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsBackendServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsBackendServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt
similarity index 99%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt
index b4d1c6867e..30afa6bc82 100644
--- a/OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt
+++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt
@@ -1,6 +1,7 @@
 package com.onesignal.session.internal.outcomes
 
 import com.onesignal.common.exceptions.BackendException
+import com.onesignal.common.threading.Waiter
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.mocks.MockHelper
@@ -307,6 +308,7 @@ class OutcomeEventsControllerTests : FunSpec({
 
     test("send unique outcome with same indirect influences") {
         /* Given */
+        val waiter = Waiter()
         val now = 111L
         val notificationIds = "[\"id1\",\"id2\"]"
         val mockSessionService = mockk<ISessionService>()
@@ -318,7 +320,7 @@ class OutcomeEventsControllerTests : FunSpec({
 
         val mockOutcomeEventsRepository = mockk<IOutcomeEventsRepository>()
         coEvery { mockOutcomeEventsRepository.getNotCachedUniqueInfluencesForOutcome("OUTCOME_1", any()) } returns listOf(notificationInfluence) andThen listOf()
-        coEvery { mockOutcomeEventsRepository.saveUniqueOutcomeEventParams(any()) }
+        coEvery { mockOutcomeEventsRepository.saveUniqueOutcomeEventParams(any()) } answers { waiter.wake() }
 
         val subscriptionModel = SubscriptionModel()
         subscriptionModel.id = "subscriptionId"
@@ -344,6 +346,8 @@ class OutcomeEventsControllerTests : FunSpec({
         val evnt1 = outcomeEventsController.sendUniqueOutcomeEvent("OUTCOME_1")
         val evnt2 = outcomeEventsController.sendUniqueOutcomeEvent("OUTCOME_1")
 
+        waiter.waitForWake()
+
         /* Then */
         evnt1 shouldNotBe null
         evnt1!!.name shouldBe "OUTCOME_1"
@@ -360,6 +364,7 @@ class OutcomeEventsControllerTests : FunSpec({
 
     test("send unique outcome with different indirect influences") {
         /* Given */
+        val waiter = Waiter()
         val now = 111L
         val notificationIds1 = "[\"id1\",\"id2\"]"
         val notificationIds2 = "[\"id3\",\"id4\"]"
@@ -378,7 +383,7 @@ class OutcomeEventsControllerTests : FunSpec({
 
         val mockOutcomeEventsRepository = mockk<IOutcomeEventsRepository>()
         coEvery { mockOutcomeEventsRepository.getNotCachedUniqueInfluencesForOutcome("OUTCOME_1", any()) } returns listOf(notificationInfluence1) andThen listOf(notificationInfluence2)
-        coEvery { mockOutcomeEventsRepository.saveUniqueOutcomeEventParams(any()) }
+        coEvery { mockOutcomeEventsRepository.saveUniqueOutcomeEventParams(any()) } answers { waiter.wake() }
 
         val mockOutcomeEventsPreferences = spyk<IOutcomeEventsPreferences>()
         val mockOutcomeEventsBackend = spyk<IOutcomeEventsBackendService>()
@@ -399,6 +404,8 @@ class OutcomeEventsControllerTests : FunSpec({
         val evnt1 = outcomeEventsController.sendUniqueOutcomeEvent("OUTCOME_1")
         val evnt2 = outcomeEventsController.sendUniqueOutcomeEvent("OUTCOME_1")
 
+        waiter.waitForWake()
+
         /* Then */
         evnt1 shouldNotBe null
         evnt1!!.name shouldBe "OUTCOME_1"
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsRepositoryTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsRepositoryTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsRepositoryTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsRepositoryTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/session/SessionServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/session/SessionServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/session/internal/session/SessionServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/session/SessionServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/UserManagerTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/backend/IdentityBackendServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/IdentityBackendServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/backend/IdentityBackendServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/IdentityBackendServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/backend/UserBackendServiceTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt
similarity index 99%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt
rename to OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt
index bead9d1780..46098254f3 100644
--- a/OneSignalSDK/onesignal/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt
+++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt
@@ -58,7 +58,7 @@ class SubscriptionManagerTests : FunSpec({
         subscriptions.collection.count() shouldBe 3
         subscriptions.push shouldNotBe null
         subscriptions.push!!.id shouldBe pushSubscription.id
-        subscriptions.push!!.pushToken shouldBe pushSubscription.address
+        subscriptions.push!!.token shouldBe pushSubscription.address
         subscriptions.push!!.optedIn shouldBe pushSubscription.optedIn
         subscriptions.emails.count() shouldBe 1
         subscriptions.emails[0].id shouldBe emailSubscription.id
diff --git a/OneSignalSDK/onesignal/in-app-messages/.gitignore b/OneSignalSDK/onesignal/in-app-messages/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/OneSignalSDK/onesignal/in-app-messages/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/inAppMessages/build.gradle b/OneSignalSDK/onesignal/in-app-messages/build.gradle
similarity index 92%
rename from OneSignalSDK/onesignal/inAppMessages/build.gradle
rename to OneSignalSDK/onesignal/in-app-messages/build.gradle
index 93afc8c032..2082df0199 100644
--- a/OneSignalSDK/onesignal/inAppMessages/build.gradle
+++ b/OneSignalSDK/onesignal/in-app-messages/build.gradle
@@ -52,9 +52,13 @@ tasks.withType(Test) {
     }
 }
 
+ext {
+    projectDescription = "OneSignal Android SDK - In App Messages Module"
+}
+
 dependencies {
-    implementation project(':onesignal')
-    implementation project(':onesignal:notifications')
+    implementation project(':OneSignal:core')
+    implementation project(':OneSignal:notifications')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
@@ -83,4 +87,6 @@ dependencies {
     testImplementation("io.mockk:mockk:1.13.2")
     testImplementation("org.json:json:20180813")
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-}
\ No newline at end of file
+}
+
+apply from: '../maven-push.gradle'
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/inAppMessages/consumer-rules.pro b/OneSignalSDK/onesignal/in-app-messages/consumer-rules.pro
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/consumer-rules.pro
rename to OneSignalSDK/onesignal/in-app-messages/consumer-rules.pro
diff --git a/OneSignalSDK/onesignal/in-app-messages/proguard-rules.pro b/OneSignalSDK/onesignal/in-app-messages/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/OneSignalSDK/onesignal/in-app-messages/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
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/in-app-messages/src/main/AndroidManifest.xml
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/AndroidManifest.xml
rename to OneSignalSDK/onesignal/in-app-messages/src/main/AndroidManifest.xml
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/InAppMessagesModule.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/InAppMessagesModule.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/InAppMessagesModule.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/InAppMessagesModule.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/DummyInAppMessagesManager.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/DummyInAppMessagesManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/DummyInAppMessagesManager.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/DummyInAppMessagesManager.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessage.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessage.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessage.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessage.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageAction.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageAction.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageAction.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageAction.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageClickResult.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageClickResult.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageClickResult.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageClickResult.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageContent.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageContent.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageContent.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageContent.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageOutcome.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageOutcome.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageOutcome.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageOutcome.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagePage.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagePage.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagePage.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagePage.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageRedisplayStats.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageRedisplayStats.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageRedisplayStats.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageRedisplayStats.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageTag.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageTag.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageTag.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageTag.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/Trigger.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/Trigger.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/Trigger.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/Trigger.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/backend/IInAppBackendService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/IInAppBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/backend/IInAppBackendService.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/IInAppBackendService.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/common/InAppHelper.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/InAppHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/common/InAppHelper.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/InAppHelper.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/common/OneSignalChromeTab.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/IInAppDisplayer.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/IInAppDisplayer.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/IInAppDisplayer.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/IInAppDisplayer.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/DraggableRelativeLayout.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/DraggableRelativeLayout.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/DraggableRelativeLayout.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/DraggableRelativeLayout.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OSWebView.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OSWebView.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OSWebView.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OSWebView.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalAnimate.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalAnimate.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalAnimate.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalAnimate.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalBounceInterpolator.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalBounceInterpolator.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalBounceInterpolator.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/OneSignalBounceInterpolator.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleEventHandler.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleEventHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleEventHandler.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleEventHandler.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleService.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/IInAppLifecycleService.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/lifecycle/impl/IAMLifecycleService.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/preferences/IInAppPreferencesController.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preferences/IInAppPreferencesController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/preferences/IInAppPreferencesController.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preferences/IInAppPreferencesController.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/preferences/impl/InAppPreferencesController.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preferences/impl/InAppPreferencesController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/preferences/impl/InAppPreferencesController.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preferences/impl/InAppPreferencesController.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandler.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandler.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandler.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/IInAppMessagePromptFactory.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/IInAppMessagePromptFactory.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/IInAppMessagePromptFactory.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/IInAppMessagePromptFactory.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessageLocationPrompt.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessageLocationPrompt.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessageLocationPrompt.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessageLocationPrompt.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePrompt.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePromptFactory.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePromptFactory.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePromptFactory.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePromptFactory.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/prompt/impl/InAppMessagePushPrompt.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/repositories/IInAppRepository.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/repositories/IInAppRepository.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/repositories/IInAppRepository.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/repositories/IInAppRepository.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/repositories/impl/InAppRepository.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/repositories/impl/InAppRepository.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/repositories/impl/InAppRepository.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/repositories/impl/InAppRepository.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/state/InAppStateService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/state/InAppStateService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/state/InAppStateService.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/state/InAppStateService.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerController.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerController.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerController.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerHandler.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerHandler.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerHandler.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/ITriggerHandler.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModel.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModel.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModel.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModel.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModelStore.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModelStore.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModelStore.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/TriggerModelStore.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerController.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerController.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerController.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerTimer.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerTimer.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerTimer.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/DynamicTriggerTimer.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/TriggerController.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/TriggerController.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/TriggerController.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/triggers/impl/TriggerController.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/main/res/values/strings.xml b/OneSignalSDK/onesignal/in-app-messages/src/main/res/values/strings.xml
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/main/res/values/strings.xml
rename to OneSignalSDK/onesignal/in-app-messages/src/main/res/values/strings.xml
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/extensions/ContainedRobolectricRunner.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/extensions/ContainedRobolectricRunner.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/extensions/ContainedRobolectricRunner.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/extensions/ContainedRobolectricRunner.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/extensions/RobolectricExtension.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/extensions/RobolectricExtension.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/extensions/RobolectricExtension.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/extensions/RobolectricExtension.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandlerTests.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandlerTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandlerTests.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/preview/InAppMessagePreviewHandlerTests.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/repositories/InAppRepositoryTests.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/repositories/InAppRepositoryTests.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/repositories/InAppRepositoryTests.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/repositories/InAppRepositoryTests.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/AndroidMockHelper.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/AndroidMockHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/AndroidMockHelper.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/AndroidMockHelper.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/DatabaseMockHelper.kt
diff --git a/OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/MockHelper.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/MockHelper.kt
similarity index 100%
rename from OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/mocks/MockHelper.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/MockHelper.kt
diff --git a/OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/MockPreferencesService.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/MockPreferencesService.kt
similarity index 100%
rename from OneSignalSDK/onesignal/src/test/java/com/onesignal/mocks/MockPreferencesService.kt
rename to OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/mocks/MockPreferencesService.kt
diff --git a/OneSignalSDK/onesignal/location/build.gradle b/OneSignalSDK/onesignal/location/build.gradle
index 18dd55638a..f500ee9dea 100644
--- a/OneSignalSDK/onesignal/location/build.gradle
+++ b/OneSignalSDK/onesignal/location/build.gradle
@@ -52,8 +52,12 @@ tasks.withType(Test) {
     }
 }
 
+ext {
+    projectDescription = "OneSignal Android SDK - Location Module"
+}
+
 dependencies {
-    implementation project(':onesignal')
+    implementation project(':OneSignal:core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
@@ -83,4 +87,6 @@ dependencies {
     testImplementation("org.json:json:20180813")
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
     testImplementation("com.google.android.gms:play-services-location:18.0.0")
-}
\ No newline at end of file
+}
+
+apply from: '../maven-push.gradle'
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/internal/background/LocationBackgroundServiceTests.kt b/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/internal/background/LocationBackgroundServiceTests.kt
index 5c3524ad56..4f9e716145 100644
--- a/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/internal/background/LocationBackgroundServiceTests.kt
+++ b/OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/internal/background/LocationBackgroundServiceTests.kt
@@ -55,7 +55,7 @@ class LocationBackgroundServiceTests : FunSpec({
     test("scheduleBackgroundRunIn will return null when location services are disabled in SDK") {
         /* Given */
         val mockLocationManager = mockk<ILocationManager>()
-        every { mockLocationManager.isLocationShared } returns false
+        every { mockLocationManager.isShared } returns false
 
         val mockLocationPreferencesService = mockk<ILocationPreferencesService>()
         val mockLocationCapturer = mockk<ILocationCapturer>()
@@ -73,13 +73,13 @@ class LocationBackgroundServiceTests : FunSpec({
 
         /* Then */
         result shouldBe null
-        verify(exactly = 1) { mockLocationManager.isLocationShared }
+        verify(exactly = 1) { mockLocationManager.isShared }
     }
 
     test("scheduleBackgroundRunIn will return null when no android permissions") {
         /* Given */
         val mockLocationManager = mockk<ILocationManager>()
-        every { mockLocationManager.isLocationShared } returns true
+        every { mockLocationManager.isShared } returns true
 
         val mockLocationPreferencesService = mockk<ILocationPreferencesService>()
         every { mockLocationPreferencesService.lastLocationTime } returns 1111
diff --git a/OneSignalSDK/onesignal/maven-push.gradle b/OneSignalSDK/onesignal/maven-push.gradle
index 586552b791..506225e8a2 100644
--- a/OneSignalSDK/onesignal/maven-push.gradle
+++ b/OneSignalSDK/onesignal/maven-push.gradle
@@ -29,19 +29,14 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 class Global {
-    static def POM_NAME = 'OneSignal'
-    static def POM_ARTIFACT_ID = 'OneSignal'
     static def POM_PACKAGING = 'aar'
-    static def VERSION_NAME = '4.8.2'
 
-    static def GROUP_ID = 'com.onesignal'
-    static def POM_DESCRIPTION = 'OneSignal Android SDK'
-    static def POM_URL = 'https://github.com/one-signal/OneSignal-Android-SDK'
-    static def POM_SCM_URL = 'https://github.com/one-signal/OneSignal-Android-SDK'
-    static def POM_SCM_CONNECTION = 'scm:git:https://github.com/one-signal/OneSignal-Android-SDK'
-    static def POM_SCM_DEV_CONNECTION = 'scm:git:https://github.com/one-signal/OneSignal-Android-SDK'
+    static def POM_URL = 'https://github.com/onesignal/onesignal-android-sdk'
+    static def POM_SCM_URL = 'https://github.com/onesignal/onesignal-android-sdk'
+    static def POM_SCM_CONNECTION = 'scm:git:https://github.com/onesignal/onesignal-android-sdk'
+    static def POM_SCM_DEV_CONNECTION = 'scm:git:https://github.com/onesignal/onesignal-android-sdk'
     static def POM_LICENCE_NAME = 'MIT License'
-    static def POM_LICENCE_URL = 'https://raw.githubusercontent.com/one-signal/OneSignal-Android-SDK/master/LICENSE'
+    static def POM_LICENCE_URL = 'https://raw.githubusercontent.com/onesignal/onesignal-android-sdk/master/LICENSE'
     static def POM_LICENCE_DIST = 'repo'
     static def POM_DEVELOPER_ID = 'OneSignal'
     static def POM_DEVELOPER_NAME = 'Josh Kasten'
@@ -72,14 +67,10 @@ afterEvaluate {
         publications {
             release(MavenPublication) {
                 from components.release
-                groupId = Global.GROUP_ID
-                artifactId = Global.POM_ARTIFACT_ID
-                version = Global.VERSION_NAME
 
                 pom {
-                    name = Global.POM_NAME
                     packaging = Global.POM_PACKAGING
-                    description = Global.POM_DESCRIPTION
+                    description = projectDescription
                     url = Global.POM_URL
 
                     scm {
diff --git a/OneSignalSDK/onesignal/notifications/build.gradle b/OneSignalSDK/onesignal/notifications/build.gradle
index 5263a31aa8..b7a35a8185 100644
--- a/OneSignalSDK/onesignal/notifications/build.gradle
+++ b/OneSignalSDK/onesignal/notifications/build.gradle
@@ -52,10 +52,14 @@ tasks.withType(Test) {
     }
 }
 
+ext {
+    projectDescription = "OneSignal Android SDK - Notifications Module"
+}
+
 dependencies {
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation project(':onesignal')
+    implementation project(':OneSignal:core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
@@ -104,4 +108,6 @@ dependencies {
     testImplementation("io.mockk:mockk:1.13.2")
     testImplementation("org.json:json:20180813")
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-}
\ No newline at end of file
+}
+
+apply from: '../maven-push.gradle'
\ No newline at end of file
diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt
index dcb88f6738..bb4e584297 100644
--- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt
+++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt
@@ -11,8 +11,8 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
 import androidx.core.app.NotificationCompat
-import com.onesignal.R
 import com.onesignal.common.AndroidUtils
+import com.onesignal.core.R
 import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.notifications.internal.bundle.impl.NotificationBundleProcessor
diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt
index c38577806a..4cee6571a6 100644
--- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt
+++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt
@@ -58,7 +58,7 @@ class FCMBroadcastReceiver : BroadcastReceiver() {
             // W/GCM: broadcast intent callback: result=CANCELLED forIntent {
             //    act=com.google.android.c2dm.intent.RECEIVE
             //    flg=0x10000000
-            //    pkg=com.onesignal.example (has extras)
+            //    pkg=com.onesignal.sdktest (has extras)
             // }
             resultCode = Activity.RESULT_OK
         }
diff --git a/OneSignalSDK/onesignal/proguard-rules.pro b/OneSignalSDK/onesignal/proguard-rules.pro
deleted file mode 100644
index b2fbbf24bf..0000000000
--- a/OneSignalSDK/onesignal/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Program Files (x86)\Android\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# 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 *;
-#}
diff --git a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
index f765cdd684..0a0938ae37 100644
--- a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
@@ -1,24 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Required so the device can access the internet. -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <application>
-        <service
-          android:name="com.onesignal.core.services.SyncService"
-          android:stopWithTask="true"
-          android:exported="false" />
-
-        <service
-          android:name="com.onesignal.core.services.SyncJobService"
-          android:permission="android.permission.BIND_JOB_SERVICE"
-          android:exported="false" />
-
-        <activity android:name="com.onesignal.core.activities.PermissionsActivity"
-                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
-                  android:exported="false" />
-    </application>
-
-    <!-- NOTE: See release version for tags with placeholders -->
 </manifest>
diff --git a/OneSignalSDK/settings.gradle b/OneSignalSDK/settings.gradle
index 1c417b671c..1536a738a9 100644
--- a/OneSignalSDK/settings.gradle
+++ b/OneSignalSDK/settings.gradle
@@ -2,12 +2,15 @@
 // This means we can keep the example app as-is so it stays as a real world example.
 gradle.rootProject {
     allprojects {
+        group = 'com.onesignal'
+        version = '5.0.0-alpha1-test'
         configurations.all {
             resolutionStrategy.dependencySubstitution {
-                substitute(module('com.onesignal:OneSignal')).using(project(':onesignal'))
-                substitute(module('com.onesignal:Notifications')).using(project(':onesignal:notifications'))
-                substitute(module('com.onesignal:Location')).using(project(':onesignal:location'))
-                substitute(module('com.onesignal:InAppMessages')).using(project(':onesignal:inAppMessages'))
+                substitute(module('com.onesignal:OneSignal')).using(project(':OneSignal'))
+                substitute(module('com.onesignal:core')).using(project(':OneSignal:core'))
+                substitute(module('com.onesignal:notifications')).using(project(':OneSignal:notifications'))
+                substitute(module('com.onesignal:location')).using(project(':OneSignal:location'))
+                substitute(module('com.onesignal:in-app-messages')).using(project(':OneSignal:in-app-messages'))
             }
         }
     }
@@ -17,6 +20,8 @@ include ':app'
 project(':app').projectDir = new File(settingsDir, '../examples/OneSignalDemo/app')
 
 include ':onesignal'
-include ':onesignal:inAppMessages'
-include ':onesignal:location'
-include ':onesignal:notifications'
+project(':onesignal').name = "OneSignal"
+include ':OneSignal:core'
+include ':OneSignal:in-app-messages'
+include ':OneSignal:location'
+include ':OneSignal:notifications'