diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fcb19bf38..b589d56e9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="18" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6e5599c54..8d8c0c577 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,13 +4,64 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/build-logic" name="build-logic">
+                <projects>
+                  <project path="$PROJECT_DIR$/build-logic" />
+                  <project path="$PROJECT_DIR$/build-logic/convention" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/providers" />
+            <option value="$PROJECT_DIR$/build-logic" />
+            <option value="$PROJECT_DIR$/build-logic/convention" />
+            <option value="$PROJECT_DIR$/core" />
+            <option value="$PROJECT_DIR$/core/database" />
+            <option value="$PROJECT_DIR$/core/datastore" />
+            <option value="$PROJECT_DIR$/core/network" />
+            <option value="$PROJECT_DIR$/core/theme" />
+            <option value="$PROJECT_DIR$/core/ui" />
+            <option value="$PROJECT_DIR$/core/util" />
+            <option value="$PROJECT_DIR$/data" />
+            <option value="$PROJECT_DIR$/data/configuration" />
+            <option value="$PROJECT_DIR$/data/provider" />
+            <option value="$PROJECT_DIR$/data/tmdb" />
+            <option value="$PROJECT_DIR$/data/user" />
+            <option value="$PROJECT_DIR$/data/util" />
+            <option value="$PROJECT_DIR$/data/watch_history" />
+            <option value="$PROJECT_DIR$/data/watchlist" />
+            <option value="$PROJECT_DIR$/domain" />
+            <option value="$PROJECT_DIR$/domain/database" />
+            <option value="$PROJECT_DIR$/domain/home" />
+            <option value="$PROJECT_DIR$/domain/provider" />
+            <option value="$PROJECT_DIR$/domain/tmdb" />
+            <option value="$PROJECT_DIR$/extractor" />
+            <option value="$PROJECT_DIR$/extractor/base" />
+            <option value="$PROJECT_DIR$/extractor/mixdrop" />
+            <option value="$PROJECT_DIR$/extractor/upcloud" />
+            <option value="$PROJECT_DIR$/feature" />
+            <option value="$PROJECT_DIR$/feature/mobile" />
+            <option value="$PROJECT_DIR$/feature/mobile/home" />
+            <option value="$PROJECT_DIR$/model" />
+            <option value="$PROJECT_DIR$/model/configuration" />
+            <option value="$PROJECT_DIR$/model/database" />
+            <option value="$PROJECT_DIR$/model/datastore" />
+            <option value="$PROJECT_DIR$/model/provider" />
+            <option value="$PROJECT_DIR$/model/tmdb" />
+            <option value="$PROJECT_DIR$/provider" />
+            <option value="$PROJECT_DIR$/provider/base" />
+            <option value="$PROJECT_DIR$/provider/flixhq" />
+            <option value="$PROJECT_DIR$/provider/lookmovie" />
+            <option value="$PROJECT_DIR$/provider/superstream" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d994a..f8467b458 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="1.9.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 02e713959..8978d23db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="18" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index d04f4e3a5..000000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,232 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'dagger.hilt.android.plugin'
-    id "com.google.devtools.ksp"
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
-}
-
-// Version
-def versionMajor = 1
-def versionMinor = 4
-def versionPatch = 0
-def versionBuild = 0
-def applicationName = "Flixclusive"
-
-android {
-    namespace 'com.flixclusive'
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "com.flixclusive"
-        minSdk 21
-        targetSdk 34
-        versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
-        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.debug
-
-            resValue "string", "app_name", applicationName
-        }
-
-        debug {
-            applicationIdSuffix ".debug"
-            versionNameSuffix "-DEBUG"
-            resValue "string", "app_name", applicationName + " Debug"
-        }
-    }
-
-    applicationVariants.configureEach { variant ->
-        variant.addJavaSourceFoldersToModel(
-            new File(buildDir, "generated/ksp/${variant.name}/kotlin")
-        )
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_18
-        coreLibraryDesugaringEnabled true
-    }
-
-    kotlinOptions {
-        jvmTarget = '18'
-        freeCompilerArgs += "-opt-in=androidx.tv.material3.ExperimentalTvMaterial3Api"
-        freeCompilerArgs += "-opt-in=androidx.tv.foundation.ExperimentalTvFoundationApi"
-    }
-    buildFeatures {
-        compose true
-        buildConfig true
-        viewBinding true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.0'
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-
-}
-
-dependencies {
-    def tvCompose = '1.0.0-alpha10'
-    def composeUi = '1.6.0-alpha04'
-    def googleMaterial = "1.10.0"
-    def material3 = "1.1.2"
-    def media3 = "1.2.0"
-    def splashScreen = "1.0.1"
-    def hilt = "2.48"
-    def hiltNavigation = "1.1.0"
-    def retrofit2 = "2.9.0"
-    def composeDestination = '1.9.53'
-    def lifecycleRuntime = "2.6.2"
-    def room = "2.6.1"
-    def dataStore = "1.0.0"
-    def coreKtx = "1.12.0"
-    def serialization = '1.6.0'
-    def activityCompose = "1.8.1"
-    def constraintLayout = "1.0.1"
-    def gson = "2.10.1"
-    def coil = "2.4.0"
-    def jUnit4 = "4.13.2"
-    def mock = '1.13.8'
-    def coroutinesTest = '1.7.3'
-    def androidXTestCore = "1.5.0"
-    def androidXTestRunner = "1.5.2"
-    def androidXTestRules = "1.5.0"
-    def accompanistPermission = "0.32.0"
-    def conscrypt = "2.5.2"
-
-    // TLS 1.3
-    implementation "org.conscrypt:conscrypt-android:$conscrypt"
-
-    // Embedded Providers
-    implementation(project(path: ":providers"))
-
-    // Permission
-    implementation "com.google.accompanist:accompanist-permissions:$accompanistPermission"
-
-    // Datastore
-    implementation "androidx.datastore:datastore-preferences:$dataStore"
-
-    // Core KTX
-    implementation "androidx.core:core-ktx:$coreKtx"
-
-    // Serialization
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization"
-
-    // Lifecycle
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleRuntime"
-    implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycleRuntime"
-
-    // UI Stuffs
-    implementation "androidx.activity:activity-compose:$activityCompose"
-    implementation "androidx.compose.ui:ui:$composeUi"
-    implementation "androidx.compose.ui:ui-graphics:$composeUi"
-    implementation "androidx.compose.animation:animation-graphics:$composeUi"
-    debugImplementation "androidx.compose.ui:ui-tooling:$composeUi"
-    implementation "androidx.compose.ui:ui-tooling-preview:$composeUi"
-    implementation "androidx.compose.ui:ui-viewbinding:$composeUi"
-    implementation "androidx.compose.foundation:foundation:$composeUi"
-    implementation "com.google.android.material:material:$googleMaterial"
-
-    // Compose for Mobile
-    implementation "androidx.compose.material3:material3:$material3"
-
-    // Compose for TV dependencies
-    implementation "androidx.tv:tv-foundation:$tvCompose"
-    implementation "androidx.tv:tv-material:$tvCompose"
-
-    // Exoplayer
-    implementation "androidx.media3:media3-session:$media3"
-    implementation "androidx.media3:media3-exoplayer:$media3"
-    implementation "androidx.media3:media3-exoplayer-hls:$media3"
-    implementation "androidx.media3:media3-ui:$media3"
-    implementation "androidx.media3:media3-ui-leanback:$media3"
-    implementation "androidx.media3:media3-cast:$media3"
-    implementation "androidx.media3:media3-common:$media3"
-    implementation "androidx.media3:media3-datasource-okhttp:$media3"
-
-    // ConstraintLayout
-    implementation "androidx.constraintlayout:constraintlayout-compose:$constraintLayout"
-
-    // Room
-    implementation "androidx.room:room-runtime:$room"
-    ksp "androidx.room:room-compiler:$room"
-    implementation "androidx.room:room-ktx:$room"
-
-    // Powerful URI provider
-    implementation "com.github.seven332:unifile:1.0.0"
-
-    // Retrofit2
-    implementation "com.squareup.retrofit2:retrofit:$retrofit2"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit2"
-    implementation "com.squareup.retrofit2:converter-scalars:$retrofit2"
-
-    // Gson
-    implementation "com.google.code.gson:gson:$gson"
-
-    // Coil
-    implementation "io.coil-kt:coil-compose:$coil"
-
-    // Hilt
-    implementation "com.google.dagger:hilt-android:$hilt"
-    ksp "com.google.dagger:hilt-android-compiler:$hilt"
-    implementation "androidx.hilt:hilt-navigation-compose:$hiltNavigation"
-
-    // Compose Destinations by raamcosta
-    implementation "io.github.raamcosta.compose-destinations:animations-core:$composeDestination"
-    ksp "io.github.raamcosta.compose-destinations:ksp:$composeDestination"
-
-    // SplashScreen
-    implementation("androidx.core:core-splashscreen:$splashScreen")
-
-    // Jsoup - for testing only
-    implementation "org.jsoup:jsoup:1.16.1"
-
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
-
-    // Test dependencies
-    androidTestImplementation "androidx.test:core:$androidXTestCore"
-    androidTestImplementation "androidx.test:core-ktx:$androidXTestCore"
-    androidTestImplementation "androidx.test:runner:$androidXTestRunner"
-    androidTestImplementation "androidx.test:rules:$androidXTestRules"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$composeUi"
-
-    androidTestImplementation "junit:junit:$jUnit4"
-    androidTestImplementation "io.mockk:mockk:$mock"
-    androidTestImplementation project(path: ':providers')
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesTest"
-}
-
-ksp {
-    arg(new RoomSchemaArgProvider(new File(projectDir, "schemas")))
-}
-
-class RoomSchemaArgProvider implements CommandLineArgumentProvider {
-
-    @InputDirectory
-    @PathSensitive(PathSensitivity.RELATIVE)
-    File schemaDir
-
-    RoomSchemaArgProvider(File schemaDir) {
-        this.schemaDir = schemaDir
-    }
-
-    @Override
-    Iterable<String> asArguments() {
-        return ["room.schemaLocation=${schemaDir.path}".toString()]
-    }
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 000000000..bb9259435
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,116 @@
+plugins {
+    alias(libs.plugins.flixclusive.application)
+    alias(libs.plugins.flixclusive.compose)
+    alias(libs.plugins.flixclusive.hilt)
+    alias(libs.plugins.flixclusive.room)
+}
+
+// Version
+val versionMajor = 1
+val versionMinor = 4
+val versionPatch = 0
+val versionBuild = 0
+val applicationName = libs.versions.applicationName.get()
+
+android {
+    namespace = "com.flixclusive"
+
+    defaultConfig {
+        applicationId = "com.flixclusive"
+        versionCode = versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
+        versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            isShrinkResources  = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+
+            resValue("string", "app_name", applicationName)
+        }
+
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-DEBUG"
+            resValue("string", "app_name", applicationName + " Debug")
+        }
+    }
+
+    packaging {
+        resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
+    }
+}
+
+dependencies {
+    val media3 = "1.2.0"
+    val retrofit2 = "2.9.0"
+    val composeDestination = "1.9.53"
+    val dataStore = "1.0.0"
+    val gson = "2.10.1"
+    val coil = "2.4.0"
+    val jUnit4 = "4.13.2"
+    val mock = "1.13.8"
+    val coroutinesTest = "1.7.3"
+    val androidXTestCore = "1.5.0"
+    val androidXTestRunner = "1.5.2"
+    val androidXTestRules = "1.5.0"
+
+    // Core KTX
+    implementation(libs.core.ktx)
+
+    // Splash Screen
+    implementation(libs.core.splashscreen)
+
+    // Datastore
+    implementation ("androidx.datastore:datastore-preferences:$dataStore")
+
+    // Exoplayer
+    implementation ("androidx.media3:media3-session:$media3")
+    implementation ("androidx.media3:media3-exoplayer:$media3")
+    implementation ("androidx.media3:media3-exoplayer-hls:$media3")
+    implementation ("androidx.media3:media3-ui:$media3")
+    implementation ("androidx.media3:media3-ui-leanback:$media3")
+    implementation ("androidx.media3:media3-cast:$media3")
+    implementation ("androidx.media3:media3-common:$media3")
+    implementation ("androidx.media3:media3-datasource-okhttp:$media3")
+
+    // Powerful URI provider
+    implementation ("com.github.seven332:unifile:1.0.0")
+
+    // Retrofit2
+    implementation ("com.squareup.retrofit2:retrofit:$retrofit2")
+    implementation ("com.squareup.retrofit2:converter-gson:$retrofit2")
+    implementation ("com.squareup.retrofit2:converter-scalars:$retrofit2")
+
+    // Gson
+    implementation ("com.google.code.gson:gson:$gson")
+
+    // Coil
+    implementation ("io.coil-kt:coil-compose:$coil")
+
+    // Compose Destinations by raamcosta
+    implementation ("io.github.raamcosta.compose-destinations:animations-core:$composeDestination")
+    ksp ("io.github.raamcosta.compose-destinations:ksp:$composeDestination")
+
+    // Jsoup - for testing only
+    implementation ("org.jsoup:jsoup:1.16.1")
+
+    coreLibraryDesugaring ("com.android.tools:desugar_jdk_libs:2.0.4")
+
+    // Test dependencies
+    androidTestImplementation ("androidx.test:core:$androidXTestCore")
+    androidTestImplementation ("androidx.test:core-ktx:$androidXTestCore")
+    androidTestImplementation ("androidx.test:runner:$androidXTestRunner")
+    androidTestImplementation ("androidx.test:rules:$androidXTestRules")
+
+    androidTestImplementation ("junit:junit:$jUnit4")
+    androidTestImplementation ("io.mockk:mockk:$mock")
+    testImplementation ("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesTest")
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 484d72bfe..6f20a2b44 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/schemas/com.flixclusive.data.database.AppDatabase/1.json b/app/schemas/com.flixclusive.data.database.AppDatabase/1.json
new file mode 100644
index 000000000..6fa8800b5
--- /dev/null
+++ b/app/schemas/com.flixclusive.data.database.AppDatabase/1.json
@@ -0,0 +1,134 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "9146d2da07c6004bec3a34de329819f6",
+    "entities": [
+      {
+        "tableName": "watch_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `ownerId` INTEGER NOT NULL, `seasons` INTEGER, `episodes` TEXT NOT NULL, `episodesWatched` TEXT NOT NULL, `dateWatched` INTEGER NOT NULL, `film` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "seasons",
+            "columnName": "seasons",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "episodes",
+            "columnName": "episodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "episodesWatched",
+            "columnName": "episodesWatched",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateWatched",
+            "columnName": "dateWatched",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "film",
+            "columnName": "film",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "watchlist",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `ownerId` INTEGER NOT NULL, `film` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "film",
+            "columnName": "film",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "User",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `image` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "userId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9146d2da07c6004bec3a34de329819f6')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/com.flixclusive.data.database.AppDatabase/2.json b/app/schemas/com.flixclusive.data.database.AppDatabase/2.json
new file mode 100644
index 000000000..252e8bc3f
--- /dev/null
+++ b/app/schemas/com.flixclusive.data.database.AppDatabase/2.json
@@ -0,0 +1,134 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "9146d2da07c6004bec3a34de329819f6",
+    "entities": [
+      {
+        "tableName": "watch_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `ownerId` INTEGER NOT NULL, `seasons` INTEGER, `episodes` TEXT NOT NULL, `episodesWatched` TEXT NOT NULL, `dateWatched` INTEGER NOT NULL, `film` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "seasons",
+            "columnName": "seasons",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "episodes",
+            "columnName": "episodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "episodesWatched",
+            "columnName": "episodesWatched",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateWatched",
+            "columnName": "dateWatched",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "film",
+            "columnName": "film",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "watchlist",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `ownerId` INTEGER NOT NULL, `film` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "film",
+            "columnName": "film",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "User",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `image` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "userId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9146d2da07c6004bec3a34de329819f6')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/flixclusive/data/repository/SourceLinksRepositoryImpl.kt b/app/src/main/java/com/flixclusive/data/repository/SourceLinksRepositoryImpl.kt
index 164c5c0f2..9355323dc 100644
--- a/app/src/main/java/com/flixclusive/data/repository/SourceLinksRepositoryImpl.kt
+++ b/app/src/main/java/com/flixclusive/data/repository/SourceLinksRepositoryImpl.kt
@@ -11,7 +11,7 @@ import com.flixclusive.domain.model.tmdb.TvShow
 import com.flixclusive.domain.repository.ProvidersRepository
 import com.flixclusive.domain.repository.SourceLinksRepository
 import com.flixclusive.domain.repository.TMDBRepository
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import com.flixclusive.providers.models.common.MediaType
 import com.flixclusive.providers.models.common.SourceLink
 import com.flixclusive.providers.models.common.Subtitle
diff --git a/app/src/main/java/com/flixclusive/data/repository/TMDBRepositoryImpl.kt b/app/src/main/java/com/flixclusive/data/repository/TMDBRepositoryImpl.kt
index 22a7cf25f..2d53ee0fb 100644
--- a/app/src/main/java/com/flixclusive/data/repository/TMDBRepositoryImpl.kt
+++ b/app/src/main/java/com/flixclusive/data/repository/TMDBRepositoryImpl.kt
@@ -1,7 +1,6 @@
 package com.flixclusive.data.repository
 
 import com.flixclusive.common.Constants.TMDB_API_BASE_URL
-import com.flixclusive.utils.LoggerUtils.errorLog
 import com.flixclusive.data.api.TMDBApiService
 import com.flixclusive.data.dto.tmdb.common.TMDBImagesResponseDto
 import com.flixclusive.data.dto.tmdb.toMovie
@@ -24,6 +23,7 @@ import com.flixclusive.domain.repository.TMDBRepository
 import com.flixclusive.domain.utils.TMDBUtils.filterOutUnreleasedRecommendations
 import com.flixclusive.domain.utils.TMDBUtils.filterOutZeroSeasons
 import com.flixclusive.presentation.utils.FormatterUtils.formatGenreIds
+import com.flixclusive.utils.LoggerUtils.errorLog
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import retrofit2.HttpException
diff --git a/app/src/main/java/com/flixclusive/data/usecase/SourceLinksProviderUseCaseImpl.kt b/app/src/main/java/com/flixclusive/data/usecase/SourceLinksProviderUseCaseImpl.kt
index 49e0627b8..043589bd5 100644
--- a/app/src/main/java/com/flixclusive/data/usecase/SourceLinksProviderUseCaseImpl.kt
+++ b/app/src/main/java/com/flixclusive/data/usecase/SourceLinksProviderUseCaseImpl.kt
@@ -14,7 +14,7 @@ import com.flixclusive.domain.repository.SourceLinksRepository
 import com.flixclusive.domain.repository.TMDBRepository
 import com.flixclusive.domain.usecase.SourceLinksProviderUseCase
 import com.flixclusive.domain.utils.WatchHistoryUtils
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import com.flixclusive.utils.LoggerUtils.debugLog
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
diff --git a/app/src/main/java/com/flixclusive/domain/common/Resource.kt b/app/src/main/java/com/flixclusive/domain/common/Resource.kt
index 0412f81c7..677385b25 100644
--- a/app/src/main/java/com/flixclusive/domain/common/Resource.kt
+++ b/app/src/main/java/com/flixclusive/domain/common/Resource.kt
@@ -17,7 +17,7 @@ sealed class Resource<out T>(
         )
     }
 
-    object Loading : Resource<Nothing>(isLoading = true)
+    data object Loading : Resource<Nothing>(isLoading = true)
 }
 
 
diff --git a/app/src/main/java/com/flixclusive/domain/model/SourceData.kt b/app/src/main/java/com/flixclusive/domain/model/SourceData.kt
index eef6374a7..978525e34 100644
--- a/app/src/main/java/com/flixclusive/domain/model/SourceData.kt
+++ b/app/src/main/java/com/flixclusive/domain/model/SourceData.kt
@@ -2,8 +2,6 @@ package com.flixclusive.domain.model
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.snapshots.SnapshotStateList
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
 import java.io.Serializable
 
 data class SourceData(
diff --git a/app/src/main/java/com/flixclusive/domain/model/provider/SourceProviderDetails.kt b/app/src/main/java/com/flixclusive/domain/model/provider/SourceProviderDetails.kt
index 281cda747..134d8c67a 100644
--- a/app/src/main/java/com/flixclusive/domain/model/provider/SourceProviderDetails.kt
+++ b/app/src/main/java/com/flixclusive/domain/model/provider/SourceProviderDetails.kt
@@ -1,6 +1,6 @@
 package com.flixclusive.domain.model.provider
 
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 
 data class SourceProviderDetails(
     val provider: SourceProvider,
diff --git a/app/src/main/java/com/flixclusive/domain/repository/SourceLinksRepository.kt b/app/src/main/java/com/flixclusive/domain/repository/SourceLinksRepository.kt
index 7958bfa8c..26f3e5071 100644
--- a/app/src/main/java/com/flixclusive/domain/repository/SourceLinksRepository.kt
+++ b/app/src/main/java/com/flixclusive/domain/repository/SourceLinksRepository.kt
@@ -2,7 +2,7 @@ package com.flixclusive.domain.repository
 
 import com.flixclusive.domain.common.Resource
 import com.flixclusive.domain.model.tmdb.Film
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import com.flixclusive.providers.models.common.SourceLink
 import com.flixclusive.providers.models.common.Subtitle
 
diff --git a/app/src/main/java/com/flixclusive/domain/usecase/SourceLinksProviderUseCase.kt b/app/src/main/java/com/flixclusive/domain/usecase/SourceLinksProviderUseCase.kt
index 1de34a88f..4b4e4d522 100644
--- a/app/src/main/java/com/flixclusive/domain/usecase/SourceLinksProviderUseCase.kt
+++ b/app/src/main/java/com/flixclusive/domain/usecase/SourceLinksProviderUseCase.kt
@@ -5,7 +5,7 @@ import com.flixclusive.domain.model.SourceDataState
 import com.flixclusive.domain.model.entities.WatchHistoryItem
 import com.flixclusive.domain.model.tmdb.Film
 import com.flixclusive.domain.model.tmdb.TMDBEpisode
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import kotlinx.coroutines.flow.Flow
 
 interface SourceLinksProviderUseCase {
diff --git a/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/PlayerControls.kt b/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/PlayerControls.kt
index 2b456247b..e030ca30d 100644
--- a/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/PlayerControls.kt
+++ b/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/PlayerControls.kt
@@ -34,7 +34,7 @@ import com.flixclusive.presentation.mobile.screens.player.controls.dialogs.setti
 import com.flixclusive.presentation.mobile.screens.player.controls.episodes.EpisodesScreen
 import com.flixclusive.presentation.mobile.screens.player.controls.gestures.GestureDirection
 import com.flixclusive.presentation.mobile.screens.player.controls.gestures.SeekerAndSliderGestures
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import com.flixclusive.providers.models.common.SourceLink
 
 const val SEEK_ANIMATION_DELAY = 450L
diff --git a/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/common/ListContentHolder.kt b/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/common/ListContentHolder.kt
index 962a01c7b..e594cf091 100644
--- a/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/common/ListContentHolder.kt
+++ b/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/common/ListContentHolder.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.sp
 import androidx.media3.common.MediaItem.SubtitleConfiguration
 import com.flixclusive.domain.common.Resource
 import com.flixclusive.presentation.utils.ModifierUtils.fadingEdge
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import com.flixclusive.providers.models.common.SourceLink
 
 @OptIn(ExperimentalFoundationApi::class)
diff --git a/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/dialogs/servers/PlayerServersDialog.kt b/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/dialogs/servers/PlayerServersDialog.kt
index 5daae1ef2..2c0e22f3e 100644
--- a/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/dialogs/servers/PlayerServersDialog.kt
+++ b/app/src/main/java/com/flixclusive/presentation/mobile/screens/player/controls/dialogs/servers/PlayerServersDialog.kt
@@ -22,7 +22,7 @@ import com.flixclusive.presentation.mobile.screens.player.controls.common.ListCo
 import com.flixclusive.presentation.mobile.screens.player.controls.common.PlayerDialogButton
 import com.flixclusive.presentation.mobile.theme.FlixclusiveMobileTheme
 import com.flixclusive.presentation.mobile.utils.ComposeMobileUtils.colorOnMediumEmphasisMobile
-import com.flixclusive.providers.interfaces.SourceProvider
+import com.flixclusive.providers.sources.SourceProvider
 import com.flixclusive.providers.models.common.SourceLink
 import com.flixclusive.providers.sources.superstream.SuperStream
 import okhttp3.OkHttpClient
diff --git a/app/src/main/java/com/flixclusive/presentation/theme/Color.kt b/app/src/main/java/com/flixclusive/presentation/theme/Color.kt
index 0f3d9ceba..690a1e158 100644
--- a/app/src/main/java/com/flixclusive/presentation/theme/Color.kt
+++ b/app/src/main/java/com/flixclusive/presentation/theme/Color.kt
@@ -6,66 +6,66 @@ val lightGray = Color.LightGray.copy(0.2F)
 val lightGrayElevated = Color.LightGray.copy(0.4F)
 val starColor = Color(0xFFFFD65B)
 
-val md_theme_light_primary = Color(0xFF006689)
-val md_theme_light_onPrimary = Color(0xFFFFFFFF)
-val md_theme_light_primaryContainer = Color(0xFFC3E8FF)
-val md_theme_light_onPrimaryContainer = Color(0xFF001E2C)
-val md_theme_light_secondary = Color(0xFF4E616D)
-val md_theme_light_onSecondary = Color(0xFFFFFFFF)
-val md_theme_light_secondaryContainer = Color(0xFFD1E5F3)
-val md_theme_light_onSecondaryContainer = Color(0xFF091E28)
-val md_theme_light_tertiary = Color(0xFF605A7D)
-val md_theme_light_onTertiary = Color(0xFFFFFFFF)
-val md_theme_light_tertiaryContainer = Color(0xFFE6DEFF)
-val md_theme_light_onTertiaryContainer = Color(0xFF1C1736)
-val md_theme_light_error = Color(0xFFBA1A1A)
-val md_theme_light_errorContainer = Color(0xFFFFDAD6)
-val md_theme_light_onError = Color(0xFFFFFFFF)
-val md_theme_light_onErrorContainer = Color(0xFF410002)
-val md_theme_light_background = Color(0xFFFBFCFE)
-val md_theme_light_onBackground = Color(0xFF191C1E)
-val md_theme_light_surface = Color(0xFFFBFCFE)
-val md_theme_light_onSurface = Color(0xFF191C1E)
-val md_theme_light_surfaceVariant = Color(0xFFDCE3E9)
-val md_theme_light_onSurfaceVariant = Color(0xFF41484D)
-val md_theme_light_outline = Color(0xFF71787D)
-val md_theme_light_inverseOnSurface = Color(0xFFF0F1F3)
-val md_theme_light_inverseSurface = Color(0xFF2E3133)
-val md_theme_light_inversePrimary = Color(0xFF78D1FF)
-//val md_theme_light_shadow = Color(0xFF000000)
-val md_theme_light_surfaceTint = Color(0xFF006689)
-val md_theme_light_outlineVariant = Color(0xFFC0C7CD)
-val md_theme_light_scrim = Color(0xFF000000)
+internal val md_theme_light_primary = Color(0xFF006689)
+internal val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+internal val md_theme_light_primaryContainer = Color(0xFFC3E8FF)
+internal val md_theme_light_onPrimaryContainer = Color(0xFF001E2C)
+internal val md_theme_light_secondary = Color(0xFF4E616D)
+internal val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+internal val md_theme_light_secondaryContainer = Color(0xFFD1E5F3)
+internal val md_theme_light_onSecondaryContainer = Color(0xFF091E28)
+internal val md_theme_light_tertiary = Color(0xFF605A7D)
+internal val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+internal val md_theme_light_tertiaryContainer = Color(0xFFE6DEFF)
+internal val md_theme_light_onTertiaryContainer = Color(0xFF1C1736)
+internal val md_theme_light_error = Color(0xFFBA1A1A)
+internal val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+internal val md_theme_light_onError = Color(0xFFFFFFFF)
+internal val md_theme_light_onErrorContainer = Color(0xFF410002)
+internal val md_theme_light_background = Color(0xFFFBFCFE)
+internal val md_theme_light_onBackground = Color(0xFF191C1E)
+internal val md_theme_light_surface = Color(0xFFFBFCFE)
+internal val md_theme_light_onSurface = Color(0xFF191C1E)
+internal val md_theme_light_surfaceVariant = Color(0xFFDCE3E9)
+internal val md_theme_light_onSurfaceVariant = Color(0xFF41484D)
+internal val md_theme_light_outline = Color(0xFF71787D)
+internal val md_theme_light_inverseOnSurface = Color(0xFFF0F1F3)
+internal val md_theme_light_inverseSurface = Color(0xFF2E3133)
+internal val md_theme_light_inversePrimary = Color(0xFF78D1FF)
+//internal val md_theme_light_shadow = Color(0xFF000000)
+internal val md_theme_light_surfaceTint = Color(0xFF006689)
+internal val md_theme_light_outlineVariant = Color(0xFFC0C7CD)
+internal val md_theme_light_scrim = Color(0xFF000000)
 
-val md_theme_dark_primary = Color(0xFFB39DDB)
-val md_theme_dark_onPrimary = Color(0xFF000000)
-val md_theme_dark_primaryContainer = Color(0xFF82007C)
-val md_theme_dark_onPrimaryContainer = Color(0xFFFFD7F3)
-val md_theme_dark_secondary = Color(0xFF7CD0FF)
-val md_theme_dark_onSecondary = Color(0xFF00344A)
-val md_theme_dark_secondaryContainer = Color(0xFF004C69)
-val md_theme_dark_onSecondaryContainer = Color(0xFFC4E7FF)
-val md_theme_dark_tertiary = Color(0xFF84FFFF)
-val md_theme_dark_onTertiary = Color(0xFF000000)
-val md_theme_dark_tertiaryContainer = Color(0xFF4527A0)
-val md_theme_dark_onTertiaryContainer = Color(0xFFFFDADB)
-val md_theme_dark_error = Color(0xFFFFB4AB)
-val md_theme_dark_errorContainer = Color(0xFF93000A)
-val md_theme_dark_onError = Color(0xFF690005)
-val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
-val md_theme_tv_dark_background = Color(0xFF000000)
-val md_theme_tv_dark_onBackground = Color(0xFFFFFFFF)
-val md_theme_tv_dark_surface = Color(0xFF000000)
-val md_theme_tv_dark_onSurface = Color(0xFFFFFFFF)
-val md_theme_tv_dark_surfaceVariant = Color(0xFF121212)
-val md_theme_tv_dark_onSurfaceVariant = Color(0xFFFFFFFF)
-val md_theme_dark_outline = Color(0xFF9A8D95)
-val md_theme_dark_inverseOnSurface = Color(0xFF000000)
-val md_theme_dark_inverseSurface = Color(0xFFFFFFFF)
-val md_theme_dark_inversePrimary = Color(0xFFAB00A2)
-val md_theme_dark_surfaceTint = Color(0xFFE0DEE4)
-val md_theme_dark_outlineVariant = Color(0xFF4E444B)
-val md_theme_dark_scrim = Color(0xFF000000)
+internal val md_theme_dark_primary = Color(0xFFB39DDB)
+internal val md_theme_dark_onPrimary = Color(0xFF000000)
+internal val md_theme_dark_primaryContainer = Color(0xFF82007C)
+internal val md_theme_dark_onPrimaryContainer = Color(0xFFFFD7F3)
+internal val md_theme_dark_secondary = Color(0xFF7CD0FF)
+internal val md_theme_dark_onSecondary = Color(0xFF00344A)
+internal val md_theme_dark_secondaryContainer = Color(0xFF004C69)
+internal val md_theme_dark_onSecondaryContainer = Color(0xFFC4E7FF)
+internal val md_theme_dark_tertiary = Color(0xFF84FFFF)
+internal val md_theme_dark_onTertiary = Color(0xFF000000)
+internal val md_theme_dark_tertiaryContainer = Color(0xFF4527A0)
+internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFDADB)
+internal val md_theme_dark_error = Color(0xFFFFB4AB)
+internal val md_theme_dark_errorContainer = Color(0xFF93000A)
+internal val md_theme_dark_onError = Color(0xFF690005)
+internal val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+internal val md_theme_tv_dark_background = Color(0xFF000000)
+internal val md_theme_tv_dark_onBackground = Color(0xFFFFFFFF)
+internal val md_theme_tv_dark_surface = Color(0xFF000000)
+internal val md_theme_tv_dark_onSurface = Color(0xFFFFFFFF)
+internal val md_theme_tv_dark_surfaceVariant = Color(0xFF121212)
+internal val md_theme_tv_dark_onSurfaceVariant = Color(0xFFFFFFFF)
+internal val md_theme_dark_outline = Color(0xFF9A8D95)
+internal val md_theme_dark_inverseOnSurface = Color(0xFF000000)
+internal val md_theme_dark_inverseSurface = Color(0xFFFFFFFF)
+internal val md_theme_dark_inversePrimary = Color(0xFFAB00A2)
+internal val md_theme_dark_surfaceTint = Color(0xFFE0DEE4)
+internal val md_theme_dark_outlineVariant = Color(0xFF4E444B)
+internal val md_theme_dark_scrim = Color(0xFF000000)
 
 
 val md_theme_mobile_dark_background = Color(0xFF121212)
diff --git a/app/src/main/java/com/flixclusive/utils/CoroutinesUtils.kt b/app/src/main/java/com/flixclusive/utils/CoroutinesUtils.kt
deleted file mode 100644
index 0fce76089..000000000
--- a/app/src/main/java/com/flixclusive/utils/CoroutinesUtils.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flixclusive.utils
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.async
-
-object CoroutinesUtils {
-    suspend fun <T> CoroutineScope.asyncAwait(
-        block: suspend CoroutineScope.() -> T
-    )=  async { block() }.await()
-}
\ No newline at end of file
diff --git a/providers/.gitignore b/build-logic/convention/.gitignore
similarity index 100%
rename from providers/.gitignore
rename to build-logic/convention/.gitignore
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
new file mode 100644
index 000000000..b891785d8
--- /dev/null
+++ b/build-logic/convention/build.gradle.kts
@@ -0,0 +1,60 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    `kotlin-dsl`
+}
+
+group = "com.flixclusive.buildlogic"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+}
+
+dependencies {
+    compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.ksp.gradlePlugin)
+    compileOnly(libs.room.gradlePlugin)
+}
+
+gradlePlugin {
+    /**
+     * Register convention plugins so they are available in the build scripts of the application
+     */
+    plugins {
+        register("flixclusiveAndroidApplication") {
+            id = "flixclusive.android.application"
+            implementationClass = "AndroidApplicationConventionPlugin"
+        }
+        register("flixclusiveAndroidLibrary") {
+            id = "flixclusive.android.library"
+            implementationClass = "AndroidLibraryConventionPlugin"
+        }
+        register("flixclusiveCompose") {
+            id = "flixclusive.compose"
+            implementationClass = "ComposeConventionPlugin"
+        }
+        register("flixclusiveHilt") {
+            id = "flixclusive.hilt"
+            implementationClass = "HiltConventionPlugin"
+        }
+        register("flixclusiveRoom") {
+            id = "flixclusive.room"
+            implementationClass = "RoomConventionPlugin"
+        }
+        register("flixclusiveFeature") {
+            id = "flixclusive.feature"
+            implementationClass = "FeatureConventionPlugin"
+        }
+        register("flixclusiveDestinations") {
+            id = "flixclusive.destinations"
+            implementationClass = "DestinationsConventionPlugin"
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
new file mode 100644
index 000000000..8366e659e
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -0,0 +1,28 @@
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.flixclusive.configureKotlinAndroid
+import com.flixclusive.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+class AndroidApplicationConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.application")
+                apply("org.jetbrains.kotlin.android")
+                apply("org.jetbrains.kotlin.plugin.serialization")
+            }
+
+            extensions.configure<ApplicationExtension> {
+                configureKotlinAndroid(commonExtension = this)
+            }
+
+            dependencies {
+                val serialization = libs.findLibrary("kotlinx-serialization").get()
+                add("implementation", serialization)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
new file mode 100644
index 000000000..9b05a46a5
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -0,0 +1,28 @@
+
+import com.android.build.api.dsl.LibraryExtension
+import com.flixclusive.configureKotlinAndroid
+import com.flixclusive.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+class AndroidLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+                apply("org.jetbrains.kotlin.android")
+                apply("org.jetbrains.kotlin.plugin.serialization")
+            }
+
+            extensions.configure<LibraryExtension> {
+                configureKotlinAndroid(commonExtension = this)
+            }
+
+            dependencies {
+                add("implementation", libs.findLibrary("kotlinx-serialization").get())
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/ComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/ComposeConventionPlugin.kt
new file mode 100644
index 000000000..1a451b4ab
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/ComposeConventionPlugin.kt
@@ -0,0 +1,16 @@
+
+import com.android.build.gradle.BaseExtension
+import com.flixclusive.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class ComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            val extension = extensions.getByType<BaseExtension>()
+            configureAndroidCompose(extension)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/DestinationsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/DestinationsConventionPlugin.kt
new file mode 100644
index 000000000..ec16c107c
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/DestinationsConventionPlugin.kt
@@ -0,0 +1,39 @@
+
+import com.android.build.gradle.LibraryExtension
+import com.flixclusive.libs
+import com.google.devtools.ksp.gradle.KspExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+
+class DestinationsConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply {
+                apply("com.google.devtools.ksp")
+            }
+
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    testInstrumentationRunner =
+                        "androidx.test.runner.AndroidJUnitRunner"
+                }
+            }
+
+            extensions.configure<KspExtension> {
+                arg("compose-destinations.moduleName", project.name)
+                arg("compose-destinations.mode", "destinations")
+            }
+
+
+            dependencies {
+                add("implementation", libs.findLibrary("destinations-core").get())
+                add("ksp", libs.findLibrary("destinations-ksp").get())
+                add("implementation", libs.findLibrary("destinations-animations").get())
+            }
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/FeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/FeatureConventionPlugin.kt
new file mode 100644
index 000000000..7bc652874
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/FeatureConventionPlugin.kt
@@ -0,0 +1,37 @@
+
+import com.android.build.gradle.LibraryExtension
+import com.flixclusive.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+
+class FeatureConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply {
+                apply("flixclusive.android.library")
+                apply("flixclusive.hilt")
+            }
+
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    testInstrumentationRunner =
+                        "androidx.test.runner.AndroidJUnitRunner"
+                }
+            }
+
+
+            dependencies {
+                add("implementation", project(":core:ui"))
+                add("implementation", project(":core:theme"))
+
+                add("implementation", libs.findLibrary("hilt-navigation").get())
+                add("implementation", libs.findLibrary("lifecycle-runtimeCompose").get())
+                add("implementation", libs.findLibrary("lifecycle-viewModelCompose").get())
+            }
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
new file mode 100644
index 000000000..725fb179b
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt
@@ -0,0 +1,21 @@
+
+import com.flixclusive.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+class HiltConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.google.devtools.ksp")
+                apply("dagger.hilt.android.plugin")
+            }
+
+            dependencies {
+                add("implementation", libs.findLibrary("hilt.android").get())
+                add("ksp", libs.findLibrary("hilt.compiler").get())
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/RoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/RoomConventionPlugin.kt
new file mode 100644
index 000000000..aad3c3672
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/RoomConventionPlugin.kt
@@ -0,0 +1,31 @@
+
+import androidx.room.gradle.RoomExtension
+import com.flixclusive.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+class RoomConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("androidx.room")
+                apply("com.google.devtools.ksp")
+            }
+
+            extensions.configure<RoomExtension> {
+                // The schemas directory contains a schema file for each version of the Room database.
+                // This is required to enable Room auto migrations.
+                // See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.
+                schemaDirectory("$projectDir/schemas")
+            }
+
+            dependencies {
+                add("implementation", libs.findLibrary("room.runtime").get())
+                add("implementation", libs.findLibrary("room.ktx").get())
+                add("ksp", libs.findLibrary("room.compiler").get())
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/com/flixclusive/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/flixclusive/AndroidCompose.kt
new file mode 100644
index 000000000..1a8a94f42
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/flixclusive/AndroidCompose.kt
@@ -0,0 +1,27 @@
+package com.flixclusive
+
+import com.android.build.gradle.BaseExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+
+@Suppress("UnstableApiUsage")
+internal fun Project.configureAndroidCompose(
+    commonExtension: BaseExtension,
+) {
+    commonExtension.apply {
+        buildFeatures.apply {
+            compose = true
+            viewBinding = true
+        }
+
+        composeOptions {
+            kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()
+        }
+
+        dependencies {
+            val bom = libs.findLibrary("compose-bom").get()
+            add("implementation", platform(bom))
+            add("androidTestImplementation", platform(bom))
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/com/flixclusive/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/flixclusive/KotlinAndroid.kt
new file mode 100644
index 000000000..a1af97719
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/flixclusive/KotlinAndroid.kt
@@ -0,0 +1,63 @@
+package com.flixclusive
+
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+
+internal fun Project.configureKotlinAndroid(
+    commonExtension: CommonExtension<*, *, *, *, *>,
+) {
+    commonExtension.apply {
+        compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
+
+        defaultConfig {
+            minSdk = libs.findVersion("minSdk").get().toString().toInt()
+            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
+
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+            isCoreLibraryDesugaringEnabled = true
+        }
+    }
+
+    configureKotlin()
+
+    dependencies {
+        add("coreLibraryDesugaring", libs.findLibrary("desugarJdkLibs").get())
+    }
+}
+
+internal fun Project.configureKotlinJvm() {
+    extensions.configure<JavaPluginExtension> {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    configureKotlin()
+}
+
+private fun Project.configureKotlin() {
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = JavaVersion.VERSION_17.toString()
+            // Treat all Kotlin warnings as errors (disabled by default)
+            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+            val warningsAsErrors: String? by project
+            allWarningsAsErrors = warningsAsErrors.toBoolean()
+            freeCompilerArgs = freeCompilerArgs + listOf(
+                // Enable experimental coroutines APIs, including Flow
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/com/flixclusive/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/com/flixclusive/ProjectExtensions.kt
new file mode 100644
index 000000000..47a48a7a3
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/flixclusive/ProjectExtensions.kt
@@ -0,0 +1,10 @@
+package com.flixclusive
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
+
+
+val Project.libs
+    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
\ No newline at end of file
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
new file mode 100644
index 000000000..48b2ab833
--- /dev/null
+++ b/build-logic/gradle.properties
@@ -0,0 +1,4 @@
+# Gradle properties are not passed to included builds https://github.com/gradle/gradle/issues/2534
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true
\ No newline at end of file
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
new file mode 100644
index 000000000..622578530
--- /dev/null
+++ b/build-logic/settings.gradle.kts
@@ -0,0 +1,14 @@
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"
+include(":convention")
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 6430e06aa..000000000
--- a/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    dependencies {
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.48")
-    }
-}
-
-plugins {
-    id 'com.android.application' version '8.1.1' apply false
-    id 'com.android.library' version '8.1.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
-    id 'com.google.devtools.ksp' version '1.9.0-1.0.13' // Depends on your kotlin version
-    id 'org.jetbrains.kotlin.jvm' version '1.9.0' apply false
-    id "com.osacky.doctor" version "0.9.1"
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 000000000..714be539d
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        maven { url = uri("https://jitpack.io") }
+    }
+}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.room) apply false
+}
diff --git a/core/database/.gitignore b/core/database/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/core/database/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
new file mode 100644
index 000000000..49d23696d
--- /dev/null
+++ b/core/database/build.gradle.kts
@@ -0,0 +1,18 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+    alias(libs.plugins.flixclusive.room)
+}
+
+android {
+    namespace = "com.flixclusive.core.database"
+}
+
+dependencies {
+    implementation(projects.model.database)
+    implementation(projects.model.tmdb)
+    implementation(projects.core.util)
+
+    implementation(libs.gson)
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/AppDatabase.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/AppDatabase.kt
new file mode 100644
index 000000000..693c785d7
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/AppDatabase.kt
@@ -0,0 +1,117 @@
+package com.flixclusive.core.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.sqlite.db.SupportSQLiteDatabase
+import com.flixclusive.core.database.dao.UserDao
+import com.flixclusive.core.database.dao.WatchHistoryDao
+import com.flixclusive.core.database.dao.WatchlistDao
+import com.flixclusive.core.database.util.FilmDataConverter
+import com.flixclusive.core.database.util.WatchHistoryItemConverter
+import com.flixclusive.core.util.common.network.di.ApplicationScope
+import com.flixclusive.model.database.User
+import com.flixclusive.model.database.WatchHistoryItem
+import com.flixclusive.model.database.WatchlistItem
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import java.io.File
+
+
+const val APP_DATABASE = "app_database"
+
+@Database(
+    entities = [WatchHistoryItem::class, WatchlistItem::class, User::class],
+    version = 2
+)
+@TypeConverters(FilmDataConverter::class, WatchHistoryItemConverter::class)
+internal abstract class AppDatabase : RoomDatabase() {
+    abstract fun userDao(): UserDao
+    abstract fun watchlistDao(): WatchlistDao
+    abstract fun watchHistoryDao(): WatchHistoryDao
+
+    companion object {
+        @Volatile
+        private var INSTANCE: AppDatabase? = null
+
+        fun getInstance(
+            context: Context,
+            @ApplicationScope scope: CoroutineScope
+        ): AppDatabase {
+            // For migration (1 to 2)
+            context.updateOldDatabase()
+            // ======================
+
+            return INSTANCE ?: synchronized(this) {
+                Room.databaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                    APP_DATABASE
+                )
+                    .addMigrations(DatabaseMigrations.Schema1to2())
+                    .addCallback(
+                        object: Callback() {
+                            private fun prepopulateUsers() {
+                                INSTANCE?.let {
+                                    scope.launch {
+                                        val thereAreNoUsers = it.userDao().getAllItems().isEmpty()
+
+                                        if(thereAreNoUsers) {
+                                            it.userDao().insert(User())
+                                        }
+                                    }
+                                }
+                            }
+
+                            override fun onCreate(db: SupportSQLiteDatabase) {
+                                super.onCreate(db)
+                                prepopulateUsers()
+                            }
+
+                            override fun onOpen(db: SupportSQLiteDatabase) {
+                                super.onOpen(db)
+                                prepopulateUsers()
+                            }
+                        }
+                    )
+                    .build()
+                    .also {
+                        INSTANCE = it
+                    }
+            }
+        }
+
+        /**
+         *
+         * This would be deleted on soon updates.
+         *
+         * */
+        private fun Context.updateOldDatabase() {
+            val oldDatabaseName = "watch_history_database"
+
+            val oldDbFile = applicationContext.getDatabasePath(oldDatabaseName)
+            val oldDbShmFile = applicationContext.getDatabasePath("$oldDatabaseName-shm")
+            val oldDbWalFile = applicationContext.getDatabasePath("$oldDatabaseName-wal")
+
+            if(oldDbFile.exists()) {
+                oldDbFile.renameTo(
+                    File(oldDbFile.path.replace(oldDatabaseName, APP_DATABASE))
+                )
+            }
+
+            if(oldDbShmFile.exists()) {
+                oldDbShmFile.renameTo(
+                    File(oldDbShmFile.path.replace("$oldDatabaseName-shm", "$APP_DATABASE-shm"))
+                )
+            }
+
+            if(oldDbWalFile.exists()) {
+                oldDbWalFile.renameTo(
+                    File(oldDbWalFile.path.replace("$oldDatabaseName-wal", "$APP_DATABASE-wal"))
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/DatabaseMigrations.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/DatabaseMigrations.kt
new file mode 100644
index 000000000..173b61332
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/DatabaseMigrations.kt
@@ -0,0 +1,17 @@
+package com.flixclusive.core.database
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+internal object DatabaseMigrations {
+    class Schema1to2 : Migration(startVersion = 1, endVersion = 2) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            // Add watchlist table
+            db.execSQL("CREATE TABLE IF NOT EXISTS `watchlist` (`ownerId` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY NOT NULL, `film` TEXT NOT NULL)")
+            // Add user table
+            db.execSQL("CREATE TABLE IF NOT EXISTS `User` (`userId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `image` INTEGER NOT NULL)")
+            // Edit watch history table to add ownerId
+            db.execSQL("ALTER TABLE `watch_history` ADD COLUMN ownerId INTEGER NOT NULL DEFAULT 1")
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/dao/UserDao.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/dao/UserDao.kt
new file mode 100644
index 000000000..f880b354e
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/dao/UserDao.kt
@@ -0,0 +1,29 @@
+package com.flixclusive.core.database.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.flixclusive.model.database.User
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface UserDao {
+    @Query("SELECT * FROM user WHERE userId = :id")
+    suspend fun getUserById(id: Int): User?
+
+    @Query("SELECT * FROM user WHERE userId = :id")
+    fun getUserByIdInFlow(id: Int): Flow<User?>
+
+    @Query("SELECT * FROM user")
+    suspend fun getAllItems(): List<User>
+
+    @Query("SELECT * FROM user")
+    fun getAllItemsInFlow(): Flow<List<User>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(item: User)
+
+    @Query("DELETE FROM user WHERE userId = :id")
+    suspend fun deleteById(id: Int)
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/dao/WatchHistoryDao.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/dao/WatchHistoryDao.kt
new file mode 100644
index 000000000..2a6fe156a
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/dao/WatchHistoryDao.kt
@@ -0,0 +1,33 @@
+package com.flixclusive.core.database.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import com.flixclusive.core.database.model.UserWithWatchHistoryList
+import com.flixclusive.model.database.WatchHistoryItem
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface WatchHistoryDao {
+    @Transaction
+    @Query("SELECT * FROM User where userId = :ownerId IN (SELECT DISTINCT ownerId FROM watch_history)")
+    fun getAllItemsInFlow(ownerId: Int): Flow<UserWithWatchHistoryList?>
+
+    @Transaction
+    @Query("SELECT * FROM User where userId = :ownerId IN (SELECT DISTINCT ownerId FROM watch_history ORDER BY RANDOM() LIMIT :count)")
+    suspend fun getRandomItems(ownerId: Int, count: Int): UserWithWatchHistoryList?
+
+    @Query("SELECT * FROM watch_history WHERE id = :itemId AND ownerId = :ownerId")
+    suspend fun getWatchHistoryItemById(itemId: Int, ownerId: Int): WatchHistoryItem?
+
+    @Query("SELECT * FROM watch_history WHERE id = :itemId AND ownerId = :ownerId")
+    fun getWatchHistoryItemByIdInFlow(itemId: Int, ownerId: Int): Flow<WatchHistoryItem?>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(item: WatchHistoryItem)
+
+    @Query("DELETE FROM watch_history WHERE id = :itemId AND ownerId = :ownerId")
+    suspend fun deleteById(itemId: Int, ownerId: Int)
+}
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/dao/WatchlistDao.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/dao/WatchlistDao.kt
new file mode 100644
index 000000000..d38b1d694
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/dao/WatchlistDao.kt
@@ -0,0 +1,33 @@
+package com.flixclusive.core.database.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Transaction
+import com.flixclusive.model.database.UserWithWatchlist
+import com.flixclusive.model.database.WatchlistItem
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface WatchlistDao {
+    @Insert
+    suspend fun insert(item: WatchlistItem)
+
+    @Delete
+    suspend fun delete(item: WatchlistItem)
+
+    @Query("DELETE FROM watchlist WHERE id = :itemId AND ownerId = :ownerId")
+    suspend fun deleteById(itemId: Int, ownerId: Int)
+
+    @Query("SELECT * FROM watchlist WHERE id = :filmId AND ownerId = :ownerId")
+    suspend fun getWatchlistItemById(filmId: Int, ownerId: Int): WatchlistItem?
+
+    @Transaction
+    @Query("SELECT * FROM User where userId = :ownerId")
+    suspend fun getAllItems(ownerId: Int): UserWithWatchlist?
+
+    @Transaction
+    @Query("SELECT * FROM User where userId = :ownerId")
+    fun getAllItemsInFlow(ownerId: Int): Flow<UserWithWatchlist?>
+}
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/di/DaoModule.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/di/DaoModule.kt
new file mode 100644
index 000000000..cf2796989
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/di/DaoModule.kt
@@ -0,0 +1,29 @@
+package com.flixclusive.core.database.di
+
+import com.flixclusive.core.database.AppDatabase
+import com.flixclusive.core.database.dao.UserDao
+import com.flixclusive.core.database.dao.WatchHistoryDao
+import com.flixclusive.core.database.dao.WatchlistDao
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object DaoModule {
+    @Provides
+    fun providesUserDao(
+        database: AppDatabase,
+    ): UserDao = database.userDao()
+
+    @Provides
+    fun providesWatchlistDao(
+        database: AppDatabase,
+    ): WatchlistDao = database.watchlistDao()
+
+    @Provides
+    fun providesWatchHistoryDao(
+        database: AppDatabase,
+    ): WatchHistoryDao = database.watchHistoryDao()
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/di/DatabaseModule.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/di/DatabaseModule.kt
new file mode 100644
index 000000000..77e58dc6e
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/di/DatabaseModule.kt
@@ -0,0 +1,22 @@
+package com.flixclusive.core.database.di
+
+import android.app.Application
+import com.flixclusive.core.database.AppDatabase
+import com.flixclusive.core.util.common.network.di.ApplicationScope
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object DatabaseModule {
+    @Provides
+    @Singleton
+    fun provideAppDatabase(
+        application: Application,
+        @ApplicationScope scope: CoroutineScope
+    ) : AppDatabase = AppDatabase.getInstance(application, scope)
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/util/FilmDataConverter.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/util/FilmDataConverter.kt
new file mode 100644
index 000000000..65a8d36b0
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/util/FilmDataConverter.kt
@@ -0,0 +1,21 @@
+package com.flixclusive.core.database.util
+
+import androidx.room.TypeConverter
+import com.flixclusive.model.tmdb.FilmImpl
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+internal class FilmDataConverter {
+    private val gson = Gson()
+
+    @TypeConverter
+    fun fromFilmData(filmData: FilmImpl): String {
+        return gson.toJson(filmData)
+    }
+
+    @TypeConverter
+    fun toFilmData(filmDataString: String): FilmImpl {
+        val listType = object : TypeToken<FilmImpl>() {}.type
+        return gson.fromJson(filmDataString, listType)
+    }
+}
\ No newline at end of file
diff --git a/core/database/src/main/kotlin/com/flixclusive/core/database/util/WatchHistoryItemConverter.kt b/core/database/src/main/kotlin/com/flixclusive/core/database/util/WatchHistoryItemConverter.kt
new file mode 100644
index 000000000..1818151e6
--- /dev/null
+++ b/core/database/src/main/kotlin/com/flixclusive/core/database/util/WatchHistoryItemConverter.kt
@@ -0,0 +1,43 @@
+package com.flixclusive.core.database.util
+
+import androidx.room.TypeConverter
+import com.flixclusive.model.database.EpisodeWatched
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import java.util.Date
+
+internal class WatchHistoryItemConverter {
+    private val gson = Gson()
+
+    @TypeConverter
+    fun fromEpisodeWatchedList(value: List<EpisodeWatched>): String {
+        return gson.toJson(value)
+    }
+
+    @TypeConverter
+    fun toEpisodeWatchedList(value: String): List<EpisodeWatched> {
+        val type = object : TypeToken<List<EpisodeWatched>>() {}.type
+        return gson.fromJson(value, type)
+    }
+
+    @TypeConverter
+    fun fromEpisodeLimitsMap(map: Map<Int, Int>): String {
+        return gson.toJson(map)
+    }
+
+    @TypeConverter
+    fun toEpisodeLimitsMap(json: String): Map<Int, Int> {
+        val type = object : TypeToken<Map<Int, Int>>() {}.type
+        return gson.fromJson(json, type)
+    }
+
+    @TypeConverter
+    fun fromDate(value: Date): Long {
+        return value.time
+    }
+
+    @TypeConverter
+    fun toDate(value: Long): Date {
+        return Date(value)
+    }
+}
diff --git a/core/datastore/.gitignore b/core/datastore/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/core/datastore/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
new file mode 100644
index 000000000..e28acbe5a
--- /dev/null
+++ b/core/datastore/build.gradle.kts
@@ -0,0 +1,16 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.core.datastore"
+}
+
+dependencies {
+    api(libs.dataStore.preferences)
+
+    implementation(projects.model.datastore)
+    implementation(projects.core.util)
+}
\ No newline at end of file
diff --git a/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/AppSettingsManager.kt b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/AppSettingsManager.kt
new file mode 100644
index 000000000..281fa3050
--- /dev/null
+++ b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/AppSettingsManager.kt
@@ -0,0 +1,28 @@
+package com.flixclusive.core.datastore
+
+import androidx.datastore.core.DataStore
+import com.flixclusive.model.datastore.AppSettings
+import com.flixclusive.core.util.common.network.di.ApplicationScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class AppSettingsManager @Inject constructor(
+    val appSettings: DataStore<AppSettings>,
+    @ApplicationScope private val scope: CoroutineScope
+) {
+    var localAppSettings: AppSettings = AppSettings()
+        private set
+
+    fun initialize() {
+        scope.launch {
+            localAppSettings = appSettings.data.first()
+        }
+    }
+
+    suspend fun updateData(newValue: AppSettings) {
+        localAppSettings = newValue
+        appSettings.updateData { newValue }
+    }
+}
\ No newline at end of file
diff --git a/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/AppSettingsSerialiazer.kt b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/AppSettingsSerialiazer.kt
new file mode 100644
index 000000000..522f7f7c7
--- /dev/null
+++ b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/AppSettingsSerialiazer.kt
@@ -0,0 +1,32 @@
+package com.flixclusive.core.datastore
+
+import androidx.datastore.core.Serializer
+import com.flixclusive.model.datastore.AppSettings
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import java.io.InputStream
+import java.io.OutputStream
+
+object AppSettingsSerializer : Serializer<AppSettings> {
+    override val defaultValue: AppSettings
+        get() = AppSettings()
+
+    override suspend fun readFrom(input: InputStream): AppSettings {
+        return try {
+            AppSettings.parseFrom(input)
+        } catch (e: SerializationException) {
+            e.printStackTrace()
+            defaultValue
+        }
+    }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    override suspend fun writeTo(t: AppSettings, output: OutputStream) {
+        output.write(
+            Json.encodeToString(
+                serializer = AppSettings.serializer(),
+                value = t
+            ).encodeToByteArray()
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/di/AppSettingsModule.kt b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/di/AppSettingsModule.kt
new file mode 100644
index 000000000..fde56fa04
--- /dev/null
+++ b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/di/AppSettingsModule.kt
@@ -0,0 +1,14 @@
+package com.flixclusive.core.datastore.di
+
+import com.flixclusive.core.datastore.AppSettingsManager
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class AppSettingsModule {
+    @Binds
+    internal abstract fun providesAppSettingsManager(): AppSettingsManager
+}
\ No newline at end of file
diff --git a/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/di/DataStoreModule.kt b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/di/DataStoreModule.kt
new file mode 100644
index 000000000..bbacd2c70
--- /dev/null
+++ b/core/datastore/src/main/kotlin/com/flixclusive/core/datastore/di/DataStoreModule.kt
@@ -0,0 +1,33 @@
+package com.flixclusive.core.datastore.di
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.dataStore
+import com.flixclusive.core.datastore.AppSettingsSerializer
+import com.flixclusive.model.datastore.AppSettings
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.core.util.common.network.di.ApplicationScope
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataStoreModule {
+    private val Context.appSettings by dataStore("app-preferences.json", AppSettingsSerializer)
+
+    @Provides
+    @Singleton
+    internal fun providesUserPreferencesDataStore(
+        @ApplicationContext context: Context,
+        @Dispatcher(AppDispatchers.IO) ioDispatcher: CoroutineDispatcher,
+        @ApplicationScope scope: CoroutineScope,
+    ): DataStore<AppSettings> = context.appSettings
+}
\ No newline at end of file
diff --git a/core/network/.gitignore b/core/network/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/core/network/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
new file mode 100644
index 000000000..c073c006f
--- /dev/null
+++ b/core/network/build.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.core.network"
+}
+
+dependencies {
+    api(libs.okhttp)
+    api(libs.okhttp.dnsoverhttps)
+    api(libs.retrofit)
+
+    implementation(libs.retrofit.gson)
+    implementation(projects.core.datastore)
+    implementation(projects.core.util)
+    implementation(projects.model.datastore)
+    implementation(projects.model.tmdb)
+    implementation(libs.conscrypt)
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/di/OkHttpModule.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/di/OkHttpModule.kt
new file mode 100644
index 000000000..16cb608a8
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/di/OkHttpModule.kt
@@ -0,0 +1,71 @@
+package com.flixclusive.core.network.di
+
+import com.flixclusive.core.datastore.AppSettingsManager
+import com.flixclusive.core.util.log.errorLog
+import com.flixclusive.core.util.network.OkHttpHelper.ignoreAllSSLErrors
+import com.flixclusive.core.util.network.doh360
+import com.flixclusive.core.util.network.dohAdGuard
+import com.flixclusive.core.util.network.dohAliDNS
+import com.flixclusive.core.util.network.dohCloudflare
+import com.flixclusive.core.util.network.dohControlD
+import com.flixclusive.core.util.network.dohDNSPod
+import com.flixclusive.core.util.network.dohGoogle
+import com.flixclusive.core.util.network.dohMullvad
+import com.flixclusive.core.util.network.dohNajalla
+import com.flixclusive.core.util.network.dohQuad101
+import com.flixclusive.core.util.network.dohQuad9
+import com.flixclusive.core.util.network.dohSheCan
+import com.flixclusive.model.datastore.network.DoHPreference
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
+import org.conscrypt.Conscrypt
+import java.security.Security
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object OkHttpModule {
+
+    @Provides
+    @Singleton
+    internal fun provideClient(
+        appSettingsManager: AppSettingsManager,
+    ): OkHttpClient {
+        try {
+            Security.insertProviderAt(Conscrypt.newProvider(), 1)
+        } catch (throwable: Throwable) {
+            errorLog(throwable.localizedMessage ?: "Unknown error trying to support TLS 1.3")
+        }
+
+        val dns = runBlocking { appSettingsManager.appSettings.data.map { it.dns }.first() }
+
+        return OkHttpClient.Builder()
+            .followRedirects(true)
+            .followSslRedirects(true)
+            .ignoreAllSSLErrors()
+            .apply {
+                when (dns) {
+                    DoHPreference.None -> Unit
+                    DoHPreference.Google -> dohGoogle()
+                    DoHPreference.Cloudfare -> dohCloudflare()
+                    DoHPreference.AdGuard -> dohAdGuard()
+                    DoHPreference.Quad9 -> dohQuad9()
+                    DoHPreference.AliDNS -> dohAliDNS()
+                    DoHPreference.DNSPod -> dohDNSPod()
+                    DoHPreference.DNS360 -> doh360()
+                    DoHPreference.Quad101 -> dohQuad101()
+                    DoHPreference.Mullvad -> dohMullvad()
+                    DoHPreference.ControlD -> dohControlD()
+                    DoHPreference.Najalla -> dohNajalla()
+                    DoHPreference.SheCan -> dohSheCan()
+                }
+            }
+            .build()
+    }
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/di/RetrofitModule.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/di/RetrofitModule.kt
new file mode 100644
index 000000000..6ee36260a
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/di/RetrofitModule.kt
@@ -0,0 +1,51 @@
+package com.flixclusive.core.network.di
+
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.core.network.retrofit.FlixclusiveConfigurationService
+import com.flixclusive.core.network.retrofit.TMDBApiService
+import com.flixclusive.core.network.util.PaginatedSearchItemsDeserializer
+import com.flixclusive.core.network.util.SearchItemDeserializer
+import com.flixclusive.core.util.common.Constants.GITHUB_BASE_URL
+import com.flixclusive.core.util.common.Constants.TMDB_API_BASE_URL
+import com.google.gson.GsonBuilder
+import dagger.Provides
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Singleton
+
+object RetrofitModule {
+
+    @Provides
+    @Singleton
+    internal fun provideTMDBApiService(
+        client: OkHttpClient
+    ): TMDBApiService {
+        val tmdbPageResponse = TMDBPageResponse<TMDBSearchItem>()
+
+        val gson = GsonBuilder()
+            .registerTypeAdapter(TMDBSearchItem::class.java, SearchItemDeserializer())
+            .registerTypeAdapter(tmdbPageResponse::class.java, PaginatedSearchItemsDeserializer())
+            .create()
+
+        return Retrofit.Builder()
+            .baseUrl(TMDB_API_BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create(gson))
+            .client(client)
+            .build()
+            .create(TMDBApiService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    internal fun provideAppConfigService(
+        client: OkHttpClient
+    ): FlixclusiveConfigurationService =
+        Retrofit.Builder()
+            .baseUrl(GITHUB_BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(client)
+            .build()
+            .create(FlixclusiveConfigurationService::class.java)
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/FlixclusiveConfigurationService.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/FlixclusiveConfigurationService.kt
new file mode 100644
index 000000000..bfe7ea8cc
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/FlixclusiveConfigurationService.kt
@@ -0,0 +1,30 @@
+package com.flixclusive.core.network.retrofit
+
+import com.flixclusive.core.model.config.AppConfig
+import com.flixclusive.core.model.config.HomeCategoriesConfig
+import com.flixclusive.core.model.config.ProviderStatus
+import com.flixclusive.core.model.config.SearchCategoriesConfig
+import retrofit2.http.GET
+
+const val GITHUB_USERNAME = "rhenwinch"
+const val GITHUB_CONFIG_REPOSITORY = "flixclusive-config"
+
+/**
+ * 
+ * A retrofit2 service for fetching app configs
+ * from github using the pre-defined [GITHUB_USERNAME] and [GITHUB_CONFIG_REPOSITORY]
+ * 
+ * */
+interface FlixclusiveConfigurationService {
+    @GET("$GITHUB_USERNAME/$GITHUB_CONFIG_REPOSITORY/main/home_items_config.json")
+    suspend fun getHomeCategoriesConfig(): HomeCategoriesConfig
+
+    @GET("$GITHUB_USERNAME/$GITHUB_CONFIG_REPOSITORY/main/search_items_config.json")
+    suspend fun getSearchCategoriesConfig(): SearchCategoriesConfig
+
+    @GET("$GITHUB_USERNAME/$GITHUB_CONFIG_REPOSITORY/main/app.json")
+    suspend fun getAppConfig(): AppConfig
+
+    @GET("$GITHUB_USERNAME/$GITHUB_CONFIG_REPOSITORY/main/providers_config.json")
+    suspend fun getProvidersStatus(): List<ProviderStatus>
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/TMDBApiService.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/TMDBApiService.kt
new file mode 100644
index 000000000..2dd2eefe3
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/TMDBApiService.kt
@@ -0,0 +1,99 @@
+package com.flixclusive.core.network.retrofit
+
+import com.flixclusive.model.tmdb.TMDBCollection
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.core.network.retrofit.dto.TMDBMovieDto
+import com.flixclusive.core.network.retrofit.dto.TMDBTvShowDto
+import com.flixclusive.core.network.retrofit.dto.common.TMDBImagesResponseDto
+import com.flixclusive.core.network.retrofit.dto.tv.TMDBSeasonDto
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+import retrofit2.http.Url
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+interface TMDBApiService {
+    @GET("movie/{id}")
+    suspend fun getMovie(
+        @Path("id") id: Int,
+        @Query("api_key") apiKey: String,
+        @Query("language") language: String = "en-US",
+        @Query("append_to_response") appendToResponse: String = "images,recommendations",
+        @Query("page") page: Int = 1,
+        @Query("include_image_language") includeImageLanguage: String = "en"
+    ): TMDBMovieDto
+
+    @GET("tv/{id}")
+    suspend fun getTvShow(
+        @Path("id") id: Int,
+        @Query("api_key") apiKey: String,
+        @Query("language") language: String = "en-US",
+        @Query("append_to_response") appendToResponse: String = "images,recommendations",
+        @Query("page") page: Int = 1,
+        @Query("include_image_language") includeImageLanguage: String = "en"
+    ): TMDBTvShowDto
+
+    @GET("tv/{id}/season/{season_number}")
+    suspend fun getSeason(
+        @Path("id") id: Int,
+        @Path("season_number") seasonNumber: Int,
+        @Query("api_key") apiKey: String,
+        @Query("language") language: String = "en-US",
+    ): TMDBSeasonDto
+
+    @GET("trending/{media_type}/{time_window}")
+    suspend fun getTrending(
+        @Path("media_type") mediaType: String, // others: movie, tv
+        @Path("time_window") timeWindow: String, // others: day
+        @Query("api_key") apiKey: String,
+        @Query("page") page: Int,
+        @Query("region") region: String = "US",
+    ): TMDBPageResponse<TMDBSearchItem>
+
+    @GET("discover/{media_type}")
+    suspend fun discoverFilms(
+        @Path("media_type") mediaType: String, // movie, tv
+        @Query("api_key") apiKey: String,
+        @Query("page") page: Int,
+        @Query("sort_by") sortBy: String = "vote_average.desc",
+        @Query("with_genres") genres: String = "",
+        @Query("with_companies") companies: String = "",
+        @Query("with_networks") networks: String = "",
+        @Query("without_genres") withoutGenres: String = "10763", // news genre
+        @Query("release_date.lte") releasedDate: String = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date()),
+        @Query("with_original_language") withOriginalLanguage: String = "en",
+    ): TMDBPageResponse<TMDBSearchItem>
+
+
+    @GET
+    suspend fun get(@Url url: String): TMDBPageResponse<TMDBSearchItem>
+
+    @GET("search/{media_type}")
+    suspend fun search(
+        @Path("media_type") mediaType: String, // movie, tv, multi
+        @Query("api_key") apiKey: String,
+        @Query("query") query: String,
+        @Query("page") page: Int,
+        @Query("language") language: String = "en-US",
+        @Query("include_adult") includeAdult: Boolean = false,
+        @Query("region") region: String = "US"
+    ): TMDBPageResponse<TMDBSearchItem>
+
+
+    @GET("{media_type}/{id}/images")
+    suspend fun getImages(
+        @Path("media_type") mediaType: String, // movie, tv,
+        @Path("id") id: Int,
+        @Query("api_key") apiKey: String,
+        @Query("include_image_language") includeImageLanguage: String = "en"
+    ): TMDBImagesResponseDto
+
+    @GET("collection/{id}")
+    suspend fun getCollection(
+        @Path("id") id: Int,
+        @Query("api_key") apiKey: String,
+    ): TMDBCollection
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/TMDBMovieDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/TMDBMovieDto.kt
new file mode 100644
index 000000000..6fa197fe5
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/TMDBMovieDto.kt
@@ -0,0 +1,72 @@
+package com.flixclusive.core.network.retrofit.dto
+
+import com.flixclusive.model.tmdb.Genre
+import com.flixclusive.model.tmdb.Movie
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.model.tmdb.toRecommendation
+import com.flixclusive.core.network.retrofit.dto.common.BelongsToCollection
+import com.flixclusive.core.network.retrofit.dto.common.ProductionCompany
+import com.flixclusive.core.network.retrofit.dto.common.ProductionCountry
+import com.flixclusive.core.network.retrofit.dto.common.SpokenLanguage
+import com.flixclusive.core.network.retrofit.dto.common.TMDBImagesResponseDto
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("movie")
+data class TMDBMovieDto(
+    val adult: Boolean,
+    @SerializedName("backdrop_path") val backdropPath: String?,
+    @SerializedName("belongs_to_collection") val belongsToCollection: BelongsToCollection?,
+    val budget: Int,
+    val genres: List<Genre>,
+    val homepage: String?,
+    val id: Int,
+    @SerializedName("imdb_id") val imdbId: String?,
+    @SerializedName("original_language") val originalLanguage: String,
+    @SerializedName("original_title") val originalTitle: String,
+    val overview: String?,
+    val popularity: Double,
+    @SerializedName("poster_path") val posterPath: String?,
+    @SerializedName("production_companies") val productionCompanies: List<ProductionCompany>,
+    @SerializedName("production_countries") val productionCountries: List<ProductionCountry>,
+    @SerializedName("release_date") val releaseDate: String,
+    val revenue: Long,
+    val runtime: Int?,
+    @SerializedName("spoken_languages") val spokenLanguages: List<SpokenLanguage>,
+    val status: String,
+    val tagline: String?,
+    val title: String,
+    val video: Boolean,
+    @SerializedName("vote_average") val voteAverage: Double,
+    @SerializedName("vote_count") val voteCount: Int,
+    val images: TMDBImagesResponseDto,
+    val recommendations: TMDBPageResponse<TMDBSearchItem>
+)
+
+fun TMDBMovieDto.toMovie(): Movie {
+    val logoPath = try {
+        images.logos[0].filePath
+    } catch (e: Exception) {
+        null
+    }
+
+    return Movie(
+        id = id,
+        title = title,
+        image = posterPath,
+        cover = backdropPath,
+        logo = logoPath,
+        rating = voteAverage,
+        releaseDate = releaseDate,
+        description = overview,
+        duration = runtime,
+        genres = genres,
+        language = originalLanguage,
+        recommendations = recommendations.results.map { it.toRecommendation() }
+    )
+}
+
+
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/TMDBTvShowDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/TMDBTvShowDto.kt
new file mode 100644
index 000000000..0052c608f
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/TMDBTvShowDto.kt
@@ -0,0 +1,85 @@
+package com.flixclusive.core.network.retrofit.dto
+
+import com.flixclusive.model.tmdb.Genre
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.model.tmdb.TvShow
+import com.flixclusive.model.tmdb.toRecommendation
+import com.flixclusive.core.network.retrofit.dto.common.ProductionCompany
+import com.flixclusive.core.network.retrofit.dto.common.ProductionCountry
+import com.flixclusive.core.network.retrofit.dto.common.SpokenLanguage
+import com.flixclusive.core.network.retrofit.dto.common.TMDBImagesResponseDto
+import com.flixclusive.core.network.retrofit.dto.tv.Creator
+import com.flixclusive.core.network.retrofit.dto.tv.EpisodeAir
+import com.flixclusive.core.network.retrofit.dto.tv.Network
+import com.flixclusive.core.network.retrofit.dto.tv.TvShowSeasonsPreview
+import com.flixclusive.core.network.retrofit.dto.tv.toSeason
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@SerialName("tv_show")
+data class TMDBTvShowDto(
+    @SerializedName("backdrop_path") val backdropPath: String?,
+    @SerializedName("created_by") val createdBy: List<Creator>,
+    @SerializedName("episode_run_time") val episodeRunTime: List<Int>?,
+    @SerializedName("first_air_date") val firstAirDate: String,
+    val genres: List<Genre>,
+    val homepage: String?,
+    val id: Int,
+    @SerializedName("in_production") val inProduction: Boolean,
+    val languages: List<String>,
+    @SerializedName("last_air_date") val lastAirDate: String?,
+    @SerializedName("last_episode_to_air") val lastEpisodeToAir: EpisodeAir?,
+    val name: String,
+    @SerializedName("next_episode_to_air") val nextEpisodeToAir: EpisodeAir?,
+    val networks: List<Network>,
+    @SerializedName("number_of_episodes") val numberOfEpisodes: Int,
+    @SerializedName("number_of_seasons") val numberOfSeasons: Int,
+    @SerializedName("origin_country") val originCountry: List<String>,
+    @SerializedName("original_language") val originalLanguage: String,
+    @SerializedName("original_name") val originalName: String,
+    val overview: String?,
+    val popularity: Double,
+    @SerializedName("poster_path") val posterPath: String?,
+    @SerializedName("production_companies") val productionCompanies: List<ProductionCompany>,
+    @SerializedName("production_countries") val productionCountries: List<ProductionCountry>,
+    val seasons: List<TvShowSeasonsPreview>,
+    @SerializedName("spoken_languages") val spokenLanguages: List<SpokenLanguage>,
+    val status: String,
+    val tagline: String?,
+    val type: String,
+    @SerializedName("vote_average") val voteAverage: Double,
+    @SerializedName("vote_count") val voteCount: Int,
+    val images: TMDBImagesResponseDto,
+    val recommendations: TMDBPageResponse<TMDBSearchItem>
+)
+
+fun TMDBTvShowDto.toTvShow(): TvShow {
+    val logoPath = try {
+        images.logos[0].filePath
+    } catch (e: Exception) {
+        null
+    }
+
+    return TvShow(
+        id = id,
+        title = name,
+        image = posterPath,
+        cover = backdropPath,
+        logo = logoPath,
+        rating = voteAverage,
+        releaseDate = firstAirDate,
+        lastAirDate = lastAirDate,
+        description = overview,
+        genres = genres,
+        duration = if(episodeRunTime?.isNotEmpty() == true) episodeRunTime[0] else null,
+        totalEpisodes = numberOfEpisodes,
+        totalSeasons = numberOfSeasons,
+        recommendations = recommendations.results.map { it.toRecommendation() },
+        inProduction = inProduction,
+        language = originalLanguage,
+        seasons = seasons.map { it.toSeason() }
+    )
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/BelongsToCollection.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/BelongsToCollection.kt
new file mode 100644
index 000000000..db65a5ee4
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/BelongsToCollection.kt
@@ -0,0 +1,12 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BelongsToCollection(
+    val id: Int,
+    val name: String,
+    @SerializedName("poster_path") val posterPath: String?,
+    @SerializedName("backdrop_path") val backdropPath: String?
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ImageResponseDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ImageResponseDto.kt
new file mode 100644
index 000000000..b0e5e734b
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ImageResponseDto.kt
@@ -0,0 +1,11 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TMDBImagesResponseDto(
+    val backdrops: List<TMDBImageDto> = emptyList(),
+    val id: Int = 0,
+    val logos: List<TMDBImageDto> = emptyList(),
+    val posters: List<TMDBImageDto> = emptyList()
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ProductionCompany.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ProductionCompany.kt
new file mode 100644
index 000000000..f9a0469c1
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ProductionCompany.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class ProductionCompany(
+    val id: Int,
+    @SerializedName("logo_path") val logoPath: String?,
+    val name: String,
+    @SerializedName("origin_country") val originCountry: String,
+)
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ProductionCountry.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ProductionCountry.kt
new file mode 100644
index 000000000..4430c95cb
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/ProductionCountry.kt
@@ -0,0 +1,11 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class ProductionCountry(
+    @SerializedName("iso_3166_1") val iso31661: String,
+    val name: String
+)
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/SpokenLanguage.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/SpokenLanguage.kt
new file mode 100644
index 000000000..d842ef42f
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/SpokenLanguage.kt
@@ -0,0 +1,14 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SpokenLanguage(
+    @SerializedName("english_name")
+    val englishName: String,
+    @SerializedName("iso_639_1")
+    val iso6391: String,
+    @SerializedName("name")
+    val name: String
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/TMDBGenresDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/TMDBGenresDto.kt
new file mode 100644
index 000000000..f0c658c21
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/TMDBGenresDto.kt
@@ -0,0 +1,10 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import com.flixclusive.domain.model.tmdb.Genre
+
+data class TMDBGenresDto(val genres: List<Genre>)
+
+
+fun TMDBGenresDto.toList(): List<Genre> {
+    return genres
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/TMDBImageDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/TMDBImageDto.kt
new file mode 100644
index 000000000..8612204a2
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/common/TMDBImageDto.kt
@@ -0,0 +1,17 @@
+package com.flixclusive.core.network.retrofit.dto.common
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TMDBImageDto(
+    @SerializedName("aspect_ratio") val aspectRatio: Double,
+    val height: Int,
+    @SerializedName("iso_639_1") val iso6391: String? = null,
+    @SerializedName("file_path") val filePath: String,
+    @SerializedName("vote_average") val voteAverage: Double,
+    @SerializedName("vote_count") val voteCount: Int,
+    val width: Int
+)
+
+
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/Creator.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/Creator.kt
new file mode 100644
index 000000000..5a4b968bf
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/Creator.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Creator(
+    val id: Int,
+    @SerializedName("credit_id") val creditId: String,
+    val name: String,
+    val gender: Int,
+    @SerializedName("profile_path") val profilePath: String?
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/CrewMember.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/CrewMember.kt
new file mode 100644
index 000000000..3fafa1cf6
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/CrewMember.kt
@@ -0,0 +1,17 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.google.gson.annotations.SerializedName
+
+data class CrewMember(
+    val department: String,
+    val job: String,
+    @SerializedName("credit_id") val creditId: String,
+    val adult: Boolean?,
+    val gender: Int?,
+    val id: Int,
+    @SerializedName("known_for_department") val knownForDepartment: String,
+    val name: String,
+    @SerializedName("original_name") val originalName: String,
+    val popularity: Double,
+    @SerializedName("profile_path") val profilePath: String?
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/EpisodeAir.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/EpisodeAir.kt
new file mode 100644
index 000000000..5acb98cc5
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/EpisodeAir.kt
@@ -0,0 +1,19 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EpisodeAir(
+    @SerializedName("air_date") val airDate: String,
+    @SerializedName("episode_number") val episodeNumber: Int,
+    val id: Int,
+    val name: String,
+    val overview: String,
+    @SerializedName("production_code") val productionCode: String?,
+    @SerializedName("season_number") val seasonNumber: Int,
+    @SerializedName("still_path") val stillPath: String?,
+    @SerializedName("vote_average") val voteAverage: Double,
+    @SerializedName("vote_count") val voteCount: Int,
+)
+
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/GuestStar.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/GuestStar.kt
new file mode 100644
index 000000000..3d4033dba
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/GuestStar.kt
@@ -0,0 +1,17 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.google.gson.annotations.SerializedName
+
+data class GuestStar(
+    @SerializedName("credit_id") val creditId: String,
+    val order: Int,
+    val character: String,
+    val adult: Boolean,
+    val gender: Int?,
+    val id: Int,
+    @SerializedName("known_for_department") val knownForDepartment: String,
+    val name: String,
+    @SerializedName("original_name") val originalName: String,
+    val popularity: Double,
+    @SerializedName("profile_path") val profilePath: String?
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/Network.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/Network.kt
new file mode 100644
index 000000000..928ac22a9
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/Network.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class Network(
+    val name: String,
+    val id: Int,
+    @SerializedName("logo_path") val logoPath: String?,
+    @SerializedName("origin_country") val originCountry: String,
+)
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TMDBEpisodeDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TMDBEpisodeDto.kt
new file mode 100644
index 000000000..9aa8ea57e
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TMDBEpisodeDto.kt
@@ -0,0 +1,34 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.flixclusive.domain.model.tmdb.TMDBEpisode
+import com.google.gson.annotations.SerializedName
+
+data class TMDBEpisodeDto(
+    @SerializedName("air_date") val airDate: String,
+    @SerializedName("episode_number") val episodeNumber: Int,
+    val id: Int,
+    val name: String,
+    val overview: String,
+    @SerializedName("production_code") val productionCode: String,
+    val runtime: Int?,
+    @SerializedName("season_number") val seasonNumber: Int,
+    @SerializedName("show_id") val showId: Int ,
+    @SerializedName("still_path") val stillPath: String?,
+    @SerializedName("vote_average") val voteAverage: Double,
+    @SerializedName("vote_count") val voteCount: Int,
+    val crew: List<CrewMember>,
+    @SerializedName("guest_stars") val guestStars: List<GuestStar>,
+)
+
+fun TMDBEpisodeDto.toEpisode(): TMDBEpisode {
+    return TMDBEpisode(
+        episodeId = id,
+        title = name,
+        episode = episodeNumber,
+        season = seasonNumber,
+        releaseDate = airDate,
+        description = overview,
+        image = stillPath,
+        rating = voteAverage
+    )
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TMDBSeasonDto.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TMDBSeasonDto.kt
new file mode 100644
index 000000000..783e832c3
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TMDBSeasonDto.kt
@@ -0,0 +1,25 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.flixclusive.model.tmdb.Season
+import com.google.gson.annotations.SerializedName
+
+data class TMDBSeasonDto(
+    val _id: String,
+    @SerializedName("air_date") val airDate: String,
+    val episodes: List<TMDBEpisodeDto>,
+    val name: String,
+    val overview: String,
+    val id: Int,
+    @SerializedName("poster_path") val posterPath: String?,
+    @SerializedName("season_number") val seasonNumber: Int
+)
+
+fun TMDBSeasonDto.toSeason(): Season {
+    return Season(
+        seasonNumber = seasonNumber,
+        image = posterPath,
+        name = name,
+        episodes = episodes.map { it.toEpisode() },
+        isReleased = true
+    )
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TvShowSeasonsPreview.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TvShowSeasonsPreview.kt
new file mode 100644
index 000000000..72232c050
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/retrofit/dto/tv/TvShowSeasonsPreview.kt
@@ -0,0 +1,26 @@
+package com.flixclusive.core.network.retrofit.dto.tv
+
+import com.flixclusive.model.tmdb.Season
+import com.flixclusive.domain.utils.TMDBUtils.isDateInFuture
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TvShowSeasonsPreview(
+    @SerializedName("air_date") val airDate: String?,
+    @SerializedName("episode_count") val episodeCount: Int,
+    val id: Int,
+    val name: String,
+    val overview: String?,
+    @SerializedName("poster_path") val posterPath: String?,
+    @SerializedName("season_number") val seasonNumber: Int
+)
+
+fun TvShowSeasonsPreview.toSeason(): Season {
+    return Season(
+        seasonNumber = seasonNumber,
+        image = posterPath,
+        episodes = emptyList(),
+        isReleased = if(airDate != null) isDateInFuture(airDate) else true
+    )
+}
\ No newline at end of file
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/util/PaginatedSearchItemsDeserializer.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/util/PaginatedSearchItemsDeserializer.kt
new file mode 100644
index 000000000..68b200350
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/util/PaginatedSearchItemsDeserializer.kt
@@ -0,0 +1,50 @@
+package com.flixclusive.core.network.util
+
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import java.lang.reflect.Type
+
+
+class PaginatedSearchItemsDeserializer : JsonDeserializer<TMDBPageResponse<TMDBSearchItem>> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?,
+    ): TMDBPageResponse<TMDBSearchItem> {
+        // Get the JsonObject from the JsonElement or create a new one if it's null
+        val jsonObject = json?.asJsonObject ?: JsonObject()
+
+        // Get the page, total pages, and total results counts from the JsonObject
+        val page = jsonObject.get("page").asInt
+        val totalPages = jsonObject.get("total_pages").asInt
+        val totalResults = jsonObject.get("total_results").asInt
+
+        // Get the results JsonArray from the JsonObject
+        val resultsJsonArray = jsonObject.getAsJsonArray("results")
+
+        // Create an empty list to hold the results
+        val results = mutableListOf<TMDBSearchItem>()
+
+        // Loop through the results JsonArray and deserialize each result into a TMDBSearchItem
+        // (in this case, a TvShowTMDBSearchItem) and add it to the results list
+        for (resultJson in resultsJsonArray) {
+            val result: TMDBSearchItem =
+                context?.deserialize(resultJson, TMDBSearchItem::class.java)
+                    ?: TMDBSearchItem.MovieTMDBSearchItem()
+            results.add(result)
+        }
+
+        // Create and return a new TMDBPageResponse object with the currentPage, results, total pages, and total results counts
+        return TMDBPageResponse(
+            page = page,
+            results = results,
+            totalPages = totalPages,
+            totalResults = totalResults,
+        )
+
+    }
+}
diff --git a/core/network/src/main/kotlin/com/flixclusive/core/network/util/SearchItemDeserializer.kt b/core/network/src/main/kotlin/com/flixclusive/core/network/util/SearchItemDeserializer.kt
new file mode 100644
index 000000000..a2a028d04
--- /dev/null
+++ b/core/network/src/main/kotlin/com/flixclusive/core/network/util/SearchItemDeserializer.kt
@@ -0,0 +1,70 @@
+package com.flixclusive.core.network.util
+
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import java.lang.reflect.Type
+
+class SearchItemDeserializer : JsonDeserializer<TMDBSearchItem> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?,
+    ): TMDBSearchItem {
+        val resultJsonObject =
+            json?.asJsonObject ?: JsonObject() // ensure we have a JsonObject to work with
+
+        val mediaTypeObject = resultJsonObject.get("media_type") // get the "media_type" property
+        val firstAirDate =
+            resultJsonObject.get("first_air_date") // get the "first_air_date" property
+        val releaseDate = resultJsonObject.get("release_date") // get the "release_date" property
+
+        // determine the media type based on the "media_type", "first_air_date", and "release_date" properties
+        val mediaType = when {
+            mediaTypeObject != null -> mediaTypeObject.asString
+            firstAirDate != null -> "tv"
+            releaseDate != null -> "movie"
+            else -> throw IllegalArgumentException("Unknown media type: $resultJsonObject")
+        }
+
+        // deserialize the JsonObject based on its media type
+        val result = when (mediaType) {
+            "movie" -> context?.deserialize(
+                resultJsonObject,
+                TMDBSearchItem.MovieTMDBSearchItem::class.java
+            ) ?: TMDBSearchItem.MovieTMDBSearchItem()
+
+            "tv" -> context?.deserialize(
+                resultJsonObject,
+                TMDBSearchItem.TvShowTMDBSearchItem::class.java
+            ) ?: TMDBSearchItem.TvShowTMDBSearchItem()
+
+            "person" -> {
+                // get the "known_for" property and recursively deserialize each into a TMDBSearchItem object
+                val knownForArray = resultJsonObject.remove("known_for").asJsonArray
+
+                val knownForList = mutableListOf<TMDBSearchItem>()
+                for (knownFor in knownForArray) {
+                    val knownForObject: TMDBSearchItem =
+                        context?.deserialize(knownFor, TMDBSearchItem::class.java)
+                            ?: TMDBSearchItem.MovieTMDBSearchItem()
+
+                    knownForList.add(knownForObject)
+                }
+
+                // deserialize the rest of the JsonObject into a PersonTMDBSearchItem object
+                context?.deserialize(resultJsonObject, TMDBSearchItem.PersonTMDBSearchItem::class.java)
+                    ?: TMDBSearchItem.PersonTMDBSearchItem().copy(
+                        knownFor = knownForList
+                    )
+            }
+
+            else -> throw IllegalArgumentException("Unknown media type: $mediaType")
+        }
+
+        return result // return the deserialized object
+
+    }
+}
\ No newline at end of file
diff --git a/core/theme/.gitignore b/core/theme/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/core/theme/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/theme/build.gradle.kts b/core/theme/build.gradle.kts
new file mode 100644
index 000000000..dfc649ae4
--- /dev/null
+++ b/core/theme/build.gradle.kts
@@ -0,0 +1,17 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.compose)
+}
+
+android {
+    namespace = "com.flixclusive.core.theme"
+}
+
+dependencies {
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.graphics)
+    implementation(libs.compose.material3)
+    implementation(libs.core.ktx)
+    implementation(libs.compose.tv.material)
+}
\ No newline at end of file
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt
new file mode 100644
index 000000000..f06ff85ff
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt
@@ -0,0 +1,90 @@
+package com.flixclusive.core.theme
+
+import androidx.compose.ui.graphics.Color
+
+val lightGray = Color.LightGray.copy(0.2F)
+val lightGrayElevated = Color.LightGray.copy(0.4F)
+val starColor = Color(0xFFFFD65B)
+
+internal val md_theme_light_primary = Color(0xFF006689)
+internal val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+internal val md_theme_light_primaryContainer = Color(0xFFC3E8FF)
+internal val md_theme_light_onPrimaryContainer = Color(0xFF001E2C)
+internal val md_theme_light_secondary = Color(0xFF4E616D)
+internal val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+internal val md_theme_light_secondaryContainer = Color(0xFFD1E5F3)
+internal val md_theme_light_onSecondaryContainer = Color(0xFF091E28)
+internal val md_theme_light_tertiary = Color(0xFF605A7D)
+internal val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+internal val md_theme_light_tertiaryContainer = Color(0xFFE6DEFF)
+internal val md_theme_light_onTertiaryContainer = Color(0xFF1C1736)
+internal val md_theme_light_error = Color(0xFFBA1A1A)
+internal val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+internal val md_theme_light_onError = Color(0xFFFFFFFF)
+internal val md_theme_light_onErrorContainer = Color(0xFF410002)
+internal val md_theme_light_background = Color(0xFFFBFCFE)
+internal val md_theme_light_onBackground = Color(0xFF191C1E)
+internal val md_theme_light_surface = Color(0xFFFBFCFE)
+internal val md_theme_light_onSurface = Color(0xFF191C1E)
+internal val md_theme_light_surfaceVariant = Color(0xFFDCE3E9)
+internal val md_theme_light_onSurfaceVariant = Color(0xFF41484D)
+internal val md_theme_light_outline = Color(0xFF71787D)
+internal val md_theme_light_inverseOnSurface = Color(0xFFF0F1F3)
+internal val md_theme_light_inverseSurface = Color(0xFF2E3133)
+internal val md_theme_light_inversePrimary = Color(0xFF78D1FF)
+//internal val md_theme_light_shadow = Color(0xFF000000)
+internal val md_theme_light_surfaceTint = Color(0xFF006689)
+internal val md_theme_light_outlineVariant = Color(0xFFC0C7CD)
+internal val md_theme_light_scrim = Color(0xFF000000)
+
+internal val md_theme_dark_primary = Color(0xFFB39DDB)
+internal val md_theme_dark_onPrimary = Color(0xFF000000)
+internal val md_theme_dark_primaryContainer = Color(0xFF82007C)
+internal val md_theme_dark_onPrimaryContainer = Color(0xFFFFD7F3)
+internal val md_theme_dark_secondary = Color(0xFF7CD0FF)
+internal val md_theme_dark_onSecondary = Color(0xFF00344A)
+internal val md_theme_dark_secondaryContainer = Color(0xFF004C69)
+internal val md_theme_dark_onSecondaryContainer = Color(0xFFC4E7FF)
+internal val md_theme_dark_tertiary = Color(0xFF84FFFF)
+internal val md_theme_dark_onTertiary = Color(0xFF000000)
+internal val md_theme_dark_tertiaryContainer = Color(0xFF4527A0)
+internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFDADB)
+internal val md_theme_dark_error = Color(0xFFFFB4AB)
+internal val md_theme_dark_errorContainer = Color(0xFF93000A)
+internal val md_theme_dark_onError = Color(0xFF690005)
+internal val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+internal val md_theme_tv_dark_background = Color(0xFF000000)
+internal val md_theme_tv_dark_onBackground = Color(0xFFFFFFFF)
+internal val md_theme_tv_dark_surface = Color(0xFF000000)
+internal val md_theme_tv_dark_onSurface = Color(0xFFFFFFFF)
+internal val md_theme_tv_dark_surfaceVariant = Color(0xFF121212)
+internal val md_theme_tv_dark_onSurfaceVariant = Color(0xFFFFFFFF)
+internal val md_theme_dark_outline = Color(0xFF9A8D95)
+internal val md_theme_dark_inverseOnSurface = Color(0xFF000000)
+internal val md_theme_dark_inverseSurface = Color(0xFFFFFFFF)
+internal val md_theme_dark_inversePrimary = Color(0xFFAB00A2)
+internal val md_theme_dark_surfaceTint = Color(0xFFE0DEE4)
+internal val md_theme_dark_outlineVariant = Color(0xFF4E444B)
+internal val md_theme_dark_scrim = Color(0xFF000000)
+
+
+val md_theme_mobile_dark_background = Color(0xFF121212)
+val md_theme_mobile_dark_onBackground = Color(0xFFEAE0E4)
+val md_theme_mobile_dark_surface = Color(0xFF121212)
+val md_theme_mobile_dark_onSurface = Color(0xFFEAE0E4)
+val md_theme_mobile_dark_surfaceVariant = Color(0xFF2B2B2B)
+val md_theme_mobile_dark_onSurfaceVariant = Color(0xFFE7E4EE)
+
+val subtitleColors = mapOf(
+    "White" to Color(0xFFFFFFFF),
+    "Yellow" to Color(0xFFFFFF00),
+    "Cyan" to Color(0xFF00FFFF),
+)
+
+val subtitleBackgroundColors = mapOf(
+    "Transparent" to Color.Transparent,
+    "White" to Color(-1),
+    "Black" to Color(0xFF000000),
+    "Yellow" to Color(0xFFFFFF00),
+    "Cyan" to Color(0xFF00FFFF),
+)
\ No newline at end of file
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/Font.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Font.kt
new file mode 100644
index 000000000..b004de8d1
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Font.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.core.theme
+
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+
+internal val spaceGrotesk = FontFamily(
+    fonts = listOf(
+        Font(resId = R.font.space_grotesk_regular),
+        Font(resId = R.font.space_grotesk_light, weight = FontWeight.Light),
+        Font(resId = R.font.space_grotesk_medium, weight = FontWeight.Medium),
+        Font(resId = R.font.space_grotesk_semibold, weight = FontWeight.SemiBold),
+        Font(resId = R.font.space_grotesk_bold, weight = FontWeight.Bold)
+    )
+)
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/Theme.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Theme.kt
new file mode 100644
index 000000000..97a3c8c2c
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Theme.kt
@@ -0,0 +1,24 @@
+package com.flixclusive.core.theme
+
+import androidx.compose.runtime.Composable
+import com.flixclusive.core.theme.mobile.FlixclusiveMobileTheme
+import com.flixclusive.core.theme.tv.FlixclusiveTvTheme
+
+@Composable
+fun FlixclusiveTheme(
+    isTv: Boolean = false,
+    useDarkTheme: Boolean = true,
+    content: @Composable () -> Unit,
+) {
+    if(isTv) {
+        FlixclusiveTvTheme(
+            useDarkTheme = useDarkTheme,
+            content = content
+        )
+    } else {
+        FlixclusiveMobileTheme(
+            useDarkTheme = useDarkTheme,
+            content = content
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/mobile/MobileTheme.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/mobile/MobileTheme.kt
new file mode 100644
index 000000000..7fef2b507
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/mobile/MobileTheme.kt
@@ -0,0 +1,174 @@
+package com.flixclusive.core.theme.mobile
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+import com.flixclusive.core.theme.md_theme_dark_error
+import com.flixclusive.core.theme.md_theme_dark_errorContainer
+import com.flixclusive.core.theme.md_theme_dark_inverseOnSurface
+import com.flixclusive.core.theme.md_theme_dark_inversePrimary
+import com.flixclusive.core.theme.md_theme_dark_inverseSurface
+import com.flixclusive.core.theme.md_theme_dark_onError
+import com.flixclusive.core.theme.md_theme_dark_onErrorContainer
+import com.flixclusive.core.theme.md_theme_dark_onPrimary
+import com.flixclusive.core.theme.md_theme_dark_onPrimaryContainer
+import com.flixclusive.core.theme.md_theme_dark_onSecondary
+import com.flixclusive.core.theme.md_theme_dark_onSecondaryContainer
+import com.flixclusive.core.theme.md_theme_dark_onTertiary
+import com.flixclusive.core.theme.md_theme_dark_onTertiaryContainer
+import com.flixclusive.core.theme.md_theme_dark_outline
+import com.flixclusive.core.theme.md_theme_dark_outlineVariant
+import com.flixclusive.core.theme.md_theme_dark_primary
+import com.flixclusive.core.theme.md_theme_dark_primaryContainer
+import com.flixclusive.core.theme.md_theme_dark_scrim
+import com.flixclusive.core.theme.md_theme_dark_secondary
+import com.flixclusive.core.theme.md_theme_dark_secondaryContainer
+import com.flixclusive.core.theme.md_theme_dark_surfaceTint
+import com.flixclusive.core.theme.md_theme_dark_tertiary
+import com.flixclusive.core.theme.md_theme_dark_tertiaryContainer
+import com.flixclusive.core.theme.md_theme_light_background
+import com.flixclusive.core.theme.md_theme_light_error
+import com.flixclusive.core.theme.md_theme_light_errorContainer
+import com.flixclusive.core.theme.md_theme_light_inverseOnSurface
+import com.flixclusive.core.theme.md_theme_light_inversePrimary
+import com.flixclusive.core.theme.md_theme_light_inverseSurface
+import com.flixclusive.core.theme.md_theme_light_onBackground
+import com.flixclusive.core.theme.md_theme_light_onError
+import com.flixclusive.core.theme.md_theme_light_onErrorContainer
+import com.flixclusive.core.theme.md_theme_light_onPrimary
+import com.flixclusive.core.theme.md_theme_light_onPrimaryContainer
+import com.flixclusive.core.theme.md_theme_light_onSecondary
+import com.flixclusive.core.theme.md_theme_light_onSecondaryContainer
+import com.flixclusive.core.theme.md_theme_light_onSurface
+import com.flixclusive.core.theme.md_theme_light_onSurfaceVariant
+import com.flixclusive.core.theme.md_theme_light_onTertiary
+import com.flixclusive.core.theme.md_theme_light_onTertiaryContainer
+import com.flixclusive.core.theme.md_theme_light_outline
+import com.flixclusive.core.theme.md_theme_light_outlineVariant
+import com.flixclusive.core.theme.md_theme_light_primary
+import com.flixclusive.core.theme.md_theme_light_primaryContainer
+import com.flixclusive.core.theme.md_theme_light_scrim
+import com.flixclusive.core.theme.md_theme_light_secondary
+import com.flixclusive.core.theme.md_theme_light_secondaryContainer
+import com.flixclusive.core.theme.md_theme_light_surface
+import com.flixclusive.core.theme.md_theme_light_surfaceTint
+import com.flixclusive.core.theme.md_theme_light_surfaceVariant
+import com.flixclusive.core.theme.md_theme_light_tertiary
+import com.flixclusive.core.theme.md_theme_light_tertiaryContainer
+import com.flixclusive.core.theme.md_theme_mobile_dark_background
+import com.flixclusive.core.theme.md_theme_mobile_dark_onBackground
+import com.flixclusive.core.theme.md_theme_mobile_dark_onSurface
+import com.flixclusive.core.theme.md_theme_mobile_dark_onSurfaceVariant
+import com.flixclusive.core.theme.md_theme_mobile_dark_surface
+import com.flixclusive.core.theme.md_theme_mobile_dark_surfaceVariant
+
+
+private val lightColors = lightColorScheme(
+    primary = md_theme_light_primary,
+    onPrimary = md_theme_light_onPrimary,
+    primaryContainer = md_theme_light_primaryContainer,
+    onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    secondary = md_theme_light_secondary,
+    onSecondary = md_theme_light_onSecondary,
+    secondaryContainer = md_theme_light_secondaryContainer,
+    onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    tertiary = md_theme_light_tertiary,
+    onTertiary = md_theme_light_onTertiary,
+    tertiaryContainer = md_theme_light_tertiaryContainer,
+    onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    error = md_theme_light_error,
+    errorContainer = md_theme_light_errorContainer,
+    onError = md_theme_light_onError,
+    onErrorContainer = md_theme_light_onErrorContainer,
+    background = md_theme_light_background,
+    onBackground = md_theme_light_onBackground,
+    surface = md_theme_light_surface,
+    onSurface = md_theme_light_onSurface,
+    surfaceVariant = md_theme_light_surfaceVariant,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    outline = md_theme_light_outline,
+    inverseOnSurface = md_theme_light_inverseOnSurface,
+    inverseSurface = md_theme_light_inverseSurface,
+    inversePrimary = md_theme_light_inversePrimary,
+    surfaceTint = md_theme_light_surfaceTint,
+    outlineVariant = md_theme_light_outlineVariant,
+    scrim = md_theme_light_scrim,
+)
+
+
+private val darkColors = darkColorScheme(
+    primary = md_theme_dark_primary,
+    onPrimary = md_theme_dark_onPrimary,
+    primaryContainer = md_theme_dark_primaryContainer,
+    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+    secondary = md_theme_dark_secondary,
+    onSecondary = md_theme_dark_onSecondary,
+    secondaryContainer = md_theme_dark_secondaryContainer,
+    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+    tertiary = md_theme_dark_tertiary,
+    onTertiary = md_theme_dark_onTertiary,
+    tertiaryContainer = md_theme_dark_tertiaryContainer,
+    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+    error = md_theme_dark_error,
+    errorContainer = md_theme_dark_errorContainer,
+    onError = md_theme_dark_onError,
+    onErrorContainer = md_theme_dark_onErrorContainer,
+    background = md_theme_mobile_dark_background,
+    onBackground = md_theme_mobile_dark_onBackground,
+    surface = md_theme_mobile_dark_surface,
+    onSurface = md_theme_mobile_dark_onSurface,
+    surfaceVariant = md_theme_mobile_dark_surfaceVariant,
+    onSurfaceVariant = md_theme_mobile_dark_onSurfaceVariant,
+    outline = md_theme_dark_outline,
+    inverseOnSurface = md_theme_dark_inverseOnSurface,
+    inverseSurface = md_theme_dark_inverseSurface,
+    inversePrimary = md_theme_dark_inversePrimary,
+    surfaceTint = md_theme_dark_surfaceTint,
+    outlineVariant = md_theme_dark_outlineVariant,
+    scrim = md_theme_dark_scrim,
+)
+
+@Composable
+internal fun FlixclusiveMobileTheme(
+    useDarkTheme: Boolean = true,
+    content: @Composable () -> Unit,
+) {
+    val colors = if (!useDarkTheme) {
+        lightColors
+    } else {
+        darkColors
+    }
+
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+
+            window.statusBarColor = Color.Transparent.toArgb()
+            window.navigationBarColor = Color.Transparent.toArgb()
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced = false
+            }
+
+            val windowsInsetsController = WindowCompat.getInsetsController(window, view)
+
+            windowsInsetsController.isAppearanceLightStatusBars = !useDarkTheme
+            windowsInsetsController.isAppearanceLightNavigationBars = !useDarkTheme
+        }
+    }
+
+    MaterialTheme(
+        colorScheme = colors,
+        typography = MobileTypography,
+        content = content,
+    )
+}
\ No newline at end of file
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/mobile/MobileTypography.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/mobile/MobileTypography.kt
new file mode 100644
index 000000000..76c4ea346
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/mobile/MobileTypography.kt
@@ -0,0 +1,116 @@
+package com.flixclusive.core.theme.mobile
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import com.flixclusive.core.theme.spaceGrotesk
+
+internal val MobileTypography = Typography(
+    displayLarge = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 96.sp,
+        letterSpacing = (-1.5).sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.1.em
+    ),
+    displayMedium = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 60.sp,
+        letterSpacing = (-0.5).sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.1.em
+    ),
+    displaySmall = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 48.sp,
+        letterSpacing = 0.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.1.em
+    ),
+    headlineLarge = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 34.sp,
+        letterSpacing = 0.25.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    headlineMedium = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp,
+        letterSpacing = 0.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    headlineSmall = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    titleLarge = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 20.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    titleMedium = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 16.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    titleSmall = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    bodyLarge = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 20.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    bodyMedium = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    bodySmall = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 14.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    labelLarge = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    labelMedium = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    labelSmall = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 10.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    )
+)
\ No newline at end of file
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/tv/TvTheme.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/tv/TvTheme.kt
new file mode 100644
index 000000000..cd4d6c43f
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/tv/TvTheme.kt
@@ -0,0 +1,143 @@
+package com.flixclusive.core.theme.tv
+
+import androidx.compose.runtime.Composable
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.darkColorScheme
+import androidx.tv.material3.lightColorScheme
+import com.flixclusive.core.theme.md_theme_dark_error
+import com.flixclusive.core.theme.md_theme_dark_errorContainer
+import com.flixclusive.core.theme.md_theme_dark_inverseOnSurface
+import com.flixclusive.core.theme.md_theme_dark_inversePrimary
+import com.flixclusive.core.theme.md_theme_dark_inverseSurface
+import com.flixclusive.core.theme.md_theme_dark_onError
+import com.flixclusive.core.theme.md_theme_dark_onErrorContainer
+import com.flixclusive.core.theme.md_theme_dark_onPrimary
+import com.flixclusive.core.theme.md_theme_dark_onPrimaryContainer
+import com.flixclusive.core.theme.md_theme_dark_onSecondary
+import com.flixclusive.core.theme.md_theme_dark_onSecondaryContainer
+import com.flixclusive.core.theme.md_theme_dark_onTertiary
+import com.flixclusive.core.theme.md_theme_dark_onTertiaryContainer
+import com.flixclusive.core.theme.md_theme_dark_primary
+import com.flixclusive.core.theme.md_theme_dark_primaryContainer
+import com.flixclusive.core.theme.md_theme_dark_scrim
+import com.flixclusive.core.theme.md_theme_dark_secondary
+import com.flixclusive.core.theme.md_theme_dark_secondaryContainer
+import com.flixclusive.core.theme.md_theme_dark_surfaceTint
+import com.flixclusive.core.theme.md_theme_dark_tertiary
+import com.flixclusive.core.theme.md_theme_dark_tertiaryContainer
+import com.flixclusive.core.theme.md_theme_light_background
+import com.flixclusive.core.theme.md_theme_light_error
+import com.flixclusive.core.theme.md_theme_light_errorContainer
+import com.flixclusive.core.theme.md_theme_light_inverseOnSurface
+import com.flixclusive.core.theme.md_theme_light_inversePrimary
+import com.flixclusive.core.theme.md_theme_light_inverseSurface
+import com.flixclusive.core.theme.md_theme_light_onBackground
+import com.flixclusive.core.theme.md_theme_light_onError
+import com.flixclusive.core.theme.md_theme_light_onErrorContainer
+import com.flixclusive.core.theme.md_theme_light_onPrimary
+import com.flixclusive.core.theme.md_theme_light_onPrimaryContainer
+import com.flixclusive.core.theme.md_theme_light_onSecondary
+import com.flixclusive.core.theme.md_theme_light_onSecondaryContainer
+import com.flixclusive.core.theme.md_theme_light_onSurface
+import com.flixclusive.core.theme.md_theme_light_onSurfaceVariant
+import com.flixclusive.core.theme.md_theme_light_onTertiary
+import com.flixclusive.core.theme.md_theme_light_onTertiaryContainer
+import com.flixclusive.core.theme.md_theme_light_primary
+import com.flixclusive.core.theme.md_theme_light_primaryContainer
+import com.flixclusive.core.theme.md_theme_light_scrim
+import com.flixclusive.core.theme.md_theme_light_secondary
+import com.flixclusive.core.theme.md_theme_light_secondaryContainer
+import com.flixclusive.core.theme.md_theme_light_surface
+import com.flixclusive.core.theme.md_theme_light_surfaceTint
+import com.flixclusive.core.theme.md_theme_light_surfaceVariant
+import com.flixclusive.core.theme.md_theme_light_tertiary
+import com.flixclusive.core.theme.md_theme_light_tertiaryContainer
+import com.flixclusive.core.theme.md_theme_tv_dark_background
+import com.flixclusive.core.theme.md_theme_tv_dark_onBackground
+import com.flixclusive.core.theme.md_theme_tv_dark_onSurface
+import com.flixclusive.core.theme.md_theme_tv_dark_onSurfaceVariant
+import com.flixclusive.core.theme.md_theme_tv_dark_surface
+import com.flixclusive.core.theme.md_theme_tv_dark_surfaceVariant
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+private val lightColors = lightColorScheme(
+    primary = md_theme_light_primary,
+    onPrimary = md_theme_light_onPrimary,
+    primaryContainer = md_theme_light_primaryContainer,
+    onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    secondary = md_theme_light_secondary,
+    onSecondary = md_theme_light_onSecondary,
+    secondaryContainer = md_theme_light_secondaryContainer,
+    onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    tertiary = md_theme_light_tertiary,
+    onTertiary = md_theme_light_onTertiary,
+    tertiaryContainer = md_theme_light_tertiaryContainer,
+    onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    error = md_theme_light_error,
+    errorContainer = md_theme_light_errorContainer,
+    onError = md_theme_light_onError,
+    onErrorContainer = md_theme_light_onErrorContainer,
+    background = md_theme_light_background,
+    onBackground = md_theme_light_onBackground,
+    surface = md_theme_light_surface,
+    onSurface = md_theme_light_onSurface,
+    surfaceVariant = md_theme_light_surfaceVariant,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    inverseOnSurface = md_theme_light_inverseOnSurface,
+    inverseSurface = md_theme_light_inverseSurface,
+    inversePrimary = md_theme_light_inversePrimary,
+    surfaceTint = md_theme_light_surfaceTint,
+    scrim = md_theme_light_scrim,
+)
+
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+private val darkColors = darkColorScheme(
+    primary = md_theme_dark_primary,
+    onPrimary = md_theme_dark_onPrimary,
+    primaryContainer = md_theme_dark_primaryContainer,
+    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+    secondary = md_theme_dark_secondary,
+    onSecondary = md_theme_dark_onSecondary,
+    secondaryContainer = md_theme_dark_secondaryContainer,
+    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+    tertiary = md_theme_dark_tertiary,
+    onTertiary = md_theme_dark_onTertiary,
+    tertiaryContainer = md_theme_dark_tertiaryContainer,
+    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+    error = md_theme_dark_error,
+    errorContainer = md_theme_dark_errorContainer,
+    onError = md_theme_dark_onError,
+    onErrorContainer = md_theme_dark_onErrorContainer,
+    background = md_theme_tv_dark_background,
+    onBackground = md_theme_tv_dark_onBackground,
+    surface = md_theme_tv_dark_surface,
+    onSurface = md_theme_tv_dark_onSurface,
+    surfaceVariant = md_theme_tv_dark_surfaceVariant,
+    onSurfaceVariant = md_theme_tv_dark_onSurfaceVariant,
+    inverseOnSurface = md_theme_dark_inverseOnSurface,
+    inverseSurface = md_theme_dark_inverseSurface,
+    inversePrimary = md_theme_dark_inversePrimary,
+    surfaceTint = md_theme_dark_surfaceTint,
+    scrim = md_theme_dark_scrim,
+)
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+@Composable
+internal fun FlixclusiveTvTheme(
+    useDarkTheme: Boolean = true,
+    content: @Composable () -> Unit,
+) {
+    val colors = if (!useDarkTheme) {
+        lightColors
+    } else {
+        darkColors
+    }
+
+    MaterialTheme(
+        colorScheme = colors,
+        typography = TvTypography,
+        content = content,
+    )
+}
\ No newline at end of file
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/tv/TvTypography.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/tv/TvTypography.kt
new file mode 100644
index 000000000..cc55a5041
--- /dev/null
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/tv/TvTypography.kt
@@ -0,0 +1,118 @@
+package com.flixclusive.core.theme.tv
+
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.Typography
+import com.flixclusive.core.theme.spaceGrotesk
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+val TvTypography = Typography(
+    displayLarge = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 96.sp,
+        letterSpacing = (-1.5).sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.1.em
+    ),
+    displayMedium = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 60.sp,
+        letterSpacing = (-0.5).sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.1.em
+    ),
+    displaySmall = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 48.sp,
+        letterSpacing = 0.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.1.em
+    ),
+    headlineLarge = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 34.sp,
+        letterSpacing = 0.25.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    headlineMedium = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp,
+        letterSpacing = 0.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    headlineSmall = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    titleLarge = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 20.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    titleMedium = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 16.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    titleSmall = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    bodyLarge = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 20.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.25.em
+    ),
+    bodyMedium = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        letterSpacing = 0.15.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    bodySmall = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 14.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    labelLarge = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    labelMedium = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    ),
+    labelSmall = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 10.sp,
+        letterSpacing = 0.1.sp,
+        fontFamily = spaceGrotesk,
+        lineHeight = 1.5.em
+    )
+)
\ No newline at end of file
diff --git a/app/src/main/res/font/space_grotesk_bold.ttf b/core/theme/src/main/res/font/space_grotesk_bold.ttf
similarity index 100%
rename from app/src/main/res/font/space_grotesk_bold.ttf
rename to core/theme/src/main/res/font/space_grotesk_bold.ttf
diff --git a/app/src/main/res/font/space_grotesk_light.ttf b/core/theme/src/main/res/font/space_grotesk_light.ttf
similarity index 100%
rename from app/src/main/res/font/space_grotesk_light.ttf
rename to core/theme/src/main/res/font/space_grotesk_light.ttf
diff --git a/app/src/main/res/font/space_grotesk_medium.ttf b/core/theme/src/main/res/font/space_grotesk_medium.ttf
similarity index 100%
rename from app/src/main/res/font/space_grotesk_medium.ttf
rename to core/theme/src/main/res/font/space_grotesk_medium.ttf
diff --git a/app/src/main/res/font/space_grotesk_regular.ttf b/core/theme/src/main/res/font/space_grotesk_regular.ttf
similarity index 100%
rename from app/src/main/res/font/space_grotesk_regular.ttf
rename to core/theme/src/main/res/font/space_grotesk_regular.ttf
diff --git a/app/src/main/res/font/space_grotesk_semibold.ttf b/core/theme/src/main/res/font/space_grotesk_semibold.ttf
similarity index 100%
rename from app/src/main/res/font/space_grotesk_semibold.ttf
rename to core/theme/src/main/res/font/space_grotesk_semibold.ttf
diff --git a/core/ui/.gitignore b/core/ui/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/core/ui/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
new file mode 100644
index 000000000..a531ac2fa
--- /dev/null
+++ b/core/ui/build.gradle.kts
@@ -0,0 +1,21 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+    alias(libs.plugins.flixclusive.compose)
+    alias(libs.plugins.flixclusive.destinations)
+}
+
+android {
+    namespace = "com.flixclusive.core.ui"
+}
+
+dependencies {
+    api(projects.core.util)
+    api(projects.model.tmdb)
+    api(projects.core.theme)
+
+    implementation(libs.compose.ui)
+    implementation(libs.compose.runtime)
+    implementation(libs.lifecycle.viewModelKtx)
+}
\ No newline at end of file
diff --git a/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/MainMobileSharedViewModel.kt b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/MainMobileSharedViewModel.kt
new file mode 100644
index 000000000..7f03d41c3
--- /dev/null
+++ b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/MainMobileSharedViewModel.kt
@@ -0,0 +1,236 @@
+package com.flixclusive.core.ui.mobile
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.flixclusive.core.data.repository.WatchHistoryRepository
+import com.flixclusive.core.data.repository.WatchlistRepository
+import com.flixclusive.core.data.util.InternetMonitor
+import com.flixclusive.core.database.model.toWatchlistItem
+import com.flixclusive.core.datastore.AppSettingsManager
+import com.flixclusive.core.domain.FilmProviderUseCase
+import com.flixclusive.core.domain.SourceLinksProviderUseCase
+import com.flixclusive.core.model.common.FilmType
+import com.flixclusive.core.model.provider.SourceData
+import com.flixclusive.core.model.provider.SourceDataState
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.model.tmdb.Movie
+import com.flixclusive.model.tmdb.TMDBEpisode
+import com.flixclusive.model.tmdb.TvShow
+import com.flixclusive.model.tmdb.toFilmInstance
+import com.flixclusive.core.ui.R
+import com.flixclusive.core.util.common.resource.Resource
+import com.ramcosta.composedestinations.spec.NavGraphSpec
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+@HiltViewModel
+class MainMobileSharedViewModel @Inject constructor(
+    private val watchlistRepository: WatchlistRepository,
+    private val watchHistoryRepository: WatchHistoryRepository,
+    private val filmProviderUseCase: FilmProviderUseCase,
+    private val sourceLinksProvider: SourceLinksProviderUseCase,
+    appSettingsManager: AppSettingsManager,
+    internetMonitor: InternetMonitor,
+) : ViewModel() {
+    private var onFilmLongClickJob: Job? = null
+    private var onWatchlistClickJob: Job? = null
+    private var onRemoveFromWatchHistoryJob: Job? = null
+    private var onPlayClickJob: Job? = null
+
+    var navGraphThatNeedsToGoToRoot: NavGraphSpec? by mutableStateOf(null)
+        private set
+
+    val isConnectedAtNetwork = internetMonitor
+        .isOnline
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000),
+            initialValue = true
+        )
+
+    val appSettings = appSettingsManager.appSettings
+        .data
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000),
+            initialValue = appSettingsManager.localAppSettings
+        )
+
+    private val _uiState = MutableStateFlow(MobileAppUiState())
+    val uiState: StateFlow<MobileAppUiState> = _uiState.asStateFlow()
+
+    private val _episodeToPlay = MutableStateFlow<TMDBEpisode?>(null)
+    val episodeToPlay = _episodeToPlay.asStateFlow()
+
+    private val _filmToPreview = MutableStateFlow<Film?>(null)
+    val filmToPreview = _filmToPreview.asStateFlow()
+
+    val loadedSourceData: SourceData?
+        get() = _filmToPreview.value?.id?.let {
+            sourceLinksProvider.getLinks(
+                filmId = it,
+                episode = _episodeToPlay.value,
+            )
+        }
+
+    fun toggleBottomBar(isVisible: Boolean) {
+        _uiState.update { it.copy(isShowingBottomNavigationBar = isVisible) }
+    }
+
+    fun onFilmLongClick(film: Film) {
+        if(onFilmLongClickJob?.isActive == true)
+            return
+
+        onFilmLongClickJob = viewModelScope.launch {
+            val isInWatchlist = watchlistRepository.getWatchlistItemById(film.id) != null
+            val isInWatchHistory = watchHistoryRepository.getWatchHistoryItemById(film.id) != null
+
+            _filmToPreview.update { film }
+            _uiState.update {
+                it.copy(
+                    isShowingBottomSheetCard = true,
+                    isLongClickedFilmInWatchlist = isInWatchlist,
+                    isLongClickedFilmInWatchHistory = isInWatchHistory
+                )
+            }
+        }
+    }
+
+    fun onBottomSheetClose() {
+        _filmToPreview.value = null
+        _uiState.update {
+            it.copy(isShowingBottomSheetCard = false)
+        }
+    }
+
+    fun onNavBarItemClickTwice(navGraph: NavGraphSpec?) {
+        navGraphThatNeedsToGoToRoot = navGraph
+    }
+
+    fun onWatchlistButtonClick() {
+        if(onWatchlistClickJob?.isActive == true)
+            return
+
+        onWatchlistClickJob = viewModelScope.launch {
+            _filmToPreview.value?.let { film ->
+                val isInWatchlist = _uiState.value.isLongClickedFilmInWatchlist
+                if(isInWatchlist) {
+                    watchlistRepository.removeById(film.id)
+                } else {
+                    watchlistRepository.insert(film.toWatchlistItem())
+                }
+
+                _uiState.update {
+                    it.copy(isLongClickedFilmInWatchlist = !isInWatchlist)
+                }
+            }
+        }
+    }
+
+    fun onSeeMoreClick(shouldSeeMore: Boolean) {
+        _uiState.update {
+            it.copy(isSeeingMoreDetailsOfLongClickedFilm = shouldSeeMore)
+        }
+    }
+
+    fun onRemoveButtonClick() {
+        if(onRemoveFromWatchHistoryJob?.isActive == true)
+            return
+
+        onRemoveFromWatchHistoryJob = viewModelScope.launch {
+            val isLongClickedFilmInWatchHistory = _uiState.value.isLongClickedFilmInWatchHistory
+
+            if(isLongClickedFilmInWatchHistory) {
+                _filmToPreview.value?.let { film ->
+                    _uiState.update {
+                        it.copy(isLongClickedFilmInWatchHistory = false)
+                    }
+
+                    watchHistoryRepository.deleteById(film.id)
+                }
+            }
+        }
+    }
+
+    fun onPlayClick(film: Film? = null, episode: TMDBEpisode? = null) {
+        if(onPlayClickJob?.isActive == true)
+            return
+
+        onPlayClickJob = viewModelScope.launch {
+            updateVideoDataDialogState(SourceDataState.Fetching(R.string.film_data_fetching))
+
+            var filmToShow = film ?: _filmToPreview.value!!
+
+            val response = filmToShow.run {
+                when {
+                    filmType == FilmType.MOVIE && this !is Movie || filmType == FilmType.TV_SHOW && this !is TvShow -> {
+                        filmProviderUseCase(id, filmType)
+                    }
+                    else -> Resource.Success(this)
+                }
+            }
+
+            if(response !is Resource.Success) {
+                return@launch updateVideoDataDialogState(SourceDataState.Error(R.string.film_data_fetch_failed))
+            }
+
+            filmToShow = response.data ?: return@launch updateVideoDataDialogState(SourceDataState.Unavailable())
+
+            val watchHistoryItem = watchHistoryRepository.getWatchHistoryItemById(filmToShow.id)
+                ?.copy(film = filmToShow.toFilmInstance())
+                ?.also { item ->
+                    viewModelScope.launch {
+                        watchHistoryRepository.insert(item)
+                    }
+                }
+
+            _filmToPreview.value = filmToShow
+
+            sourceLinksProvider.clearCache() // Clear cache for safety.
+            sourceLinksProvider.loadLinks(
+                film = filmToShow,
+                watchHistoryItem = watchHistoryItem,
+                episode = episode,
+                onSuccess = { episodeToPlay ->
+                    _episodeToPlay.value = episodeToPlay
+                }
+            ).collectLatest(::updateVideoDataDialogState)
+        }
+    }
+
+    private fun updateVideoDataDialogState(sourceDataState: SourceDataState) {
+        _uiState.update {
+            it.copy(sourceDataState = sourceDataState)
+        }
+    }
+
+    fun onConsumePlayerDialog(isForceClosing: Boolean = false) {
+        updateVideoDataDialogState(SourceDataState.Idle)
+        if(isForceClosing) {
+            onPlayClickJob?.cancel() // Cancel job
+            onPlayClickJob = null
+        }
+
+        _episodeToPlay.value = null
+    }
+
+    fun setIsInPlayer(state: Boolean) {
+        _uiState.update { it.copy(isInPlayer = state) }
+    }
+
+    fun setPiPModeState(state: Boolean) {
+        _uiState.update { it.copy(isInPipMode = state) }
+    }
+}
+
diff --git a/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/MobileAppUiState.kt b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/MobileAppUiState.kt
new file mode 100644
index 000000000..1c8b2e94b
--- /dev/null
+++ b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/MobileAppUiState.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.core.ui.mobile
+
+import com.flixclusive.core.model.provider.SourceDataState
+
+data class MobileAppUiState(
+    val isInPlayer: Boolean = false,
+    val isShowingUpdateDialog: Boolean = false,
+    val isShowingBottomNavigationBar: Boolean = true,
+    val isShowingBottomSheetCard: Boolean = false,
+    val isLongClickedFilmInWatchlist: Boolean = false,
+    val isLongClickedFilmInWatchHistory: Boolean = false,
+    val isSeeingMoreDetailsOfLongClickedFilm: Boolean = false,
+    val sourceDataState: SourceDataState = SourceDataState.Idle,
+    val isInPipMode: Boolean = false,
+)
diff --git a/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/OnDoubleNavBarItemClickObserver.kt b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/OnDoubleNavBarItemClickObserver.kt
new file mode 100644
index 000000000..9d07b0994
--- /dev/null
+++ b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/OnDoubleNavBarItemClickObserver.kt
@@ -0,0 +1,29 @@
+package com.flixclusive.core.ui.mobile
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import com.flixclusive.presentation.NavGraph
+import com.flixclusive.presentation.destinations.Destination
+import com.ramcosta.composedestinations.spec.NavGraphSpec
+
+@Composable
+fun OnDoubleNavBarItemClickObserver(
+    navGraphThatNeedsToGoToRootProvider: () -> NavGraphSpec?,
+    navGraph: NavGraph,
+    currentScreen: Destination,
+    startDestination: Destination,
+    navigate: () -> Unit,
+    consume: (NavGraphSpec?) -> Unit
+) {
+    val navGraphThatNeedsToGoToRoot by rememberUpdatedState(newValue = navGraphThatNeedsToGoToRootProvider())
+
+    LaunchedEffect(key1 = navGraphThatNeedsToGoToRoot) {
+        if(navGraphThatNeedsToGoToRoot == navGraph && currentScreen != startDestination) {
+            navigate()
+        }
+
+        consume(null) // consume it
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/OnSeeMoreDetailsClickObserver.kt b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/OnSeeMoreDetailsClickObserver.kt
new file mode 100644
index 000000000..77d0dd370
--- /dev/null
+++ b/core/ui/src/main/kotlin/com/flixclusive/core/ui/mobile/OnSeeMoreDetailsClickObserver.kt
@@ -0,0 +1,31 @@
+package com.flixclusive.core.ui.mobile
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.lifecycle.Lifecycle
+import androidx.navigation.NavBackStackEntry
+
+@Composable
+fun OnSeeMoreDetailsClickObserver(
+    isSeeingMoreDetailsProvider: () -> Boolean,
+    currentBackStackEntryProvider: () -> NavBackStackEntry?,
+    navigate: () -> Unit
+) {
+    val isSeeingMoreDetails = remember(isSeeingMoreDetailsProvider()) { isSeeingMoreDetailsProvider() }
+    val currentBackStackEntry = remember(currentBackStackEntryProvider()) { currentBackStackEntryProvider() }
+
+    LaunchedEffect(key1 = isSeeingMoreDetails) {
+        if(isSeeingMoreDetails && currentBackStackEntry?.lifecycleIsResumed() == true) {
+            navigate()
+        }
+    }
+}
+
+/**
+ * If the lifecycle is not resumed it means this NavBackStackEntry already processed a nav event.
+ *
+ * This is used to de-duplicate navigation events.
+ */
+private fun NavBackStackEntry.lifecycleIsResumed() =
+    this.lifecycle.currentState == Lifecycle.State.RESUMED
\ No newline at end of file
diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
new file mode 100644
index 000000000..707cb2138
--- /dev/null
+++ b/core/ui/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="film_data_fetching">Fetching film details…</string>
+    <string name="film_data_fetch_failed">Failed to fetch film data</string>
+</resources>
\ No newline at end of file
diff --git a/core/util/.gitignore b/core/util/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/core/util/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/util/build.gradle.kts b/core/util/build.gradle.kts
new file mode 100644
index 000000000..9f9bd8004
--- /dev/null
+++ b/core/util/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+    alias(libs.plugins.flixclusive.compose)
+    alias(libs.plugins.flixclusive.destinations)
+}
+
+android {
+    namespace = "com.flixclusive.core.util"
+}
+
+dependencies {
+    api(libs.okhttp)
+
+    implementation(projects.model.database)
+    implementation(projects.model.tmdb)
+    implementation(libs.retrofit)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.runtime)
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/Constants.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/Constants.kt
new file mode 100644
index 000000000..b9eeba171
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/Constants.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.core.util.common
+
+object Constants {
+    const val FLIXCLUSIVE_LOG_TAG = "FlixclusiveLog"
+    const val IMAGE_BASE_URL = "https://image.tmdb.org/t/p/"
+    const val TMDB_API_BASE_URL = "https://api.themoviedb.org/3/"
+    const val GITHUB_BASE_URL = "https://raw.githubusercontent.com/"
+    const val FINISH_THRESHOLD = 95.0
+    const val FILM_TV_SHOW_TITLE_FORMAT = "S%d E%d: %s"
+    const val APP_DATABASE = "app_database"
+    const val GITHUB_REPOSITORY = "https://github.com/rhenwinch/Flixclusive"
+    const val GITHUB_LATEST_RELEASE = "$GITHUB_REPOSITORY/releases/latest"
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/AppDispatchers.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/AppDispatchers.kt
new file mode 100644
index 000000000..6ea8e1cdb
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/AppDispatchers.kt
@@ -0,0 +1,14 @@
+package com.flixclusive.core.util.common.network
+
+import javax.inject.Qualifier
+
+// https://github.com/android/nowinandroid/blob/main/core/common/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.kt
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Dispatcher(val appDispatcher: AppDispatchers)
+
+enum class AppDispatchers {
+    Default,
+    IO,
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/di/CoroutineScopesModule.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/di/CoroutineScopesModule.kt
new file mode 100644
index 000000000..0b6308bac
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/di/CoroutineScopesModule.kt
@@ -0,0 +1,28 @@
+package com.flixclusive.core.util.common.network.di
+
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class ApplicationScope
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object CoroutineScopesModule {
+    @Provides
+    @Singleton
+    @ApplicationScope
+    fun providesCoroutineScope(
+        @Dispatcher(AppDispatchers.Default) dispatcher: CoroutineDispatcher,
+    ): CoroutineScope = CoroutineScope(SupervisorJob() + dispatcher)
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/di/DispatchersModule.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/di/DispatchersModule.kt
new file mode 100644
index 000000000..bf1c4c707
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/network/di/DispatchersModule.kt
@@ -0,0 +1,22 @@
+package com.flixclusive.core.util.common.network.di
+
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DispatchersModule {
+    @Provides
+    @Dispatcher(AppDispatchers.IO)
+    fun providesIODispatcher(): CoroutineDispatcher = Dispatchers.IO
+
+    @Provides
+    @Dispatcher(AppDispatchers.Default)
+    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/resource/Resource.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/resource/Resource.kt
new file mode 100644
index 000000000..7c739919d
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/resource/Resource.kt
@@ -0,0 +1,20 @@
+package com.flixclusive.core.util.common.resource
+
+import androidx.annotation.StringRes
+import com.flixclusive.core.util.common.ui.UiText
+
+sealed class Resource<out T>(
+    val data: T? = null,
+    val error: UiText? = null,
+    val isLoading: Boolean = false,
+) {
+    class Success<T>(data: T) : Resource<T>(data = data, isLoading = false)
+    class Failure(error: UiText?) : Resource<Nothing>(error = error, isLoading = false) {
+        constructor(@StringRes errorId: Int) : this(UiText.StringResource(errorId))
+        constructor(error: String?) : this(
+            if(error.isNullOrEmpty()) null else UiText.StringValue(error)
+        )
+    }
+
+    data object Loading : Resource<Nothing>(isLoading = true)
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/ui/UiText.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/ui/UiText.kt
new file mode 100644
index 000000000..c2d4cfa90
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/ui/UiText.kt
@@ -0,0 +1,30 @@
+package com.flixclusive.core.util.common.ui
+
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+
+sealed class UiText {
+    data class StringValue(val str: String) : UiText()
+
+    class StringResource(
+        @StringRes val stringId: Int,
+        vararg val args: Any,
+    ) : UiText()
+
+    fun asString(context: Context): String {
+        return when (this) {
+            is StringValue -> str
+            is StringResource -> context.getString(stringId, *args)
+        }
+    }
+
+    @Composable
+    fun asString(): String {
+        return when (this) {
+            is StringValue -> str
+            is StringResource -> stringResource(id = stringId, formatArgs = args)
+        }
+    }
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/Coroutines.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/coroutines/CoroutineHelper.kt
similarity index 92%
rename from providers/src/main/java/com/flixclusive/providers/utils/Coroutines.kt
rename to core/util/src/main/kotlin/com/flixclusive/core/util/coroutines/CoroutineHelper.kt
index 7810652b4..628cd0a67 100644
--- a/providers/src/main/java/com/flixclusive/providers/utils/Coroutines.kt
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/coroutines/CoroutineHelper.kt
@@ -1,42 +1,41 @@
-package com.flixclusive.providers.utils
-
-import com.flixclusive.providers.R
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.runBlocking
-
-/**
- *
- * Fast list iteration:
- * https://www.linkedin.com/pulse/faster-list-iteration-using-kotlin-coroutines-elyes-mansour
- *
- * */
-suspend fun <T, R> Iterable<T>.mapAsync(
-    mapper: suspend (T) -> R
-): List<R> = coroutineScope { map { async { mapper(it) } }.awaitAll() }
-
-/**
- *
- * Fast list iteration with index
- * */
-suspend fun <T, R> Iterable<T>.mapIndexedAsync(
-    mapper: suspend (Int, T) -> R
-): List<R> = coroutineScope { mapIndexed { i, item -> async { mapper(i, item) } }.awaitAll() }
-
-
-/**
- *
- * From Cloudstream `argamap`, aims to call
- * multiple suspend functions asynchronously
- *
- * https://github.com/recloudstream/cloudstream/blob/9d3b2ba3d2497e3a494f87b88b41687df7f5223a/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt#L76
- *
- * */
-fun <R> asyncCalls(
-    vararg transforms: suspend () -> R,
-) = runBlocking {
-    transforms.map {
-        async { it.invoke() }
-    }.map { it.await() }
+package com.flixclusive.core.util.coroutines
+
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runBlocking
+
+/**
+ *
+ * Fast list iteration:
+ * https://www.linkedin.com/pulse/faster-list-iteration-using-kotlin-coroutines-elyes-mansour
+ *
+ * */
+suspend fun <T, R> Iterable<T>.mapAsync(
+    mapper: suspend (T) -> R
+): List<R> = coroutineScope { map { async { mapper(it) } }.awaitAll() }
+
+/**
+ *
+ * Fast list iteration with index
+ * */
+suspend fun <T, R> Iterable<T>.mapIndexedAsync(
+    mapper: suspend (Int, T) -> R
+): List<R> = coroutineScope { mapIndexed { i, item -> async { mapper(i, item) } }.awaitAll() }
+
+
+/**
+ *
+ * From Cloudstream `argamap`, aims to call
+ * multiple suspend functions asynchronously
+ *
+ * https://github.com/recloudstream/cloudstream/blob/9d3b2ba3d2497e3a494f87b88b41687df7f5223a/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt#L76
+ *
+ * */
+fun <R> asyncCalls(
+    vararg transforms: suspend () -> R,
+) = runBlocking {
+    transforms.map {
+        async { it.invoke() }
+    }.map { it.await() }
 }
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/database/WatchHistoryItemHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/database/WatchHistoryItemHelper.kt
new file mode 100644
index 000000000..7f79f386c
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/database/WatchHistoryItemHelper.kt
@@ -0,0 +1,121 @@
+package com.flixclusive.core.util.database
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.model.database.WatchHistoryItem
+import com.flixclusive.model.tmdb.TMDBEpisode
+
+private const val FINISHED_WATCHING_THRESHOLD = 90L
+
+fun filterWatchedFilms(watchHistoryItem: WatchHistoryItem): Boolean {
+    val isTvShow = watchHistoryItem.seasons != null
+
+    var isFinished = true
+    if (watchHistoryItem.episodesWatched.isEmpty()) {
+        isFinished = false
+    } else if(isTvShow) {
+        val nextEpisodeToWatch = getNextEpisodeToWatch(watchHistoryItem)
+        if(nextEpisodeToWatch.first != null)
+            isFinished = false
+    } else {
+        isFinished = watchHistoryItem.episodesWatched.last().isFinished
+    }
+
+    return isFinished
+}
+
+/**
+ * Determines whether the current playback time is considered as finished watching based on the total duration.
+ *
+ * @param currentTime The current playback time in milliseconds.
+ * @param totalTime The total duration of the media in milliseconds.
+ * @return `true` if the current playback time is 95% or more of the total duration, `false` otherwise.
+ */
+fun isFinishedWatching(currentTime: Long, totalTime: Long): Boolean {
+    val percentage = (currentTime.toDouble() / totalTime.toDouble()) * 100
+    return percentage >= FINISHED_WATCHING_THRESHOLD
+}
+
+
+/**
+ * Retrieves the next episode to watch based on the watch history item.
+ * If the show has been finished watching, it returns a pair of `null` values to indicate that the show is finished.
+ *
+ * @param watchHistoryItem The watch history item containing the episodes watched.
+ * @return A pair of season number and episode number representing the next episode to watch.
+ *         Returns a pair of `null` values if the show has been finished watching.
+ */
+fun getNextEpisodeToWatch(watchHistoryItem: WatchHistoryItem): Pair<Int?, Int?> {
+    if(watchHistoryItem.episodesWatched.isEmpty())
+        return 1 to 1
+
+    val lastEpisodeWatched = watchHistoryItem.episodesWatched.last()
+    var seasonNumber = lastEpisodeWatched.seasonNumber!!
+    var episodeNumber = lastEpisodeWatched.episodeNumber!!
+
+    if (lastEpisodeWatched.isFinished) {
+        val episodeCountMap = watchHistoryItem.episodes
+        val isLastEpisodeOfSeason = episodeNumber == getEpisodeCountForSeason(seasonNumber, episodeCountMap)
+
+        if (isLastEpisodeOfSeason) {
+            val nextSeasonNumber = seasonNumber + 1
+
+            val isNextSeasonAvailable = episodeCountMap.containsKey(nextSeasonNumber) || nextSeasonNumber < watchHistoryItem.seasons!!
+            if (isNextSeasonAvailable) {
+                seasonNumber = nextSeasonNumber
+                episodeNumber = 1
+            } else {
+                // The show has been finished watching
+                return null to null
+            }
+        } else {
+            episodeNumber++
+        }
+    }
+
+    return seasonNumber to episodeNumber
+}
+
+/**
+ * Retrieves the episode count for a given season number.
+ *
+ * @param seasonNumber The season number.
+ * @param episodeCountMap The map containing episode counts for each season.
+ * @return The episode count for the given season number.
+ *         Returns 0 if the episode count is not available.
+ */
+private fun getEpisodeCountForSeason(seasonNumber: Int, episodeCountMap: Map<Int, Int>?): Int = episodeCountMap?.get(seasonNumber) ?: 0
+
+fun isTimeInRangeOfThreshold(currentWatchTime: Long, totalDurationToWatch: Long, threshold: Long = 10_000L): Boolean = (totalDurationToWatch - currentWatchTime) <= threshold
+
+fun calculateRemainingAmount(amount: Long, percentage: Double): Long {
+    val deductedAmount = (amount * percentage).toLong()
+    return amount - deductedAmount
+}
+
+fun getSavedTimeForFilm(
+    watchHistoryItem: WatchHistoryItem,
+    episodeToWatch: TMDBEpisode?
+): Pair<Long, Long> {
+    if(watchHistoryItem.episodesWatched.isEmpty())
+        return 0L to 0L
+
+    val isTvShow = watchHistoryItem.seasons != null || watchHistoryItem.film.filmType == FilmType.TV_SHOW
+    return when {
+        isTvShow -> {
+            watchHistoryItem.episodesWatched.find {
+                it.seasonNumber == episodeToWatch?.season
+                        && it.episodeNumber == episodeToWatch?.episode
+            }?.let {
+                if (it.isFinished) 0L to 0L
+                else it.watchTime to it.durationTime
+            } ?: (0L to 0L)
+
+        }
+        !watchHistoryItem.episodesWatched.last().isFinished -> {
+            watchHistoryItem.episodesWatched.last().let {
+                it.watchTime to it.durationTime
+            }
+        }
+        else -> 0L to 0L
+    }
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/exception/ExceptionExtensions.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/exception/ExceptionExtensions.kt
new file mode 100644
index 000000000..d42d72159
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/exception/ExceptionExtensions.kt
@@ -0,0 +1,44 @@
+package com.flixclusive.core.util.exception
+
+import com.flixclusive.core.util.R
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.core.util.log.errorLog
+import retrofit2.HttpException
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLException
+
+
+/**
+ *
+ * Catches all internet-related exceptions
+ * and returns the message.
+ *
+ * */
+fun Exception.catchInternetRelatedException(): Resource.Failure {
+    val defaultMessage = localizedMessage ?: message ?: "Unknown error occurred"
+    errorLog(message = defaultMessage)
+
+    val error = when (this) {
+        is SocketTimeoutException -> Resource.Failure(R.string.connection_timeout)
+        is ConnectException, is UnknownHostException -> Resource.Failure(R.string.connection_failed)
+        is HttpException -> {
+            val errorMessage = "HTTP error: code ${code()}"
+            errorLog(errorMessage)
+            Resource.Failure(errorMessage)
+        }
+        is SSLException -> {
+            val errorMessage = "SSL error: $localizedMessage; Check if your system date is correct."
+            errorLog(errorMessage)
+            Resource.Failure(errorMessage)
+        }
+        else -> {
+            errorLog(defaultMessage)
+            Resource.Failure(defaultMessage)
+        }
+    }
+
+    errorLog(stackTraceToString())
+    return error
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/film/FilmFormatHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/film/FilmFormatHelper.kt
new file mode 100644
index 000000000..b1db1a328
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/film/FilmFormatHelper.kt
@@ -0,0 +1,14 @@
+package com.flixclusive.core.util.film
+
+fun formatMinutes(totalMinutes: Int?): String {
+    if (totalMinutes == null)
+        return "No runtime"
+
+    val hours = totalMinutes / 60
+    val minutes = totalMinutes % 60
+
+    val hoursText = if (hours > 0) "${hours}h " else ""
+    val minutesText = if (minutes > 0) "${minutes}m" else ""
+
+    return (hoursText + minutesText).trim()
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/film/FilmType.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/film/FilmType.kt
new file mode 100644
index 000000000..879f81fcd
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/film/FilmType.kt
@@ -0,0 +1,32 @@
+package com.flixclusive.core.util.film
+
+import com.flixclusive.core.util.R
+
+enum class FilmType(
+    val type: String,
+    val resId: Int
+) {
+    MOVIE(
+        type = "movie",
+        resId = R.string.movies
+    ),
+    TV_SHOW(
+        type = "tv",
+        resId = R.string.tv_shows
+    );
+
+    companion object {
+        fun String?.toFilmType(): FilmType {
+            var result = entries.find { it.type == this }
+            if(result == null) {
+                result = when(this?.lowercase()) {
+                    "tv series" -> TV_SHOW
+                    "movie" -> MOVIE
+                    else -> throw IllegalStateException("Invalid film type: $this")
+                }
+            }
+
+            return result
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/film/TMDBHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/film/TMDBHelper.kt
new file mode 100644
index 000000000..c6a2383d9
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/film/TMDBHelper.kt
@@ -0,0 +1,50 @@
+package com.flixclusive.core.util.film
+
+import android.os.Build
+import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatterBuilder
+import java.time.format.DateTimeParseException
+import java.util.Calendar
+import java.util.Locale
+
+/**
+ * Determines whether the given date string represents a date in the future.
+ *
+ * @param dateString The date string to check. It should be in the format "yyyy-MM-dd" or "MMMM d, yyyy".
+ * @return `true` if the date is in the future, `false` otherwise.
+ */
+fun isDateInFuture(
+    dateString: String?
+): Boolean {
+    if(dateString == null || dateString == "No release date" || dateString.isEmpty())
+        return true
+
+    val locale = Locale.US
+
+    val format = if(dateString.contains(",")) {
+        "MMMM d, yyyy"
+    } else if(dateString.contains("-")) {
+        "yyyy-MM-dd"
+    } else ""
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val date = try {
+            LocalDate.parse(dateString)
+        } catch (e: DateTimeParseException) {
+            val formatter = DateTimeFormatterBuilder()
+                .parseCaseInsensitive()
+                .appendPattern(format)
+                .toFormatter(locale)
+
+            LocalDate.parse(dateString, formatter)
+        }
+
+        date.isAfter(LocalDate.now())
+    } else {
+        val formatter = SimpleDateFormat(format, locale)
+        val currentDate = Calendar.getInstance().time
+        val date = formatter.parse(dateString)
+        date?.after(currentDate) ?: false
+    }
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/json/JsonHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/json/JsonHelper.kt
new file mode 100644
index 000000000..f8718bd68
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/json/JsonHelper.kt
@@ -0,0 +1,8 @@
+package com.flixclusive.core.util.json
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+inline fun <reified T> fromJson(json: String): T {
+    return Gson().fromJson(json, object : TypeToken<T>() {}.type)
+}
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/log/LogHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/log/LogHelper.kt
new file mode 100644
index 000000000..e4c8974a6
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/log/LogHelper.kt
@@ -0,0 +1,8 @@
+package com.flixclusive.core.util.log
+
+import android.util.Log
+
+const val FLIXCLUSIVE_LOG_TAG = "FlixclusiveLog"
+
+fun debugLog(message: String) = Log.d(FLIXCLUSIVE_LOG_TAG, message)
+fun errorLog(message: String) = Log.e(FLIXCLUSIVE_LOG_TAG, message)
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/navigation/NavigationHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/navigation/NavigationHelper.kt
new file mode 100644
index 000000000..8e15aa867
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/navigation/NavigationHelper.kt
@@ -0,0 +1,25 @@
+package com.flixclusive.core.util.navigation
+
+import androidx.navigation.NavHostController
+import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.navigation.popUpTo
+import com.ramcosta.composedestinations.spec.Direction
+import com.ramcosta.composedestinations.spec.Route
+
+fun NavHostController.navigateSingleTopTo(
+    direction: Direction,
+    route: Route
+) = this.navigate(direction) {
+    // Pop up to the start destination of the graph to
+    // avoid building up a large stack of destinations
+    // on the back stack as users select items
+    popUpTo(route) {
+        saveState = true
+    }
+
+    // Avoid multiple copies of the same destination when
+    // re-selecting the same item
+    launchSingleTop = true
+    // Restore uiState when re-selecting a previously selected item
+    restoreState = true
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/network/DoHProviders.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/network/DoHProviders.kt
similarity index 96%
rename from providers/src/main/java/com/flixclusive/providers/utils/network/DoHProviders.kt
rename to core/util/src/main/kotlin/com/flixclusive/core/util/network/DoHProviders.kt
index f1a5257a8..f119f91a0 100644
--- a/providers/src/main/java/com/flixclusive/providers/utils/network/DoHProviders.kt
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/network/DoHProviders.kt
@@ -1,172 +1,172 @@
-package com.flixclusive.providers.utils.network
-
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-import okhttp3.dnsoverhttps.DnsOverHttps
-import java.net.InetAddress
-
-/**
- * - https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt
- */
-fun OkHttpClient.Builder.dohCloudflare() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("162.159.36.1"),
-            InetAddress.getByName("162.159.46.1"),
-            InetAddress.getByName("1.1.1.1"),
-            InetAddress.getByName("1.0.0.1"),
-            InetAddress.getByName("162.159.132.53"),
-            InetAddress.getByName("2606:4700:4700::1111"),
-            InetAddress.getByName("2606:4700:4700::1001"),
-            InetAddress.getByName("2606:4700:4700::0064"),
-            InetAddress.getByName("2606:4700:4700::6400"),
-        )
-        .build(),
-)
-
-fun OkHttpClient.Builder.dohGoogle() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://dns.google/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("8.8.4.4"),
-            InetAddress.getByName("8.8.8.8"),
-            InetAddress.getByName("2001:4860:4860::8888"),
-            InetAddress.getByName("2001:4860:4860::8844"),
-        )
-        .build(),
-)
-
-// AdGuard "Default" DNS works too but for the sake of making sure no site is blacklisted,
-// we use "Unfiltered"
-fun OkHttpClient.Builder.dohAdGuard() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://dns-unfiltered.adguard.com/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("94.140.14.140"),
-            InetAddress.getByName("94.140.14.141"),
-            InetAddress.getByName("2a10:50c0::1:ff"),
-            InetAddress.getByName("2a10:50c0::2:ff"),
-        )
-        .build(),
-)
-
-fun OkHttpClient.Builder.dohQuad9() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://dns.quad9.net/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("9.9.9.9"),
-            InetAddress.getByName("149.112.112.112"),
-            InetAddress.getByName("2620:fe::fe"),
-            InetAddress.getByName("2620:fe::9"),
-        )
-        .build(),
-)
-
-fun OkHttpClient.Builder.dohAliDNS() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://dns.alidns.com/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("223.5.5.5"),
-            InetAddress.getByName("223.6.6.6"),
-            InetAddress.getByName("2400:3200::1"),
-            InetAddress.getByName("2400:3200:baba::1"),
-        )
-        .build(),
-)
-
-fun OkHttpClient.Builder.dohDNSPod() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://doh.pub/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("1.12.12.12"),
-            InetAddress.getByName("120.53.53.53"),
-        )
-        .build(),
-)
-
-fun OkHttpClient.Builder.doh360() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://doh.360.cn/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("101.226.4.6"),
-            InetAddress.getByName("218.30.118.6"),
-            InetAddress.getByName("123.125.81.6"),
-            InetAddress.getByName("140.207.198.6"),
-            InetAddress.getByName("180.163.249.75"),
-            InetAddress.getByName("101.199.113.208"),
-            InetAddress.getByName("36.99.170.86"),
-        )
-        .build(),
-)
-
-fun OkHttpClient.Builder.dohQuad101() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://dns.twnic.tw/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("101.101.101.101"),
-            InetAddress.getByName("2001:de4::101"),
-            InetAddress.getByName("2001:de4::102"),
-        )
-        .build(),
-)
-
-/*
- * Mullvad DoH
- * without ad blocking option
- * Source : https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/
- */
-fun OkHttpClient.Builder.dohMullvad() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://doh.mullvad.net/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("194.242.2.2"),
-            InetAddress.getByName("193.19.108.2"),
-            InetAddress.getByName("2a07:e340::2"),
-        )
-        .build(),
-)
-
-/*
- * Control D
- * unfiltered option
- * Source : https://controld.com/free-dns/?
- */
-fun OkHttpClient.Builder.dohControlD() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://freedns.controld.com/p0".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("76.76.2.0"),
-            InetAddress.getByName("76.76.10.0"),
-            InetAddress.getByName("2606:1a40::"),
-            InetAddress.getByName("2606:1a40:1::"),
-        )
-        .build(),
-)
-
-/*
- * Njalla
- * Non logging and uncensored
- */
-fun OkHttpClient.Builder.dohNajalla() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://dns.njal.la/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("95.215.19.53"),
-            InetAddress.getByName("2001:67c:2354:2::53"),
-        )
-        .build(),
-)
-
-/**
- * Source: https://shecan.ir/
- */
-fun OkHttpClient.Builder.dohSheCan() = dns(
-    DnsOverHttps.Builder().client(build())
-        .url("https://free.shecan.ir/dns-query".toHttpUrl())
-        .bootstrapDnsHosts(
-            InetAddress.getByName("178.22.122.100"),
-            InetAddress.getByName("185.51.200.2"),
-        )
-        .build(),
+package com.flixclusive.core.util.network
+
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.dnsoverhttps.DnsOverHttps
+import java.net.InetAddress
+
+/**
+ * - https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt
+ */
+fun OkHttpClient.Builder.dohCloudflare() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("162.159.36.1"),
+            InetAddress.getByName("162.159.46.1"),
+            InetAddress.getByName("1.1.1.1"),
+            InetAddress.getByName("1.0.0.1"),
+            InetAddress.getByName("162.159.132.53"),
+            InetAddress.getByName("2606:4700:4700::1111"),
+            InetAddress.getByName("2606:4700:4700::1001"),
+            InetAddress.getByName("2606:4700:4700::0064"),
+            InetAddress.getByName("2606:4700:4700::6400"),
+        )
+        .build(),
+)
+
+fun OkHttpClient.Builder.dohGoogle() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://dns.google/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("8.8.4.4"),
+            InetAddress.getByName("8.8.8.8"),
+            InetAddress.getByName("2001:4860:4860::8888"),
+            InetAddress.getByName("2001:4860:4860::8844"),
+        )
+        .build(),
+)
+
+// AdGuard "Default" DNS works too but for the sake of making sure no site is blacklisted,
+// we use "Unfiltered"
+fun OkHttpClient.Builder.dohAdGuard() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://dns-unfiltered.adguard.com/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("94.140.14.140"),
+            InetAddress.getByName("94.140.14.141"),
+            InetAddress.getByName("2a10:50c0::1:ff"),
+            InetAddress.getByName("2a10:50c0::2:ff"),
+        )
+        .build(),
+)
+
+fun OkHttpClient.Builder.dohQuad9() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://dns.quad9.net/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("9.9.9.9"),
+            InetAddress.getByName("149.112.112.112"),
+            InetAddress.getByName("2620:fe::fe"),
+            InetAddress.getByName("2620:fe::9"),
+        )
+        .build(),
+)
+
+fun OkHttpClient.Builder.dohAliDNS() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://dns.alidns.com/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("223.5.5.5"),
+            InetAddress.getByName("223.6.6.6"),
+            InetAddress.getByName("2400:3200::1"),
+            InetAddress.getByName("2400:3200:baba::1"),
+        )
+        .build(),
+)
+
+fun OkHttpClient.Builder.dohDNSPod() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://doh.pub/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("1.12.12.12"),
+            InetAddress.getByName("120.53.53.53"),
+        )
+        .build(),
+)
+
+fun OkHttpClient.Builder.doh360() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://doh.360.cn/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("101.226.4.6"),
+            InetAddress.getByName("218.30.118.6"),
+            InetAddress.getByName("123.125.81.6"),
+            InetAddress.getByName("140.207.198.6"),
+            InetAddress.getByName("180.163.249.75"),
+            InetAddress.getByName("101.199.113.208"),
+            InetAddress.getByName("36.99.170.86"),
+        )
+        .build(),
+)
+
+fun OkHttpClient.Builder.dohQuad101() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://dns.twnic.tw/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("101.101.101.101"),
+            InetAddress.getByName("2001:de4::101"),
+            InetAddress.getByName("2001:de4::102"),
+        )
+        .build(),
+)
+
+/*
+ * Mullvad DoH
+ * without ad blocking option
+ * Source : https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/
+ */
+fun OkHttpClient.Builder.dohMullvad() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://doh.mullvad.net/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("194.242.2.2"),
+            InetAddress.getByName("193.19.108.2"),
+            InetAddress.getByName("2a07:e340::2"),
+        )
+        .build(),
+)
+
+/*
+ * Control D
+ * unfiltered option
+ * Source : https://controld.com/free-dns/?
+ */
+fun OkHttpClient.Builder.dohControlD() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://freedns.controld.com/p0".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("76.76.2.0"),
+            InetAddress.getByName("76.76.10.0"),
+            InetAddress.getByName("2606:1a40::"),
+            InetAddress.getByName("2606:1a40:1::"),
+        )
+        .build(),
+)
+
+/*
+ * Njalla
+ * Non logging and uncensored
+ */
+fun OkHttpClient.Builder.dohNajalla() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://dns.njal.la/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("95.215.19.53"),
+            InetAddress.getByName("2001:67c:2354:2::53"),
+        )
+        .build(),
+)
+
+/**
+ * Source: https://shecan.ir/
+ */
+fun OkHttpClient.Builder.dohSheCan() = dns(
+    DnsOverHttps.Builder().client(build())
+        .url("https://free.shecan.ir/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("178.22.122.100"),
+            InetAddress.getByName("185.51.200.2"),
+        )
+        .build(),
 )
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/network/TrustManagerHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/network/TrustManagerHelper.kt
new file mode 100644
index 000000000..5c3725798
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/network/TrustManagerHelper.kt
@@ -0,0 +1,30 @@
+package com.flixclusive.core.util.network
+
+import android.annotation.SuppressLint
+import okhttp3.OkHttpClient
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+// https://stackoverflow.com/a/59322754
+fun OkHttpClient.Builder.ignoreAllSSLErrors(): OkHttpClient.Builder {
+    val naiveTrustManager = SSLTrustManager()
+
+    val insecureSocketFactory = SSLContext.getInstance("SSL").apply {
+        val trustAllCerts = arrayOf<TrustManager>(naiveTrustManager)
+        init(null, trustAllCerts, SecureRandom())
+    }.socketFactory
+
+    sslSocketFactory(insecureSocketFactory, naiveTrustManager)
+    hostnameVerifier { _, _ -> true }
+    return this
+}
+
+@SuppressLint("CustomX509TrustManager")
+class SSLTrustManager : X509TrustManager {
+    override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+    override fun checkClientTrusted(certs: Array<X509Certificate>, authType: String) = Unit
+    override fun checkServerTrusted(certs: Array<X509Certificate>, authType: String) = Unit
+}
\ No newline at end of file
diff --git a/core/util/src/main/res/values/strings.xml b/core/util/src/main/res/values/strings.xml
new file mode 100644
index 000000000..0fb11aa61
--- /dev/null
+++ b/core/util/src/main/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="connection_timeout">Connection timeout</string>
+    <string name="connection_failed">Connection failure</string>
+
+
+    <!--  Film Types  -->
+    <string name="movies">Movies</string>
+    <string name="tv_shows">TV Shows</string>
+</resources>
+
diff --git a/data/configuration/.gitignore b/data/configuration/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/configuration/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/configuration/build.gradle.kts b/data/configuration/build.gradle.kts
new file mode 100644
index 000000000..e4c7caf2e
--- /dev/null
+++ b/data/configuration/build.gradle.kts
@@ -0,0 +1,18 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.configuration"
+}
+
+dependencies {
+    api(projects.core.datastore)
+    api(projects.model.configuration)
+    api(projects.core.util)
+
+    implementation(projects.core.network)
+    implementation(projects.data.provider)
+}
\ No newline at end of file
diff --git a/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/AppConfigurationManager.kt b/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/AppConfigurationManager.kt
new file mode 100644
index 000000000..55897ab1b
--- /dev/null
+++ b/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/AppConfigurationManager.kt
@@ -0,0 +1,28 @@
+package com.flixclusive.data.configuration
+
+import com.flixclusive.core.util.common.ui.UiText
+import com.flixclusive.model.configuration.AppConfig
+import com.flixclusive.model.configuration.HomeCategoriesConfig
+import com.flixclusive.model.configuration.ProviderStatus
+import com.flixclusive.model.configuration.SearchCategoriesConfig
+import kotlinx.coroutines.flow.StateFlow
+
+sealed class RemoteConfigStatus(val errorMessage: UiText? = null) {
+    data object Loading :  RemoteConfigStatus()
+    data object Success :  RemoteConfigStatus()
+    data class Error(
+        val message: UiText
+    ) : RemoteConfigStatus(message)
+}
+
+interface AppConfigurationManager {
+    val remoteStatus: StateFlow<RemoteConfigStatus>
+
+    var homeCategoriesConfig: HomeCategoriesConfig?
+    var searchCategoriesConfig: SearchCategoriesConfig?
+    var appConfig: AppConfig?
+    var providersStatus: List<ProviderStatus>?
+
+    fun initialize()
+    fun checkForUpdates()
+}
\ No newline at end of file
diff --git a/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/DefaultAppConfigurationManager.kt b/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/DefaultAppConfigurationManager.kt
new file mode 100644
index 000000000..82ceb0a28
--- /dev/null
+++ b/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/DefaultAppConfigurationManager.kt
@@ -0,0 +1,140 @@
+package com.flixclusive.data.configuration
+
+import com.flixclusive.core.datastore.AppSettingsManager
+import com.flixclusive.core.network.retrofit.FlixclusiveConfigurationService
+import com.flixclusive.core.util.common.ui.UiText
+import com.flixclusive.core.util.exception.catchInternetRelatedException
+import com.flixclusive.core.util.log.errorLog
+import com.flixclusive.data.provider.ProviderRepository
+import com.flixclusive.model.configuration.AppConfig
+import com.flixclusive.model.configuration.HomeCategoriesConfig
+import com.flixclusive.model.configuration.ProviderStatus
+import com.flixclusive.model.configuration.SearchCategoriesConfig
+import com.flixclusive.model.datastore.ProviderPreference
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+private const val MAX_RETRIES = 5
+
+internal class DefaultAppConfigurationManager @Inject constructor(
+    private val appConfigService: FlixclusiveConfigurationService,
+    private val providersRepository: ProviderRepository,
+    private val appSettingsManager: AppSettingsManager,
+    private val ioScope: CoroutineScope,
+) : AppConfigurationManager {
+
+    private val _remoteStatus = MutableStateFlow<RemoteConfigStatus>(RemoteConfigStatus.Loading)
+    private var fetchJob: Job? = null
+
+    override val remoteStatus: StateFlow<RemoteConfigStatus>
+        get() = _remoteStatus.asStateFlow()
+
+    override var homeCategoriesConfig: HomeCategoriesConfig? = null
+    override var searchCategoriesConfig: SearchCategoriesConfig? = null
+    override var appConfig: AppConfig? = null
+    override var providersStatus: List<ProviderStatus>? = null
+
+    override fun initialize() {
+        if(fetchJob?.isActive == true)
+            return
+
+        fetchJob = ioScope.launch {
+            for (i in 0..MAX_RETRIES) {
+                _remoteStatus.update { RemoteConfigStatus.Loading }
+
+                try {
+                    appConfig = appConfigService.getAppConfig()
+                    providersStatus = appConfigService.getProvidersStatus()
+
+                    initializeProviders()
+
+                    homeCategoriesConfig = appConfigService.getHomeCategoriesConfig()
+                    searchCategoriesConfig = appConfigService.getSearchCategoriesConfig()
+
+                    if (homeCategoriesConfig == null || searchCategoriesConfig == null || appConfig == null || providersStatus == null) {
+                        continue
+                    }
+
+                    return@launch _remoteStatus.update { RemoteConfigStatus.Success }
+                } catch (e: Exception) {
+                    errorLog(e.stackTraceToString())
+                    val errorMessageId = e.catchInternetRelatedException().error!!
+
+                    _remoteStatus.update { RemoteConfigStatus.Error(errorMessageId) }
+                }
+
+            }
+
+            _remoteStatus.update {
+                RemoteConfigStatus.Error(UiText.StringResource(R.string.failed_to_init_app))
+            }
+        }
+    }
+
+    override fun checkForUpdates() {
+        if(fetchJob?.isActive == true)
+            return
+
+        fetchJob = ioScope.launch {
+            _remoteStatus.update { RemoteConfigStatus.Loading }
+
+            try {
+                appConfig = appConfigService.getAppConfig()
+
+                return@launch _remoteStatus.update { RemoteConfigStatus.Success }
+            } catch (e: Exception) {
+                errorLog(e.stackTraceToString())
+                val errorMessageId = e.catchInternetRelatedException().error!!
+
+                _remoteStatus.update { RemoteConfigStatus.Error(errorMessageId) }
+            }
+        }
+    }
+
+    private suspend fun initializeProviders() {
+        val appSettings = appSettingsManager.localAppSettings
+        val providersPreferences = appSettings.providers.toMutableList()
+
+        val isConfigEmpty = providersPreferences.isEmpty()
+
+        if (providersRepository.providers.size >= providersStatus!!.size)
+            return
+
+        providersRepository.providers.clear()
+
+        for (i in providersStatus!!.indices) {
+            val provider = if (!isConfigEmpty) {
+                providersStatus!!.find {
+                    it.name.equals(
+                        other = providersPreferences[i].name,
+                        ignoreCase = true
+                    )
+                }
+            } else providersStatus!![i]
+
+            val isIgnored = providersPreferences.getOrNull(i)?.isIgnored ?: false
+
+            providersRepository.populate(
+                name = provider!!.name,
+                isMaintenance = provider.isMaintenance,
+                isIgnored = isIgnored
+            )
+
+            if (isConfigEmpty) {
+                providersPreferences.add(
+                    ProviderPreference(name = provider.name)
+                )
+
+                appSettingsManager.updateData(
+                    appSettings.copy(providers = providersPreferences)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/di/AppConfigurationModule.kt b/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/di/AppConfigurationModule.kt
new file mode 100644
index 000000000..5c84148ca
--- /dev/null
+++ b/data/configuration/src/main/kotlin/com/flixclusive/data/configuration/di/AppConfigurationModule.kt
@@ -0,0 +1,17 @@
+package com.flixclusive.data.configuration.di
+
+import com.flixclusive.data.configuration.AppConfigurationManager
+import com.flixclusive.data.configuration.DefaultAppConfigurationManager
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class AppConfigurationModule {
+    @Binds
+    internal abstract fun bindsAppConfigurationProvider(
+        appConfigurationProvider: DefaultAppConfigurationManager,
+    ): AppConfigurationManager
+}
\ No newline at end of file
diff --git a/data/configuration/src/main/res/values/strings.xml b/data/configuration/src/main/res/values/strings.xml
new file mode 100644
index 000000000..265b90a95
--- /dev/null
+++ b/data/configuration/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="failed_to_init_app">Couldn\'t initialize the app.</string>
+</resources>
\ No newline at end of file
diff --git a/data/provider/.gitignore b/data/provider/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/provider/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/provider/build.gradle.kts b/data/provider/build.gradle.kts
new file mode 100644
index 000000000..4e787ea50
--- /dev/null
+++ b/data/provider/build.gradle.kts
@@ -0,0 +1,21 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.compose)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.provider"
+}
+
+dependencies {
+    api(projects.core.datastore)
+    api(projects.model.datastore)
+    api(projects.model.provider)
+    api(projects.core.util)
+    api(libs.compose.runtime)
+
+    implementation(projects.data.tmdb)
+    implementation(libs.okhttp)
+}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt
new file mode 100644
index 000000000..fd455b18c
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt
@@ -0,0 +1,129 @@
+package com.flixclusive.data.provider
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import com.flixclusive.core.datastore.AppSettingsManager
+import com.flixclusive.model.datastore.AppSettings
+import com.flixclusive.model.provider.ProviderWrapper
+import com.flixclusive.provider.provider.flixhq.FlixHQ
+import com.flixclusive.provider.provider.lookmovie.LookMovie
+import com.flixclusive.provider.provider.superstream.SuperStream
+import okhttp3.OkHttpClient
+import javax.inject.Inject
+
+internal class DefaultProviderRepository @Inject constructor(
+    client: OkHttpClient,
+    private val appSettingsManager: AppSettingsManager,
+) : ProviderRepository {
+    private val listOfAvailableProviders = arrayListOf(
+        SuperStream(client),
+        LookMovie(client),
+        FlixHQ(client)
+    )
+
+    override val providers: SnapshotStateList<ProviderWrapper> = mutableStateListOf()
+
+    override fun populate(
+        name: String,
+        isIgnored: Boolean,
+        isMaintenance: Boolean
+    ) {
+        if(providers.any { it.provider.name == name })
+            return
+
+        val provider = listOfAvailableProviders.find { it.name.equals(name, true) }
+            ?: throw Exception("Can't find this provider in the available list.")
+
+        providers.add(
+            ProviderWrapper(
+                provider = provider,
+                isMaintenance = isMaintenance,
+                isIgnored = isIgnored
+            )
+        )
+    }
+
+    override suspend fun swap(
+        appSettings: AppSettings,
+        fromIndex: Int,
+        toIndex: Int
+    ) {
+        val size = providers.size
+        if (fromIndex == toIndex || fromIndex < 0 || toIndex < 0 || fromIndex >= size || toIndex >= size) {
+            return
+        }
+
+        val tempProvidersList = providers[fromIndex]
+        providers[fromIndex] = providers[toIndex]
+        providers[toIndex] = tempProvidersList
+        
+        appSettings.swapProviders(
+            fromIndex = fromIndex,
+            toIndex = toIndex
+        )
+    }
+
+    /**
+     *
+     * Swap the provider in app settings
+     *
+     * */
+    private suspend fun AppSettings.swapProviders(
+        fromIndex: Int,
+        toIndex: Int
+    ) {
+        // === SWAP on APP SETTINGS
+        val providerConfig = providers.toMutableList()
+        val tempProvidersConfig = providerConfig[fromIndex]
+        providerConfig[fromIndex] = providerConfig[toIndex]
+        providerConfig[toIndex] = tempProvidersConfig
+
+        appSettingsManager.updateData(
+            copy(
+                providers = providerConfig
+            )
+        )
+        // ========================
+    }
+
+    override suspend fun toggleUsage(
+        appSettings: AppSettings,
+        index: Int
+    ) {
+        val size = providers.size
+        if (index >= size) {
+            return
+        }
+
+        val dataProvidersList = providers[index]
+        providers[index] = dataProvidersList.copy(
+            isIgnored = !dataProvidersList.isIgnored
+        )
+
+
+        appSettings.toggleProvider(index)
+    }
+
+
+    /**
+     *
+     * Toggles whether to use the provider
+     * inside app settings.
+     *
+     * */
+    private suspend fun AppSettings.toggleProvider(index: Int) {
+        // === TOGGLE USAGE on APP SETTINGS
+        val providerConfig = providers.toMutableList()
+        val dataProvidersConfig = providerConfig[index]
+        providerConfig[index] = dataProvidersConfig.copy(
+            isIgnored = !dataProvidersConfig.isIgnored
+        )
+
+        appSettingsManager.updateData(
+            copy(
+                providers = providerConfig
+            )
+        )
+        // =================================
+    }
+}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultSourceLinksRepository.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultSourceLinksRepository.kt
new file mode 100644
index 000000000..a5f987466
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultSourceLinksRepository.kt
@@ -0,0 +1,145 @@
+package com.flixclusive.data.provider
+
+import com.flixclusive.data.tmdb.TMDBRepository
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.core.util.exception.catchInternetRelatedException
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.log.errorLog
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.model.tmdb.TvShow
+import com.flixclusive.provider.provider.BaseProvider
+import com.flixclusive.provider.utils.DecryptUtils
+import com.google.gson.JsonSyntaxException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class DefaultSourceLinksRepository @Inject constructor(
+    private val tmdbRepository: TMDBRepository,
+    @Dispatcher(AppDispatchers.IO) private val ioDispatcher: CoroutineDispatcher,
+) : SourceLinksRepository {
+
+    override suspend fun getSourceLinks(
+        mediaId: String,
+        provider: BaseProvider,
+        season: Int?,
+        episode: Int?,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ): Resource<Unit?> {
+        return withContext(ioDispatcher) {
+            try {
+                provider.getSourceLinks(
+                    filmId = mediaId,
+                    episode = episode,
+                    season = season,
+                    onLinkLoaded = onLinkLoaded,
+                    onSubtitleLoaded = onSubtitleLoaded
+                )
+
+                return@withContext Resource.Success(Unit)
+            } catch (e: Exception) {
+                errorLog(e.stackTraceToString())
+                return@withContext when (e) {
+                    is DecryptUtils.DecryptionException -> Resource.Failure(R.string.decryption_error)
+                    is JsonSyntaxException -> Resource.Failure(R.string.failed_to_extract)
+                    else -> e.catchInternetRelatedException()
+                }
+            }
+        }
+    }
+
+    override suspend fun getMediaId(
+        film: Film?,
+        provider: BaseProvider,
+    ): String? {
+        return withContext(ioDispatcher) {
+            try {
+                val filmToSearch = if(film?.filmType == FilmType.TV_SHOW && film !is TvShow) {
+                    val response = tmdbRepository.getTvShow(film.id)
+
+                    if(response is Resource.Failure)
+                        return@withContext null
+
+                    response.data
+                } else film
+
+                if (filmToSearch == null)
+                    return@withContext null
+
+                var i = 1
+                var id: String? = null
+                val maxPage = 3
+
+                while (id == null) {
+                    if (i > maxPage) {
+                        return@withContext ""
+                    }
+
+                    val searchResponse = provider.search(
+                        query = filmToSearch.title,
+                        page = i,
+                        filmType = filmToSearch.filmType
+                    )
+
+                    if (searchResponse.results.isEmpty())
+                        return@withContext ""
+
+
+                    for(result in searchResponse.results) {
+                        if(result.tmdbId == filmToSearch.id) {
+                            id = result.id
+                            break
+                        }
+
+                        val titleMatches = result.title.equals(filmToSearch.title, ignoreCase = true)
+                        val filmTypeMatches = result.mediaType?.type == filmToSearch.filmType.type
+                        val releaseDateMatches =
+                            result.releaseDate == filmToSearch.dateReleased.split(" ").last()
+
+                        if (titleMatches && filmTypeMatches && filmToSearch is TvShow) {
+                            if (filmToSearch.seasons.size == result.seasons || releaseDateMatches) {
+                                id = result.id
+                                break
+                            }
+
+                            val tvShowInfo = provider.getFilmInfo(
+                                filmId = result.id!!,
+                                filmType = filmToSearch.filmType
+                            )
+
+                            val tvReleaseDateMatches = tvShowInfo.yearReleased == filmToSearch.dateReleased.split("-").first()
+                            val seasonCountMatches = filmToSearch.seasons.size == tvShowInfo.seasons
+
+                            if (tvReleaseDateMatches || seasonCountMatches) {
+                                id = result.id
+                                break
+                            }
+                        }
+
+                        if (titleMatches && filmTypeMatches && releaseDateMatches) {
+                            id = result.id
+                            break
+                        }
+                    }
+
+                    if (searchResponse.hasNextPage) {
+                        i++
+                    } else if (id.isNullOrEmpty()) {
+                        id = ""
+                        break
+                    }
+                }
+
+                id
+            } catch (e: Exception) {
+                errorLog(e.stackTraceToString())
+                null
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt
new file mode 100644
index 000000000..2acc577ad
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt
@@ -0,0 +1,19 @@
+package com.flixclusive.data.provider
+
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import com.flixclusive.model.datastore.AppSettings
+import com.flixclusive.model.provider.ProviderWrapper
+
+interface ProviderRepository {
+    val providers: SnapshotStateList<ProviderWrapper>
+
+    fun populate(
+        name: String,
+        isIgnored: Boolean,
+        isMaintenance: Boolean
+    )
+
+    suspend fun swap(appSettings: AppSettings, fromIndex: Int, toIndex: Int)
+
+    suspend fun toggleUsage(appSettings: AppSettings, index: Int)
+}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/SourceLinksRepository.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/SourceLinksRepository.kt
new file mode 100644
index 000000000..7ff01543d
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/SourceLinksRepository.kt
@@ -0,0 +1,24 @@
+package com.flixclusive.data.provider
+
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.provider.provider.BaseProvider
+
+interface SourceLinksRepository {
+
+    suspend fun getSourceLinks(
+        mediaId: String,
+        provider: BaseProvider,
+        season: Int? = null,
+        episode: Int? = null,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ): Resource<Unit?>
+
+    suspend fun getMediaId(
+        film: Film?,
+        provider: BaseProvider,
+    ): String?
+}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt
new file mode 100644
index 000000000..16a7958d6
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt
@@ -0,0 +1,25 @@
+package com.flixclusive.data.provider.di
+
+import com.flixclusive.data.provider.DefaultProviderRepository
+import com.flixclusive.data.provider.DefaultSourceLinksRepository
+import com.flixclusive.data.provider.ProviderRepository
+import com.flixclusive.data.provider.SourceLinksRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class ProviderModule {
+    @Binds
+    internal abstract fun bindsProviderRepository(
+        providerRepository: DefaultProviderRepository,
+    ): ProviderRepository
+
+    @Binds
+    internal abstract fun bindsSourceLinksRepository(
+        sourceLinksRepository: DefaultSourceLinksRepository,
+    ): SourceLinksRepository
+
+}
\ No newline at end of file
diff --git a/data/provider/src/main/res/values/strings.xml b/data/provider/src/main/res/values/strings.xml
new file mode 100644
index 000000000..2f409af2b
--- /dev/null
+++ b/data/provider/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="failed_to_extract">Failed to extract, try again later</string>
+    <string name="decryption_error">Decryption of data failed, try again later</string>
+</resources>
\ No newline at end of file
diff --git a/data/tmdb/.gitignore b/data/tmdb/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/tmdb/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/tmdb/build.gradle.kts b/data/tmdb/build.gradle.kts
new file mode 100644
index 000000000..0ee57eac9
--- /dev/null
+++ b/data/tmdb/build.gradle.kts
@@ -0,0 +1,17 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.tmdb"
+}
+
+dependencies {
+    api(projects.data.configuration)
+    api(projects.model.tmdb)
+    api(projects.core.util)
+
+    implementation(projects.core.network)
+}
\ No newline at end of file
diff --git a/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/DefaultTMDBRepository.kt b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/DefaultTMDBRepository.kt
new file mode 100644
index 000000000..b431f3d42
--- /dev/null
+++ b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/DefaultTMDBRepository.kt
@@ -0,0 +1,293 @@
+package com.flixclusive.data.tmdb
+
+import com.flixclusive.core.network.retrofit.TMDBApiService
+import com.flixclusive.core.network.retrofit.dto.common.TMDBImagesResponseDto
+import com.flixclusive.core.network.retrofit.dto.toMovie
+import com.flixclusive.core.network.retrofit.dto.toTvShow
+import com.flixclusive.core.network.retrofit.dto.tv.toSeason
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.core.util.exception.catchInternetRelatedException
+import com.flixclusive.core.util.log.errorLog
+import com.flixclusive.data.configuration.AppConfigurationManager
+import com.flixclusive.data.tmdb.util.filterOutUnreleasedRecommendations
+import com.flixclusive.data.tmdb.util.filterOutZeroSeasons
+import com.flixclusive.model.tmdb.Genre
+import com.flixclusive.model.tmdb.Movie
+import com.flixclusive.model.tmdb.Season
+import com.flixclusive.model.tmdb.TMDBCollection
+import com.flixclusive.model.tmdb.TMDBEpisode
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.model.tmdb.TvShow
+import com.flixclusive.model.tmdb.util.formatGenreIds
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import retrofit2.HttpException
+import javax.inject.Inject
+
+private const val TMDB_API_BASE_URL = "https://api.themoviedb.org/3/"
+
+class DefaultTMDBRepository @Inject constructor(
+    private val tmdbApiService: TMDBApiService,
+    private val configurationProvider: AppConfigurationManager,
+    @Dispatcher(AppDispatchers.IO) private val ioDispatcher: CoroutineDispatcher,
+) : TMDBRepository {
+    override val tmdbApiKey: String
+        get() = configurationProvider.appConfig!!.tmdbApiKey
+
+    override suspend fun getTrending(
+        mediaType: String,
+        timeWindow: String,
+        page: Int,
+    ): Resource<TMDBPageResponse<TMDBSearchItem>> {
+        return withContext(ioDispatcher) {
+            try {
+                val response = tmdbApiService.getTrending(
+                    mediaType = mediaType,
+                    timeWindow = timeWindow,
+                    apiKey = tmdbApiKey,
+                    page = page
+                )
+
+                Resource.Success(response)
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun discoverFilms(
+        mediaType: String,
+        page: Int,
+        withNetworks: List<Int>?,
+        withCompanies: List<Int>?,
+        withGenres: List<Genre>?,
+        sortBy: SortOptions,
+    ): Resource<TMDBPageResponse<TMDBSearchItem>> {
+        return withContext(ioDispatcher) {
+            try {
+                val sortOption = when (sortBy) {
+                    SortOptions.POPULARITY -> "popularity.desc"
+                    SortOptions.RATED -> "vote_average.desc"
+                }
+
+                val response = tmdbApiService.discoverFilms(
+                    mediaType = mediaType,
+                    apiKey = tmdbApiKey,
+                    page = page,
+                    sortBy = sortOption,
+                    networks = withNetworks?.joinToString(",") ?: "",
+                    companies = withCompanies?.joinToString(",") ?: "",
+                    genres = withGenres?.joinToString(",") { it.id.toString() } ?: ""
+                )
+
+                Resource.Success(response)
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun search(
+        mediaType: String,
+        query: String,
+        page: Int,
+    ): Resource<TMDBPageResponse<TMDBSearchItem>> {
+        return withContext(ioDispatcher) {
+            try {
+                if (query.isEmpty()) {
+                    Resource.Failure("Search query should not be empty!")
+                }
+
+                val response = tmdbApiService.search(
+                    mediaType = mediaType,
+                    apiKey = tmdbApiKey,
+                    page = page,
+                    query = query
+                )
+
+                Resource.Success(response)
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun getImages(
+        mediaType: String,
+        id: Int,
+    ): Resource<TMDBImagesResponseDto> {
+        return withContext(ioDispatcher) {
+            try {
+                val response = tmdbApiService.getImages(
+                    mediaType = mediaType,
+                    apiKey = tmdbApiKey,
+                    id = id
+                )
+
+                Resource.Success(response)
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun getMovie(id: Int): Resource<Movie> {
+        return withContext(ioDispatcher) {
+            try {
+                val movie = tmdbApiService.getMovie(
+                    id = id, apiKey = tmdbApiKey
+                )
+
+                val collection: TMDBCollection? = if (movie.belongsToCollection != null) {
+                    val collection = getCollection(id = movie.belongsToCollection!!.id)
+
+                    if (collection !is Resource.Success)
+                        throw Exception("Error fetching collection of ${movie.title} [${movie.id}]")
+
+                    collection.data
+                } else null
+
+                val filteredRecommendations =
+                    filterOutUnreleasedRecommendations(movie.recommendations.results)
+                val newGenres = formatGenreIds(
+                    genreIds = movie.genres.map { it.id },
+                    genresList = configurationProvider
+                        .searchCategoriesConfig!!.genres.map {
+                            Genre(
+                                id = it.id,
+                                name = it.name,
+                                mediaType = it.mediaType
+                            )
+                        }
+                )
+
+                Resource.Success(
+                    movie.copy(
+                        recommendations = movie.recommendations.copy(
+                            results = filteredRecommendations
+                        ),
+                        genres = newGenres
+                    )
+                        .toMovie()
+                        .copy(
+                            collection = collection?.copy(
+                                films = filterOutUnreleasedRecommendations(collection.films)
+                            )
+                        )
+                )
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun getTvShow(id: Int): Resource<TvShow> {
+        return withContext(ioDispatcher) {
+            try {
+                val tvShow = tmdbApiService.getTvShow(
+                    id = id, apiKey = tmdbApiKey
+                )
+
+                val filteredRecommendations =
+                    filterOutUnreleasedRecommendations(tvShow.recommendations.results)
+                val filteredSeasons = filterOutZeroSeasons(tvShow.seasons)
+                val newGenres = formatGenreIds(
+                    genreIds = tvShow.genres.map { it.id },
+                    genresList = configurationProvider
+                        .searchCategoriesConfig!!.genres.map {
+                            Genre(
+                                id = it.id,
+                                name = it.name,
+                                mediaType = it.mediaType
+                            )
+                        }
+                )
+
+                Resource.Success(
+                    tvShow.copy(
+                        seasons = filteredSeasons,
+                        numberOfSeasons = filteredSeasons.size,
+                        recommendations = tvShow.recommendations.copy(
+                            results = filteredRecommendations
+                        ),
+                        genres = newGenres
+                    ).toTvShow()
+                )
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun getSeason(id: Int, seasonNumber: Int): Resource<Season> {
+        return withContext(ioDispatcher) {
+            try {
+                val season = tmdbApiService.getSeason(
+                    id = id, seasonNumber = seasonNumber, apiKey = tmdbApiKey
+                )
+
+                Resource.Success(
+                    season.toSeason()
+                )
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun getEpisode(
+        id: Int,
+        seasonNumber: Int,
+        episodeNumber: Int,
+    ): Resource<TMDBEpisode?> {
+        return withContext(ioDispatcher) {
+            val season = getSeason(id, seasonNumber)
+
+            if (season is Resource.Failure)
+                return@withContext Resource.Failure(season.error)
+
+            val episodeId = season.data!!.episodes.find {
+                it.season == seasonNumber
+                        && it.episode == episodeNumber
+            }
+            Resource.Success(episodeId)
+        }
+    }
+
+    override suspend fun getCollection(id: Int): Resource<TMDBCollection> {
+        return withContext(ioDispatcher) {
+            try {
+                val response = tmdbApiService.getCollection(
+                    id = id, apiKey = tmdbApiKey
+                )
+
+                Resource.Success(response)
+            } catch (e: Exception) {
+                e.catchInternetRelatedException()
+            }
+        }
+    }
+
+    override suspend fun paginateConfigItems(
+        url: String,
+        page: Int,
+    ): Resource<TMDBPageResponse<TMDBSearchItem>> {
+        return withContext(ioDispatcher) {
+            val fullUrl = "$TMDB_API_BASE_URL$url&page=$page&api_key=$tmdbApiKey"
+
+            try {
+                Resource.Success(tmdbApiService.get(fullUrl))
+            } catch (e: HttpException) {
+                errorLog("Http Error (${e.code()}) on URL[$fullUrl]: ${e.response()}")
+                errorLog(e.stackTraceToString())
+                Resource.Failure(e.message ?: "Unknown error occurred")
+            } catch (e: Exception) {
+                errorLog(e.stackTraceToString())
+                Resource.Failure(e.message ?: "Unknown error occurred")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/TMDBRepository.kt b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/TMDBRepository.kt
new file mode 100644
index 000000000..b2565ba59
--- /dev/null
+++ b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/TMDBRepository.kt
@@ -0,0 +1,74 @@
+package com.flixclusive.data.tmdb
+
+import com.flixclusive.core.network.retrofit.dto.common.TMDBImagesResponseDto
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.model.tmdb.Genre
+import com.flixclusive.model.tmdb.Movie
+import com.flixclusive.model.tmdb.Season
+import com.flixclusive.model.tmdb.TMDBCollection
+import com.flixclusive.model.tmdb.TMDBEpisode
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.model.tmdb.TvShow
+
+enum class SortOptions {
+    POPULARITY,
+    RATED,
+}
+
+interface TMDBRepository {
+    val tmdbApiKey: String
+
+    suspend fun getMovie(
+        id: Int
+    ): Resource<Movie>
+
+    suspend fun getTvShow(
+        id: Int
+    ): Resource<TvShow>
+
+    suspend fun getSeason(
+        id: Int,
+        seasonNumber: Int
+    ): Resource<Season>
+
+    suspend fun getTrending(
+        mediaType: String = "all",
+        timeWindow: String = "week",
+        page: Int
+    ): Resource<TMDBPageResponse<TMDBSearchItem>>
+
+    suspend fun discoverFilms(
+        mediaType: String,
+        page: Int,
+        withNetworks: List<Int>? = null,
+        withCompanies: List<Int>? = null,
+        withGenres: List<Genre>? = null,
+        sortBy: SortOptions = SortOptions.RATED
+    ): Resource<TMDBPageResponse<TMDBSearchItem>>
+
+    suspend fun search(
+        mediaType: String,
+        query: String,
+        page: Int,
+    ): Resource<TMDBPageResponse<TMDBSearchItem>>
+
+    suspend fun getImages(
+        mediaType: String,
+        id: Int,
+    ): Resource<TMDBImagesResponseDto>
+
+    suspend fun getEpisode(
+        id: Int,
+        seasonNumber: Int,
+        episodeNumber: Int,
+    ): Resource<TMDBEpisode?>
+
+    suspend fun getCollection(id: Int): Resource<TMDBCollection>
+
+    /**
+    * A GET request function for custom queries from
+    * the HomeCategoriesConfig item
+    */
+    suspend fun paginateConfigItems(url: String, page: Int): Resource<TMDBPageResponse<TMDBSearchItem>>
+}
\ No newline at end of file
diff --git a/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/di/TmdbDataModule.kt b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/di/TmdbDataModule.kt
new file mode 100644
index 000000000..eac5eb031
--- /dev/null
+++ b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/di/TmdbDataModule.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.data.tmdb.di
+
+import com.flixclusive.data.tmdb.DefaultTMDBRepository
+import com.flixclusive.data.tmdb.TMDBRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class TmdbDataModule {
+    @Binds
+    internal abstract fun bindsTMDBRepository(
+        tmdbRepository: DefaultTMDBRepository,
+    ): TMDBRepository
+
+}
\ No newline at end of file
diff --git a/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/util/TMDBHelper.kt b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/util/TMDBHelper.kt
new file mode 100644
index 000000000..044a4a030
--- /dev/null
+++ b/data/tmdb/src/main/kotlin/com/flixclusive/data/tmdb/util/TMDBHelper.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.data.tmdb.util
+
+import com.flixclusive.core.network.retrofit.dto.tv.TvShowSeasonsPreview
+import com.flixclusive.core.util.film.isDateInFuture
+import com.flixclusive.model.tmdb.TMDBSearchItem
+
+
+internal fun filterOutZeroSeasons(seasons: List<TvShowSeasonsPreview>): List<TvShowSeasonsPreview> {
+    return seasons.filter { it.seasonNumber != 0 }
+}
+
+internal fun filterOutUnreleasedRecommendations(recommendations: List<TMDBSearchItem>): List<TMDBSearchItem> {
+    return recommendations
+        .filterNot { isDateInFuture(it.dateReleased) || it.posterImage.isNullOrEmpty() }
+}
\ No newline at end of file
diff --git a/data/user/.gitignore b/data/user/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/user/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/user/build.gradle.kts b/data/user/build.gradle.kts
new file mode 100644
index 000000000..c0e3c038c
--- /dev/null
+++ b/data/user/build.gradle.kts
@@ -0,0 +1,16 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.user"
+}
+
+dependencies {
+    api(projects.model.database)
+    api(projects.core.util)
+
+    implementation(projects.core.database)
+}
\ No newline at end of file
diff --git a/data/user/src/main/kotlin/com/flixclusive/data/user/DefaultUserRepository.kt b/data/user/src/main/kotlin/com/flixclusive/data/user/DefaultUserRepository.kt
new file mode 100644
index 000000000..93c140fd1
--- /dev/null
+++ b/data/user/src/main/kotlin/com/flixclusive/data/user/DefaultUserRepository.kt
@@ -0,0 +1,37 @@
+package com.flixclusive.data.user
+
+import com.flixclusive.core.database.dao.UserDao
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.model.database.User
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+internal class DefaultUserRepository @Inject constructor(
+    private val userDao: UserDao,
+    @Dispatcher(AppDispatchers.IO) private val ioDispatcher: CoroutineDispatcher
+) : UserRepository {
+    override fun getAllUsers(): Flow<List<User>> = userDao.getAllItemsInFlow()
+
+    override suspend fun getUserById(id: Int): User? {
+        return withContext(ioDispatcher) {
+            userDao.getUserById(id)
+        }
+    }
+
+    override fun getUserByIdFlow(id: Int): Flow<User?> = userDao.getUserByIdInFlow(id)
+
+    override suspend fun insert(user: User) {
+        withContext(ioDispatcher) {
+            userDao.insert(user)
+        }
+    }
+
+    override suspend fun deleteById(id: Int) {
+        withContext(ioDispatcher) {
+            userDao.deleteById(id)
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/user/src/main/kotlin/com/flixclusive/data/user/UserRepository.kt b/data/user/src/main/kotlin/com/flixclusive/data/user/UserRepository.kt
new file mode 100644
index 000000000..eb4c8f6b4
--- /dev/null
+++ b/data/user/src/main/kotlin/com/flixclusive/data/user/UserRepository.kt
@@ -0,0 +1,16 @@
+package com.flixclusive.data.user
+
+import com.flixclusive.model.database.User
+import kotlinx.coroutines.flow.Flow
+
+interface UserRepository {
+    fun getAllUsers(): Flow<List<User>>
+
+    suspend fun getUserById(id: Int): User?
+
+    fun getUserByIdFlow(id: Int): Flow<User?>
+
+    suspend fun insert(user: User)
+
+    suspend fun deleteById(id: Int)
+}
\ No newline at end of file
diff --git a/data/user/src/main/kotlin/com/flixclusive/data/user/di/UserDataModule.kt b/data/user/src/main/kotlin/com/flixclusive/data/user/di/UserDataModule.kt
new file mode 100644
index 000000000..08522efaa
--- /dev/null
+++ b/data/user/src/main/kotlin/com/flixclusive/data/user/di/UserDataModule.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.data.user.di
+
+import com.flixclusive.data.user.DefaultUserRepository
+import com.flixclusive.data.user.UserRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class UserDataModule {
+    @Binds
+    internal abstract fun bindsUserRepository(
+        userRepository: DefaultUserRepository,
+    ): UserRepository
+
+}
\ No newline at end of file
diff --git a/data/util/.gitignore b/data/util/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/util/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/util/build.gradle.kts b/data/util/build.gradle.kts
new file mode 100644
index 000000000..5197824c6
--- /dev/null
+++ b/data/util/build.gradle.kts
@@ -0,0 +1,9 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.util"
+}
\ No newline at end of file
diff --git a/data/util/src/main/AndroidManifest.xml b/data/util/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..d785e8f1d
--- /dev/null
+++ b/data/util/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
\ No newline at end of file
diff --git a/data/util/src/main/kotlin/com/flixclusive/data/util/InternetMonitor.kt b/data/util/src/main/kotlin/com/flixclusive/data/util/InternetMonitor.kt
new file mode 100644
index 000000000..6cfe8862d
--- /dev/null
+++ b/data/util/src/main/kotlin/com/flixclusive/data/util/InternetMonitor.kt
@@ -0,0 +1,7 @@
+package com.flixclusive.data.util
+
+import kotlinx.coroutines.flow.Flow
+
+interface InternetMonitor {
+    val isOnline: Flow<Boolean>
+}
\ No newline at end of file
diff --git a/data/util/src/main/kotlin/com/flixclusive/data/util/InternetMonitorManager.kt b/data/util/src/main/kotlin/com/flixclusive/data/util/InternetMonitorManager.kt
new file mode 100644
index 000000000..d8b30c464
--- /dev/null
+++ b/data/util/src/main/kotlin/com/flixclusive/data/util/InternetMonitorManager.kt
@@ -0,0 +1,73 @@
+package com.flixclusive.data.util
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.NetworkRequest.Builder
+import android.os.Build
+import androidx.core.content.getSystemService
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.conflate
+import javax.inject.Inject
+
+internal class InternetMonitorManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) : InternetMonitor {
+    override val isOnline: Flow<Boolean> = callbackFlow {
+        val connectivityManager = context.getSystemService<ConnectivityManager>()
+        if (connectivityManager == null) {
+            channel.trySend(false)
+            channel.close()
+            return@callbackFlow
+        }
+
+        /**
+         * The callback's methods are invoked on changes to *any* network matching the [NetworkRequest],
+         * not just the active network. So we can simply track the presence (or absence) of such [Network].
+         */
+        val callback = object : ConnectivityManager.NetworkCallback() {
+
+            private val networks = mutableSetOf<Network>()
+
+            override fun onAvailable(network: Network) {
+                networks += network
+                channel.trySend(true)
+            }
+
+            override fun onLost(network: Network) {
+                networks -= network
+                channel.trySend(networks.isNotEmpty())
+            }
+        }
+
+        val request = Builder()
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .build()
+        connectivityManager.registerNetworkCallback(request, callback)
+
+        /**
+         * Sends the latest connectivity status to the underlying channel.
+         */
+        channel.trySend(connectivityManager.isCurrentlyConnected())
+
+        awaitClose {
+            connectivityManager.unregisterNetworkCallback(callback)
+        }
+    }
+        .conflate()
+
+    @Suppress("DEPRECATION")
+    private fun ConnectivityManager.isCurrentlyConnected() = when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ->
+            activeNetwork
+                ?.let(::getNetworkCapabilities)
+                ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+
+        else -> activeNetworkInfo?.isConnected
+    } ?: false
+}
\ No newline at end of file
diff --git a/data/util/src/main/kotlin/com/flixclusive/data/util/di/InternetMonitorModule.kt b/data/util/src/main/kotlin/com/flixclusive/data/util/di/InternetMonitorModule.kt
new file mode 100644
index 000000000..b3619837b
--- /dev/null
+++ b/data/util/src/main/kotlin/com/flixclusive/data/util/di/InternetMonitorModule.kt
@@ -0,0 +1,17 @@
+package com.flixclusive.data.util.di
+
+import com.flixclusive.data.util.InternetMonitor
+import com.flixclusive.data.util.InternetMonitorManager
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class InternetMonitorModule {
+    @Binds
+    internal abstract fun bindsInternetMonitor(
+        internetMonitorManager: InternetMonitorManager
+    ): InternetMonitor
+}
\ No newline at end of file
diff --git a/data/watch_history/.gitignore b/data/watch_history/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/watch_history/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/watch_history/build.gradle.kts b/data/watch_history/build.gradle.kts
new file mode 100644
index 000000000..d066c26f2
--- /dev/null
+++ b/data/watch_history/build.gradle.kts
@@ -0,0 +1,16 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.watch_history"
+}
+
+dependencies {
+    api(projects.model.database)
+    api(projects.core.util)
+
+    implementation(projects.core.database)
+}
\ No newline at end of file
diff --git a/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/DefaultWatchHistoryRepository.kt b/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/DefaultWatchHistoryRepository.kt
new file mode 100644
index 000000000..e8497de3f
--- /dev/null
+++ b/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/DefaultWatchHistoryRepository.kt
@@ -0,0 +1,41 @@
+package com.flixclusive.data.watch_history
+
+import com.flixclusive.core.database.dao.WatchHistoryDao
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.model.database.WatchHistoryItem
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+internal class DefaultWatchHistoryRepository @Inject constructor(
+    private val watchHistoryDao: WatchHistoryDao,
+    @Dispatcher(AppDispatchers.IO) private val ioDispatcher: CoroutineDispatcher
+) : WatchHistoryRepository {
+
+    override fun getAllItemsInFlow(ownerId: Int): Flow<List<WatchHistoryItem>> = watchHistoryDao.getAllItemsInFlow(ownerId)
+        .map { it?.watchHistory ?: emptyList() }
+
+    override suspend fun getWatchHistoryItemById(itemId: Int, ownerId: Int): WatchHistoryItem? = withContext(ioDispatcher) {
+        watchHistoryDao.getWatchHistoryItemById(itemId, ownerId)
+    }
+
+    override fun getWatchHistoryItemByIdInFlow(itemId: Int, ownerId: Int): Flow<WatchHistoryItem?> {
+        return watchHistoryDao.getWatchHistoryItemByIdInFlow(itemId, ownerId)
+    }
+
+    override suspend fun getRandomWatchHistoryItems(ownerId: Int, count: Int) = withContext(ioDispatcher) {
+        watchHistoryDao.getRandomItems(ownerId, count)
+            ?.watchHistory ?: emptyList()
+    }
+
+    override suspend fun insert(item: WatchHistoryItem) = withContext(ioDispatcher) {
+        watchHistoryDao.insert(item)
+    }
+
+    override suspend fun deleteById(itemId: Int, ownerId: Int) = withContext(ioDispatcher) {
+        watchHistoryDao.deleteById(itemId, ownerId)
+    }
+}
diff --git a/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/WatchHistoryRepository.kt b/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/WatchHistoryRepository.kt
new file mode 100644
index 000000000..6a03b6b73
--- /dev/null
+++ b/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/WatchHistoryRepository.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.data.watch_history
+
+import com.flixclusive.model.database.WatchHistoryItem
+import kotlinx.coroutines.flow.Flow
+
+interface WatchHistoryRepository {
+    fun getAllItemsInFlow(ownerId: Int = 1): Flow<List<WatchHistoryItem>>
+
+    suspend fun getWatchHistoryItemById(itemId: Int, ownerId: Int = 1): WatchHistoryItem?
+
+    fun getWatchHistoryItemByIdInFlow(itemId: Int, ownerId: Int = 1): Flow<WatchHistoryItem?>
+
+    suspend fun getRandomWatchHistoryItems(ownerId: Int = 1, count: Int): List<WatchHistoryItem>
+
+    suspend fun insert(item: WatchHistoryItem)
+
+    suspend fun deleteById(itemId: Int, ownerId: Int = 1)
+}
\ No newline at end of file
diff --git a/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/di/WatchHistoryDataModule.kt b/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/di/WatchHistoryDataModule.kt
new file mode 100644
index 000000000..f604c279c
--- /dev/null
+++ b/data/watch_history/src/main/kotlin/com/flixclusive/data/watch_history/di/WatchHistoryDataModule.kt
@@ -0,0 +1,19 @@
+package com.flixclusive.data.watch_history.di
+
+import com.flixclusive.data.watch_history.DefaultWatchHistoryRepository
+import com.flixclusive.data.watch_history.WatchHistoryRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class WatchHistoryDataModule {
+
+    @Binds
+    internal abstract fun bindsWatchHistoryRepository(
+        watchHistoryRepository: DefaultWatchHistoryRepository,
+    ): WatchHistoryRepository
+
+}
\ No newline at end of file
diff --git a/data/watchlist/.gitignore b/data/watchlist/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/data/watchlist/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/data/watchlist/build.gradle.kts b/data/watchlist/build.gradle.kts
new file mode 100644
index 000000000..6d639a885
--- /dev/null
+++ b/data/watchlist/build.gradle.kts
@@ -0,0 +1,16 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.data.watchlist"
+}
+
+dependencies {
+    api(projects.model.database)
+    api(projects.core.util)
+
+    implementation(projects.core.database)
+}
\ No newline at end of file
diff --git a/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/DefaultWatchlistRepository.kt b/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/DefaultWatchlistRepository.kt
new file mode 100644
index 000000000..d5e448402
--- /dev/null
+++ b/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/DefaultWatchlistRepository.kt
@@ -0,0 +1,40 @@
+package com.flixclusive.data.watchlist
+
+import com.flixclusive.core.database.dao.WatchlistDao
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.model.database.WatchlistItem
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+internal class DefaultWatchlistRepository @Inject constructor(
+    private val watchlistDao: WatchlistDao,
+    @Dispatcher(AppDispatchers.IO) private val ioDispatcher: CoroutineDispatcher
+) : WatchlistRepository {
+    override suspend fun insert(item: WatchlistItem) = withContext(ioDispatcher) {
+        watchlistDao.insert(item)
+    }
+
+    override suspend fun remove(item: WatchlistItem) = withContext(ioDispatcher) {
+        watchlistDao.delete(item)
+    }
+
+    override suspend fun removeById(itemId: Int, ownerId: Int) = withContext(ioDispatcher) {
+        watchlistDao.deleteById(itemId, ownerId)
+    }
+
+    override suspend fun getWatchlistItemById(filmId: Int, ownerId: Int): WatchlistItem? = withContext(ioDispatcher) {
+        watchlistDao.getWatchlistItemById(filmId, ownerId)
+    }
+
+    override suspend fun getAllItems(ownerId: Int): List<WatchlistItem> = withContext(ioDispatcher) {
+        watchlistDao.getAllItems(ownerId)
+            ?.watchlist ?: emptyList()
+    }
+
+    override fun getAllItemsInFlow(ownerId: Int): Flow<List<WatchlistItem>> = watchlistDao.getAllItemsInFlow(ownerId)
+        .map { it?.watchlist ?: emptyList() }
+}
\ No newline at end of file
diff --git a/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/WatchlistRepository.kt b/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/WatchlistRepository.kt
new file mode 100644
index 000000000..0b988f9a2
--- /dev/null
+++ b/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/WatchlistRepository.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.data.watchlist
+
+import com.flixclusive.model.database.WatchlistItem
+import kotlinx.coroutines.flow.Flow
+
+interface WatchlistRepository {
+    suspend fun insert(item: WatchlistItem)
+
+    suspend fun remove(item: WatchlistItem)
+
+    suspend fun removeById(itemId: Int, ownerId: Int = 1)
+
+    suspend fun getWatchlistItemById(filmId: Int, ownerId: Int = 1): WatchlistItem?
+
+    suspend fun getAllItems(ownerId: Int = 1): List<WatchlistItem>
+
+    fun getAllItemsInFlow(ownerId: Int = 1): Flow<List<WatchlistItem>>
+}
diff --git a/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/di/WatchlistDataModule.kt b/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/di/WatchlistDataModule.kt
new file mode 100644
index 000000000..da954f9ac
--- /dev/null
+++ b/data/watchlist/src/main/kotlin/com/flixclusive/data/watchlist/di/WatchlistDataModule.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.data.watchlist.di
+
+import com.flixclusive.data.watchlist.DefaultWatchlistRepository
+import com.flixclusive.data.watchlist.WatchlistRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class WatchlistDataModule {
+    @Binds
+    internal abstract fun bindsWatchlistRepository(
+        watchlistRepository: DefaultWatchlistRepository,
+    ): WatchlistRepository
+
+}
\ No newline at end of file
diff --git a/domain/database/.gitignore b/domain/database/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/domain/database/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/database/build.gradle.kts b/domain/database/build.gradle.kts
new file mode 100644
index 000000000..68f80abd7
--- /dev/null
+++ b/domain/database/build.gradle.kts
@@ -0,0 +1,17 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.domain.database"
+}
+
+dependencies {
+    api(projects.data.watchlist)
+    api(projects.data.watchHistory)
+    api(projects.model.tmdb)
+
+    implementation(projects.core.util)
+}
\ No newline at end of file
diff --git a/domain/database/src/main/kotlin/com/flixclusive/domain/database/WatchHistoryItemManagerUseCase.kt b/domain/database/src/main/kotlin/com/flixclusive/domain/database/WatchHistoryItemManagerUseCase.kt
new file mode 100644
index 000000000..bcaa20001
--- /dev/null
+++ b/domain/database/src/main/kotlin/com/flixclusive/domain/database/WatchHistoryItemManagerUseCase.kt
@@ -0,0 +1,141 @@
+package com.flixclusive.domain.database
+
+import com.flixclusive.core.util.common.network.AppDispatchers
+import com.flixclusive.core.util.common.network.Dispatcher
+import com.flixclusive.core.util.database.isFinishedWatching
+import com.flixclusive.data.watch_history.WatchHistoryRepository
+import com.flixclusive.model.database.EpisodeWatched
+import com.flixclusive.model.database.WatchHistoryItem
+import com.flixclusive.model.tmdb.TMDBEpisode
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import java.util.Date
+import javax.inject.Inject
+
+class WatchHistoryItemManagerUseCase @Inject constructor(
+    private val watchHistoryRepository: WatchHistoryRepository,
+    @Dispatcher(AppDispatchers.Default) private val defaultDispatcher: CoroutineDispatcher
+) {
+    suspend fun updateEpisodeCount(
+        id: Int,
+        seasonNumber: Int,
+        episodeCount: Int,
+    ): WatchHistoryItem? {
+        val watchHistoryItem = watchHistoryRepository.getWatchHistoryItemById(id)
+        var newWatchHistoryItem: WatchHistoryItem? = null
+
+        watchHistoryItem?.let { item ->
+            val newEpisodesMap = item.episodes.toMutableMap()
+            newEpisodesMap[seasonNumber] = episodeCount
+
+            newWatchHistoryItem = item.copy(episodes = newEpisodesMap)
+            watchHistoryRepository.insert(newWatchHistoryItem!!)
+        }
+
+        return newWatchHistoryItem
+    }
+
+    suspend fun updateWatchHistoryItem(
+        watchHistoryItem: WatchHistoryItem,
+        currentTime: Long,
+        totalDuration: Long,
+        currentSelectedEpisode: TMDBEpisode?,
+    ): WatchHistoryItem {
+        val minute = 60000
+        val isLessThanAMinute = currentTime <= minute
+
+        if(isLessThanAMinute)
+            return watchHistoryItem
+
+        val newWatchHistoryItem: WatchHistoryItem
+        val isTvShow = when (currentSelectedEpisode) {
+            null -> false
+            else -> true
+        }
+
+        if (isTvShow) {
+            val updatedEpisodesWatchedList = watchHistoryItem.episodesWatched.toMutableList()
+
+            val episodeWatchedIndex = withContext(defaultDispatcher) {
+                watchHistoryItem.episodesWatched.indexOfFirst {
+                    it.seasonNumber == currentSelectedEpisode!!.season
+                            && it.episodeNumber == currentSelectedEpisode.episode
+                }
+            }
+
+            val isEpisodeWatchedAlready = episodeWatchedIndex != -1
+            if (isEpisodeWatchedAlready) {
+                val episode = watchHistoryItem.episodesWatched[episodeWatchedIndex]
+                updatedEpisodesWatchedList[episodeWatchedIndex] = episode.copy(
+                    watchTime = currentTime,
+                    durationTime = totalDuration,
+                    isFinished = isFinishedWatching(
+                        currentTime,
+                        totalDuration
+                    )
+                )
+            } else {
+                val currentSelectedEpisodeId = currentSelectedEpisode!!.episodeId
+                val episodeToAdd = EpisodeWatched(
+                    episodeId = currentSelectedEpisodeId,
+                    episodeNumber = currentSelectedEpisode.episode,
+                    seasonNumber = currentSelectedEpisode.season,
+                    watchTime = currentTime,
+                    durationTime = totalDuration,
+                    isFinished = isFinishedWatching(
+                        currentTime,
+                        totalDuration
+                    )
+                )
+
+                val insertIndex = if(watchHistoryItem.episodesWatched.isEmpty()) {
+                    0
+                } else {
+                    getSortedIndexOfItemInEpisodesWatched(
+                        watchHistoryItem.episodesWatched,
+                        episodeToAdd
+                    )
+                }
+
+                updatedEpisodesWatchedList.add(insertIndex, episodeToAdd)
+            }
+
+            newWatchHistoryItem = watchHistoryItem.copy(
+                episodesWatched = updatedEpisodesWatchedList,
+                dateWatched = Date()
+            )
+        } else {
+            val episodeWatchedItem = EpisodeWatched(
+                episodeId = watchHistoryItem.id,
+                watchTime = currentTime,
+                durationTime = totalDuration,
+                isFinished = isFinishedWatching(
+                    currentTime,
+                    totalDuration
+                )
+            )
+
+            newWatchHistoryItem = watchHistoryItem.copy(
+                episodesWatched = listOf(episodeWatchedItem),
+                dateWatched = Date()
+            )
+        }
+
+        watchHistoryRepository.insert(newWatchHistoryItem)
+
+        return newWatchHistoryItem
+    }
+
+    private fun getSortedIndexOfItemInEpisodesWatched(
+        episodes: List<EpisodeWatched>,
+        episodeToAdd: EpisodeWatched
+    ): Int {
+        val insertIndex = episodes.binarySearch { watchedEpisode ->
+            compareValuesBy(watchedEpisode, episodeToAdd, { it.seasonNumber }, { it.episodeNumber })
+        }
+        return when {
+            insertIndex >= 0 -> insertIndex
+            else -> -insertIndex - 1
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/database/src/main/kotlin/com/flixclusive/domain/database/WatchlistItemManagerUseCase.kt b/domain/database/src/main/kotlin/com/flixclusive/domain/database/WatchlistItemManagerUseCase.kt
new file mode 100644
index 000000000..31494a37e
--- /dev/null
+++ b/domain/database/src/main/kotlin/com/flixclusive/domain/database/WatchlistItemManagerUseCase.kt
@@ -0,0 +1,24 @@
+package com.flixclusive.domain.database
+
+import com.flixclusive.data.watchlist.WatchlistRepository
+import com.flixclusive.model.database.WatchlistItem
+import javax.inject.Inject
+
+class WatchlistItemManagerUseCase @Inject constructor(
+    private val watchlistRepository: WatchlistRepository,
+) {
+    suspend fun isInWatchlist(id: Int): Boolean =
+        watchlistRepository.getWatchlistItemById(id) != null
+
+    suspend fun toggleWatchlistStatus(watchlistItem: WatchlistItem): Boolean {
+        val isInWatchlist = isInWatchlist(id = watchlistItem.id)
+
+        if (isInWatchlist) {
+            watchlistRepository.removeById(watchlistItem.id)
+        } else {
+            watchlistRepository.insert(watchlistItem)
+        }
+
+        return !isInWatchlist
+    }
+}
\ No newline at end of file
diff --git a/domain/home/.gitignore b/domain/home/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/domain/home/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/home/build.gradle.kts b/domain/home/build.gradle.kts
new file mode 100644
index 000000000..8c22e2663
--- /dev/null
+++ b/domain/home/build.gradle.kts
@@ -0,0 +1,15 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.domain.home"
+}
+
+dependencies {
+    api(projects.data.watchHistory)
+    api(projects.data.configuration)
+    api(projects.data.tmdb)
+}
\ No newline at end of file
diff --git a/domain/home/src/main/kotlin/com/flixclusive/domain/home/HomeItemsProviderUseCase.kt b/domain/home/src/main/kotlin/com/flixclusive/domain/home/HomeItemsProviderUseCase.kt
new file mode 100644
index 000000000..c2df8b013
--- /dev/null
+++ b/domain/home/src/main/kotlin/com/flixclusive/domain/home/HomeItemsProviderUseCase.kt
@@ -0,0 +1,211 @@
+package com.flixclusive.domain.home
+
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.data.configuration.AppConfigurationManager
+import com.flixclusive.data.tmdb.TMDBRepository
+import com.flixclusive.data.watch_history.WatchHistoryRepository
+import com.flixclusive.model.configuration.HomeCategoryItem
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.model.tmdb.Genre
+import com.flixclusive.model.tmdb.TMDBPageResponse
+import com.flixclusive.model.tmdb.TMDBSearchItem
+import com.flixclusive.model.tmdb.util.formatGenreIds
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+import kotlin.random.Random
+
+private const val MINIMUM_HOME_ITEMS = 15
+private const val MAXIMUM_HOME_ITEMS = 28
+
+class HomeItemsProviderUseCase @Inject constructor(
+    private val tmdbRepository: TMDBRepository,
+    private val watchHistoryRepository: WatchHistoryRepository,
+    private val configurationProvider: AppConfigurationManager,
+) {
+
+    suspend fun getFocusedItem(film: Film): Film? {
+        val response: Resource<Film> = when (film.filmType) {
+            FilmType.MOVIE -> tmdbRepository.getMovie(film.id)
+            FilmType.TV_SHOW -> tmdbRepository.getTvShow(film.id)
+        }
+
+        if (response is Resource.Failure)
+            return null
+
+        return response.data
+    }
+
+    suspend fun getHeaderItem(): Film? {
+        var headerItemToUse: TMDBSearchItem? = null
+
+        retry@ for(i in 0..5) {
+            val page = Random.nextInt(1, 3000)
+            val itemConfig =
+                if (page % 2 == 0) configurationProvider.homeCategoriesConfig?.movie?.random() else configurationProvider.homeCategoriesConfig?.tv?.random() ?: continue
+
+            val response = tmdbRepository.paginateConfigItems(
+                url = itemConfig!!.query,
+                page = Integer.max(1, page % 5)
+            )
+
+            if (response is Resource.Failure)
+                continue
+
+            if(response.data?.results?.isEmpty() == true)
+                continue
+
+            response.data?.results?.size?.let {
+                headerItemToUse = response.data!!.results.random()
+            }
+
+            if (headerItemToUse != null) {
+                val item = headerItemToUse!! // For smart casting
+
+                val imageResponse = tmdbRepository.getImages(
+                    mediaType = if (page % 2 == 0) FilmType.MOVIE.type else FilmType.TV_SHOW.type,
+                    id = item.id
+                )
+
+                if (imageResponse is Resource.Failure)
+                    continue
+
+                if (imageResponse.data?.logos != null) {
+                    val logos = imageResponse.data!!.logos
+
+                    if (logos.isEmpty()) {
+                        continue
+                    }
+
+                    val logoToUse = logos[0].filePath.replace("svg", "png")
+
+                    when (item) {
+                        is TMDBSearchItem.MovieTMDBSearchItem -> {
+                            val newGenres = formatGenreIds(
+                                genreIds = item.genreIds,
+                                genresList = configurationProvider
+                                    .searchCategoriesConfig!!.genres.map {
+                                        Genre(
+                                            id = it.id,
+                                            name = it.name,
+                                            mediaType = it.mediaType
+                                        )
+                                    }
+                            ) + item.genres
+
+                            headerItemToUse = item.copy(
+                                logoImage = logoToUse,
+                                genres = newGenres
+                            )
+                            break
+                        }
+                        is TMDBSearchItem.TvShowTMDBSearchItem -> {
+                            val newGenres = formatGenreIds(
+                                genreIds = item.genreIds,
+                                genresList = configurationProvider
+                                    .searchCategoriesConfig!!.genres.map {
+                                        Genre(
+                                            id = it.id,
+                                            name = it.name,
+                                            mediaType = FilmType.TV_SHOW.type
+                                        )
+                                    }
+                            ) + item.genres
+
+                            headerItemToUse = item.copy(
+                                logoImage = logoToUse,
+                                genres = newGenres
+                            )
+                            break
+                        }
+
+                        else -> throw IllegalStateException("SearchItem is not parsable to a film!")
+                    }
+                }
+            }
+        }
+
+        return headerItemToUse
+    }
+
+    fun getHomeRecommendations(): Flow<HomeCategoryItem?> = flow {
+        val usedCategories = mutableListOf<String>()
+
+        val config = configurationProvider.homeCategoriesConfig!!
+
+        val combinedMovieAndTvShowConfig = config.tv + config.movie
+        val combinedConfig = config.all + combinedMovieAndTvShowConfig
+
+        var countOfItemsToFetch = Random.nextInt(MINIMUM_HOME_ITEMS, MAXIMUM_HOME_ITEMS)
+        var i = 0
+        while (i < countOfItemsToFetch) {
+            val shouldEmitRequiredCategories = Random.nextInt(0, 1000) % Random.nextInt(2, 3) == 0
+
+            val item = if (shouldEmitRequiredCategories) {
+                val requiredRecommendation = combinedConfig.find {
+                    !usedCategories.contains(it.name) && it.required
+                }
+
+                if (requiredRecommendation != null) {
+                    countOfItemsToFetch++
+                    requiredRecommendation
+                } else combinedMovieAndTvShowConfig.random()
+            } else combinedMovieAndTvShowConfig.random()
+
+            if (usedCategories.contains(item.name))
+                continue
+
+            emit(item)
+            usedCategories.add(item.name)
+            i++
+            humanizer()
+        }
+    }
+
+    suspend fun getHomeItems(
+        query: String,
+        page: Int,
+        onFailure: () -> Unit,
+        onSuccess: (data: TMDBPageResponse<TMDBSearchItem>) -> Unit,
+    ) {
+        when (
+            val result = tmdbRepository.paginateConfigItems(
+                url = query,
+                page = page
+            )
+        ) {
+            is Resource.Failure -> onFailure()
+            Resource.Loading -> Unit
+            is Resource.Success -> onSuccess(result.data!!)
+        }
+    }
+
+    fun getUserRecommendations(userId: Int, count: Int): Flow<HomeCategoryItem?> = flow {
+        check(count > 0) { "SearchItem count must be greater than 0" }
+
+        val randomWatchedFilms =
+            watchHistoryRepository.getRandomWatchHistoryItems(ownerId = userId, count = count)
+        if (randomWatchedFilms.isNotEmpty()) {
+            randomWatchedFilms.forEach { item ->
+                if (item.film.recommendedTitles.size >= 10) {
+                    emit(
+                        HomeCategoryItem(
+                            name = "If you liked ${item.film.title}",
+                            mediaType = item.film.filmType.type,
+                            required = false,
+                            canPaginate = true,
+                            query = "${item.film.filmType.type}/${item.id}/recommendations?language=en-US"
+                        )
+                    )
+                    humanizer()
+                }
+            }
+        }
+    }
+
+    private suspend fun humanizer() {
+        delay(Random.nextLong(0, 30))
+    }
+}
\ No newline at end of file
diff --git a/domain/provider/.gitignore b/domain/provider/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/domain/provider/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/provider/build.gradle.kts b/domain/provider/build.gradle.kts
new file mode 100644
index 000000000..cc01e1df6
--- /dev/null
+++ b/domain/provider/build.gradle.kts
@@ -0,0 +1,15 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.domain.provider"
+}
+
+dependencies {
+    api(projects.model.database)
+    api(projects.data.tmdb)
+    api(projects.data.provider)
+}
\ No newline at end of file
diff --git a/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt b/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt
new file mode 100644
index 000000000..3710f982d
--- /dev/null
+++ b/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt
@@ -0,0 +1,293 @@
+package com.flixclusive.domain.provider
+
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.core.util.common.ui.UiText
+import com.flixclusive.core.util.database.getNextEpisodeToWatch
+import com.flixclusive.data.provider.ProviderRepository
+import com.flixclusive.data.provider.SourceLinksRepository
+import com.flixclusive.data.tmdb.TMDBRepository
+import com.flixclusive.model.database.WatchHistoryItem
+import com.flixclusive.model.provider.SourceData
+import com.flixclusive.model.provider.SourceDataState
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.model.tmdb.TMDBEpisode
+import com.flixclusive.model.tmdb.TvShow
+import com.flixclusive.provider.provider.BaseProvider
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+
+/**
+ *
+ * Combination of filmId parameter
+ * and season:episode of the film
+ * (if it is a tv show).
+ *
+ * actual format: "$filmId-$season:$episode"
+ *
+ * */
+typealias FilmKey = String
+
+class SourceLinksProviderUseCase @Inject constructor(
+    private val sourceLinksRepository: SourceLinksRepository,
+    private val providersRepository: ProviderRepository,
+    private val tmdbRepository: TMDBRepository,
+) {
+
+    companion object {
+        /**
+         *
+         * Converts film and episode to [FilmKey].
+         * Which is to be used for caching
+         *
+         * */
+        fun getFilmKey(
+            filmId: Int,
+            episodeData: TMDBEpisode?,
+        ): FilmKey = "$filmId-${episodeData?.season}:${episodeData?.episode}"
+    }
+
+     val providers: List<BaseProvider>
+        get() = providersRepository.providers
+            .filter { !it.isIgnored && !it.isMaintenance }
+            .map { it.provider }
+
+    /**
+     *
+     * For caching provider links for each films ONLY
+     * because some providers have timeouts on their links
+     *
+     * */
+    private val cache = HashMap<FilmKey, SourceData>()
+
+    fun loadLinks(
+        film: Film,
+        watchHistoryItem: WatchHistoryItem?,
+        preferredProviderName: String? = null,
+        isChangingProvider: Boolean = false,
+        mediaId: String? = null,
+        episode: TMDBEpisode? = null,
+        onSuccess: (TMDBEpisode?) -> Unit,
+        onError: (() -> Unit)? = null,
+    ): Flow<SourceDataState> = flow {
+        val providesList = getPrioritizedProvidersList(preferredProviderName)
+
+        if (providesList.isEmpty()) {
+            onError?.invoke()
+            return@flow emit(SourceDataState.Unavailable(R.string.no_available_sources))
+        }
+
+        val episodeToUse = if (episode == null && film is TvShow) {
+            emit(SourceDataState.Fetching(UiText.StringResource(R.string.fetching_episode_message)))
+
+            when (
+                val episodeFetchResult = getNearestEpisodeToWatch(
+                    film = film,
+                    watchHistoryItem = watchHistoryItem
+                )
+            ) {
+                is Resource.Failure -> {
+                    onError?.invoke()
+                    return@flow emit(SourceDataState.Error(episodeFetchResult.error))
+                }
+
+                Resource.Loading -> null
+                is Resource.Success -> episodeFetchResult.data
+            }
+        } else episode
+        val cacheKey = getFilmKey(film.id, episodeToUse)
+
+        val cachedSourceData = cache[cacheKey]?.let { cache ->
+            // If user chose the same provider then just skip all the process
+            // Otherwise, clear the links and fetch for a new provider
+            if (preferredProviderName == cache.providerName)
+                return@flow onSuccess(episodeToUse)
+
+            cache
+        }
+
+        for (i in providesList.indices) {
+            val provider = providesList[i]
+
+            if (provider.name != preferredProviderName && isChangingProvider)
+                continue
+
+            emit(SourceDataState.Fetching("Fetching from ${provider.name}..."))
+
+            val canStopLooping = i == providesList.lastIndex
+            val needsNewMediaId = mediaId != null && provider.name != preferredProviderName
+
+            val mediaIdToUse = if (needsNewMediaId || mediaId == null) {
+                sourceLinksRepository.getMediaId(
+                    film = film,
+                    provider = provider
+                )
+            } else mediaId
+
+            if (mediaIdToUse.isNullOrEmpty()) {
+                if (canStopLooping) {
+                    onError?.invoke()
+                    return@flow emit(SourceDataState.Unavailable())
+                }
+
+                continue
+            }
+
+            emit(SourceDataState.Extracting("Extracting from ${provider.name}..."))
+
+            if (cachedSourceData != null) {
+                cachedSourceData.run {
+                    /**
+                     *
+                     * Only clear links since subtitles
+                     * could be used on other provider's [SourceLink]
+                     * */
+                    /**
+                     *
+                     * Only clear links since subtitles
+                     * could be used on other provider's [SourceLink]
+                     * */
+                    cachedLinks.clear()
+                    cache[cacheKey] = copy(
+                        mediaId = mediaIdToUse,
+                        providerName = provider.name
+                    )
+                }
+            } else {
+                cache[cacheKey] = SourceData(
+                    mediaId = mediaIdToUse,
+                    providerName = provider.name
+                )
+            }
+
+            val sourceData = getLinks(
+                filmId = film.id,
+                episode = episodeToUse
+            )
+
+            val result = sourceLinksRepository.getSourceLinks(
+                mediaId = mediaIdToUse,
+                season = episodeToUse?.season,
+                episode = episodeToUse?.episode,
+                provider = provider,
+                onSubtitleLoaded = {
+                    sourceData.run {
+                        if (!cachedSubtitles.contains(it)) {
+                            // If cached data is not null
+                            // add the subtitle on the top.
+                            if (cachedSourceData != null) {
+                                cachedSubtitles.add(0, it)
+                            } else cachedSubtitles.add(it)
+                        }
+                    }
+                },
+                onLinkLoaded = {
+                    sourceData.run {
+                        if (!cachedLinks.contains(it)) {
+                            cachedLinks.add(it)
+                        }
+                    }
+                }
+            )
+
+            when (result) {
+                is Resource.Failure -> {
+                    if (canStopLooping) {
+                        onError?.invoke()
+                        return@flow emit(SourceDataState.Error(result.error))
+                    }
+                }
+
+                Resource.Loading -> Unit
+                is Resource.Success -> {
+                    onSuccess(episodeToUse)
+                    return@flow emit(SourceDataState.Success)
+                }
+            }
+        }
+
+        emit(SourceDataState.Unavailable())
+    }
+
+    /**
+     *
+     *
+     * @param filmId id of the film to fetch
+     * @param episode [TMDBEpisode] of the film if it is a tv show
+     *
+     * @return [SourceData] of the cached film if it exists. Returns a default value if it is null
+     * */
+    fun getLinks(
+        filmId: Int,
+        episode: TMDBEpisode?,
+    ) = cache.getOrElse(getFilmKey(filmId, episode)) {
+        SourceData()
+    }
+
+    fun clearCache() {
+        cache.clear()
+    }
+
+    /**
+     *
+     * Obtains the [TMDBEpisode] data of the nearest
+     * episode to be watched by the user
+     *
+     * */
+    private suspend fun getNearestEpisodeToWatch(
+        film: TvShow,
+        watchHistoryItem: WatchHistoryItem?,
+    ): Resource<TMDBEpisode?> {
+        val isNewlyWatchShow =
+            watchHistoryItem == null || watchHistoryItem.episodesWatched.isEmpty()
+
+        val seasonNumber: Int
+        val episodeNumber: Int
+
+        if (isNewlyWatchShow) {
+            if (film.totalSeasons == 0 || film.totalEpisodes == 0) {
+                return Resource.Failure(SourceDataState.Unavailable().message)
+            }
+
+            seasonNumber = 1
+            episodeNumber = 1
+        } else {
+            val (nextSeason, nextEpisode) = getNextEpisodeToWatch(watchHistoryItem!!)
+            seasonNumber = nextSeason ?: 1
+            episodeNumber = nextEpisode ?: 1
+        }
+
+        val episodeFromApiService = tmdbRepository.getEpisode(
+            id = film.id,
+            seasonNumber = seasonNumber,
+            episodeNumber = episodeNumber
+        )
+
+        if (episodeFromApiService is Resource.Failure) {
+            return episodeFromApiService
+        }
+        else if (episodeFromApiService is Resource.Success && episodeFromApiService.data == null) {
+            return Resource.Failure(R.string.unavailable_episode)
+        }
+
+        return episodeFromApiService
+    }
+
+
+    /**
+     *
+     * Returns a list of providers
+     * available that prioritizes the
+     * given provider and on top of the list
+     * */
+    private fun getPrioritizedProvidersList(
+        preferredProvider: String?
+    ): List<BaseProvider> {
+        if(preferredProvider != null) {
+            return providers
+                .sortedBy { it.name == preferredProvider }
+        }
+
+        return providers
+    }
+}
\ No newline at end of file
diff --git a/domain/provider/src/main/res/values/strings.xml b/domain/provider/src/main/res/values/strings.xml
new file mode 100644
index 000000000..cc2fefd56
--- /dev/null
+++ b/domain/provider/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="fetching_episode_message">Fetching show episode…</string>
+    <string name="unavailable_episode">Episode is not yet available</string>
+    <string name="no_available_sources">No available source providers!</string>
+    <string name="error_finding_episode_id_from_meta">An unknown error occurred while obtaining episode data from meta api</string>
+    <string name="error_finding_episode_id_from_source_provider">An unknown error occurred while obtaining episode data from video data api</string>
+</resources>
\ No newline at end of file
diff --git a/domain/tmdb/.gitignore b/domain/tmdb/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/domain/tmdb/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/tmdb/build.gradle.kts b/domain/tmdb/build.gradle.kts
new file mode 100644
index 000000000..5d0ff0471
--- /dev/null
+++ b/domain/tmdb/build.gradle.kts
@@ -0,0 +1,13 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
+}
+
+android {
+    namespace = "com.flixclusive.domain.tmdb"
+}
+
+dependencies {
+    api(projects.data.tmdb)
+}
\ No newline at end of file
diff --git a/domain/tmdb/src/main/kotlin/com/flixclusive/domain/tmdb/FilmProviderUseCase.kt b/domain/tmdb/src/main/kotlin/com/flixclusive/domain/tmdb/FilmProviderUseCase.kt
new file mode 100644
index 000000000..02c5719d5
--- /dev/null
+++ b/domain/tmdb/src/main/kotlin/com/flixclusive/domain/tmdb/FilmProviderUseCase.kt
@@ -0,0 +1,21 @@
+package com.flixclusive.domain.tmdb
+
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.data.tmdb.TMDBRepository
+import com.flixclusive.model.tmdb.Film
+import javax.inject.Inject
+
+class FilmProviderUseCase @Inject constructor(
+    private val tmdbRepository: TMDBRepository
+) {
+    suspend operator fun invoke(
+        id: Int,
+        type: FilmType
+    ): Resource<Film> {
+        return when (type) {
+            FilmType.MOVIE -> tmdbRepository.getMovie(id = id)
+            FilmType.TV_SHOW -> tmdbRepository.getTvShow(id = id)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tmdb/src/main/kotlin/com/flixclusive/domain/tmdb/SeasonProviderUseCase.kt b/domain/tmdb/src/main/kotlin/com/flixclusive/domain/tmdb/SeasonProviderUseCase.kt
new file mode 100644
index 000000000..8b35dd8d4
--- /dev/null
+++ b/domain/tmdb/src/main/kotlin/com/flixclusive/domain/tmdb/SeasonProviderUseCase.kt
@@ -0,0 +1,21 @@
+package com.flixclusive.domain.tmdb
+
+import com.flixclusive.core.util.common.resource.Resource
+import com.flixclusive.data.tmdb.TMDBRepository
+import com.flixclusive.model.tmdb.Season
+import javax.inject.Inject
+
+class SeasonProviderUseCase @Inject constructor(
+    private val tmdbRepository: TMDBRepository
+)  {
+    suspend fun invoke(id: Int, seasonNumber: Int): Season? {
+        return when(
+            val result =
+                tmdbRepository.getSeason(id = id, seasonNumber = seasonNumber)
+        ) {
+            is Resource.Failure -> null
+            Resource.Loading -> throw IllegalStateException("$result is not a valid return type!")
+            is Resource.Success -> result.data!!
+        }
+    }
+}
\ No newline at end of file
diff --git a/extractor/base/.gitignore b/extractor/base/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/extractor/base/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/extractor/base/build.gradle.kts b/extractor/base/build.gradle.kts
new file mode 100644
index 000000000..25ab4a9ce
--- /dev/null
+++ b/extractor/base/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.extractor.base"
+}
+
+dependencies {
+    api(libs.okhttp)
+    api(projects.model.provider)
+    api(projects.core.util)
+}
\ No newline at end of file
diff --git a/extractor/base/src/main/kotlin/com/flixclusive/extractor/base/Extractor.kt b/extractor/base/src/main/kotlin/com/flixclusive/extractor/base/Extractor.kt
new file mode 100644
index 000000000..2703f18c0
--- /dev/null
+++ b/extractor/base/src/main/kotlin/com/flixclusive/extractor/base/Extractor.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.extractor.base
+
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import java.net.URL
+
+abstract class Extractor {
+    abstract val name: String
+    abstract val host: String
+
+    abstract suspend fun extract(
+        url: URL,
+        mediaId: String,
+        episodeId: String,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    )
+}
\ No newline at end of file
diff --git a/extractor/mixdrop/.gitignore b/extractor/mixdrop/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/extractor/mixdrop/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/extractor/mixdrop/build.gradle.kts b/extractor/mixdrop/build.gradle.kts
new file mode 100644
index 000000000..7601e7767
--- /dev/null
+++ b/extractor/mixdrop/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.extractor.mixdrop"
+}
+
+dependencies {
+    implementation(projects.extractor.base)
+
+    implementation(libs.jsoup)
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/MixDrop.kt b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/MixDrop.kt
similarity index 67%
rename from providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/MixDrop.kt
rename to extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/MixDrop.kt
index bde125a8a..15b359c07 100644
--- a/providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/MixDrop.kt
+++ b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/MixDrop.kt
@@ -1,51 +1,51 @@
-package com.flixclusive.providers.extractors.mixdrop
-
-import com.flixclusive.providers.extractors.mixdrop.utils.Unpacker
-import com.flixclusive.providers.interfaces.Extractor
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import com.flixclusive.providers.utils.network.OkHttpUtils.GET
-import com.flixclusive.providers.utils.network.OkHttpUtils.asJsoup
-import com.flixclusive.providers.utils.network.OkHttpUtils.asString
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import java.net.URL
-
-class MixDrop(
-    private val client: OkHttpClient,
-) : Extractor {
-    override val name: String = "mixdrop"
-    private val oldHost = "mixdrop.co"
-    private val newHost = "mixdrop.vc"
-
-    override suspend fun extract(
-        url: URL,
-        mediaId: String,
-        episodeId: String,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    ) {
-        val newUrl = URL(url.toString().replace(oldHost, newHost))
-        val headers = Headers.headersOf("Referer", newUrl.toString())
-        val response = client.newCall(
-            GET(newUrl.toString(), headers)
-        ).execute().use {
-            if(it.body?.charStream().asString()?.contains("WE ARE SORRY", true) == true)
-                throw NullPointerException("Mixdrop cannot find the source.")
-
-            it.asJsoup()
-        }
-
-        val packed = response.selectFirst("script:containsData(eval)")?.data()
-
-        val unpacked = packed?.let(Unpacker::unpack)
-            ?: throw Exception("Could not fetch sources.")
-
-        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
-            .substringBefore("\"")
-
-        val subs = unpacked.substringAfter("Core.remotesub=\"").substringBefore('"')
-
-        TODO("Return the embed data from MIXDROP")
-    }
+package com.flixclusive.extractor.mixdrop
+
+import com.flixclusive.extractor.base.Extractor
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.util.GET
+import com.flixclusive.provider.base.util.asJsoup
+import com.flixclusive.provider.base.util.asString
+import com.flixclusive.extractor.mixdrop.util.Unpacker
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import java.net.URL
+
+class MixDrop(
+    private val client: OkHttpClient,
+) : Extractor() {
+    override val name: String = "mixdrop"
+    override val host: String = "mixdrop.co"
+    private val newHost = "mixdrop.vc"
+
+    override suspend fun extract(
+        url: URL,
+        mediaId: String,
+        episodeId: String,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ) {
+        val newUrl = URL(url.toString().replace(host, newHost))
+        val headers = Headers.headersOf("Referer", newUrl.toString())
+        val response = client.newCall(
+            GET(newUrl.toString(), headers)
+        ).execute().use {
+            if(it.body?.charStream().asString()?.contains("WE ARE SORRY", true) == true)
+                throw NullPointerException("Mixdrop cannot find the source.")
+
+            it.asJsoup()
+        }
+
+        val packed = response.selectFirst("script:containsData(eval)")?.data()
+
+        val unpacked = packed?.let(Unpacker::unpack)
+            ?: throw Exception("Could not fetch sources.")
+
+        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
+            .substringBefore("\"")
+
+        val subs = unpacked.substringAfter("Core.remotesub=\"").substringBefore('"')
+
+        TODO("Return the embed data from MIXDROP")
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/utils/SubstringExtractor.kt b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/util/SubstringExtractor.kt
similarity index 92%
rename from providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/utils/SubstringExtractor.kt
rename to extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/util/SubstringExtractor.kt
index b4d7bbe2a..8c62cce4f 100644
--- a/providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/utils/SubstringExtractor.kt
+++ b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/util/SubstringExtractor.kt
@@ -1,37 +1,37 @@
-package com.flixclusive.providers.extractors.mixdrop.utils
-
-
-/**
- *
- * Source (Aniyomi):
- * https://github.com/aniyomiorg/aniyomi-extensions/blob/master/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/SubstringExtractor.kt
- *
- *
- */
-class SubstringExtractor(private val text: String) {
-    private var startIndex = 0
-
-    fun skipOver(str: String) {
-        val index = text.indexOf(str, startIndex)
-        if (index == -1) return
-        startIndex = index + str.length
-    }
-
-    fun substringBefore(str: String): String {
-        val index = text.indexOf(str, startIndex)
-        if (index == -1) return ""
-        val result = text.substring(startIndex, index)
-        startIndex = index + str.length
-        return result
-    }
-
-    fun substringBetween(left: String, right: String): String {
-        val index = text.indexOf(left, startIndex)
-        if (index == -1) return ""
-        val leftIndex = index + left.length
-        val rightIndex = text.indexOf(right, leftIndex)
-        if (rightIndex == -1) return ""
-        startIndex = rightIndex + right.length
-        return text.substring(leftIndex, rightIndex)
-    }
+package com.flixclusive.extractor.mixdrop.util
+
+
+/**
+ *
+ * Source (Aniyomi):
+ * https://github.com/aniyomiorg/aniyomi-extensions/blob/master/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/SubstringExtractor.kt
+ *
+ *
+ */
+class SubstringExtractor(private val text: String) {
+    private var startIndex = 0
+
+    fun skipOver(str: String) {
+        val index = text.indexOf(str, startIndex)
+        if (index == -1) return
+        startIndex = index + str.length
+    }
+
+    fun substringBefore(str: String): String {
+        val index = text.indexOf(str, startIndex)
+        if (index == -1) return ""
+        val result = text.substring(startIndex, index)
+        startIndex = index + str.length
+        return result
+    }
+
+    fun substringBetween(left: String, right: String): String {
+        val index = text.indexOf(left, startIndex)
+        if (index == -1) return ""
+        val leftIndex = index + left.length
+        val rightIndex = text.indexOf(right, leftIndex)
+        if (rightIndex == -1) return ""
+        startIndex = rightIndex + right.length
+        return text.substring(leftIndex, rightIndex)
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/utils/Unpacker.kt b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/util/Unpacker.kt
similarity index 94%
rename from providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/utils/Unpacker.kt
rename to extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/util/Unpacker.kt
index 1c92e5486..0612fe98b 100644
--- a/providers/src/main/java/com/flixclusive/providers/extractors/mixdrop/utils/Unpacker.kt
+++ b/extractor/mixdrop/src/main/kotlin/com/flixclusive/extractor/mixdrop/util/Unpacker.kt
@@ -1,78 +1,78 @@
-package com.flixclusive.providers.extractors.mixdrop.utils
-
-/**
- *
- * Source (Aniyomi):
- * https://github.com/aniyomiorg/aniyomi-extensions/blob/master/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/Unpacker.kt
- *
- *
- */
-object Unpacker {
-
-    /**
-     * Unpacks JavaScript code compressed by packer.
-     *
-     * Specify [left] and [right] to unpack only the data between them.
-     *
-     * Note: single quotes `\'` in the data will be replaced with double quotes `"`.
-     */
-    fun unpack(script: String, left: String? = null, right: String? = null): String =
-        unpack(SubstringExtractor(script), left, right)
-
-    /**
-     * Unpacks JavaScript code compressed by packer.
-     *
-     * Specify [left] and [right] to unpack only the data between them.
-     *
-     * Note: single quotes `\'` in the data will be replaced with double quotes `"`.
-     */
-    private fun unpack(script: SubstringExtractor, left: String? = null, right: String? = null): String {
-        val packed = script
-            .substringBetween("}('", ".split('|'),0,{}))")
-            .replace("\\'", "\"")
-
-        val parser = SubstringExtractor(packed)
-        val data: String
-        if (left != null && right != null) {
-            data = parser.substringBetween(left, right)
-            parser.skipOver("',")
-        } else {
-            data = parser.substringBefore("',")
-        }
-        if (data.isEmpty()) return ""
-
-        val dictionary = parser.substringBetween("'", "'").split("|")
-        val size = dictionary.size
-
-        return wordRegex.replace(data) {
-            val key = it.value
-            val index = parseRadix62(key)
-            if (index >= size) return@replace key
-            dictionary[index].ifEmpty { key }
-        }
-    }
-
-    private val wordRegex by lazy { Regex("""\w+""") }
-
-    private fun parseRadix62(str: String): Int {
-        var result = 0
-        for (ch in str.toCharArray()) {
-            result = result * 62 + when {
-                ch.code <= '9'.code -> { // 0-9
-                    ch.code - '0'.code
-                }
-
-                ch.code >= 'a'.code -> { // a-z
-                    // ch - 'a' + 10
-                    ch.code - ('a'.code - 10)
-                }
-
-                else -> { // A-Z
-                    // ch - 'A' + 36
-                    ch.code - ('A'.code - 36)
-                }
-            }
-        }
-        return result
-    }
+package com.flixclusive.extractor.mixdrop.util
+
+/**
+ *
+ * Source (Aniyomi):
+ * https://github.com/aniyomiorg/aniyomi-extensions/blob/master/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/Unpacker.kt
+ *
+ *
+ */
+object Unpacker {
+
+    /**
+     * Unpacks JavaScript code compressed by packer.
+     *
+     * Specify [left] and [right] to unpack only the data between them.
+     *
+     * Note: single quotes `\'` in the data will be replaced with double quotes `"`.
+     */
+    fun unpack(script: String, left: String? = null, right: String? = null): String =
+        unpack(SubstringExtractor(script), left, right)
+
+    /**
+     * Unpacks JavaScript code compressed by packer.
+     *
+     * Specify [left] and [right] to unpack only the data between them.
+     *
+     * Note: single quotes `\'` in the data will be replaced with double quotes `"`.
+     */
+    private fun unpack(script: SubstringExtractor, left: String? = null, right: String? = null): String {
+        val packed = script
+            .substringBetween("}('", ".split('|'),0,{}))")
+            .replace("\\'", "\"")
+
+        val parser = SubstringExtractor(packed)
+        val data: String
+        if (left != null && right != null) {
+            data = parser.substringBetween(left, right)
+            parser.skipOver("',")
+        } else {
+            data = parser.substringBefore("',")
+        }
+        if (data.isEmpty()) return ""
+
+        val dictionary = parser.substringBetween("'", "'").split("|")
+        val size = dictionary.size
+
+        return wordRegex.replace(data) {
+            val key = it.value
+            val index = parseRadix62(key)
+            if (index >= size) return@replace key
+            dictionary[index].ifEmpty { key }
+        }
+    }
+
+    private val wordRegex by lazy { Regex("""\w+""") }
+
+    private fun parseRadix62(str: String): Int {
+        var result = 0
+        for (ch in str.toCharArray()) {
+            result = result * 62 + when {
+                ch.code <= '9'.code -> { // 0-9
+                    ch.code - '0'.code
+                }
+
+                ch.code >= 'a'.code -> { // a-z
+                    // ch - 'a' + 10
+                    ch.code - ('a'.code - 10)
+                }
+
+                else -> { // A-Z
+                    // ch - 'A' + 36
+                    ch.code - ('A'.code - 36)
+                }
+            }
+        }
+        return result
+    }
 }
\ No newline at end of file
diff --git a/extractor/upcloud/.gitignore b/extractor/upcloud/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/extractor/upcloud/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/extractor/upcloud/build.gradle.kts b/extractor/upcloud/build.gradle.kts
new file mode 100644
index 000000000..b343acba9
--- /dev/null
+++ b/extractor/upcloud/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.extractor.upcloud"
+}
+
+dependencies {
+    implementation(projects.extractor.base)
+
+    implementation(libs.jsoup)
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/extractors/upcloud/UpCloud.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/UpCloud.kt
similarity index 72%
rename from providers/src/main/java/com/flixclusive/providers/extractors/upcloud/UpCloud.kt
rename to extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/UpCloud.kt
index 27c98488f..227210c0f 100644
--- a/providers/src/main/java/com/flixclusive/providers/extractors/upcloud/UpCloud.kt
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/UpCloud.kt
@@ -1,140 +1,145 @@
-package com.flixclusive.providers.extractors.upcloud
-
-import com.flixclusive.providers.extractors.upcloud.utils.DecryptUtils.extractEmbedDecryptionDetails
-import com.flixclusive.providers.extractors.upcloud.utils.DecryptUtils.getKeyStops
-import com.flixclusive.providers.interfaces.Extractor
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import com.flixclusive.providers.models.extractors.upcloud.DecryptedSource
-import com.flixclusive.providers.models.extractors.upcloud.UpCloudEmbedData
-import com.flixclusive.providers.models.extractors.upcloud.UpCloudEmbedData.Companion.toSubtitle
-import com.flixclusive.providers.utils.DecryptUtils.decryptAes
-import com.flixclusive.providers.utils.JsonUtils.fromJson
-import com.flixclusive.providers.utils.asyncCalls
-import com.flixclusive.providers.utils.mapAsync
-import com.flixclusive.providers.utils.mapIndexedAsync
-import com.flixclusive.providers.utils.network.OkHttpUtils.GET
-import com.flixclusive.providers.utils.network.OkHttpUtils.asString
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import java.net.URL
-
-/**
- *
- * Also known as vidcloud
- * */
-class UpCloud(
-    private val client: OkHttpClient,
-    private val isAlternative: Boolean = false,
-) : Extractor {
-    override val name: String = "upcloud"
-    private val alternativeName: String = "vidcloud"
-
-    private val host: String = "https://rabbitstream.net"
-    private val alternateHost: String = "https://dokicloud.one"
-    private val e4ScriptEndpoint = "https://rabbitstream.net/js/player/prod/e4-player.min.js"
-
-    private fun getName(isAlternative: Boolean) = if(isAlternative) alternativeName else name
-
-    override suspend fun extract(
-        url: URL,
-        mediaId: String,
-        episodeId: String,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    ) {
-
-        val id = url.path.split('/').last().split('?').first()
-        val options = Headers.Builder()
-            .add("X-Requested-With", "XMLHttpRequest")
-            .add("Referer", url.toString())
-            .build()
-
-        val hostToUse = if (isAlternative) alternateHost else host
-        val response = client.newCall(
-            GET("$hostToUse/ajax/embed-4/getSources?id=$id", options)
-        ).execute()
-
-        val responseBody = response.body?.charStream().asString() ?: throw Exception("Cannot fetch sources")
-
-
-        if(responseBody.isBlank())
-            throw Exception("Cannot fetch sources")
-
-        val upCloudEmbedData: UpCloudEmbedData
-
-        try {
-            upCloudEmbedData = fromJson<UpCloudEmbedData>(responseBody)
-        } catch (e: Exception) {
-            println("!! Source could be an array !!")
-            println(responseBody)
-
-            throw Exception("Invalid source type. Possibly an array")
-        }
-
-        var sources = mutableListOf<DecryptedSource>()
-
-        if (upCloudEmbedData.encrypted) {
-            val e4Script = client.newCall(
-                GET(e4ScriptEndpoint, options)
-            ).execute().body?.charStream().asString()
-                ?: throw Exception("Cannot fetch key decoder")
-
-            val stops = getKeyStops(e4Script)
-            val (decryptedKey, newSource) = extractEmbedDecryptionDetails(upCloudEmbedData.sources, stops)
-
-            sources = fromJson<MutableList<DecryptedSource>>(decryptAes(newSource, decryptedKey))
-        }
-
-
-        check(sources.isNotEmpty())
-        onLinkLoaded(
-            SourceLink(
-                url = sources[0].url,
-                name = "${getName(isAlternative)}: " + "Auto"
-            )
-        )
-
-        asyncCalls(
-            {
-                sources.mapAsync { source ->
-                    client.newCall(
-                        GET(source.url, options)
-                    ).execute().body
-                        ?.charStream()
-                        .asString()
-                        ?.let { data ->
-                            val urls = data
-                                .split('\n')
-                                .filter { line -> line.contains(".m3u8") }
-
-                            val qualities = data
-                                .split('\n')
-                                .filter { line -> line.contains("RESOLUTION=") }
-
-                            qualities.mapIndexedAsync { i, s ->
-                                val qualityTag = "${getName(isAlternative)}: ${s.split('x')[1]}p"
-                                val dataUrl = urls[i]
-
-                                onLinkLoaded(
-                                    SourceLink(
-                                        name = qualityTag,
-                                        url = dataUrl
-                                    )
-                                )
-                            }
-                        }
-                }
-            },
-            {
-                upCloudEmbedData.tracks.mapAsync {
-                    onSubtitleLoaded(
-                        it.toSubtitle(
-                            customName = "${getName(isAlternative)}: ",
-                        )
-                    )
-                }
-            }
-        )
-    }
+package com.flixclusive.extractor.upcloud
+
+import com.flixclusive.core.util.coroutines.asyncCalls
+import com.flixclusive.core.util.coroutines.mapAsync
+import com.flixclusive.core.util.coroutines.mapIndexedAsync
+import com.flixclusive.core.util.json.fromJson
+import com.flixclusive.extractor.base.Extractor
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.util.CryptographyHelper.decryptAes
+import com.flixclusive.provider.base.util.GET
+import com.flixclusive.provider.base.util.asString
+import com.flixclusive.extractor.upcloud.util.DecryptUtils.extractEmbedDecryptionDetails
+import com.flixclusive.extractor.upcloud.util.DecryptUtils.getKeyStops
+import com.flixclusive.extractor.upcloud.dto.DecryptedSource
+import com.flixclusive.extractor.upcloud.dto.UpCloudEmbedData
+import com.flixclusive.extractor.upcloud.dto.UpCloudEmbedData.Companion.toSubtitle
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import java.net.URL
+
+/**
+ *
+ * Also known as vidcloud
+ * */
+class UpCloud(
+    private val client: OkHttpClient,
+    private val isAlternative: Boolean = false,
+) : Extractor() {
+    override val name: String = "upcloud"
+    private val alternativeName: String = "vidcloud"
+
+    override val host: String = "https://rabbitstream.net"
+    private val alternateHost: String = "https://dokicloud.one"
+    private val e4ScriptEndpoint = "https://rabbitstream.net/js/player/prod/e4-player.min.js"
+
+    private fun getName(isAlternative: Boolean) = if(isAlternative) alternativeName else name
+
+    override suspend fun extract(
+        url: URL,
+        mediaId: String,
+        episodeId: String,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ) {
+
+        val id = url.path.split('/').last().split('?').first()
+        val options = Headers.Builder()
+            .add("X-Requested-With", "XMLHttpRequest")
+            .add("Referer", url.toString())
+            .build()
+
+        val hostToUse = if (isAlternative) alternateHost else host
+        val response = client.newCall(
+            GET("$hostToUse/ajax/embed-4/getSources?id=$id", options)
+        ).execute()
+
+        val responseBody = response.body
+            ?.charStream()
+            .asString()
+            ?: throw Exception("Cannot fetch sources")
+
+
+        if(responseBody.isBlank())
+            throw Exception("Cannot fetch sources")
+
+        val upCloudEmbedData: UpCloudEmbedData
+
+        try {
+            upCloudEmbedData = fromJson<UpCloudEmbedData>(responseBody)
+        } catch (e: Exception) {
+            println("!! Source could be an array !!")
+            println(responseBody)
+
+            throw Exception("Invalid source type. Possibly an array")
+        }
+
+        var sources = mutableListOf<DecryptedSource>()
+
+        if (upCloudEmbedData.encrypted) {
+            val e4Script = client.newCall(
+                GET(e4ScriptEndpoint, options)
+            ).execute().body?.charStream().asString()
+                ?: throw Exception("Cannot fetch key decoder")
+
+            val stops = getKeyStops(e4Script)
+            val (decryptedKey, newSource) = extractEmbedDecryptionDetails(upCloudEmbedData.sources, stops)
+
+            sources = fromJson<MutableList<DecryptedSource>>(
+                decryptAes(newSource, decryptedKey)
+            )
+        }
+
+
+        check(sources.isNotEmpty())
+        onLinkLoaded(
+            SourceLink(
+                url = sources[0].url,
+                name = "${getName(isAlternative)}: " + "Auto"
+            )
+        )
+
+        asyncCalls(
+            {
+                sources.mapAsync { source ->
+                    client.newCall(
+                        GET(source.url, options)
+                    ).execute().body
+                        ?.charStream()
+                        .asString()
+                        ?.let { data ->
+                            val urls = data
+                                .split('\n')
+                                .filter { line -> line.contains(".m3u8") }
+
+                            val qualities = data
+                                .split('\n')
+                                .filter { line -> line.contains("RESOLUTION=") }
+
+                            qualities.mapIndexedAsync { i, s ->
+                                val qualityTag = "${getName(isAlternative)}: ${s.split('x')[1]}p"
+                                val dataUrl = urls[i]
+
+                                onLinkLoaded(
+                                    SourceLink(
+                                        name = qualityTag,
+                                        url = dataUrl
+                                    )
+                                )
+                            }
+                        }
+                }
+            },
+            {
+                upCloudEmbedData.tracks.mapAsync {
+                    onSubtitleLoaded(
+                        it.toSubtitle(
+                            customName = "${getName(isAlternative)}: ",
+                        )
+                    )
+                }
+            }
+        )
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/extractors/upcloud/DecryptedSource.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/DecryptedSource.kt
similarity index 71%
rename from providers/src/main/java/com/flixclusive/providers/models/extractors/upcloud/DecryptedSource.kt
rename to extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/DecryptedSource.kt
index 05a17e68e..811032031 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/extractors/upcloud/DecryptedSource.kt
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/DecryptedSource.kt
@@ -1,8 +1,8 @@
-package com.flixclusive.providers.models.extractors.upcloud
-
-import com.google.gson.annotations.SerializedName
-
-data class DecryptedSource(
-    @SerializedName("file") val url: String,
-    val type: String
+package com.flixclusive.extractor.upcloud.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class DecryptedSource(
+    @SerializedName("file") val url: String,
+    val type: String
 )
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/extractors/upcloud/UpCloudEmbedData.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt
similarity index 82%
rename from providers/src/main/java/com/flixclusive/providers/models/extractors/upcloud/UpCloudEmbedData.kt
rename to extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt
index 174fff643..da48d5368 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/extractors/upcloud/UpCloudEmbedData.kt
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt
@@ -1,25 +1,24 @@
-package com.flixclusive.providers.models.extractors.upcloud
-
-import com.flixclusive.providers.models.common.Subtitle
-import com.google.gson.annotations.SerializedName
-
-
-data class UpCloudEmbedData(
-    val sources: String,
-    val tracks: List<UpCloudEmbedSubtitleData>,
-    val encrypted: Boolean,
-    val server: Int
-) {
-    data class UpCloudEmbedSubtitleData(
-        @SerializedName("file") val url: String,
-        @SerializedName("label") val lang: String,
-        val kind: String
-    )
-
-    companion object {
-        fun UpCloudEmbedSubtitleData.toSubtitle(customName: String? = null) = Subtitle(
-            url = url,
-            lang = customName + lang
-        )
-    }
+package com.flixclusive.extractor.upcloud.dto
+
+import com.flixclusive.model.provider.Subtitle
+import com.google.gson.annotations.SerializedName
+
+data class UpCloudEmbedData(
+    val sources: String,
+    val tracks: List<UpCloudEmbedSubtitleData>,
+    val encrypted: Boolean,
+    val server: Int
+) {
+    data class UpCloudEmbedSubtitleData(
+        @SerializedName("file") val url: String,
+        @SerializedName("label") val lang: String,
+        val kind: String
+    )
+
+    companion object {
+        fun UpCloudEmbedSubtitleData.toSubtitle(customName: String? = null) = Subtitle(
+            url = url,
+            lang = customName + lang
+        )
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/extractors/upcloud/utils/DecryptUtils.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptUtils.kt
similarity index 93%
rename from providers/src/main/java/com/flixclusive/providers/extractors/upcloud/utils/DecryptUtils.kt
rename to extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptUtils.kt
index 06e3a0fa6..b0e203272 100644
--- a/providers/src/main/java/com/flixclusive/providers/extractors/upcloud/utils/DecryptUtils.kt
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptUtils.kt
@@ -1,61 +1,61 @@
-package com.flixclusive.providers.extractors.upcloud.utils
-
-typealias Stops = List<List<Int>>
-
-object DecryptUtils {
-    fun getKeyStops(script: String): Stops {
-        val startOfSwitch = script.lastIndexOf("switch")
-        val endOfCases = script.indexOf("=partKey")
-        val switchBody = script.substring(startOfSwitch, endOfCases)
-
-        val stops = mutableListOf<List<Int>>()
-        val regex = Regex(":[a-zA-Z0-9]+=([a-zA-Z0-9]+),[a-zA-Z0-9]+=([a-zA-Z0-9]+);")
-        val matches = regex.findAll(switchBody)
-
-        for (match in matches) {
-            val innerNumbers = mutableListOf<Int>()
-            for (varMatch in listOf(match.groupValues[1], match.groupValues[2])) {
-                val regexStr = Regex("$varMatch=([a-zA-Z0-9]+)")
-                val varMatches = regexStr.findAll(script)
-                val lastMatch = varMatches.lastOrNull()?.groupValues?.lastOrNull() ?: return listOf()
-                val number = if (lastMatch.startsWith("0x")) {
-                    lastMatch.substring(2).toInt(16)
-                } else {
-                    lastMatch.toInt()
-                }
-                innerNumbers.add(number)
-            }
-            stops.add(innerNumbers)
-        }
-
-        return stops
-    }
-
-    fun extractEmbedDecryptionDetails(encryptedString: String, stops: Stops): Pair<String, String> {
-        var decryptedKey = ""
-        var offset = 0
-        var secondStopSum = 0;
-        var newEncryptedString = encryptedString
-
-        for(stop in stops) {
-            val start = stop[0] + secondStopSum
-            val end = start + stop[1]
-            secondStopSum += stop[1]
-
-            decryptedKey += newEncryptedString.substring(
-                start - offset,
-                end - offset
-            )
-
-            newEncryptedString = newEncryptedString.replaceRange(
-                start - offset,
-                end - offset,
-                ""
-            )
-
-            offset += end - start
-        }
-
-        return Pair(decryptedKey, newEncryptedString)
-    }
+package com.flixclusive.extractor.upcloud.util
+
+typealias Stops = List<List<Int>>
+
+object DecryptUtils {
+    fun getKeyStops(script: String): Stops {
+        val startOfSwitch = script.lastIndexOf("switch")
+        val endOfCases = script.indexOf("=partKey")
+        val switchBody = script.substring(startOfSwitch, endOfCases)
+
+        val stops = mutableListOf<List<Int>>()
+        val regex = Regex(":[a-zA-Z0-9]+=([a-zA-Z0-9]+),[a-zA-Z0-9]+=([a-zA-Z0-9]+);")
+        val matches = regex.findAll(switchBody)
+
+        for (match in matches) {
+            val innerNumbers = mutableListOf<Int>()
+            for (varMatch in listOf(match.groupValues[1], match.groupValues[2])) {
+                val regexStr = Regex("$varMatch=([a-zA-Z0-9]+)")
+                val varMatches = regexStr.findAll(script)
+                val lastMatch = varMatches.lastOrNull()?.groupValues?.lastOrNull() ?: return listOf()
+                val number = if (lastMatch.startsWith("0x")) {
+                    lastMatch.substring(2).toInt(16)
+                } else {
+                    lastMatch.toInt()
+                }
+                innerNumbers.add(number)
+            }
+            stops.add(innerNumbers)
+        }
+
+        return stops
+    }
+
+    fun extractEmbedDecryptionDetails(encryptedString: String, stops: Stops): Pair<String, String> {
+        var decryptedKey = ""
+        var offset = 0
+        var secondStopSum = 0
+        var newEncryptedString = encryptedString
+
+        for(stop in stops) {
+            val start = stop[0] + secondStopSum
+            val end = start + stop[1]
+            secondStopSum += stop[1]
+
+            decryptedKey += newEncryptedString.substring(
+                start - offset,
+                end - offset
+            )
+
+            newEncryptedString = newEncryptedString.replaceRange(
+                start - offset,
+                end - offset,
+                ""
+            )
+
+            offset += end - start
+        }
+
+        return Pair(decryptedKey, newEncryptedString)
+    }
 }
\ No newline at end of file
diff --git a/feature/mobile/home/.gitignore b/feature/mobile/home/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/feature/mobile/home/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/mobile/home/build.gradle.kts b/feature/mobile/home/build.gradle.kts
new file mode 100644
index 000000000..e694ce273
--- /dev/null
+++ b/feature/mobile/home/build.gradle.kts
@@ -0,0 +1,12 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.feature)
+    alias(libs.plugins.flixclusive.destinations)
+}
+
+android {
+    namespace = "com.flixclusive.mobile.home"
+}
+
+dependencies {
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/HomeMobileScreen.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/HomeMobileScreen.kt
new file mode 100644
index 000000000..bb2955ec1
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/HomeMobileScreen.kt
@@ -0,0 +1,88 @@
+package com.flixclusive.mobile.home
+
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.flixclusive.core.ui.mobile.MainMobileSharedViewModel
+import com.flixclusive.core.ui.mobile.OnDoubleNavBarItemClickObserver
+import com.flixclusive.core.ui.mobile.OnSeeMoreDetailsClickObserver
+import com.flixclusive.core.util.navigation.navigateSingleTopTo
+import com.flixclusive.presentation.NavGraphs
+import com.flixclusive.presentation.appCurrentDestinationAsState
+import com.flixclusive.presentation.destinations.Destination
+import com.flixclusive.presentation.destinations.HomeFilmScreenDestination
+import com.flixclusive.presentation.destinations.HomeScreenContentDestination
+import com.flixclusive.presentation.mobile.common.MobileRootNavGraph
+import com.flixclusive.presentation.mobile.main.MainMobileSharedViewModel
+import com.flixclusive.presentation.mobile.main.utils.OnDoubleNavBarItemClickObserver
+import com.flixclusive.presentation.mobile.main.utils.OnSeeMoreDetailsClickObserver
+import com.flixclusive.presentation.utils.ComposeUtils.navigateSingleTopTo
+import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
+import com.ramcosta.composedestinations.DestinationsNavHost
+import com.ramcosta.composedestinations.animations.rememberAnimatedNavHostEngine
+import com.ramcosta.composedestinations.annotation.NavGraph
+import com.ramcosta.composedestinations.navigation.dependency
+import com.ramcosta.composedestinations.navigation.navigate
+
+@MobileRootNavGraph(start = true)
+@NavGraph
+annotation class HomeNavGraph(
+    val start: Boolean = false
+)
+
+@OptIn(ExperimentalMaterialNavigationApi::class, ExperimentalAnimationApi::class)
+@com.ramcosta.composedestinations.annotation.Destination(
+    style = HomeScreenTransition::class
+)
+@Composable
+fun HomeMobileScreen(
+    mainMobileSharedViewModel: MainMobileSharedViewModel,
+) {
+    val engine = rememberAnimatedNavHostEngine()
+    val navController = engine.rememberNavController()
+
+    val startDestination = HomeScreenContentDestination
+    val navGraph = NavGraphs.home
+    val currentScreen: Destination = navController.appCurrentDestinationAsState().value
+        ?: startDestination
+
+    val navGraphThatNeedsToGoToRoot by rememberUpdatedState(newValue = mainMobileSharedViewModel.navGraphThatNeedsToGoToRoot)
+    val mainUiState by mainMobileSharedViewModel.uiState.collectAsStateWithLifecycle()
+    val filmToPreview by mainMobileSharedViewModel.filmToPreview.collectAsStateWithLifecycle()
+
+    OnSeeMoreDetailsClickObserver(
+        isSeeingMoreDetailsProvider = { mainUiState.isSeeingMoreDetailsOfLongClickedFilm },
+        currentBackStackEntryProvider = { navController.currentBackStackEntry },
+        navigate = {
+            // consume it
+            navController.navigate(
+                HomeFilmScreenDestination(filmToPreview!!)
+            )
+            mainMobileSharedViewModel.onBottomSheetClose()
+            mainMobileSharedViewModel.onSeeMoreClick(shouldSeeMore = false)
+        }
+    )
+
+    OnDoubleNavBarItemClickObserver(
+        navGraphThatNeedsToGoToRootProvider = { navGraphThatNeedsToGoToRoot },
+        currentScreen = currentScreen,
+        startDestination = startDestination,
+        navGraph = navGraph,
+        navigate = {
+            navController.navigateSingleTopTo(startDestination, NavGraphs.mobileRoot)
+        },
+        consume = mainMobileSharedViewModel::onNavBarItemClickTwice
+    )
+
+    DestinationsNavHost(
+        engine = engine,
+        navController = navController,
+        navGraph = navGraph,
+        startRoute = startDestination,
+        dependenciesContainerBuilder = {
+            dependency(mainMobileSharedViewModel)
+        }
+    )
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/HomeScreenTransition.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/HomeScreenTransition.kt
new file mode 100644
index 000000000..0e2937ad0
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/HomeScreenTransition.kt
@@ -0,0 +1,31 @@
+package com.flixclusive.mobile.home
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.navigation.NavBackStackEntry
+import com.flixclusive.presentation.appDestination
+import com.flixclusive.presentation.destinations.PreferencesMobileScreenDestination
+import com.flixclusive.presentation.destinations.SearchMobileScreenDestination
+import com.ramcosta.composedestinations.spec.DestinationStyle.Animated
+
+object HomeScreenTransition : Animated {
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
+        return when(initialState.appDestination()) {
+            SearchMobileScreenDestination, PreferencesMobileScreenDestination -> slideInHorizontally { -1000 } + fadeIn()
+            else -> null
+        }
+    }
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.exitTransition(): ExitTransition? {
+        return when(targetState.appDestination()) {
+            SearchMobileScreenDestination, PreferencesMobileScreenDestination -> fadeOut() + slideOutHorizontally { -1000 }
+            else -> null
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeContinueWatchingRow.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeContinueWatchingRow.kt
new file mode 100644
index 000000000..aa01a91fb
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeContinueWatchingRow.kt
@@ -0,0 +1,261 @@
+package com.flixclusive.mobile.home.content
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.flixclusive.R
+import com.flixclusive.domain.model.entities.WatchHistoryItem
+import com.flixclusive.domain.model.tmdb.Film
+import com.flixclusive.domain.utils.WatchHistoryUtils.getNextEpisodeToWatch
+import com.flixclusive.presentation.common.composables.FilmCover
+import com.flixclusive.presentation.mobile.main.LABEL_START_PADDING
+import com.flixclusive.presentation.mobile.utils.ComposeMobileUtils.colorOnMediumEmphasisMobile
+import com.flixclusive.presentation.utils.FormatterUtils.formatMinutes
+
+@Composable
+fun HomeContinueWatchingRow(
+    modifier: Modifier = Modifier,
+    showCardTitle: Boolean,
+    dataListProvider: () -> List<WatchHistoryItem>,
+    onFilmClick: (Film) -> Unit,
+    onSeeMoreClick: (Film) -> Unit,
+) {
+    if(dataListProvider().isNotEmpty()) {
+        Column(
+            modifier = modifier
+                .padding(top = 25.dp, bottom = 10.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp)
+        ) {
+            Text(
+                text = stringResource(R.string.continue_watching),
+                style = MaterialTheme.typography.bodyMedium,
+                fontWeight = FontWeight.Medium,
+                modifier = Modifier
+                    .padding(start = LABEL_START_PADDING)
+            )
+
+
+            LazyRow {
+                items(
+                    items = dataListProvider(),
+                    key = { it.id }
+                ) { item ->
+                    ContinueWatchingCard(
+                        modifier = Modifier
+                            .width(135.dp),
+                        showCardTitle = showCardTitle,
+                        watchHistoryItem = item,
+                        onClick = onFilmClick,
+                        onSeeMoreClick = { onSeeMoreClick(item.film) }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun ContinueWatchingCard(
+    watchHistoryItem: WatchHistoryItem,
+    showCardTitle: Boolean,
+    onClick: (Film) -> Unit,
+    onSeeMoreClick: (Film) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val haptic = LocalHapticFeedback.current
+    val film = watchHistoryItem.film
+
+    val isTvShow = watchHistoryItem.seasons != null
+
+    if(watchHistoryItem.episodesWatched.isEmpty())
+        return
+
+    val lastWatchedEpisode = watchHistoryItem.episodesWatched.last()
+    var progress by remember(watchHistoryItem) {
+        val percentage = if(lastWatchedEpisode.durationTime == 0L) {
+            0F
+        } else {
+            lastWatchedEpisode.watchTime.toFloat() / lastWatchedEpisode.durationTime.toFloat()
+        }
+
+        mutableFloatStateOf(percentage)
+    }
+
+    val itemLabel = remember(watchHistoryItem) {
+        if(isTvShow) {
+            val nextEpisodeWatched = getNextEpisodeToWatch(watchHistoryItem)
+            val season = nextEpisodeWatched.first
+            val episode = nextEpisodeWatched.second
+
+            val lastEpisodeIsNotSameWithNextEpisodeToWatch = lastWatchedEpisode.episodeNumber != episode
+
+            if(lastEpisodeIsNotSameWithNextEpisodeToWatch)
+                progress = 0F
+
+            "S${season} E${episode}"
+        } else {
+            val watchTime = watchHistoryItem.episodesWatched.last().watchTime
+            val watchTimeInSeconds = (watchTime / 1000).toInt()
+            val watchTimeInMinutes = watchTimeInSeconds / 60
+
+            formatMinutes(totalMinutes = watchTimeInMinutes)
+        }
+    }
+
+    Column(
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+            .padding(3.dp)
+    ) {
+        Box(
+            modifier = Modifier
+                .clip(
+                    RoundedCornerShape(
+                        bottomStart = 4.dp,
+                        bottomEnd = 4.dp
+                    )
+                )
+                .combinedClickable(
+                    onClick = { onClick(film) },
+                    onLongClick = {
+                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                        onSeeMoreClick(film)
+                    }
+                )
+        ) {
+            FilmCover.Poster(
+                imagePath = film.posterImage,
+                imageSize = "w220_and_h330_face"
+            )
+
+            Box(
+                modifier = Modifier
+                    .size(50.dp)
+                    .align(Alignment.Center)
+                    .border(
+                        width = 1.dp,
+                        color = Color.White,
+                        shape = CircleShape
+                    )
+                    .background(
+                        color = colorOnMediumEmphasisMobile(color = Color.Black),
+                        shape = CircleShape
+                    )
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.play),
+                    contentDescription = stringResource(id = R.string.play_button),
+                    modifier = Modifier
+                        .size(30.dp)
+                        .align(Alignment.Center),
+                    tint = Color.White
+                )
+            }
+
+            Box(
+                modifier = Modifier
+                    .matchParentSize()
+                    .background(
+                        Brush.verticalGradient(
+                            0F to Color.Transparent,
+                            0.6F to Color.Transparent,
+                            0.95F to colorOnMediumEmphasisMobile(
+                                MaterialTheme.colorScheme.surface,
+                                0.8F
+                            )
+                        )
+                    )
+            ) {
+                Column(
+                    modifier = Modifier
+                        .align(Alignment.BottomStart)
+                        .fillMaxWidth()
+                        .padding(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    Text(
+                        text = itemLabel,
+                        style = MaterialTheme.typography.labelLarge.copy(
+                            fontSize = 12.sp
+                        ),
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+
+                    LinearProgressIndicator(
+                        progress = progress,
+                        color = MaterialTheme.colorScheme.primary,
+                        trackColor = MaterialTheme.colorScheme.primary.copy(0.4F),
+                        modifier = Modifier.clip(MaterialTheme.shapes.large)
+                    )
+                }
+            }
+
+            IconButton(
+                onClick = { onSeeMoreClick(film) },
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .size(30.dp)
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.round_more_vert_24),
+                    contentDescription = stringResource(R.string.see_more_btn_content_desc),
+                    tint = Color.White
+                )
+            }
+        }
+
+        if(showCardTitle) {
+            Text(
+                text = film.title,
+                style = MaterialTheme.typography.labelLarge.copy(
+                    fontSize = 12.sp
+                ),
+                textAlign = TextAlign.Center,
+                overflow = TextOverflow.Ellipsis,
+                color = colorOnMediumEmphasisMobile(emphasis = 0.8F),
+                maxLines = 1,
+                modifier = Modifier
+                    .padding(vertical = 5.dp)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeHeader.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeHeader.kt
new file mode 100644
index 000000000..adc62cca6
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeHeader.kt
@@ -0,0 +1,303 @@
+package com.flixclusive.mobile.home.content
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Star
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.flixclusive.R
+import com.flixclusive.domain.model.tmdb.Film
+import com.flixclusive.domain.model.tmdb.Genre
+import com.flixclusive.presentation.mobile.main.LABEL_START_PADDING
+import com.flixclusive.presentation.mobile.utils.ComposeMobileUtils.colorOnMediumEmphasisMobile
+import com.flixclusive.presentation.theme.lightGray
+import com.flixclusive.presentation.theme.lightGrayElevated
+import com.flixclusive.presentation.theme.starColor
+import com.flixclusive.presentation.utils.FormatterUtils.formatRating
+import com.flixclusive.presentation.utils.ImageRequestCreator.buildImageUrl
+import com.flixclusive.presentation.utils.ModifierUtils.fadingEdge
+import com.flixclusive.presentation.utils.ModifierUtils.placeholderEffect
+import kotlin.random.Random
+
+@OptIn(ExperimentalLayoutApi::class, ExperimentalFoundationApi::class)
+@Composable
+fun HomeHeader(
+    modifier: Modifier = Modifier,
+    film: Film,
+    onGenreClick: (Genre) -> Unit,
+    onFilmClick: (Film) -> Unit,
+    onFilmLongClick: (Film) -> Unit
+) {
+    val haptic = LocalHapticFeedback.current
+    val context = LocalContext.current
+    val backgroundColor = MaterialTheme.colorScheme.background
+
+    var shouldShowTextInsteadOfLogo by remember { mutableStateOf(false) }
+    var logoImage: ImageRequest? by remember { mutableStateOf(null) }
+    var posterImage: ImageRequest? by remember { mutableStateOf(null) }
+
+    var filmInfo by remember { mutableStateOf("") }
+
+    Box(
+        contentAlignment = Alignment.Center
+    ) {
+        if(filmInfo.isEmpty())
+            filmInfo = "${formatRating(film.rating)} | ${film.dateReleased}"
+
+        if(posterImage == null)
+            posterImage = context.buildImageUrl(
+                imagePath = film.backdropImage,
+                imageSize = "w600_and_h900_multi_faces"
+            )
+
+        if(logoImage == null)
+            logoImage = context.buildImageUrl(
+                imagePath = film.logoImage,
+                imageSize = "w500"
+            )
+
+        AsyncImage(
+            model = posterImage,
+            imageLoader = LocalContext.current.imageLoader,
+            placeholder = painterResource(R.drawable.movie_placeholder),
+            error = painterResource(R.drawable.movie_placeholder),
+            contentDescription = stringResource(R.string.popular),
+            contentScale = ContentScale.Crop,
+            modifier = modifier
+                .combinedClickable(
+                    onClick = { onFilmClick(film) },
+                    onLongClick = {
+                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                        onFilmLongClick(film)
+                    }
+                )
+        )
+
+        Column(
+            modifier = Modifier
+                .matchParentSize()
+                .statusBarsPadding()
+                .drawBehind {
+                    drawRect(
+                        Brush.verticalGradient(
+                            colors = listOf(
+                                Color.Transparent,
+                                backgroundColor
+                            ),
+                            endY = size.height.times(0.9F)
+                        )
+                    )
+                },
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = 15.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.Bottom
+            ) {
+                Box {
+                    if(shouldShowTextInsteadOfLogo) {
+                        Text(
+                            text = film.title,
+                            style = MaterialTheme.typography.headlineMedium,
+                            textAlign = TextAlign.Center,
+                            softWrap = true,
+                            modifier = Modifier.padding(
+                                top = 23.dp,
+                                start = 5.dp,
+                                end = 5.dp
+                            )
+                        )
+                    } else {
+                        AsyncImage(
+                            model = logoImage,
+                            imageLoader = LocalContext.current.imageLoader,
+                            contentDescription = film.title,
+                            contentScale = ContentScale.Fit,
+                            modifier = Modifier
+                                .height(96.dp)
+                                .fillMaxWidth()
+                                .padding(horizontal = 25.dp),
+                            onError = {
+                                shouldShowTextInsteadOfLogo = true
+                            }
+                        )
+                    }
+                }
+
+                Row(
+                    horizontalArrangement = Arrangement.Center,
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(top = 15.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Rounded.Star,
+                        contentDescription = stringResource(R.string.rating_icon),
+                        modifier = Modifier.scale(0.6F),
+                        tint = starColor
+                    )
+
+                    Text(
+                        text = filmInfo,
+                        style = MaterialTheme.typography.labelMedium,
+                        color = colorOnMediumEmphasisMobile()
+                    )
+                }
+
+                FlowRow(
+                    modifier = Modifier.padding(top = 4.dp),
+                    verticalArrangement = Arrangement.Center,
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    film.genres.forEach {
+                        OutlinedButton(
+                            colors = ButtonDefaults.outlinedButtonColors(contentColor = colorOnMediumEmphasisMobile()),
+                            onClick = {
+                                onGenreClick(it)
+                            },
+                            contentPadding = PaddingValues(
+                                horizontal = 15.dp,
+                                vertical = 5.dp
+                            ),
+                            elevation = ButtonDefaults.buttonElevation(8.dp),
+                            modifier = Modifier
+                                .padding(horizontal = 5.dp)
+                                .defaultMinSize(
+                                    minHeight = 1.dp,
+                                    minWidth = 1.dp
+                                )
+                        ) {
+                            Text(
+                                text = it.name,
+                                style = MaterialTheme.typography.labelMedium
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun HomeHeaderPlaceholder(
+    modifier: Modifier = Modifier
+) {
+    val listBottomFade = Brush.verticalGradient(0.8f to Color.Red, 0.9f to Color.Transparent)
+
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .fadingEdge(listBottomFade)
+                .drawBehind {
+                    drawRect(lightGray)
+                }
+        ) {}
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(
+                    horizontal = LABEL_START_PADDING,
+                    vertical = LABEL_START_PADDING
+                )
+                .align(Alignment.BottomCenter),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Spacer(
+                modifier = Modifier
+                    .height(90.dp)
+                    .fillMaxWidth(0.85F)
+                    .placeholderEffect(
+                        shape = RoundedCornerShape(15),
+                        color = lightGrayElevated
+                    )
+            )
+
+            Spacer(
+                modifier = Modifier
+                    .height(25.dp)
+                    .fillMaxWidth(0.4F)
+                    .padding(top = 15.dp)
+                    .placeholderEffect(
+                        shape = RoundedCornerShape(100),
+                        color = lightGrayElevated
+                    )
+            )
+
+            FlowRow(
+                modifier = Modifier
+                    .padding(top = 14.dp),
+                horizontalArrangement = Arrangement.spacedBy(10.dp),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+                maxItemsInEachRow = 3
+            ) {
+                repeat(3) {
+                    val randomWidth by remember { mutableIntStateOf(Random.nextInt(60, 120)) }
+
+                    Spacer(
+                        modifier = Modifier
+                            .height(23.dp)
+                            .width(randomWidth.dp)
+                            .placeholderEffect(
+                                shape = RoundedCornerShape(100),
+                                color = lightGrayElevated
+                            )
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeMobileFilmsRow.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeMobileFilmsRow.kt
new file mode 100644
index 000000000..d7db1b72d
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeMobileFilmsRow.kt
@@ -0,0 +1,151 @@
+package com.flixclusive.mobile.home.content
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.flixclusive.R
+import com.flixclusive.domain.model.config.HomeCategoryItem
+import com.flixclusive.domain.model.tmdb.Film
+import com.flixclusive.domain.model.tmdb.TMDBSearchItem
+import com.flixclusive.presentation.common.PagingState
+import com.flixclusive.presentation.common.viewmodels.home.PaginationStateInfo
+import com.flixclusive.presentation.mobile.common.composables.film.FilmCard
+import com.flixclusive.presentation.mobile.common.composables.film.FilmCardPlaceholder
+import com.flixclusive.presentation.mobile.main.LABEL_START_PADDING
+import com.flixclusive.presentation.mobile.utils.ComposeMobileUtils.colorOnMediumEmphasisMobile
+import com.flixclusive.presentation.utils.LazyListUtils.shouldPaginate
+
+@Composable
+fun HomeMobileFilmsRow(
+    modifier: Modifier = Modifier,
+    categoryItem: HomeCategoryItem,
+    paginationState: PaginationStateInfo,
+    showCardTitle: Boolean,
+    films: List<Film>,
+    onFilmClick: (Film) -> Unit,
+    onFilmLongClick: (Film) -> Unit,
+    paginate: (query: String, page: Int) -> Unit,
+    onSeeAllClick: () -> Unit
+) {
+    val listState = rememberLazyListState()
+
+    val shouldStartPaginate by remember {
+        derivedStateOf {
+            listState.shouldPaginate()
+        }
+    }
+
+    LaunchedEffect(shouldStartPaginate) {
+        if (shouldStartPaginate && paginationState.canPaginate && paginationState.pagingState == PagingState.IDLE) {
+            paginate(
+                categoryItem.query,
+                paginationState.currentPage
+            )
+        }
+    }
+
+    if(films.isNotEmpty() || paginationState.canPaginate) {
+        Column(
+            modifier = modifier
+                .padding(vertical = if(showCardTitle) 3.dp else 8.dp)
+        ) {
+            Box(
+                modifier = Modifier
+                    .clickable {
+                        onSeeAllClick()
+                    }
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.Center,
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(10))
+                        .padding(vertical = 10.dp)
+                ) {
+                    Text(
+                        text = categoryItem.name,
+                        style = MaterialTheme.typography.bodyMedium,
+                        fontWeight = FontWeight.Medium,
+                        modifier = Modifier
+                            .weight(1F)
+                            .padding(start = LABEL_START_PADDING)
+                    )
+
+                    Box(
+                        modifier = Modifier
+                            .padding(end = LABEL_START_PADDING),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.right_arrow),
+                            contentDescription = stringResource(id = R.string.see_all),
+                            tint = colorOnMediumEmphasisMobile(),
+                            modifier = Modifier
+                                .size(14.dp)
+                                .clickable { onSeeAllClick() }
+                        )
+                    }
+                }
+            }
+
+            LazyRow(state = listState) {
+                items(films) { film ->
+
+                    // Necessary if we ever encounter a trending cast/person model
+                    if(film is TMDBSearchItem.PersonTMDBSearchItem)
+                        return@items
+
+                    FilmCard(
+                        modifier = Modifier
+                            .width(135.dp),
+                        shouldShowTitle = showCardTitle,
+                        film = film,
+                        onClick = onFilmClick,
+                        onLongClick = { onFilmLongClick(film) }
+                    )
+                }
+
+                if(
+                    paginationState.pagingState == PagingState.LOADING ||
+                    paginationState.pagingState == PagingState.PAGINATING ||
+                    paginationState.pagingState == PagingState.ERROR ||
+                    paginationState.pagingState == PagingState.PAGINATING_EXHAUST ||
+                    films.isEmpty()
+                ) {
+                    items(5) {
+                        FilmCardPlaceholder(
+                            modifier = Modifier
+                                .width(135.dp)
+                                .fillMaxHeight()
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeScreenContent.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeScreenContent.kt
new file mode 100644
index 000000000..32e5932dc
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/content/HomeScreenContent.kt
@@ -0,0 +1,271 @@
+package com.flixclusive.mobile.home.content
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.media3.common.util.UnstableApi
+import com.flixclusive.R
+import com.flixclusive.domain.model.tmdb.Film
+import com.flixclusive.presentation.common.FadeInAndOutScreenTransition
+import com.flixclusive.presentation.common.viewmodels.home.HomeContentScreenViewModel
+import com.flixclusive.presentation.destinations.HomeFilmScreenDestination
+import com.flixclusive.presentation.destinations.HomeGenreScreenDestination
+import com.flixclusive.presentation.destinations.HomeSeeAllScreenDestination
+import com.flixclusive.presentation.mobile.common.composables.ErrorScreenWithButton
+import com.flixclusive.presentation.mobile.common.composables.film.FilmCardPlaceholder
+import com.flixclusive.presentation.mobile.main.LABEL_START_PADDING
+import com.flixclusive.presentation.mobile.main.MainMobileSharedViewModel
+import com.flixclusive.presentation.mobile.screens.home.HomeNavGraph
+import com.flixclusive.presentation.utils.ModifierUtils.placeholderEffect
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import kotlinx.coroutines.launch
+
+@HomeNavGraph(start = true)
+@Destination(
+    style = FadeInAndOutScreenTransition::class
+)
+@UnstableApi
+@Composable
+fun HomeScreenContent(
+    mainMobileSharedViewModel: MainMobileSharedViewModel,
+    navigator: DestinationsNavigator
+) {
+    val viewModel: HomeContentScreenViewModel = hiltViewModel()
+    val scope = rememberCoroutineScope()
+    val listState = rememberLazyListState()
+
+    val appSettings by viewModel.appSettings.collectAsStateWithLifecycle()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val watchHistoryItems by viewModel.continueWatchingList.collectAsStateWithLifecycle(emptyList())
+
+    val isScrollToTopEnabled by remember {
+        derivedStateOf {
+            listState.firstVisibleItemIndex > 0 || listState.firstVisibleItemScrollOffset > 0
+        }
+    }
+    val isLoading = remember(uiState.isLoading, uiState.hasErrors) { uiState.isLoading && !uiState.hasErrors }
+
+    val navigateToFilm = { film: Film ->
+        navigator.navigate(
+            direction = HomeFilmScreenDestination(
+                film = film
+            ),
+            onlyIfResumed = true
+        )
+    }
+
+    BackHandler(
+        enabled = isScrollToTopEnabled
+    ) {
+        scope.launch {
+            listState.animateScrollToItem(0)
+        }
+    }
+
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        HomeScreenContentLoadingScreen(isLoading = isLoading)
+
+        ErrorScreenWithButton(
+            modifier = Modifier
+                .fillMaxSize(),
+            shouldShowError = uiState.hasErrors,
+            error = stringResource(R.string.error_on_initialization),
+            onRetry = viewModel::initialize
+        )
+
+        LazyColumn(
+            state = listState
+        ) {
+            if(!isLoading) {
+                item {
+                    HomeHeader(
+                        modifier = Modifier
+                            .height(480.dp)
+                            .fillMaxWidth(),
+                        film = uiState.headerItem!!,
+                        onGenreClick = { genre ->
+                            if(genre.id >= 0) {
+                                navigator.navigate(
+                                    HomeGenreScreenDestination(genre = genre),
+                                    onlyIfResumed = true
+                                )
+                            }
+                        },
+                        onFilmClick = navigateToFilm,
+                        onFilmLongClick = mainMobileSharedViewModel::onFilmLongClick
+                    )
+                }
+
+                item {
+                    HomeContinueWatchingRow(
+                        dataListProvider = { watchHistoryItems },
+                        onFilmClick = mainMobileSharedViewModel::onPlayClick,
+                        showCardTitle = appSettings.isShowingFilmCardTitle,
+                        onSeeMoreClick = mainMobileSharedViewModel::onFilmLongClick,
+                    )
+                }
+
+                itemsIndexed(
+                    items = viewModel.homeCategories,
+                    key = { _, item ->
+                        item.name
+                    }
+                ) { i, item ->
+                    HomeMobileFilmsRow(
+                        categoryItem = item,
+                        paginationState = viewModel.homeRowItemsPagingState[i],
+                        films = viewModel.homeRowItems[i],
+                        onFilmClick = navigateToFilm,
+                        showCardTitle = appSettings.isShowingFilmCardTitle,
+                        onFilmLongClick = mainMobileSharedViewModel::onFilmLongClick,
+                        paginate = { query, page ->
+                            viewModel.onPaginateFilms(
+                                query = query,
+                                page = page,
+                                index = i
+                            )
+                        },
+                        onSeeAllClick = {
+                            navigator.navigate(
+                                onlyIfResumed = true,
+                                direction = HomeSeeAllScreenDestination(
+                                    item = item
+                                )
+                            )
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun HomeScreenContentLoadingScreen(
+    isLoading: Boolean
+) {
+    AnimatedVisibility(
+        visible = isLoading,
+        enter = fadeIn(),
+        exit = fadeOut()
+    ) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(10.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .fillMaxSize()
+        ) {
+            Box(
+                modifier = Modifier
+                    .padding(bottom = 40.dp)
+            ) {
+                HomeHeaderPlaceholder(
+                    modifier = Modifier
+                        .height(480.dp)
+                )
+            }
+
+            repeat(3) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 10.dp)
+                ) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Center
+                    ) {
+                        Box(
+                            modifier = Modifier
+                                .weight(1F)
+                                .padding(vertical = 4.dp),
+                            contentAlignment = Alignment.CenterStart
+                        ) {
+                            Spacer(
+                                modifier = Modifier
+                                    .height(13.dp)
+                                    .width(200.dp)
+                                    .padding(start = LABEL_START_PADDING)
+                                    .placeholderEffect()
+                            )
+                        }
+
+                        Box(
+                            modifier = Modifier
+                                .padding(end = LABEL_START_PADDING),
+                            contentAlignment = Alignment.CenterEnd
+                        ) {
+                            Spacer(
+                                modifier = Modifier
+                                    .height(14.dp)
+                                    .width(24.dp)
+                                    .placeholderEffect()
+                            )
+                        }
+                    }
+
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = LABEL_START_PADDING),
+                        horizontalArrangement = Arrangement.Center,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Box(
+                            modifier = Modifier.weight(1F)
+                        ) {
+                            Spacer(
+                                modifier = Modifier
+                                    .height(20.dp)
+                                    .placeholderEffect()
+                            )
+
+                            Spacer(
+                                modifier = Modifier
+                                    .height(14.dp)
+                                    .placeholderEffect()
+                            )
+                        }
+                    }
+
+                    Row {
+                        repeat(5) {
+                            FilmCardPlaceholder(
+                                modifier = Modifier
+                                    .width(135.dp)
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/film/HomeFilmScreen.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/film/HomeFilmScreen.kt
new file mode 100644
index 000000000..58ead9462
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/film/HomeFilmScreen.kt
@@ -0,0 +1,45 @@
+package com.flixclusive.mobile.home.film
+
+import androidx.compose.runtime.Composable
+import androidx.media3.common.util.UnstableApi
+import com.flixclusive.presentation.common.viewmodels.film.FilmScreenNavArgs
+import com.flixclusive.presentation.destinations.HomeFilmScreenDestination
+import com.flixclusive.presentation.destinations.HomeGenreScreenDestination
+import com.flixclusive.presentation.mobile.common.transitions.CommonScreenTransition
+import com.flixclusive.presentation.mobile.main.MainMobileSharedViewModel
+import com.flixclusive.presentation.mobile.common.composables.film.FilmMobileScreen
+import com.flixclusive.presentation.mobile.screens.home.HomeNavGraph
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+
+@UnstableApi
+@HomeNavGraph
+@Destination(
+    navArgsDelegate = FilmScreenNavArgs::class,
+    style = CommonScreenTransition::class
+)
+@Composable
+fun HomeFilmScreen(
+    navigator: DestinationsNavigator,
+    mainMobileSharedViewModel: MainMobileSharedViewModel,
+) {
+    FilmMobileScreen(
+        onNavigationIconClick = navigator::navigateUp,
+        onGenreClick = { genre ->
+            navigator.navigate(
+                HomeGenreScreenDestination(genre = genre),
+                onlyIfResumed = true
+            )
+        },
+        onFilmLongClick = mainMobileSharedViewModel::onFilmLongClick,
+        onFilmClick = { clickedFilm ->
+            navigator.navigate(
+                HomeFilmScreenDestination(
+                    film = clickedFilm
+                ),
+                onlyIfResumed = true
+            )
+        },
+        onPlayClick = mainMobileSharedViewModel::onPlayClick
+    )
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/genre/HomeGenreScreen.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/genre/HomeGenreScreen.kt
new file mode 100644
index 000000000..07ac12b1d
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/genre/HomeGenreScreen.kt
@@ -0,0 +1,37 @@
+package com.flixclusive.mobile.home.genre
+
+import androidx.compose.runtime.Composable
+import com.flixclusive.presentation.destinations.HomeFilmScreenDestination
+import com.flixclusive.presentation.mobile.common.transitions.CommonScreenTransition
+import com.flixclusive.presentation.mobile.screens.home.HomeNavGraph
+import com.flixclusive.presentation.mobile.main.MainMobileSharedViewModel
+import com.flixclusive.presentation.mobile.common.composables.genre.GenreScreen
+import com.flixclusive.presentation.mobile.common.composables.genre.GenreScreenNavArgs
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+
+@HomeNavGraph
+@Destination(
+    navArgsDelegate = GenreScreenNavArgs::class,
+    style = CommonScreenTransition::class
+)
+@Composable
+fun HomeGenreScreen(
+    navigator: DestinationsNavigator,
+    mainMobileSharedViewModel: MainMobileSharedViewModel,
+    genreArgs: GenreScreenNavArgs,
+) {
+    GenreScreen(
+        genre = genreArgs.genre,
+        onFilmLongClick = mainMobileSharedViewModel::onFilmLongClick,
+        onFilmClick = { clickedFilm ->
+            navigator.navigate(
+                HomeFilmScreenDestination(
+                    film = clickedFilm
+                ),
+                onlyIfResumed = true
+            )
+        },
+        onNavigationIconClick = navigator::navigateUp
+    )
+}
\ No newline at end of file
diff --git a/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/see_all/HomeSeeAllScreen.kt b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/see_all/HomeSeeAllScreen.kt
new file mode 100644
index 000000000..1b4d47c07
--- /dev/null
+++ b/feature/mobile/home/src/main/kotlin/com/flixclusive/mobile/home/see_all/HomeSeeAllScreen.kt
@@ -0,0 +1,35 @@
+package com.flixclusive.mobile.home.see_all
+
+import androidx.compose.runtime.Composable
+import com.flixclusive.presentation.common.viewmodels.see_all.SeeAllScreenNavArgs
+import com.flixclusive.presentation.destinations.HomeFilmScreenDestination
+import com.flixclusive.presentation.mobile.common.composables.see_all.SeeAllMobileScreen
+import com.flixclusive.presentation.mobile.common.transitions.CommonScreenTransition
+import com.flixclusive.presentation.mobile.main.MainMobileSharedViewModel
+import com.flixclusive.presentation.mobile.screens.home.HomeNavGraph
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+
+@HomeNavGraph
+@Destination(
+    navArgsDelegate = SeeAllScreenNavArgs::class,
+    style = CommonScreenTransition::class
+)
+@Composable
+fun HomeSeeAllScreen(
+    navigator: DestinationsNavigator,
+    mainMobileSharedViewModel: MainMobileSharedViewModel
+) {
+    SeeAllMobileScreen(
+        onFilmLongClick = mainMobileSharedViewModel::onFilmLongClick,
+        onNavigationIconClick = navigator::navigateUp,
+        onFilmClick = {
+            navigator.navigate(
+                HomeFilmScreenDestination(
+                    film = it
+                ),
+                onlyIfResumed = true
+            )
+        },
+    )
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f677e57b7..d7535c7b6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1024M -XX:+UseParallelGC -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryErro
+org.gradle.jvmargs=-Xmx1024M -XX:+UseParallelGC -XX:MaxMetaspaceSize=683m -XX:+HeapDumpOnOutOfMemoryError
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..55cc0cf3a
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,161 @@
+[versions]
+compileSdk = "34"
+minSdk = "21"
+applicationName = "Flixclusive"
+androidGradlePlugin = "8.2.0"
+ksp = "1.9.10-1.0.13"
+kotlin = "1.9.10"
+androidDesugarJdkLibs = "2.0.4"
+compose = "1.6.0-alpha04"
+jsoup = "1.16.1"
+okhttp = "4.11.0"
+okhttpDnsoverhttps = "4.9.0"
+tvCompose = '1.0.0-alpha10'
+androidxComposeBom = "2023.10.01"
+androidxComposeCompiler = "1.5.7"
+composeDestinations = "1.9.53"
+androidxDataStore = "1.0.0"
+androidxCore = "1.12.0"
+androidxCoreSplashscreen = "1.0.1"
+material = "1.11.0"
+material3 = "1.1.2"
+constraintLayout = "1.0.1"
+accompanist = "0.32.0"
+lifecycleRuntime = "2.6.2"
+room = "2.6.1"
+hilt = "2.48"
+coil = "2.5.0"
+gson = "2.10.1"
+retrofit = "2.9.0"
+conscrypt = "2.5.2"
+hiltNavigation = "1.1.0"
+serialization = '1.6.0'
+coreKtx = "1.12.0"
+junit = "4.13.2"
+mockk = "1.13.8"
+coroutines = "1.7.3"
+androidxTestCore = "1.5.0"
+androidxTestExt = "1.1.5"
+androidxTestRules = "1.5.0"
+androidxTestRunner = "1.5.2"
+androidx-test-ext-junit = "1.1.5"
+espresso-core = "3.5.1"
+appcompat = "1.6.1"
+kotlin1910 = "1.9.10"
+kotlin19102 = "1.9.10"
+
+[libraries]
+# Accompanist
+accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }
+
+# Testing
+coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
+test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" }
+test-core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "androidxTestCore" }
+test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
+test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" }
+
+# TV UI (Compose)
+compose-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "tvCompose"}
+compose-tv-material = { module = "androidx.tv:tv-material", version.ref = "tvCompose"}
+
+# UI (Compose)
+compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
+compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
+compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
+compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
+compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
+compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+compose-ui = { group = "androidx.compose.ui", name = "ui" }
+compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
+compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+compose-viewbinding = { group = "androidx.compose.ui", name = "ui-viewbinding" }
+core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
+constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintLayout"}
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
+
+# Compose Destinations by raamcosta
+destinations-ksp = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "composeDestinations" }
+destinations-core = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "composeDestinations" }
+destinations-animations = { module = "io.github.raamcosta.compose-destinations:animations-core", version.ref = "composeDestinations" }
+
+# Coil
+coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
+
+# Jsoup
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
+
+# Gson
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+
+# Data Store
+dataStore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDataStore" }
+
+# Lifecycle
+lifecycle-viewModelKtx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntime" }
+lifecycle-runtimeCompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntime" }
+lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntime" }
+
+# Hilt
+hilt-navigation = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigation"}
+hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt"}
+hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt"}
+
+desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
+kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization"}
+kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
+
+# Conscrypt
+conscrypt = { module = "org.conscrypt:conscrypt-android", version.ref = "conscrypt" }
+
+# OkHttp
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttpDnsoverhttps" }
+
+
+# Retrofit
+retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
+retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
+retrofit-scalars = { group = "com.squareup.retrofit2", name = "converter-scalars", version.ref = "retrofit" }
+
+# Room
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+
+# Dependencies for build-logic
+android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
+kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
+room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }
+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
+espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+room = { id = "androidx.room", version.ref = "room" }
+
+
+
+# Plugins defined by this project
+flixclusive-application = { id = "flixclusive.android.application", version = "unspecified" }
+flixclusive-library = { id = "flixclusive.android.library", version = "unspecified" }
+flixclusive-compose = { id = "flixclusive.compose", version = "unspecified" }
+flixclusive-hilt = { id = "flixclusive.hilt", version = "unspecified" }
+flixclusive-room = { id = "flixclusive.room", version = "unspecified" }
+flixclusive-feature = { id = "flixclusive.feature", version = "unspecified" }
+flixclusive-destinations = { id = "flixclusive.destinations", version = "unspecified" }
+#flixclusive-android-test = { id = "flixclusive.android.test", version = "unspecified" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 050d3564f..b8f16d52f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Apr 26 08:49:28 PST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/model/configuration/.gitignore b/model/configuration/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/model/configuration/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/model/configuration/build.gradle.kts b/model/configuration/build.gradle.kts
new file mode 100644
index 000000000..4c4eac510
--- /dev/null
+++ b/model/configuration/build.gradle.kts
@@ -0,0 +1,12 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.model.configuration"
+}
+
+dependencies {
+    api(libs.gson)
+}
\ No newline at end of file
diff --git a/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/AppConfig.kt b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/AppConfig.kt
new file mode 100644
index 000000000..509cd5543
--- /dev/null
+++ b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/AppConfig.kt
@@ -0,0 +1,12 @@
+package com.flixclusive.model.configuration
+
+import com.google.gson.annotations.SerializedName
+
+data class AppConfig(
+    val isMaintenance: Boolean,
+    val build: Long,
+    @SerializedName("build_codename") val versionName: String,
+    @SerializedName("update_url") val updateUrl: String,
+    @SerializedName("update_info") val updateInfo: String? = null,
+    @SerializedName("tmdb_api_key") val tmdbApiKey: String,
+)
\ No newline at end of file
diff --git a/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/CategoryItem.kt b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/CategoryItem.kt
new file mode 100644
index 000000000..d03bcf3c9
--- /dev/null
+++ b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/CategoryItem.kt
@@ -0,0 +1,10 @@
+package com.flixclusive.model.configuration
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface CategoryItem {
+    val name: String
+    val query: String
+    val mediaType: String
+}
\ No newline at end of file
diff --git a/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/HomeCategoryItem.kt b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/HomeCategoryItem.kt
new file mode 100644
index 000000000..e86ff8304
--- /dev/null
+++ b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/HomeCategoryItem.kt
@@ -0,0 +1,34 @@
+package com.flixclusive.model.configuration
+
+import com.google.gson.annotations.SerializedName
+import java.io.Serializable
+
+
+/**
+ * A model used for the homepage/dashboard.
+ * It contains the query which is to be fetched thru
+ * GET request in Retrofit2 instance of TMDBRepository.
+ *
+ * The hardcoded query will be useful for pagination.
+ */
+@kotlinx.serialization.Serializable
+data class HomeCategoryItem(
+    override val name: String,
+    @SerializedName("type") override val mediaType: String,
+    val required: Boolean,
+    val canPaginate: Boolean,
+    override val query: String,
+) : Serializable, CategoryItem
+
+
+
+/**
+ * A model used for wrapping response of
+ * Retrofit2 instance for [HomeCategoryItem]
+ *
+ */
+data class HomeCategoriesConfig(
+    val all: List<HomeCategoryItem>,
+    val movie: List<HomeCategoryItem>,
+    val tv: List<HomeCategoryItem>,
+)
\ No newline at end of file
diff --git a/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/ProviderStatus.kt b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/ProviderStatus.kt
new file mode 100644
index 000000000..da61b776b
--- /dev/null
+++ b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/ProviderStatus.kt
@@ -0,0 +1,11 @@
+package com.flixclusive.model.configuration
+
+/**
+ *
+ * Required for the response of [FlixclusiveConfigService]
+ *
+ * */
+data class ProviderStatus(
+    val name: String,
+    val isMaintenance: Boolean
+)
\ No newline at end of file
diff --git a/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/SearchCategoryItem.kt b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/SearchCategoryItem.kt
new file mode 100644
index 000000000..897383f83
--- /dev/null
+++ b/model/configuration/src/main/kotlin/com/flixclusive/model/configuration/SearchCategoryItem.kt
@@ -0,0 +1,34 @@
+package com.flixclusive.model.configuration
+
+import com.google.gson.annotations.SerializedName
+import java.io.Serializable
+
+
+/**
+ * A model used for the search initial content screen.
+ * It contains the query which is to be fetched thru
+ * GET request in Retrofit2 instance of TMDBRepository.
+ *
+ * The hardcoded query will be useful for pagination.
+ */
+@kotlinx.serialization.Serializable
+data class SearchCategoryItem(
+    val id: Int,
+    override val name: String,
+    @SerializedName("poster_path") val posterPath: String? = null,
+    override val query: String,
+    @SerializedName("type") override val mediaType: String
+) : Serializable, CategoryItem
+
+
+/**
+ * A model used for wrapping response of
+ * Retrofit2 instance for [SearchCategoryItem]
+ *
+ */
+data class SearchCategoriesConfig(
+    val networks: List<SearchCategoryItem>,
+    val companies: List<SearchCategoryItem>,
+    val genres: List<SearchCategoryItem>,
+    val type: List<SearchCategoryItem>,
+)
\ No newline at end of file
diff --git a/model/database/.gitignore b/model/database/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/model/database/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/model/database/build.gradle.kts b/model/database/build.gradle.kts
new file mode 100644
index 000000000..b5acea022
--- /dev/null
+++ b/model/database/build.gradle.kts
@@ -0,0 +1,14 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.room)
+}
+
+android {
+    namespace = "com.flixclusive.model.database"
+}
+
+dependencies {
+    api(projects.model.tmdb)
+    api(libs.gson)
+}
\ No newline at end of file
diff --git a/model/database/src/main/kotlin/com/flixclusive/model/database/User.kt b/model/database/src/main/kotlin/com/flixclusive/model/database/User.kt
new file mode 100644
index 000000000..434abd03f
--- /dev/null
+++ b/model/database/src/main/kotlin/com/flixclusive/model/database/User.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.model.database
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class User(
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo("userId")
+    val id: Int = 1,
+    val name: String = USER_DEFAULT_NAME,
+    val image: Int = 0
+) {
+    companion object {
+        private const val USER_DEFAULT_NAME = "User"
+    }
+}
\ No newline at end of file
diff --git a/model/database/src/main/kotlin/com/flixclusive/model/database/UserWithWatchHistoryList.kt b/model/database/src/main/kotlin/com/flixclusive/model/database/UserWithWatchHistoryList.kt
new file mode 100644
index 000000000..2d24a9391
--- /dev/null
+++ b/model/database/src/main/kotlin/com/flixclusive/model/database/UserWithWatchHistoryList.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.core.database.model
+
+import androidx.room.Embedded
+import androidx.room.Relation
+import com.flixclusive.model.database.User
+import com.flixclusive.model.database.WatchHistoryItem
+
+data class UserWithWatchHistoryList(
+    @Embedded val user: User,
+    @Relation(
+        parentColumn = "userId",
+        entityColumn = "ownerId"
+    )
+    val watchHistory: List<WatchHistoryItem>
+)
\ No newline at end of file
diff --git a/model/database/src/main/kotlin/com/flixclusive/model/database/UserWithWatchlist.kt b/model/database/src/main/kotlin/com/flixclusive/model/database/UserWithWatchlist.kt
new file mode 100644
index 000000000..1269ada1d
--- /dev/null
+++ b/model/database/src/main/kotlin/com/flixclusive/model/database/UserWithWatchlist.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.model.database
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class UserWithWatchlist(
+    @Embedded val user: User,
+    @Relation(
+        parentColumn = "userId",
+        entityColumn = "ownerId"
+    )
+    val watchlist: List<WatchlistItem>
+)
\ No newline at end of file
diff --git a/model/database/src/main/kotlin/com/flixclusive/model/database/WatchHistoryItem.kt b/model/database/src/main/kotlin/com/flixclusive/model/database/WatchHistoryItem.kt
new file mode 100644
index 000000000..b91ec039a
--- /dev/null
+++ b/model/database/src/main/kotlin/com/flixclusive/model/database/WatchHistoryItem.kt
@@ -0,0 +1,44 @@
+package com.flixclusive.model.database
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.model.tmdb.FilmImpl
+import com.flixclusive.model.tmdb.TvShow
+import com.flixclusive.model.tmdb.toFilmInstance
+import java.io.Serializable
+import java.util.Date
+
+@Entity(tableName = "watch_history")
+data class WatchHistoryItem(
+    @PrimaryKey val id: Int = 0,
+    val ownerId: Int = 1,
+    val seasons: Int? = null,
+    val episodes: Map<Int, Int> = emptyMap(),
+    val episodesWatched: List<EpisodeWatched> = emptyList(),
+    val dateWatched: Date = Date(),
+    val film: FilmImpl = FilmImpl()
+) : Serializable
+
+data class EpisodeWatched(
+    val episodeId: Int = 0,
+    val seasonNumber: Int? = null,
+    val episodeNumber: Int? = null,
+    val watchTime: Long = 0,
+    val durationTime: Long = 0,
+    val isFinished: Boolean = false
+) : Serializable
+
+
+fun Film.toWatchHistoryItem(): WatchHistoryItem {
+    val seasonCount = when(this is TvShow) {
+        true -> totalSeasons
+        false -> null
+    }
+
+    return WatchHistoryItem(
+        id = id,
+        seasons = seasonCount,
+        film = this.toFilmInstance()
+    )
+}
\ No newline at end of file
diff --git a/model/database/src/main/kotlin/com/flixclusive/model/database/WatchlistItem.kt b/model/database/src/main/kotlin/com/flixclusive/model/database/WatchlistItem.kt
new file mode 100644
index 000000000..25b8b4227
--- /dev/null
+++ b/model/database/src/main/kotlin/com/flixclusive/model/database/WatchlistItem.kt
@@ -0,0 +1,21 @@
+package com.flixclusive.model.database
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.flixclusive.model.tmdb.Film
+import com.flixclusive.model.tmdb.FilmImpl
+import com.flixclusive.model.tmdb.toFilmInstance
+
+@Entity(tableName = "watchlist")
+data class WatchlistItem(
+    @PrimaryKey val id: Int = 0,
+    val ownerId: Int = 1,
+    val film: FilmImpl = FilmImpl()
+)
+
+fun Film.toWatchlistItem(): WatchlistItem {
+    return WatchlistItem(
+        id = id,
+        film = this.toFilmInstance()
+    )
+}
\ No newline at end of file
diff --git a/model/datastore/.gitignore b/model/datastore/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/model/datastore/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/model/datastore/build.gradle.kts b/model/datastore/build.gradle.kts
new file mode 100644
index 000000000..ad6d6564b
--- /dev/null
+++ b/model/datastore/build.gradle.kts
@@ -0,0 +1,12 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.model.datastore"
+}
+
+dependencies {
+    api(libs.gson)
+}
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt
new file mode 100644
index 000000000..e4ff16661
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt
@@ -0,0 +1,59 @@
+package com.flixclusive.model.datastore
+
+import android.graphics.Color
+import com.flixclusive.model.datastore.network.DoHPreference
+import com.flixclusive.model.datastore.player.CaptionEdgeTypePreference
+import com.flixclusive.model.datastore.player.CaptionSizePreference
+import com.flixclusive.model.datastore.player.CaptionStylePreference
+import com.flixclusive.model.datastore.player.PlayerQuality
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import java.io.InputStream
+
+const val DEFAULT_PLAYER_SEEK_AMOUNT = 10000L
+
+@Serializable
+data class AppSettings(
+    // General
+    val isShowingFilmCardTitle: Boolean = false,
+    // ===
+
+    // == Subs
+    val isSubtitleEnabled: Boolean = true,
+    val subtitleLanguage: String = "en",
+    val subtitleColor: Int = Color.WHITE,
+    val subtitleSize: CaptionSizePreference = CaptionSizePreference.Medium,
+    val subtitleFontStyle: CaptionStylePreference = CaptionStylePreference.Bold,
+    val subtitleBackgroundColor: Int = Color.TRANSPARENT,
+    val subtitleEdgeType: CaptionEdgeTypePreference = CaptionEdgeTypePreference.Drop_Shadow,
+    // ==
+
+    // == internet/others
+    val dns: DoHPreference = DoHPreference.None,
+    val providers: List<ProviderPreference> = emptyList(),
+    // ==
+
+    // == player
+    val shouldReleasePlayer: Boolean = true,
+    val isPlayerTimeReversed: Boolean = true,
+    val preferredQuality: PlayerQuality = PlayerQuality._1080p,
+    val preferredResizeMode: Int = 0, // Fit
+    val preferredDiskCacheSize: Long = 0L,
+    val preferredBufferCacheSize: Long = -1, // Unset
+    val preferredVideoBufferMs: Long = 50_000, // 50s (Default)
+    val preferredSeekAmount: Long = DEFAULT_PLAYER_SEEK_AMOUNT,
+    // ==
+) {
+    companion object {
+        val possibleAvailableSeekIncrementMs = listOf(
+            5L, 10L, 30L
+        )
+
+        fun parseFrom(input: InputStream): AppSettings {
+            return Json.decodeFromString(
+                deserializer = serializer(),
+                string = input.readBytes().decodeToString()
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt
new file mode 100644
index 000000000..2d4172606
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.model.datastore
+
+import kotlinx.serialization.Serializable
+
+/**
+ *
+ * Data model to use for saving provider list order
+ * */
+@Serializable
+data class ProviderPreference(
+    val name: String,
+    val isIgnored: Boolean = false,
+)
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/network/DoHPreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/network/DoHPreference.kt
new file mode 100644
index 000000000..a3a34a4fc
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/network/DoHPreference.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.model.datastore.network
+
+@Suppress("SpellCheckingInspection")
+enum class DoHPreference {
+    None,
+    Google,
+    Cloudfare,
+    AdGuard,
+    Quad9,
+    AliDNS,
+    DNSPod,
+    DNS360,
+    Quad101,
+    Mullvad,
+    ControlD,
+    Najalla,
+    SheCan;
+}
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionEdgePreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionEdgePreference.kt
new file mode 100644
index 000000000..bdb850c22
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionEdgePreference.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.model.datastore.player
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+
+
+@Suppress("EnumEntryName")
+@SuppressLint("UnsafeOptInUsageError")
+enum class CaptionEdgeTypePreference(
+    val type: Int,
+    val color: Int = Color.BLACK
+) {
+    Drop_Shadow(2),
+    Outline(1);
+}
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionSizePreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionSizePreference.kt
new file mode 100644
index 000000000..5c9801076
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionSizePreference.kt
@@ -0,0 +1,21 @@
+package com.flixclusive.model.datastore.player
+
+enum class CaptionSizePreference {
+    Small,
+    Medium,
+    Large;
+
+    companion object {
+        private const val SMALL_FONT_SIZE = 18F // Equivalent to 20dp
+        private const val MEDIUM_FONT_SIZE = 20F // Equivalent to 20dp
+        private const val LARGE_FONT_SIZE = 24F
+
+        fun CaptionSizePreference.getDp(isTv: Boolean = false): Float {
+            return when(this) {
+                Large -> LARGE_FONT_SIZE + (if(isTv) 4F else 0F)
+                Medium -> MEDIUM_FONT_SIZE + (if(isTv) 4F else 0F)
+                Small -> SMALL_FONT_SIZE + (if(isTv) 2F else 0F)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionStylePreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionStylePreference.kt
new file mode 100644
index 000000000..0e02ec86e
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/CaptionStylePreference.kt
@@ -0,0 +1,10 @@
+package com.flixclusive.model.datastore.player
+
+import android.graphics.Typeface
+
+enum class CaptionStylePreference(val typeface: Typeface) {
+    Normal(Typeface.create("sans-serif", Typeface.NORMAL)),
+    Bold(Typeface.create("sans-serif-medium", Typeface.BOLD)),
+    Italic(Typeface.create("sans-serif-medium", Typeface.ITALIC)),
+    Monospace(Typeface.create("monospace", Typeface.NORMAL));
+}
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/PlayerQuality.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/PlayerQuality.kt
new file mode 100644
index 000000000..90942ad1b
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/PlayerQuality.kt
@@ -0,0 +1,9 @@
+package com.flixclusive.model.datastore.player
+
+enum class PlayerQuality(val qualityName: String) {
+    _4k("4k"),
+    _1080p("1080p"),
+    _720p("720p"),
+    _480p("480p"),
+    _360p("360p"),
+}
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/ResizeMode.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/ResizeMode.kt
new file mode 100644
index 000000000..32cbf3b03
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/player/ResizeMode.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.model.datastore.player
+
+enum class ResizeMode(val mode: Int) {
+    Fit(0),
+    Fill(3),
+    Zoom(4);
+
+    override fun toString(): String {
+        return when(this) {
+            Fill -> "Stretch"
+            Zoom -> "Center Crop"
+            else -> super.toString()
+        }
+    }
+}
\ No newline at end of file
diff --git a/model/provider/.gitignore b/model/provider/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/model/provider/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/model/provider/build.gradle.kts b/model/provider/build.gradle.kts
new file mode 100644
index 000000000..10f393d76
--- /dev/null
+++ b/model/provider/build.gradle.kts
@@ -0,0 +1,17 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.compose)
+}
+
+android {
+    namespace = "com.flixclusive.model.provider"
+}
+
+dependencies {
+    api(projects.provider.base)
+    api(libs.gson)
+    api(libs.compose.runtime)
+
+    implementation(projects.core.util)
+}
\ No newline at end of file
diff --git a/model/provider/src/main/kotlin/com/flixclusive/model/provider/ProviderWrapper.kt b/model/provider/src/main/kotlin/com/flixclusive/model/provider/ProviderWrapper.kt
new file mode 100644
index 000000000..35c6c4082
--- /dev/null
+++ b/model/provider/src/main/kotlin/com/flixclusive/model/provider/ProviderWrapper.kt
@@ -0,0 +1,18 @@
+package com.flixclusive.model.provider
+
+import com.flixclusive.provider.base.Provider
+
+
+/**
+ *
+ * Wrapper class to be used for preferences.
+ *
+ * This is a useless model and will be removed soon
+ * as soon as I implemented the plugins system of this app.
+ *
+ * */
+data class ProviderWrapper(
+    val provider: Provider,
+    val isMaintenance: Boolean = false,
+    val isIgnored: Boolean = false,
+)
\ No newline at end of file
diff --git a/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceData.kt b/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceData.kt
new file mode 100644
index 000000000..4dc8d5d36
--- /dev/null
+++ b/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceData.kt
@@ -0,0 +1,22 @@
+package com.flixclusive.model.provider
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import java.io.Serializable
+
+/**
+ *
+ * Data model used by the provider and domain layer which
+ * is to be sent to the ui layer for unwrapping.
+ *
+ * @param mediaId the media id of the film from the used provider
+ * @param providerName the name of the provider used
+ * @param cachedLinks watchable links obtained from the provider
+ * @param cachedSubtitles subtitle links obtained from the provider
+ * */
+data class SourceData(
+    val mediaId: String = "",
+    val providerName: String = "",
+    val cachedLinks: SnapshotStateList<SourceLink> = mutableStateListOf(),
+    val cachedSubtitles: SnapshotStateList<Subtitle> = mutableStateListOf()
+) : Serializable
\ No newline at end of file
diff --git a/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceDataState.kt b/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceDataState.kt
new file mode 100644
index 000000000..34110931a
--- /dev/null
+++ b/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceDataState.kt
@@ -0,0 +1,58 @@
+package com.flixclusive.model.provider
+
+import androidx.annotation.StringRes
+import com.flixclusive.core.util.common.ui.UiText
+
+
+sealed class SourceDataState(val message: UiText) {
+    companion object {
+        @StringRes private val defaultUnavailableMessageId = R.string.source_data_dialog_state_unavailable_default
+        @StringRes private val defaultErrorMessageId = R.string.source_data_dialog_state_error_default
+    }
+    
+    data object Idle : SourceDataState(message = UiText.StringValue(""))
+
+    class Fetching(
+        message: UiText? = null,
+    ) : SourceDataState(
+        message = message
+            ?: UiText.StringResource(R.string.source_data_dialog_state_fetching)
+    ) {
+        constructor(message: String) : this(UiText.StringValue(message))
+        constructor(@StringRes errorMessageId: Int) : this(
+            message = UiText.StringResource(errorMessageId)
+        )
+    }
+
+    class Extracting(
+        message: UiText? = null,
+    ) : SourceDataState(
+        message = message
+            ?: UiText.StringResource(R.string.source_data_dialog_state_extracting)
+    ) {
+        constructor(message: String) : this(UiText.StringValue(message))
+    }
+
+    class Error(
+        errorMessage: UiText? = null,
+    ) : SourceDataState(
+        message = errorMessage
+            ?: UiText.StringResource(defaultErrorMessageId)
+    ) {
+        constructor(@StringRes errorMessageId: Int) : this(
+            errorMessage = UiText.StringResource(errorMessageId)
+        )
+    }
+
+    class Unavailable(errorMessage: UiText? = null) :
+        SourceDataState(
+            message = errorMessage ?: UiText.StringResource(defaultUnavailableMessageId)
+        ) {
+        constructor(@StringRes errorMessageId: Int) : this(
+            errorMessage = UiText.StringResource(errorMessageId)
+        )
+    }
+
+    object Success :
+        SourceDataState(message = UiText.StringResource(R.string.source_data_dialog_state_success))
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/SourceLink.kt b/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceLink.kt
similarity index 63%
rename from providers/src/main/java/com/flixclusive/providers/models/common/SourceLink.kt
rename to model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceLink.kt
index 09607c8c6..6cf47fb74 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/common/SourceLink.kt
+++ b/model/provider/src/main/kotlin/com/flixclusive/model/provider/SourceLink.kt
@@ -1,7 +1,15 @@
-package com.flixclusive.providers.models.common
+package com.flixclusive.model.provider
 
 import java.io.Serializable
 
+/**
+ *
+ * A wrapper for the watchable url link of the extracted film to watch.
+ *
+ * @param name the name of the source where the provider got it from
+ * @param url the url of the watchable source
+ *
+ * */
 data class SourceLink(
     val name: String,
     val url: String,
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/Subtitle.kt b/model/provider/src/main/kotlin/com/flixclusive/model/provider/Subtitle.kt
similarity index 79%
rename from providers/src/main/java/com/flixclusive/providers/models/common/Subtitle.kt
rename to model/provider/src/main/kotlin/com/flixclusive/model/provider/Subtitle.kt
index 474f0e1ff..ee900933f 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/common/Subtitle.kt
+++ b/model/provider/src/main/kotlin/com/flixclusive/model/provider/Subtitle.kt
@@ -1,4 +1,4 @@
-package com.flixclusive.providers.models.common
+package com.flixclusive.model.provider
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
diff --git a/model/provider/src/main/res/values/strings.xml b/model/provider/src/main/res/values/strings.xml
new file mode 100644
index 000000000..4cd98f157
--- /dev/null
+++ b/model/provider/src/main/res/values/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--  SourceData State messages  -->
+    <string name="source_data_dialog_state_error_default">Could not initialize video player!</string>
+    <string name="source_data_dialog_state_unavailable_default">I\'m sorry, this is not yet watchable</string>
+    <string name="source_data_dialog_state_fetching">Fetching video data…</string>
+    <string name="source_data_dialog_state_extracting">Extracting video data…</string>
+    <string name="source_data_dialog_state_success">Starting player…</string>
+</resources>
\ No newline at end of file
diff --git a/model/tmdb/.gitignore b/model/tmdb/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/model/tmdb/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/model/tmdb/build.gradle.kts b/model/tmdb/build.gradle.kts
new file mode 100644
index 000000000..c041b5230
--- /dev/null
+++ b/model/tmdb/build.gradle.kts
@@ -0,0 +1,14 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.model.tmdb"
+}
+
+dependencies {
+    api(libs.gson)
+
+    implementation(projects.core.util)
+}
\ No newline at end of file
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Film.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Film.kt
new file mode 100644
index 000000000..1136a90a8
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Film.kt
@@ -0,0 +1,21 @@
+package com.flixclusive.model.tmdb
+
+import com.flixclusive.core.util.film.FilmType
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface Film {
+    val id: Int
+    val title: String
+    val posterImage: String?
+    val backdropImage: String?
+    val logoImage: String?
+    val overview: String?
+    val filmType: FilmType
+    val dateReleased: String
+    val runtime: String
+    val rating: Double
+    val language: String
+    val genres: List<Genre>
+    val recommendedTitles: List<Recommendation>
+}
\ No newline at end of file
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/FilmImpl.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/FilmImpl.kt
new file mode 100644
index 000000000..d7e4eb419
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/FilmImpl.kt
@@ -0,0 +1,39 @@
+package com.flixclusive.model.tmdb
+
+import com.flixclusive.core.util.film.FilmType
+import java.io.Serializable
+
+@kotlinx.serialization.Serializable
+data class FilmImpl(
+    override val id: Int = 0,
+    override val title: String = "",
+    override val posterImage: String? = null,
+    override val backdropImage: String? = null,
+    override val logoImage: String? = null,
+    override val overview: String? = null,
+    override val filmType: FilmType = FilmType.MOVIE,
+    override val dateReleased: String = "",
+    override val runtime: String = "",
+    override val rating: Double = 0.0,
+    override val language: String = "en",
+    override val genres: List<Genre> = emptyList(),
+    override val recommendedTitles: List<Recommendation> = emptyList()
+) : Film, Serializable
+
+fun Film.toFilmInstance(): FilmImpl {
+    return FilmImpl(
+        id = id,
+        title = title,
+        posterImage = posterImage,
+        backdropImage = backdropImage,
+        logoImage = logoImage,
+        overview = overview,
+        filmType = filmType,
+        dateReleased = dateReleased,
+        runtime = runtime,
+        rating = rating,
+        genres = genres,
+        language = language,
+        recommendedTitles = recommendedTitles
+    )
+}
\ No newline at end of file
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Genre.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Genre.kt
new file mode 100644
index 000000000..ff872dcbd
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Genre.kt
@@ -0,0 +1,11 @@
+package com.flixclusive.model.tmdb
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Genre(
+    val id: Int,
+    val name: String,
+    val mediaType: String? = null,
+    val posterPath: String? = null
+) : java.io.Serializable
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Movie.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Movie.kt
new file mode 100644
index 000000000..573a03218
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Movie.kt
@@ -0,0 +1,49 @@
+package com.flixclusive.model.tmdb
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.film.formatMinutes
+import com.flixclusive.model.tmdb.util.formatDate
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Movie(
+    override val id: Int = -1,
+    override val title: String = "",
+    val image: String? = null,
+    val cover: String? = null,
+    val logo: String? = null,
+    override val rating: Double = 0.0,
+    val releaseDate: String = "",
+    val description: String? = null,
+    override val language: String,
+    override val genres: List<Genre> = emptyList(),
+    val duration: Int? = null,
+    val recommendations: List<Recommendation> = emptyList(),
+    val collection: TMDBCollection? = null
+) : Film, java.io.Serializable {
+    override val filmType: FilmType
+        get() = FilmType.MOVIE
+
+    override val posterImage: String?
+        get() = image
+
+    override val dateReleased: String
+        get() = formatDate(releaseDate)
+
+    override val runtime: String
+        get() = formatMinutes(duration)
+
+    override val overview: String?
+        get() = description
+
+    override val backdropImage: String?
+        get() = cover
+
+    override val logoImage: String?
+        get() = logo
+
+    override val recommendedTitles: List<Recommendation>
+        get() = recommendations
+}
+
+
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Recommendation.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Recommendation.kt
new file mode 100644
index 000000000..5e0ec1726
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Recommendation.kt
@@ -0,0 +1,35 @@
+package com.flixclusive.model.tmdb
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.film.FilmType.Companion.toFilmType
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Recommendation(
+    override val id: Int = 0,
+    override val title: String = "",
+    val image: String? = null,
+    val mediaType: String = "",
+    override val language: String = "en",
+    override val rating: Double = 0.0,
+    val releaseDate: String = ""
+) : Film, java.io.Serializable {
+    override val posterImage: String?
+        get() = image
+    override val backdropImage: String?
+        get() = null
+    override val logoImage: String?
+        get() = null
+    override val overview: String?
+        get() = null
+    override val filmType: FilmType
+        get() = mediaType.toFilmType()
+    override val dateReleased: String
+        get() = releaseDate
+    override val runtime: String
+        get() = ""
+    override val genres: List<Genre>
+        get() = emptyList()
+    override val recommendedTitles: List<Recommendation>
+        get() = emptyList()
+}
\ No newline at end of file
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Season.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Season.kt
new file mode 100644
index 000000000..e38fb351c
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/Season.kt
@@ -0,0 +1,13 @@
+package com.flixclusive.model.tmdb
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Season(
+    val seasonNumber: Int = 0,
+    val image: String? = null,
+    val name: String = "",
+    val episodes: List<TMDBEpisode> = emptyList(),
+    val isReleased: Boolean = false
+) : java.io.Serializable
+
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBCollection.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBCollection.kt
new file mode 100644
index 000000000..16b31b408
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBCollection.kt
@@ -0,0 +1,14 @@
+package com.flixclusive.model.tmdb
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TMDBCollection(
+    @SerializedName("backdrop_path") val backdropPath: String?,
+    val id: Int,
+    @SerializedName("name") val collectionName: String,
+    val overview: String?,
+    @SerializedName("parts") val films: List<TMDBSearchItem>,
+    @SerializedName("poster_path") val posterPath: String?
+) : java.io.Serializable
\ No newline at end of file
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBEpisode.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBEpisode.kt
new file mode 100644
index 000000000..7335b4676
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBEpisode.kt
@@ -0,0 +1,27 @@
+package com.flixclusive.model.tmdb
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TMDBEpisode(
+    val episodeId: Int = 0,
+    val title: String = "",
+    val episode: Int = 0,
+    val rating: Double = 0.0,
+    val season: Int = 0,
+    val releaseDate: String = "",
+    val description: String = "",
+    val image: String? = null,
+    val runtime: Int? = null
+) : java.io.Serializable {
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if(other !is TMDBEpisode)
+            return false
+
+        return season == other.season && episode == other.episode && episodeId == other.episodeId
+    }
+}
\ No newline at end of file
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBPageResponse.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBPageResponse.kt
new file mode 100644
index 000000000..286a8911e
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBPageResponse.kt
@@ -0,0 +1,12 @@
+package com.flixclusive.model.tmdb
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TMDBPageResponse<T>(
+    val page: Int = 0,
+    val results: List<T> = emptyList(),
+    @SerializedName("total_pages") val totalPages: Int = 0,
+    @SerializedName("total_results") val totalResults: Int = 0
+)
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBSearchItem.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBSearchItem.kt
new file mode 100644
index 000000000..2271af8c9
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TMDBSearchItem.kt
@@ -0,0 +1,114 @@
+package com.flixclusive.model.tmdb
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.model.tmdb.util.formatDate
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed class TMDBSearchItem : Film {
+    @Serializable
+    data class MovieTMDBSearchItem(
+        @SerializedName("poster_path") override val posterImage: String? = null,
+        override val overview: String = "",
+        @SerializedName("release_date") val releaseDate: String = "",
+        @SerializedName("genre_ids") val genreIds: List<Int> = emptyList(),
+        override val id: Int = 0,
+        @SerializedName("media_type") val mediaType: String? = null,
+        @SerializedName("original_language") override val language: String = "en",
+        override val title: String = "",
+        @SerializedName("backdrop_path") override val backdropImage: String? = null,
+        @SerializedName("vote_average") override val rating: Double = 0.0,
+        override val logoImage: String? = null,
+        override val genres: List<Genre> = listOf(Genre(-1, "Movie"))
+    ) : TMDBSearchItem() {
+        override val filmType: FilmType
+            get() = FilmType.MOVIE
+        override val dateReleased: String
+            get() = formatDate(releaseDate)
+        override val runtime: String
+            get() = "0"
+        override val recommendedTitles: List<Recommendation>
+            get() = emptyList()
+    }
+
+    @Serializable
+    data class TvShowTMDBSearchItem(
+        @SerializedName("poster_path") override val posterImage: String? = null,
+        override val id: Int = 0,
+        override val overview: String = "",
+        @SerializedName("backdrop_path") override val backdropImage: String? = null,
+        @SerializedName("vote_average") override val rating: Double = 0.0,
+        @SerializedName("media_type") val mediaType: String? = null,
+        @SerializedName("first_air_date") val firstAirDate: String = "",
+        @SerializedName("genre_ids") val genreIds: List<Int> = emptyList(),
+        @SerializedName("original_language") override val language: String = "en",
+        @SerializedName("name") override val title: String = "",
+        override val logoImage: String? = null,
+        override val genres: List<Genre> = listOf(Genre(-1, "TV Show"))
+    ) : TMDBSearchItem() {
+        override val filmType: FilmType
+            get() = FilmType.TV_SHOW
+        override val dateReleased: String
+            get() = formatDate(firstAirDate)
+        override val runtime: String
+            get() = "0"
+        override val recommendedTitles: List<Recommendation>
+            get() = emptyList()
+    }
+
+    @Serializable
+    data class PersonTMDBSearchItem(
+        @SerializedName("profile_path") val profilePath: String = "",
+        val adult: Boolean = false,
+        @SerializedName("id") val _id: Int = 0,
+        @SerializedName("media_type") val _mediaType: String? = null,
+        @SerializedName("known_for") val knownFor: List<TMDBSearchItem> = emptyList(),
+        val name: String = "",
+        val popularity: Double = 0.0,
+    ) : TMDBSearchItem() {
+        override val language: String
+            get() = "en"
+
+        override val id: Int
+            get() = -1
+        override val title: String
+            get() = ""
+        override val posterImage: String?
+            get() = null
+        override val overview: String?
+            get() = null
+        override val filmType: FilmType
+            get() = FilmType.MOVIE
+        override val dateReleased: String
+            get() = ""
+        override val runtime: String
+            get() = ""
+        override val rating: Double
+            get() = 0.0
+        override val genres: List<Genre>
+            get() = listOf()
+        override val backdropImage: String?
+            get() = null
+        override val logoImage: String?
+            get() = null
+        override val recommendedTitles: List<Recommendation>
+            get() = emptyList()
+    }
+}
+
+fun TMDBSearchItem.toRecommendation(): Recommendation {
+    return Recommendation(
+        id = id,
+        title = title,
+        image = posterImage,
+        mediaType = when (filmType) {
+            FilmType.MOVIE -> "Movie"
+            FilmType.TV_SHOW -> "TV Series"
+        },
+        rating = rating,
+        releaseDate = dateReleased
+    )
+}
+
+
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TvShow.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TvShow.kt
new file mode 100644
index 000000000..8553bd75d
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/TvShow.kt
@@ -0,0 +1,77 @@
+package com.flixclusive.model.tmdb
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.film.formatMinutes
+import com.flixclusive.model.tmdb.util.formatAirDates
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TvShow(
+    override val id: Int = -1,
+    override val title: String = "",
+    val image: String? = null,
+    val cover: String? = null,
+    val logo: String? = null,
+    override val rating: Double = 0.0,
+    val releaseDate: String = "",
+    val lastAirDate: String? = null,
+    val description: String? = null,
+    override val language: String,
+    override val genres: List<Genre> = emptyList(),
+    val duration: Int? = null,
+    val totalEpisodes: Int = 0,
+    val totalSeasons: Int = 0,
+    val recommendations: List<Recommendation> = emptyList(),
+    val seasons: List<Season> = emptyList(),
+    val inProduction: Boolean? = null,
+) : Film, java.io.Serializable {
+    override val filmType: FilmType
+        get() = FilmType.TV_SHOW
+
+    override val posterImage: String?
+        get() = image
+
+    override val dateReleased: String
+        get() = formatAirDates(
+            firstAirDate = releaseDate,
+            lastAirDate = lastAirDate ?: "",
+            inProduction = inProduction
+        )
+
+    override val runtime: String
+        get() {
+            var runtimeString = ""
+
+            if (duration != null)
+                runtimeString = "${formatMinutes(duration)} | "
+
+            if(totalSeasons > 0) {
+                runtimeString += "$totalSeasons Season"
+
+                if(totalSeasons > 1)
+                    runtimeString += "s"
+            }
+
+
+            if(totalEpisodes > 0) {
+                runtimeString += " | $totalEpisodes Episodes"
+
+                if(totalEpisodes > 1)
+                    runtimeString += "s"
+            }
+
+            return runtimeString
+        }
+
+    override val overview: String?
+        get() = description
+
+    override val backdropImage: String?
+        get() = cover
+
+    override val logoImage: String?
+        get() = logo
+
+    override val recommendedTitles: List<Recommendation>
+        get() = recommendations
+}
diff --git a/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/util/FilmFormatHelper.kt b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/util/FilmFormatHelper.kt
new file mode 100644
index 000000000..bda0d3c86
--- /dev/null
+++ b/model/tmdb/src/main/kotlin/com/flixclusive/model/tmdb/util/FilmFormatHelper.kt
@@ -0,0 +1,58 @@
+package com.flixclusive.model.tmdb.util
+
+import android.os.Build
+import com.flixclusive.model.tmdb.Genre
+import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatterBuilder
+import java.util.Locale
+
+internal fun formatDate(dateString: String?): String {
+    if (dateString.isNullOrEmpty()) {
+        return "No release date"
+    }
+
+    val locale = Locale.US
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val date = LocalDate.parse(dateString)
+        val formatter = DateTimeFormatterBuilder()
+            .parseCaseInsensitive()
+            .appendPattern("MMMM d, yyyy")
+            .toFormatter(locale)
+
+        return date.format(formatter)
+    }
+
+    val inputFormat = SimpleDateFormat("yyyy-MM-dd", locale)
+    val outputFormat = SimpleDateFormat("MMMM d, yyyy", locale)
+
+    val date = inputFormat.parse(dateString)
+    return date?.let {
+        outputFormat.format(it)
+    } ?: "No release date"
+}
+
+internal fun formatAirDates(
+    firstAirDate: String,
+    lastAirDate: String,
+    inProduction: Boolean?,
+): String {
+    if (firstAirDate.isEmpty() && lastAirDate.isEmpty()) {
+        return "No air dates"
+    }
+
+    val firstYear = firstAirDate.substring(0, 4)
+    val lastYear = if (inProduction == true) "present" else lastAirDate.substring(0, 4)
+
+    return "$firstYear-$lastYear"
+}
+
+
+fun formatGenreIds(
+    genreIds: List<Int>,
+    genresList: List<Genre>
+): List<Genre> {
+    val genreMap = genresList.associateBy({ it.id }, { it })
+    return genreIds.mapNotNull { genreMap[it] }
+}
\ No newline at end of file
diff --git a/provider/base/.gitignore b/provider/base/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/provider/base/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/provider/base/build.gradle.kts b/provider/base/build.gradle.kts
new file mode 100644
index 000000000..ea7452c25
--- /dev/null
+++ b/provider/base/build.gradle.kts
@@ -0,0 +1,24 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.provider.base"
+}
+
+dependencies {
+    api(projects.extractor.base)
+    api(projects.core.util)
+    api(projects.model.provider)
+    api(libs.okhttp)
+    api(libs.jsoup)
+    api(libs.gson)
+
+    implementation(libs.mockk)
+    implementation(libs.coroutines.test)
+    implementation(libs.junit)
+
+    testImplementation(libs.mockk)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.junit)
+}
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/Provider.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/Provider.kt
new file mode 100644
index 000000000..ee20d82a1
--- /dev/null
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/Provider.kt
@@ -0,0 +1,48 @@
+package com.flixclusive.provider.base
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.dto.FilmInfo
+import com.flixclusive.provider.base.dto.SearchResults
+import com.flixclusive.extractor.base.Extractor
+import okhttp3.OkHttpClient
+
+abstract class Provider(
+    protected val client: OkHttpClient
+) {
+    abstract val name: String
+    open val baseUrl: String = ""
+
+    /**
+     *
+     * The embeds, extractors or servers of
+     * this provider instance.
+     *
+     * */
+    open val supportedExtractors: List<Extractor> = emptyList()
+
+    abstract suspend fun search(
+        query: String,
+        page: Int = 1,
+        filmType: FilmType,
+    ): SearchResults
+
+    abstract suspend fun getFilmInfo(
+        filmId: String,
+        filmType: FilmType,
+    ): FilmInfo
+
+    /**
+     *
+     * Obtains source links for the film provided.
+     *
+     * */
+    abstract suspend fun getSourceLinks(
+        filmId: String,
+        season: Int? = null,
+        episode: Int? = null,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    )
+}
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/EmbedData.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/EmbedData.kt
new file mode 100644
index 000000000..7ace6a6d8
--- /dev/null
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/EmbedData.kt
@@ -0,0 +1,9 @@
+package com.flixclusive.provider.base.dto
+
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+
+data class EmbedData(
+    val servers: List<SourceLink>,
+    val subtitles: List<Subtitle> = emptyList()
+)
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/MediaInfo.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/FilmInfo.kt
similarity index 66%
rename from providers/src/main/java/com/flixclusive/providers/models/common/MediaInfo.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/FilmInfo.kt
index a124c7dd8..36089c365 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/common/MediaInfo.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/FilmInfo.kt
@@ -1,9 +1,9 @@
-package com.flixclusive.providers.models.common
-
-data class MediaInfo(
-    val id: String,
-    val title: String,
-    val yearReleased: String = "",
-    val seasons: Int? = null,
-    val episodes: Int? = null
-)
+package com.flixclusive.provider.base.dto
+
+data class FilmInfo(
+    val id: String,
+    val title: String,
+    val yearReleased: String = "",
+    val seasons: Int? = null,
+    val episodes: Int? = null
+)
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/SearchResultItem.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/SearchResultItem.kt
similarity index 63%
rename from providers/src/main/java/com/flixclusive/providers/models/common/SearchResultItem.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/SearchResultItem.kt
index 6ceb24a33..2045a6ad5 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/common/SearchResultItem.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/SearchResultItem.kt
@@ -1,12 +1,15 @@
-package com.flixclusive.providers.models.common
-
-data class SearchResultItem(
-    val id: String? = null,
-    val tmdbId: Int? = null,
-    val title: String? = null,
-    val url: String? = null,
-    val image: String? = null,
-    val releaseDate: String? = null,
-    val mediaType: MediaType? = null,
-    val seasons: Int? = null
-)
+package com.flixclusive.provider.base.dto
+
+import com.flixclusive.core.util.film.FilmType
+
+
+data class SearchResultItem(
+    val id: String? = null,
+    val tmdbId: Int? = null,
+    val title: String? = null,
+    val url: String? = null,
+    val image: String? = null,
+    val releaseDate: String? = null,
+    val filmType: FilmType? = null,
+    val seasons: Int? = null
+)
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/SearchResults.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/SearchResults.kt
similarity index 75%
rename from providers/src/main/java/com/flixclusive/providers/models/common/SearchResults.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/SearchResults.kt
index 111e5cf75..415007503 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/common/SearchResults.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/dto/SearchResults.kt
@@ -1,7 +1,7 @@
-package com.flixclusive.providers.models.common
-
-data class SearchResults(
-    val currentPage: Int = 1,
-    val hasNextPage: Boolean = false,
-    val results: List<SearchResultItem> = emptyList()
+package com.flixclusive.provider.base.dto
+
+data class SearchResults(
+    val currentPage: Int = 1,
+    val hasNextPage: Boolean = false,
+    val results: List<SearchResultItem> = emptyList()
 )
\ No newline at end of file
diff --git a/providers/src/test/java/com/flixclusive/providers/BaseSourceProviderTest.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/testing/BaseProviderTest.kt
similarity index 66%
rename from providers/src/test/java/com/flixclusive/providers/BaseSourceProviderTest.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/testing/BaseProviderTest.kt
index 01cd0ed35..ccade7bd8 100644
--- a/providers/src/test/java/com/flixclusive/providers/BaseSourceProviderTest.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/testing/BaseProviderTest.kt
@@ -1,189 +1,196 @@
-package com.flixclusive.providers
-
-import android.util.Base64
-import com.flixclusive.providers.interfaces.SourceProvider
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import io.mockk.every
-import io.mockk.mockkStatic
-import kotlinx.coroutines.test.runTest
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-abstract class BaseSourceProviderTest {
-    lateinit var sourceProvider: SourceProvider
-
-    @Before
-    open fun setUp(): Unit = runTest {
-        mockkStatic(Base64::class)
-        every { Base64.encodeToString(any(), any()) } answers {
-            val byteArray = arg<ByteArray>(0)
-            java.util.Base64.getEncoder().encodeToString(byteArray)
-        }
-        every { Base64.encode(any(), any()) } answers {
-            val byteArray = arg<String>(0).toByteArray()
-            java.util.Base64.getEncoder().encode(byteArray)
-        }
-        every { Base64.decode(any<String>(), any()) } answers {
-            val byteArray = arg<String>(0).toByteArray()
-            java.util.Base64.getDecoder().decode(byteArray)
-        }
-        every { Base64.decode(any<ByteArray>(), any()) } answers {
-            java.util.Base64.getDecoder().decode(arg<ByteArray>(0))
-        }
-    }
-
-    private suspend fun getSourceData(
-        title: String,
-        releaseDate: String,
-        type: MediaType,
-        season: Int? = null,
-        episode: Int? = null,
-    ) {
-        val response = sourceProvider.search(
-            query = title,
-            page = 1,
-            mediaType = type
-        )
-
-        val mediaId = response.results.find {
-            val releaseDateToUse = if(it.releaseDate == null) {
-                sourceProvider.getMediaInfo(it.id!!, it.mediaType!!).yearReleased
-            } else it.releaseDate
-
-            releaseDateToUse == releaseDate
-        }?.id
-        Assert.assertNotNull(mediaId)
-
-        val links = mutableSetOf<SourceLink>()
-        val subtitles = mutableSetOf<Subtitle>()
-        sourceProvider.getSourceLinks(
-            mediaId = mediaId!!,
-            season = season,
-            episode = episode,
-            onLinkLoaded = {
-                assert(it.url.isNotEmpty())
-                links.add(it)
-                println("SourceLink for $title: $it")
-            },
-            onSubtitleLoaded = {
-                assert(it.url.isNotEmpty())
-                subtitles.add(it)
-                println("Subtitle for $title: $it")
-            }
-        )
-
-        assert(links.isNotEmpty())
-        assert(subtitles.isNotEmpty())
-    }
-
-    private suspend fun getMediaInfo(
-        title: String,
-        releaseDate: String,
-        type: MediaType,
-    ): MediaInfo {
-        val response = sourceProvider.search(
-            query = title,
-            page = 1,
-            mediaType = type
-        )
-
-        val mediaId = response.results.find {
-            val releaseDateToUse = if(it.releaseDate == null) {
-                sourceProvider.getMediaInfo(it.id!!, it.mediaType!!).yearReleased
-            } else it.releaseDate
-
-            releaseDateToUse == releaseDate
-        }?.id
-        Assert.assertNotNull(mediaId)
-
-        return sourceProvider.getMediaInfo(mediaId = mediaId!!, mediaType = type)
-    }
-
-    @Test
-    open fun `Search for The Dark Knight (2008)`() = runTest {
-        val title = "The Dark Knight"
-        val releaseDate = "2008"
-        val response = sourceProvider.search(
-            query = title,
-            page = 1,
-            mediaType = MediaType.Movie
-        )
-
-        assert(response.results.isNotEmpty())
-        assert(response.results.any { it.releaseDate == releaseDate })
-    }
-
-    @Test
-    open fun `Get The Dark Knight (2008) source`() = runTest {
-        val title = "The Dark Knight"
-        val releaseDate = "2008"
-
-        getSourceData(
-            title = title,
-            releaseDate = releaseDate,
-            type = MediaType.Movie
-        )
-    }
-
-    @Test
-    open fun `Get World War Z (2013) source`() = runTest {
-        val title = "World War Z"
-        val releaseDate = "2013"
-
-        getSourceData(
-            title = title,
-            releaseDate = releaseDate,
-            type = MediaType.Movie
-        )
-    }
-
-    @Test
-    open fun `Get When Evil Lurks (2023) source`() = runTest {
-        val title = "When Evil Lurks"
-        val releaseDate = "2023"
-
-        getSourceData(
-            title = title,
-            releaseDate = releaseDate,
-            type = MediaType.Movie
-        )
-    }
-
-    @Test
-    open fun `Get Silo (TV-2023) Details`() = runTest {
-        val title = "Silo"
-        val releaseDate = "2023"
-
-        val data = getMediaInfo(
-            title = title,
-            releaseDate = releaseDate,
-            type = MediaType.TvShow
-        )
-
-        Assert.assertEquals(data.title, title)
-        assert(data.yearReleased.isNotBlank())
-        assert(data.id.isNotEmpty())
-    }
-
-    @Test
-    open fun `Get Attack on Titan (TV) S1-E3`() = runTest {
-        val title = "Attack on Titan"
-        val releaseDate = "2013"
-        val season = 1
-        val episode = 3
-
-        getSourceData(
-            title = title,
-            releaseDate = releaseDate,
-            type = MediaType.TvShow,
-            season = season,
-            episode = episode
-        )
-    }
+package com.flixclusive.provider.base.testing
+
+import android.util.Base64
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.Provider
+import com.flixclusive.provider.base.dto.FilmInfo
+import io.mockk.every
+import io.mockk.mockkStatic
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+
+abstract class BaseProviderTest {
+    lateinit var sourceProvider: Provider
+
+    @Before
+    open fun setUp(): Unit = runTest {
+        mockkStatic(Base64::class)
+        every { Base64.encodeToString(any(), any()) } answers {
+            val byteArray = arg<ByteArray>(0)
+            java.util.Base64.getEncoder().encodeToString(byteArray)
+        }
+        every { Base64.encode(any(), any()) } answers {
+            val byteArray = arg<String>(0).toByteArray()
+            java.util.Base64.getEncoder().encode(byteArray)
+        }
+        every { Base64.decode(any<String>(), any()) } answers {
+            val byteArray = arg<String>(0).toByteArray()
+            java.util.Base64.getDecoder().decode(byteArray)
+        }
+        every { Base64.decode(any<ByteArray>(), any()) } answers {
+            java.util.Base64.getDecoder().decode(arg<ByteArray>(0))
+        }
+    }
+
+    private suspend fun getSourceData(
+        title: String,
+        releaseDate: String,
+        type: FilmType,
+        season: Int? = null,
+        episode: Int? = null,
+    ) {
+        val response = sourceProvider.search(
+            query = title,
+            page = 1,
+            filmType = type
+        )
+
+        val filmId = response.results.find {
+            val releaseDateToUse = if(it.releaseDate == null) {
+                sourceProvider.getFilmInfo(
+                    filmId = it.id!!,
+                    filmType = it.filmType!!
+                ).yearReleased
+            } else it.releaseDate
+
+            releaseDateToUse == releaseDate
+        }?.id
+        Assert.assertNotNull(filmId)
+
+        val links = mutableSetOf<SourceLink>()
+        val subtitles = mutableSetOf<Subtitle>()
+        sourceProvider.getSourceLinks(
+            filmId = filmId!!,
+            season = season,
+            episode = episode,
+            onLinkLoaded = {
+                assert(it.url.isNotEmpty())
+                links.add(it)
+                println("SourceLink for $title: $it")
+            },
+            onSubtitleLoaded = {
+                assert(it.url.isNotEmpty())
+                subtitles.add(it)
+                println("Subtitle for $title: $it")
+            }
+        )
+
+        assert(links.isNotEmpty())
+        assert(subtitles.isNotEmpty())
+    }
+
+    private suspend fun getFilmInfo(
+        title: String,
+        releaseDate: String,
+        type: FilmType,
+    ): FilmInfo {
+        val response = sourceProvider.search(
+            query = title,
+            page = 1,
+            filmType = type
+        )
+
+        val filmId = response.results.find {
+            val releaseDateToUse = if(it.releaseDate == null) {
+                sourceProvider.getFilmInfo(
+                    filmId = it.id!!,
+                    filmType = it.filmType!!
+                ).yearReleased
+            } else it.releaseDate
+
+            releaseDateToUse == releaseDate
+        }?.id
+        Assert.assertNotNull(filmId)
+
+        return sourceProvider.getFilmInfo(
+            filmId = filmId!!,
+            filmType = type
+        )
+    }
+
+    @Test
+    open fun search_for_The_Dark_Knight_2008() = runTest {
+        val title = "The Dark Knight"
+        val releaseDate = "2008"
+        val response = sourceProvider.search(
+            query = title,
+            page = 1,
+            filmType = FilmType.MOVIE
+        )
+
+        assert(response.results.isNotEmpty())
+        assert(response.results.any { it.releaseDate == releaseDate })
+    }
+
+    @Test
+    open fun get_source_for_The_Dark_Knight_2008() = runTest {
+        val title = "The Dark Knight"
+        val releaseDate = "2008"
+
+        getSourceData(
+            title = title,
+            releaseDate = releaseDate,
+            type = FilmType.MOVIE
+        )
+    }
+
+    @Test
+    open fun getfor_World_War_Z_2013() = runTest {
+        val title = "World War Z"
+        val releaseDate = "2013"
+
+        getSourceData(
+            title = title,
+            releaseDate = releaseDate,
+            type = FilmType.MOVIE
+        )
+    }
+
+    @Test
+    open fun get_for_When_Evil_Returns_2023() = runTest {
+        val title = "When Evil Lurks"
+        val releaseDate = "2023"
+
+        getSourceData(
+            title = title,
+            releaseDate = releaseDate,
+            type = FilmType.MOVIE
+        )
+    }
+
+    @Test
+    open fun get_for_Silo_2023_tv_show() = runTest {
+        val title = "Silo"
+        val releaseDate = "2023"
+
+        val data = getFilmInfo(
+            title = title,
+            releaseDate = releaseDate,
+            type = FilmType.TV_SHOW
+        )
+
+        Assert.assertEquals(data.title, title)
+        assert(data.yearReleased.isNotBlank())
+        assert(data.id.isNotEmpty())
+    }
+
+    @Test
+    open fun get_for_Attack_On_Titan_2013_tv_show_S1_E3() = runTest {
+        val title = "Attack on Titan"
+        val releaseDate = "2013"
+        val season = 1
+        val episode = 3
+
+        getSourceData(
+            title = title,
+            releaseDate = releaseDate,
+            type = FilmType.TV_SHOW,
+            season = season,
+            episode = episode
+        )
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/DecryptUtils.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/CryptographyHelper.kt
similarity index 96%
rename from providers/src/main/java/com/flixclusive/providers/utils/DecryptUtils.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/util/CryptographyHelper.kt
index f8f5df773..bec212954 100644
--- a/providers/src/main/java/com/flixclusive/providers/utils/DecryptUtils.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/CryptographyHelper.kt
@@ -1,100 +1,100 @@
-package com.flixclusive.providers.utils
-
-import android.util.Base64
-import java.security.DigestException
-import java.security.MessageDigest
-import java.util.Arrays
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-object DecryptUtils {
-    class DecryptionException(message: String) : Exception(message)
-
-    fun decryptAes(encryptedData: String, key: String): String {
-        return try {
-            val cipherData = Base64.decode(encryptedData, Base64.DEFAULT)
-            val saltData: ByteArray = Arrays.copyOfRange(cipherData, 8, 16)
-
-            val md5 = MessageDigest.getInstance("MD5")
-            val keyAndIV = generateKeyAndIV(saltData, key.toByteArray(), md5) ?: throw Exception("Null Key and IV")
-            val keySpec = SecretKeySpec(keyAndIV[0], "AES")
-            val iv = IvParameterSpec(keyAndIV[1])
-
-            val encrypted = Arrays.copyOfRange(cipherData, 16, cipherData.size)
-            val aesCBC = Cipher.getInstance("AES/CBC/PKCS5Padding")
-            aesCBC.init(Cipher.DECRYPT_MODE, keySpec, iv)
-            val decryptedData = aesCBC.doFinal(encrypted)
-
-            String(decryptedData)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            throw DecryptionException("Key might be invalid: $key")
-        }
-    }
-
-    /**
-     * Generates a key and an initialization vector (IV) with the given salt and password.
-     *
-     *
-     * This method is equivalent to OpenSSL's EVP_BytesToKey function
-     * (see https://github.com/openssl/openssl/blob/master/crypto/evp/evp_key.c).
-     * By default, OpenSSL uses a single iteration, MD5 as the algorithm and UTF-8 encoded password data.
-     *
-     * @param keyLength the length of the generated key (in bytes)
-     * @param ivLength the length of the generated IV (in bytes)
-     * @param iterations the number of digestion rounds
-     * @param salt the salt data (8 bytes of data or `null`)
-     * @param password the password data (optional)
-     * @param md the message digest algorithm to use
-     * @return an two-element array with the generated key and IV
-     */
-    private fun generateKeyAndIV(
-        salt: ByteArray?,
-        password: ByteArray?,
-        md: MessageDigest,
-        keyLength: Int = 32,
-        ivLength: Int = 16,
-        iterations: Int = 1,
-    ): Array<ByteArray?>? {
-        val digestLength = md.digestLength
-        val requiredLength = (keyLength + ivLength + digestLength - 1) / digestLength * digestLength
-        val generatedData = ByteArray(requiredLength)
-        var generatedLength = 0
-        return try {
-            md.reset()
-
-            // Repeat process until sufficient data has been generated
-            while (generatedLength < keyLength + ivLength) {
-
-                // Digest data (last digest if available, password data, salt if available)
-                if (generatedLength > 0) md.update(generatedData, generatedLength - digestLength, digestLength)
-                md.update(password)
-                if (salt != null) md.update(salt, 0, 8)
-                md.digest(generatedData, generatedLength, digestLength)
-
-                // additional rounds
-                for (i in 1 until iterations) {
-                    md.update(generatedData, generatedLength, digestLength)
-                    md.digest(generatedData, generatedLength, digestLength)
-                }
-                generatedLength += digestLength
-            }
-
-            // Copy key and IV into separate byte arrays
-            val result = arrayOfNulls<ByteArray>(2)
-            result[0] = generatedData.copyOfRange(0, keyLength)
-            if (ivLength > 0) result[1] = generatedData.copyOfRange(keyLength, keyLength + ivLength)
-            result
-        } catch (e: DigestException) {
-            throw RuntimeException(e)
-        } finally {
-            // Clean out temporary data
-            Arrays.fill(generatedData, 0.toByte())
-        }
-    }
-
-    fun base64Decode(data: String): String = String(Base64.decode(data, Base64.DEFAULT))
-
-    fun base64Encode(data: ByteArray): String = Base64.encodeToString(data, Base64.DEFAULT)
+package com.flixclusive.provider.base.util
+
+import android.util.Base64
+import java.security.DigestException
+import java.security.MessageDigest
+import java.util.Arrays
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+object CryptographyHelper {
+    class DecryptionException(message: String) : Exception(message)
+
+    fun decryptAes(encryptedData: String, key: String): String {
+        return try {
+            val cipherData = Base64.decode(encryptedData, Base64.DEFAULT)
+            val saltData: ByteArray = Arrays.copyOfRange(cipherData, 8, 16)
+
+            val md5 = MessageDigest.getInstance("MD5")
+            val keyAndIV = generateKeyAndIV(saltData, key.toByteArray(), md5) ?: throw Exception("Null Key and IV")
+            val keySpec = SecretKeySpec(keyAndIV[0], "AES")
+            val iv = IvParameterSpec(keyAndIV[1])
+
+            val encrypted = Arrays.copyOfRange(cipherData, 16, cipherData.size)
+            val aesCBC = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            aesCBC.init(Cipher.DECRYPT_MODE, keySpec, iv)
+            val decryptedData = aesCBC.doFinal(encrypted)
+
+            String(decryptedData)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            throw DecryptionException("Key might be invalid: $key")
+        }
+    }
+
+    /**
+     * Generates a key and an initialization vector (IV) with the given salt and password.
+     *
+     *
+     * This method is equivalent to OpenSSL's EVP_BytesToKey function
+     * (see https://github.com/openssl/openssl/blob/master/crypto/evp/evp_key.c).
+     * By default, OpenSSL uses a single iteration, MD5 as the algorithm and UTF-8 encoded password data.
+     *
+     * @param keyLength the length of the generated key (in bytes)
+     * @param ivLength the length of the generated IV (in bytes)
+     * @param iterations the number of digestion rounds
+     * @param salt the salt data (8 bytes of data or `null`)
+     * @param password the password data (optional)
+     * @param md the message digest algorithm to use
+     * @return an two-element array with the generated key and IV
+     */
+    private fun generateKeyAndIV(
+        salt: ByteArray?,
+        password: ByteArray?,
+        md: MessageDigest,
+        keyLength: Int = 32,
+        ivLength: Int = 16,
+        iterations: Int = 1,
+    ): Array<ByteArray?>? {
+        val digestLength = md.digestLength
+        val requiredLength = (keyLength + ivLength + digestLength - 1) / digestLength * digestLength
+        val generatedData = ByteArray(requiredLength)
+        var generatedLength = 0
+        return try {
+            md.reset()
+
+            // Repeat process until sufficient data has been generated
+            while (generatedLength < keyLength + ivLength) {
+
+                // Digest data (last digest if available, password data, salt if available)
+                if (generatedLength > 0) md.update(generatedData, generatedLength - digestLength, digestLength)
+                md.update(password)
+                if (salt != null) md.update(salt, 0, 8)
+                md.digest(generatedData, generatedLength, digestLength)
+
+                // additional rounds
+                for (i in 1 until iterations) {
+                    md.update(generatedData, generatedLength, digestLength)
+                    md.digest(generatedData, generatedLength, digestLength)
+                }
+                generatedLength += digestLength
+            }
+
+            // Copy key and IV into separate byte arrays
+            val result = arrayOfNulls<ByteArray>(2)
+            result[0] = generatedData.copyOfRange(0, keyLength)
+            if (ivLength > 0) result[1] = generatedData.copyOfRange(keyLength, keyLength + ivLength)
+            result
+        } catch (e: DigestException) {
+            throw RuntimeException(e)
+        } finally {
+            // Clean out temporary data
+            Arrays.fill(generatedData, 0.toByte())
+        }
+    }
+
+    fun base64Decode(data: String): String = String(Base64.decode(data, Base64.DEFAULT))
+
+    fun base64Encode(data: ByteArray): String = Base64.encodeToString(data, Base64.DEFAULT)
 }
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/JsoupHelper.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/JsoupHelper.kt
new file mode 100644
index 000000000..25c032d18
--- /dev/null
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/JsoupHelper.kt
@@ -0,0 +1,9 @@
+package com.flixclusive.provider.base.util
+
+import okhttp3.Response
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+
+fun Response.asJsoup(html: String? = null): Document {
+    return Jsoup.parse(html ?: body!!.string(), request.url.toString())
+}
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/OkHttpHelper.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/OkHttpHelper.kt
new file mode 100644
index 000000000..be08074c5
--- /dev/null
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/OkHttpHelper.kt
@@ -0,0 +1,110 @@
+package com.flixclusive.provider.base.util
+
+import com.flixclusive.provider.base.util.RequestBodyType.Companion.toMediaTypeOrNull
+import okhttp3.FormBody
+import okhttp3.Headers
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.Reader
+
+const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36"
+
+private val mustHaveBody = listOf("POST", "PUT")
+
+enum class RequestBodyType(val type: String) {
+    JSON("application/json;charset=utf-8"),
+    TEXT("text/plain;charset=utf-8");
+
+    companion object {
+        fun RequestBodyType.toMediaTypeOrNull(): MediaType? {
+            return type.toMediaTypeOrNull()
+        }
+    }
+}
+
+fun Reader?.asString(): String? {
+    return use {
+        val string = it?.readText()
+        it?.close()
+
+        return@use string
+    }
+}
+
+fun GET(
+    url: String,
+    headers: Headers = Headers.headersOf(),
+    userAgent: String = USER_AGENT,
+): Request {
+    val headersToUse = Headers.Builder()
+        .add("User-Agent", userAgent)
+        .addAll(headers)
+        .build()
+
+    return Request.Builder()
+        .url(url)
+        .headers(headersToUse)
+        .build()
+}
+
+fun POST(
+    url: String,
+    data: Map<String, String>? = null,
+    json: Any? = null,
+    headers: Headers = Headers.headersOf(),
+    userAgent: String = USER_AGENT,
+): Request {
+    val method = "POST"
+    val headersToUse = Headers.Builder()
+        .add("User-Agent", userAgent)
+        .addAll(headers)
+        .build()
+
+    val body = getRequestBody(method, data, json)
+
+    return Request.Builder()
+        .url(url)
+        .method(method, body)
+        .headers(headersToUse)
+        .build()
+}
+
+private fun Map<String, String>.toFormBody(): FormBody {
+    val builder = FormBody.Builder()
+    forEach {
+        builder.addEncoded(it.key, it.value)
+    }
+    return builder.build()
+}
+
+private fun jsonToRequestBody(data: Any): RequestBody {
+    val jsonString = when (data) {
+        is JSONObject -> data.toString()
+        is JSONArray -> data.toString()
+        is String -> data
+        else -> data.toString()
+    }
+
+    val type = if (data is String)
+        RequestBodyType.TEXT
+    else RequestBodyType.JSON
+
+    return jsonString.toRequestBody(type.toMediaTypeOrNull())
+}
+
+private fun getRequestBody(
+    method: String,
+    data: Map<String, String>? = null,
+    json: Any? = null,
+): RequestBody? {
+    return when {
+        data != null -> data.toFormBody()
+        json != null -> jsonToRequestBody(json)
+        else -> if(mustHaveBody.contains(method)) FormBody.Builder().build() else null
+    }
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/StringExtensions.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/StringExtensions.kt
similarity index 90%
rename from providers/src/main/java/com/flixclusive/providers/utils/StringExtensions.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/util/StringExtensions.kt
index d4321056a..1bf9328d1 100644
--- a/providers/src/main/java/com/flixclusive/providers/utils/StringExtensions.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/StringExtensions.kt
@@ -1,24 +1,24 @@
-package com.flixclusive.providers.utils
-
-import java.text.SimpleDateFormat
-import java.util.Locale
-
-fun String.replaceWhitespaces(toReplace: String) = replace(
-    Regex("[\\s_]+"),
-    toReplace
-)
-
-fun String?.toValidReleaseDate(format: String = "MMMM d, yyyy"): String? {
-    if(isNullOrBlank())
-        return null
-
-    val inputFormat = SimpleDateFormat(format, Locale.US)
-    val outputFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
-
-    return try {
-        val date = inputFormat.parse(this)
-        outputFormat.format(date)
-    } catch (e: Exception) {
-        throw Exception("Cannot parse release date of show.")
-    }
+package com.flixclusive.provider.base.util
+
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+fun String.replaceWhitespaces(toReplace: String) = replace(
+    Regex("[\\s_]+"),
+    toReplace
+)
+
+fun String?.toValidReleaseDate(format: String = "MMMM d, yyyy"): String? {
+    if(isNullOrBlank())
+        return null
+
+    val inputFormat = SimpleDateFormat(format, Locale.US)
+    val outputFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
+
+    return try {
+        val date = inputFormat.parse(this)
+        outputFormat.format(date)
+    } catch (e: Exception) {
+        throw Exception("Cannot parse release date of show.")
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/flixhq/TvShowCacheData.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/TvShowCacheData.kt
similarity index 55%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/flixhq/TvShowCacheData.kt
rename to provider/base/src/main/kotlin/com/flixclusive/provider/base/util/TvShowCacheData.kt
index 95147523a..7ddf86fe6 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/flixhq/TvShowCacheData.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/util/TvShowCacheData.kt
@@ -1,19 +1,19 @@
-package com.flixclusive.providers.models.providers.flixhq
+package com.flixclusive.provider.base.util
 
-import com.flixclusive.providers.models.common.MediaInfo
+import com.flixclusive.provider.base.dto.FilmInfo
 import org.jsoup.select.Elements
 
 
 /**
  *
- * Used to cache data of previous called tv show.
+ * The cached data of previous called tv show.
  * This will ease rapid (tv) episodes requests from
  * the source/provider.
  *
  * */
 data class TvShowCacheData(
     val id: String? = null,
-    val mediaInfo: MediaInfo? = null,
+    val filmInfo: FilmInfo? = null,
     val seasons: Elements? = null,
     val episodes: Elements? = null,
 )
\ No newline at end of file
diff --git a/provider/flixhq/.gitignore b/provider/flixhq/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/provider/flixhq/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/provider/flixhq/build.gradle.kts b/provider/flixhq/build.gradle.kts
new file mode 100644
index 000000000..baa53330a
--- /dev/null
+++ b/provider/flixhq/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.provider.flixhq"
+}
+
+dependencies {
+    implementation(projects.provider.base)
+    implementation(projects.extractor.upcloud)
+    implementation(project(":app"))
+
+    // TODO: Conventional Testing
+    testImplementation(libs.mockk)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.espresso.core)
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/flixhq/FlixHQ.kt b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt
similarity index 67%
rename from providers/src/main/java/com/flixclusive/providers/sources/flixhq/FlixHQ.kt
rename to provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt
index 98a8d63ad..d8dc48d50 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/flixhq/FlixHQ.kt
+++ b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt
@@ -1,259 +1,259 @@
-package com.flixclusive.providers.sources.flixhq
-
-import com.flixclusive.providers.extractors.upcloud.UpCloud
-import com.flixclusive.providers.flixhq.utils.FlixHQUtils.getEpisodeId
-import com.flixclusive.providers.flixhq.utils.FlixHQUtils.getSeasonId
-import com.flixclusive.providers.flixhq.utils.FlixHQUtils.getServerName
-import com.flixclusive.providers.flixhq.utils.FlixHQUtils.getServerUrl
-import com.flixclusive.providers.flixhq.utils.FlixHQUtils.toSearchResultItem
-import com.flixclusive.providers.interfaces.Extractor
-import com.flixclusive.providers.interfaces.SourceProvider
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SearchResultItem
-import com.flixclusive.providers.models.common.SearchResults
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import com.flixclusive.providers.models.providers.flixhq.FlixHQInitialSourceData
-import com.flixclusive.providers.models.providers.flixhq.TvShowCacheData
-import com.flixclusive.providers.utils.JsonUtils.fromJson
-import com.flixclusive.providers.utils.mapAsync
-import com.flixclusive.providers.utils.network.OkHttpUtils.GET
-import com.flixclusive.providers.utils.network.OkHttpUtils.asString
-import com.flixclusive.providers.utils.replaceWhitespaces
-import okhttp3.OkHttpClient
-import org.jsoup.Jsoup
-import java.net.URL
-import java.net.URLDecoder
-
-@Suppress("SpellCheckingInspection")
-class FlixHQ(client: OkHttpClient) : SourceProvider(client) {
-    override val name: String = "FlixHQ"
-    override val baseUrl: String = "https://flixhq.to"
-
-    private var tvCacheData: TvShowCacheData = TvShowCacheData()
-
-    override val supportedExtractors: List<Extractor> = listOf(
-        UpCloud(client = client),
-        UpCloud(client = client, isAlternative = true), // Vidcloud
-        //"mixdrop",
-    )
-
-    override suspend fun search(
-        query: String,
-        page: Int,
-        mediaType: MediaType
-    ): SearchResults {
-        var searchResult = SearchResults(page, false, listOf())
-
-        val response = client.newCall(
-            GET(
-                "${baseUrl}/search/${
-                    query.replaceWhitespaces("-")
-                }?page=$page"
-            )
-        ).execute()
-
-        response.body?.charStream().asString()?.let { data ->
-            val doc = Jsoup.parse(data)
-            val navSelector = "div.pre-pagination:nth-child(3) > nav:nth-child(1) > ul:nth-child(1)"
-            searchResult = searchResult.copy(
-                hasNextPage = doc.select(navSelector).size > 0 && doc.select(navSelector).last()
-                    ?.hasClass("active") == false
-            )
-
-            val results = mutableListOf<SearchResultItem>()
-
-            doc.select(".film_list-wrap > div.flw-item").forEach { element ->
-                results.add(element.toSearchResultItem(baseUrl))
-            }
-
-            return searchResult.copy(results = results)
-        }
-
-        return SearchResults()
-    }
-
-    override suspend fun getMediaInfo(
-        mediaId: String,
-        mediaType: MediaType,
-    ): MediaInfo {
-        var updatedMediaId = mediaId
-        if (!mediaId.startsWith(baseUrl)) {
-            updatedMediaId = "$baseUrl/$mediaId"
-        }
-
-        if (tvCacheData.mediaInfo?.id == updatedMediaId)
-            return tvCacheData.mediaInfo!!
-
-        var mediaInfo = MediaInfo(
-            id = updatedMediaId.split("to/").last(),
-            title = ""
-        )
-
-        val response = client.newCall(GET(updatedMediaId)).execute()
-        val data = response.body?.charStream().asString()
-
-        if (data != null) {
-            val doc = Jsoup.parse(data)
-            mediaInfo = mediaInfo.copy(
-                title = doc.select(".heading-name > a:nth-child(1)").text()
-            )
-
-            val uid = doc.select(".watch_block").attr("data-id")
-            val releaseDate = Jsoup.parse(data).select("div.row-line:nth-child(3)").text()
-                .replace("Released: ", "").trim()
-            mediaInfo = mediaInfo.copy(yearReleased = releaseDate.split("-").first())
-
-            if (mediaType == MediaType.Movie) {
-                mediaInfo = mediaInfo.copy(
-                    id = uid,
-                    title = "${mediaInfo.title} Movie",
-                )
-            }
-
-            tvCacheData = TvShowCacheData(id = uid, mediaInfo)
-            return mediaInfo
-        }
-
-        throw NullPointerException("MediaInfo is null!")
-    }
-
-    private fun getEpisodeId(
-        mediaId: String,
-        episode: Int,
-        season: Int,
-    ): String {
-        val updatedMediaId = mediaId.split("-").last()
-        val isSameId = tvCacheData.id == updatedMediaId
-
-        val ajaxReqUrl: (String, String, Boolean) -> String = { id, type, isSeasons ->
-            "$baseUrl/ajax/v2/$type/${if (isSeasons) "seasons" else "episodes"}/$id"
-        }
-
-        if (isSameId) {
-            tvCacheData.episodes
-                ?.getEpisodeId(episode)
-                ?.let {
-                    return it
-                }
-        }
-
-        if (tvCacheData.seasons == null || !isSameId) {
-            val responseSeasons =
-                client.newCall(GET(ajaxReqUrl(updatedMediaId, "tv", true))).execute()
-            val dataSeasons = responseSeasons.body?.charStream().asString()
-                ?: throw Exception("Failed to fetch season data from provider")
-
-            val seasonsDoc = Jsoup.parse(dataSeasons)
-                .select(".dropdown-menu > a")
-
-            tvCacheData = if (isSameId) {
-                tvCacheData.copy(seasons = seasonsDoc)
-            } else {
-                TvShowCacheData(id = updatedMediaId, seasons = seasonsDoc)
-            }
-        }
-
-        val seasons = tvCacheData.seasons!!
-
-        if (seasons.size < season)
-            throw Exception("Season $season is not available")
-
-        val seasonId =
-            seasons.getSeasonId(season) ?: throw Exception("Season $season is not available")
-
-        val responseEpisodes = client.newCall(GET(ajaxReqUrl(seasonId, "season", false))).execute()
-        val dataEpisodes = responseEpisodes.body?.string()
-            ?: throw Exception("Failed to fetch episode id from provider")
-
-        val docEpisodes = Jsoup.parse(dataEpisodes)
-        val episodes = docEpisodes.select(".nav > li")
-
-        tvCacheData = if (isSameId) {
-            tvCacheData.copy(episodes = episodes)
-        } else {
-            TvShowCacheData(
-                id = updatedMediaId,
-                seasons = seasons,
-                episodes = episodes
-            )
-        }
-
-        return episodes.getEpisodeId(episode) ?: throw Exception("Cannot find episode id!")
-    }
-
-    override suspend fun getSourceLinks(
-        mediaId: String,
-        season: Int?,
-        episode: Int?,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    ) {
-        val isTvShow = season != null && episode != null
-
-        val episodeId = if(isTvShow) {
-            getEpisodeId(
-                mediaId = mediaId,
-                episode = episode!!,
-                season = season!!
-            )
-        } else mediaId.split("-").last()
-
-        val fetchServerUrl =
-            if (!episodeId.startsWith("$baseUrl/ajax") && !mediaId.contains("movie")) {
-                "$baseUrl/ajax/v2/episode/servers/$episodeId"
-            } else {
-                "$baseUrl/ajax/movie/episodes/$episodeId"
-            }
-
-        val response = client.newCall(GET(fetchServerUrl)).execute()
-        val data = response.body?.charStream().asString()
-
-        if (data != null) {
-            val doc = Jsoup.parse(data)
-            val servers = doc.select(".nav > li")
-                .filter { element ->
-                    val serverName = element.select("a").getServerName(mediaId)
-
-                    supportedExtractors.find { it.name == serverName } != null
-                }
-                .mapAsync { element ->
-                    val anchorElement = element.select("a")
-
-                    SourceLink(
-                        name = anchorElement.getServerName(mediaId),
-                        url = anchorElement.getServerUrl(baseUrl, mediaId)
-                    )
-                }
-
-            servers.mapAsync { server ->
-                val serverResponse = client.newCall(
-                    GET("${baseUrl}/ajax/get_link/${server.url.split('.').last()}")
-                ).execute()
-
-                serverResponse.body
-                    ?.charStream()
-                    ?.asString()
-                    ?.let { initialSourceData ->
-                        val serverUrl = URLDecoder.decode(
-                            fromJson<FlixHQInitialSourceData>(initialSourceData).link,
-                            "UTF-8"
-                        )
-
-                        supportedExtractors.mapAsync { extractor ->
-                            if (extractor.name == server.name) {
-                                extractor.extract(
-                                    url = URL(serverUrl),
-                                    mediaId = mediaId,
-                                    episodeId = episodeId,
-                                    onLinkLoaded = onLinkLoaded,
-                                    onSubtitleLoaded = onSubtitleLoaded
-                                )
-                            }
-                        }
-                    }
-            }
-        }
-    }
+package com.flixclusive.provider.flixhq
+
+import com.flixclusive.core.util.coroutines.mapAsync
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.json.fromJson
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.Provider
+import com.flixclusive.provider.base.dto.FilmInfo
+import com.flixclusive.provider.base.dto.SearchResultItem
+import com.flixclusive.provider.base.dto.SearchResults
+import com.flixclusive.provider.base.util.GET
+import com.flixclusive.provider.base.util.TvShowCacheData
+import com.flixclusive.provider.base.util.asString
+import com.flixclusive.provider.base.util.replaceWhitespaces
+import com.flixclusive.extractor.base.Extractor
+import com.flixclusive.extractor.upcloud.UpCloud
+import com.flixclusive.provider.flixhq.dto.FlixHQInitialSourceData
+import com.flixclusive.provider.flixhq.util.FlixHQHelper.getEpisodeId
+import com.flixclusive.provider.flixhq.util.FlixHQHelper.getSeasonId
+import com.flixclusive.provider.flixhq.util.FlixHQHelper.getServerName
+import com.flixclusive.provider.flixhq.util.FlixHQHelper.getServerUrl
+import com.flixclusive.provider.flixhq.util.FlixHQHelper.toSearchResultItem
+import okhttp3.OkHttpClient
+import org.jsoup.Jsoup
+import java.net.URL
+import java.net.URLDecoder
+
+@Suppress("SpellCheckingInspection")
+class FlixHQ(client: OkHttpClient) : Provider(client) {
+    override val name: String = "FlixHQ"
+    override val baseUrl: String = "https://flixhq.to"
+
+    private var tvCacheData: TvShowCacheData = TvShowCacheData()
+
+    override val supportedExtractors: List<Extractor> = listOf(
+        UpCloud(client = client),
+        UpCloud(client = client, isAlternative = true), // Vidcloud
+        //"mixdrop",
+    )
+
+    override suspend fun search(
+        query: String,
+        page: Int,
+        filmType: FilmType
+    ): SearchResults {
+        var searchResult = SearchResults(page, false, listOf())
+
+        val response = client.newCall(
+            GET(
+                "${baseUrl}/search/${
+                    query.replaceWhitespaces("-")
+                }?page=$page"
+            )
+        ).execute()
+
+        response.body?.charStream().asString()?.let { data ->
+            val doc = Jsoup.parse(data)
+            val navSelector = "div.pre-pagination:nth-child(3) > nav:nth-child(1) > ul:nth-child(1)"
+            searchResult = searchResult.copy(
+                hasNextPage = doc.select(navSelector).size > 0 && doc.select(navSelector).last()
+                    ?.hasClass("active") == false
+            )
+
+            val results = mutableListOf<SearchResultItem>()
+
+            doc.select(".film_list-wrap > div.flw-item").forEach { element ->
+                results.add(element.toSearchResultItem(baseUrl))
+            }
+
+            return searchResult.copy(results = results)
+        }
+
+        return SearchResults()
+    }
+
+    override suspend fun getFilmInfo(
+        filmId: String,
+        filmType: FilmType
+    ): FilmInfo {
+        var filmIdToUse = filmId
+        if (!filmId.startsWith(baseUrl)) {
+            filmIdToUse = "$baseUrl/$filmId"
+        }
+
+        if (tvCacheData.filmInfo?.id == filmIdToUse)
+            return tvCacheData.filmInfo!!
+
+        var filmInfo = FilmInfo(
+            id = filmIdToUse.split("to/").last(),
+            title = ""
+        )
+
+        val response = client.newCall(GET(filmIdToUse)).execute()
+        val data = response.body?.charStream().asString()
+
+        if (data != null) {
+            val doc = Jsoup.parse(data)
+            filmInfo = filmInfo.copy(
+                title = doc.select(".heading-name > a:nth-child(1)").text()
+            )
+
+            val uid = doc.select(".watch_block").attr("data-id")
+            val releaseDate = Jsoup.parse(data).select("div.row-line:nth-child(3)").text()
+                .replace("Released: ", "").trim()
+            filmInfo = filmInfo.copy(yearReleased = releaseDate.split("-").first())
+
+            if (filmType == FilmType.MOVIE) {
+                filmInfo = filmInfo.copy(
+                    id = uid,
+                    title = "${filmInfo.title} Movie",
+                )
+            }
+
+            tvCacheData = TvShowCacheData(id = uid, filmInfo)
+            return filmInfo
+        }
+
+        throw NullPointerException("FilmInfo is null!")
+    }
+
+    private fun getEpisodeId(
+        filmId: String,
+        episode: Int,
+        season: Int,
+    ): String {
+        val filmIdToUse = filmId.split("-").last()
+        val isSameId = tvCacheData.id == filmIdToUse
+
+        val ajaxReqUrl: (String, String, Boolean) -> String = { id, type, isSeasons ->
+            "$baseUrl/ajax/v2/$type/${if (isSeasons) "seasons" else "episodes"}/$id"
+        }
+
+        if (isSameId) {
+            tvCacheData.episodes
+                ?.getEpisodeId(episode)
+                ?.let {
+                    return it
+                }
+        }
+
+        if (tvCacheData.seasons == null || !isSameId) {
+            val responseSeasons =
+                client.newCall(GET(ajaxReqUrl(filmIdToUse, "tv", true))).execute()
+            val dataSeasons = responseSeasons.body?.charStream().asString()
+                ?: throw Exception("Failed to fetch season data from provider")
+
+            val seasonsDoc = Jsoup.parse(dataSeasons)
+                .select(".dropdown-menu > a")
+
+            tvCacheData = if (isSameId) {
+                tvCacheData.copy(seasons = seasonsDoc)
+            } else {
+                TvShowCacheData(id = filmIdToUse, seasons = seasonsDoc)
+            }
+        }
+
+        val seasons = tvCacheData.seasons!!
+
+        if (seasons.size < season)
+            throw Exception("Season $season is not available")
+
+        val seasonId =
+            seasons.getSeasonId(season) ?: throw Exception("Season $season is not available")
+
+        val responseEpisodes = client.newCall(GET(ajaxReqUrl(seasonId, "season", false))).execute()
+        val dataEpisodes = responseEpisodes.body?.string()
+            ?: throw Exception("Failed to fetch episode id from provider")
+
+        val docEpisodes = Jsoup.parse(dataEpisodes)
+        val episodes = docEpisodes.select(".nav > li")
+
+        tvCacheData = if (isSameId) {
+            tvCacheData.copy(episodes = episodes)
+        } else {
+            TvShowCacheData(
+                id = filmIdToUse,
+                seasons = seasons,
+                episodes = episodes
+            )
+        }
+
+        return episodes.getEpisodeId(episode) ?: throw Exception("Cannot find episode id!")
+    }
+
+    override suspend fun getSourceLinks(
+        filmId: String,
+        season: Int?,
+        episode: Int?,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ) {
+        val isTvShow = season != null && episode != null
+
+        val episodeId = if(isTvShow) {
+            getEpisodeId(
+                filmId = filmId,
+                episode = episode!!,
+                season = season!!
+            )
+        } else filmId.split("-").last()
+
+        val fetchServerUrl =
+            if (!episodeId.startsWith("$baseUrl/ajax") && !filmId.contains("movie")) {
+                "$baseUrl/ajax/v2/episode/servers/$episodeId"
+            } else {
+                "$baseUrl/ajax/movie/episodes/$episodeId"
+            }
+
+        val response = client.newCall(GET(fetchServerUrl)).execute()
+        val data = response.body?.charStream().asString()
+
+        if (data != null) {
+            val doc = Jsoup.parse(data)
+            val servers = doc.select(".nav > li")
+                .filter { element ->
+                    val serverName = element.select("a").getServerName(filmId)
+
+                    supportedExtractors.find { it.name == serverName } != null
+                }
+                .mapAsync { element ->
+                    val anchorElement = element.select("a")
+
+                    SourceLink(
+                        name = anchorElement.getServerName(filmId),
+                        url = anchorElement.getServerUrl(baseUrl, filmId)
+                    )
+                }
+
+            servers.mapAsync { server ->
+                val serverResponse = client.newCall(
+                    GET("${baseUrl}/ajax/get_link/${server.url.split('.').last()}")
+                ).execute()
+
+                serverResponse.body
+                    ?.charStream()
+                    ?.asString()
+                    ?.let { initialSourceData ->
+                        val serverUrl = URLDecoder.decode(
+                            fromJson<FlixHQInitialSourceData>(initialSourceData).link,
+                            "UTF-8"
+                        )
+
+                        supportedExtractors.mapAsync { extractor ->
+                            if (extractor.name == server.name) {
+                                extractor.extract(
+                                    url = URL(serverUrl),
+                                    mediaId = filmId,
+                                    episodeId = episodeId,
+                                    onLinkLoaded = onLinkLoaded,
+                                    onSubtitleLoaded = onSubtitleLoaded
+                                )
+                            }
+                        }
+                    }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/flixhq/FlixHQInitialSourceData.kt b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/dto/FlixHQInitialSourceData.kt
similarity index 73%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/flixhq/FlixHQInitialSourceData.kt
rename to provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/dto/FlixHQInitialSourceData.kt
index 2ca89f087..ad2635349 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/flixhq/FlixHQInitialSourceData.kt
+++ b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/dto/FlixHQInitialSourceData.kt
@@ -1,9 +1,9 @@
-package com.flixclusive.providers.models.providers.flixhq
-
-data class FlixHQInitialSourceData(
-    val type: String,
-    val link: String,
-    val sources: List<Any>,
-    val tracks: List<Any>,
-    val title: String
+package com.flixclusive.provider.flixhq.dto
+
+data class FlixHQInitialSourceData(
+    val type: String,
+    val link: String,
+    val sources: List<Any>,
+    val tracks: List<Any>,
+    val title: String
 )
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/flixhq/utils/FlixHQUtils.kt b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/util/FlixHQHelper.kt
similarity index 87%
rename from providers/src/main/java/com/flixclusive/providers/sources/flixhq/utils/FlixHQUtils.kt
rename to provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/util/FlixHQHelper.kt
index ad13d2238..88e995c8f 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/flixhq/utils/FlixHQUtils.kt
+++ b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/util/FlixHQHelper.kt
@@ -1,100 +1,100 @@
-package com.flixclusive.providers.flixhq.utils
-
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SearchResultItem
-import org.jsoup.nodes.Element
-import org.jsoup.select.Elements
-import java.util.Locale
-
-internal class NoExtractorAvailableException(embed: String) : Exception("No extractor for this server [$embed] yet.")
-
-object FlixHQUtils {
-
-    internal fun Elements.getEpisodeId(episode: Int): String? {
-        return try {
-            var episodeId: String? = null
-
-            val episodeDoc = select("a.eps-item:contains(Eps $episode)")
-
-            if(episodeDoc.isNotEmpty()) {
-                episodeId = episodeDoc.attr("data-id")
-            }
-
-            return episodeId
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    internal fun Elements.getSeasonId(season: Int): String? {
-        return try {
-            var seasonId: String? = null
-
-            if(size == 1 && season == 1 || this[season - 1].text().contains("Season $season")) {
-                return this[season - 1].attr("data-id")
-            }
-
-            val seasonDoc = select("a:contains(Season ${season})")
-
-            if(seasonDoc.isNotEmpty()) {
-                seasonId = seasonDoc.attr("data-id")
-            }
-
-            return seasonId
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    internal fun Element.toSearchResultItem(baseUrl: String): SearchResultItem {
-        val releaseDate = select("div.film-detail > div.fd-infor > span:nth-child(1)").text()
-
-        return SearchResultItem(
-            id = select("div.film-poster > a").attr("href").substring(1),
-            title = select("div.film-detail > h2 > a").attr("title"),
-            url = "${baseUrl}${select("div.film-poster > a").attr("href")}",
-            image = select("div.film-poster > img").attr("data-src"),
-            releaseDate = if (releaseDate.isNotBlank() && releaseDate.toIntOrNull() != null) releaseDate else null,
-            seasons = if (releaseDate.contains("SS")) releaseDate.split("SS")[1].trim().toIntOrNull() else null,
-            mediaType = if (select("div.film-detail > div.fd-infor > span.float-right").text() == "Movie") MediaType.Movie else MediaType.TvShow
-        )
-    }
-
-    internal fun Elements.getServerName(mediaId: String): String {
-        val anchorElement = select("a")
-        val titleElement = anchorElement.attr("title")
-
-        return if (mediaId.contains("movie")) {
-            titleElement
-                .lowercase(Locale.US)
-        } else {
-            titleElement.substring(6)
-                .trim()
-                .lowercase(Locale.US)
-        }
-    }
-
-    internal fun Elements.getServerUrl(
-        baseUrl: String,
-        mediaId: String
-    ): String {
-        return "${baseUrl}/${mediaId}.${
-            if (!mediaId.contains("movie")) {
-                attr("data-id")
-            } else {
-                attr("data-linkid")
-            }
-        }".replace(
-            if (!mediaId.contains("movie")) {
-                Regex("/tv/")
-            } else {
-                Regex("/movie/")
-            },
-            if (!mediaId.contains("movie")) {
-                "/watch-tv/"
-            } else {
-                "/watch-movie/"
-            }
-        )
-    }
+package com.flixclusive.provider.flixhq.util
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.provider.base.dto.SearchResultItem
+import org.jsoup.nodes.Element
+import org.jsoup.select.Elements
+import java.util.Locale
+
+internal class NoExtractorAvailableException(embed: String) : Exception("No extractor for this server [$embed] yet.")
+
+object FlixHQHelper {
+
+    internal fun Elements.getEpisodeId(episode: Int): String? {
+        return try {
+            var episodeId: String? = null
+
+            val episodeDoc = select("a.eps-item:contains(Eps $episode)")
+
+            if(episodeDoc.isNotEmpty()) {
+                episodeId = episodeDoc.attr("data-id")
+            }
+
+            return episodeId
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    internal fun Elements.getSeasonId(season: Int): String? {
+        return try {
+            var seasonId: String? = null
+
+            if(size == 1 && season == 1 || this[season - 1].text().contains("Season $season")) {
+                return this[season - 1].attr("data-id")
+            }
+
+            val seasonDoc = select("a:contains(Season ${season})")
+
+            if(seasonDoc.isNotEmpty()) {
+                seasonId = seasonDoc.attr("data-id")
+            }
+
+            return seasonId
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    internal fun Element.toSearchResultItem(baseUrl: String): SearchResultItem {
+        val releaseDate = select("div.film-detail > div.fd-infor > span:nth-child(1)").text()
+
+        return SearchResultItem(
+            id = select("div.film-poster > a").attr("href").substring(1),
+            title = select("div.film-detail > h2 > a").attr("title"),
+            url = "${baseUrl}${select("div.film-poster > a").attr("href")}",
+            image = select("div.film-poster > img").attr("data-src"),
+            releaseDate = if (releaseDate.isNotBlank() && releaseDate.toIntOrNull() != null) releaseDate else null,
+            seasons = if (releaseDate.contains("SS")) releaseDate.split("SS")[1].trim().toIntOrNull() else null,
+            filmType = if (select("div.film-detail > div.fd-infor > span.float-right").text() == "Movie") FilmType.MOVIE else FilmType.TV_SHOW
+        )
+    }
+
+    internal fun Elements.getServerName(mediaId: String): String {
+        val anchorElement = select("a")
+        val titleElement = anchorElement.attr("title")
+
+        return if (mediaId.contains("movie")) {
+            titleElement
+                .lowercase(Locale.US)
+        } else {
+            titleElement.substring(6)
+                .trim()
+                .lowercase(Locale.US)
+        }
+    }
+
+    internal fun Elements.getServerUrl(
+        baseUrl: String,
+        mediaId: String
+    ): String {
+        return "${baseUrl}/${mediaId}.${
+            if (!mediaId.contains("movie")) {
+                attr("data-id")
+            } else {
+                attr("data-linkid")
+            }
+        }".replace(
+            if (!mediaId.contains("movie")) {
+                Regex("/tv/")
+            } else {
+                Regex("/movie/")
+            },
+            if (!mediaId.contains("movie")) {
+                "/watch-tv/"
+            } else {
+                "/watch-movie/"
+            }
+        )
+    }
 }
\ No newline at end of file
diff --git a/providers/src/test/java/com/flixclusive/providers/sources/FlixHQTest.kt b/provider/flixhq/src/test/kotlin/com/flixclusive/provider/flixhq/FlixHQTest.kt
similarity index 79%
rename from providers/src/test/java/com/flixclusive/providers/sources/FlixHQTest.kt
rename to provider/flixhq/src/test/kotlin/com/flixclusive/provider/flixhq/FlixHQTest.kt
index 5f025c7b7..b5f19c428 100644
--- a/providers/src/test/java/com/flixclusive/providers/sources/FlixHQTest.kt
+++ b/provider/flixhq/src/test/kotlin/com/flixclusive/provider/flixhq/FlixHQTest.kt
@@ -1,15 +1,14 @@
-package com.flixclusive.providers.sources
+package com.flixclusive.provider.flixhq
 
-import com.flixclusive.providers.BaseSourceProviderTest
-import com.flixclusive.providers.sources.flixhq.FlixHQ
-import com.flixclusive.providers.utils.DecryptUtils.decryptAes
+import com.flixclusive.provider.base.testing.BaseProviderTest
+import com.flixclusive.provider.base.util.CryptographyHelper.decryptAes
 import okhttp3.OkHttpClient
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
 @Suppress("SpellCheckingInspection")
-class FlixHQTest : BaseSourceProviderTest() {
+class FlixHQTest : BaseProviderTest() {
 
     @Before
     override fun setUp() {
diff --git a/provider/lookmovie/.gitignore b/provider/lookmovie/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/provider/lookmovie/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/provider/lookmovie/build.gradle.kts b/provider/lookmovie/build.gradle.kts
new file mode 100644
index 000000000..10a36ed41
--- /dev/null
+++ b/provider/lookmovie/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.provider.lookmovie"
+}
+
+dependencies {
+    implementation(projects.provider.base)
+
+    // TODO: Conventional Testing
+    testImplementation(libs.mockk)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.espresso.core)
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/lookmovie/LookMovie.kt b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/LookMovie.kt
similarity index 60%
rename from providers/src/main/java/com/flixclusive/providers/sources/lookmovie/LookMovie.kt
rename to provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/LookMovie.kt
index 66ac968aa..2d3eb0eb8 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/lookmovie/LookMovie.kt
+++ b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/LookMovie.kt
@@ -1,109 +1,112 @@
-package com.flixclusive.providers.sources.lookmovie
-
-import com.flixclusive.providers.interfaces.SourceProvider
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SearchResults
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import com.flixclusive.providers.models.providers.lookmovie.LookMovieMediaDetail
-import com.flixclusive.providers.models.providers.lookmovie.LookMovieMediaDetail.Companion.toMediaInfo
-import com.flixclusive.providers.models.providers.lookmovie.LookMovieSearchResponse
-import com.flixclusive.providers.models.providers.lookmovie.LookMovieSearchResponse.Companion.toSearchResponse
-import com.flixclusive.providers.utils.JsonUtils.fromJson
-import com.flixclusive.providers.utils.asyncCalls
-import com.flixclusive.providers.utils.network.OkHttpUtils
-import com.flixclusive.providers.utils.network.OkHttpUtils.asString
-import com.flixclusive.providers.utils.replaceWhitespaces
-import okhttp3.OkHttpClient
-
-class LookMovie(client: OkHttpClient) : SourceProvider(client) {
-    override val name: String = "LookMovie"
-    override val baseUrl: String = "https://lmscript.xyz"
-
-    override suspend fun search(query: String, page: Int, mediaType: MediaType): SearchResults {
-        val mode = if (mediaType == MediaType.Movie) "movies" else "shows"
-        val uri = OkHttpUtils.GET(
-            "$baseUrl/v1/$mode?filters[q]=${
-                query.replaceWhitespaces("+")
-            }&page=$page"
-        )
-
-        val data = client.newCall(uri).execute()
-            .body
-            ?.charStream()
-            ?.asString()
-            ?: throw Exception("Error searching on LookMovie")
-
-        return fromJson<LookMovieSearchResponse>(data).toSearchResponse()
-    }
-
-    override suspend fun getMediaInfo(mediaId: String, mediaType: MediaType): MediaInfo =
-        getTvShow(mediaId).toMediaInfo()
-
-    override suspend fun getSourceLinks(
-        mediaId: String,
-        season: Int?,
-        episode: Int?,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    ) {
-        val isTvShow = season != null || episode != null
-        val mode = if (isTvShow) "episodes" else "movies"
-
-        var mediaIdToUse = mediaId
-
-        if (isTvShow) {
-            val data = getTvShow(mediaIdToUse)
-
-            val newId = data.episodes
-                ?.find {
-                    it.episode == episode && it.season == season
-                }?.id ?: throw NullPointerException("Couldn't find episode/season queried.")
-
-            mediaIdToUse = newId.toString()
-        }
-
-        val response = client.newCall(
-            OkHttpUtils.GET(
-                "$baseUrl/v1/$mode/view?expand=streams,subtitles&id=$mediaIdToUse"
-            )
-        ).execute()
-            .body
-            ?.charStream()
-            ?.asString()
-            ?: throw Exception("Error getting $mediaIdToUse data from LookMovie")
-
-        val data = fromJson<LookMovieMediaDetail>(response)
-
-        // For rapid parallel iterations
-        asyncCalls(
-            {
-                (data.subtitles
-                    ?.map { it.copy(url = baseUrl + it.url) }
-                    ?.distinctBy { it.url }
-                    ?: emptyList())
-                    .map(onSubtitleLoaded)
-            },
-            {
-                data.streams?.forEach { (key, value) ->
-                    onLinkLoaded(SourceLink("$key server", value))
-                }
-            }
-        )
-    }
-
-    private fun getTvShow(mediaId: String): LookMovieMediaDetail {
-        val data = client.newCall(
-            OkHttpUtils.GET(
-                "$baseUrl/v1/shows?expand=episodes&id=$mediaId"
-            )
-        ).execute()
-            .body
-            ?.charStream()
-            ?.asString()
-            ?: throw Exception("Error getting $mediaId from LookMovie")
-
-        return fromJson<LookMovieMediaDetail>(data)
-    }
+package com.flixclusive.provider.lookmovie
+
+import com.flixclusive.core.util.coroutines.asyncCalls
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.json.fromJson
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.Provider
+import com.flixclusive.provider.base.dto.FilmInfo
+import com.flixclusive.provider.base.dto.SearchResults
+import com.flixclusive.provider.base.util.GET
+import com.flixclusive.provider.base.util.asString
+import com.flixclusive.provider.base.util.replaceWhitespaces
+import com.flixclusive.provider.lookmovie.dto.LookMovieMediaDetail
+import com.flixclusive.provider.lookmovie.dto.LookMovieMediaDetail.Companion.toMediaInfo
+import com.flixclusive.provider.lookmovie.dto.LookMovieSearchResponse
+import com.flixclusive.provider.lookmovie.dto.LookMovieSearchResponse.Companion.toSearchResponse
+import okhttp3.OkHttpClient
+
+class LookMovie(client: OkHttpClient) : Provider(client) {
+    override val name: String = "LookMovie"
+    override val baseUrl: String = "https://lmscript.xyz"
+
+    override suspend fun search(
+        query: String,
+        page: Int,
+        filmType: FilmType,
+    ): SearchResults {
+        val mode = if (filmType == FilmType.MOVIE) "movies" else "shows"
+        val uri = GET(
+            "$baseUrl/v1/$mode?filters[q]=${
+                query.replaceWhitespaces("+")
+            }&page=$page"
+        )
+
+        val data = client.newCall(uri).execute()
+            .body
+            ?.charStream()
+            ?.asString()
+            ?: throw Exception("Error searching on LookMovie")
+
+        return fromJson<LookMovieSearchResponse>(data).toSearchResponse()
+    }
+
+    override suspend fun getFilmInfo(filmId: String, filmType: FilmType): FilmInfo = getTvShow(filmId).toMediaInfo()
+
+    override suspend fun getSourceLinks(
+        filmId: String,
+        season: Int?,
+        episode: Int?,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ) {
+        val isTvShow = season != null || episode != null
+        val mode = if (isTvShow) "episodes" else "movies"
+
+        var mediaIdToUse = filmId
+
+        if (isTvShow) {
+            val data = getTvShow(mediaIdToUse)
+
+            val newId = data.episodes
+                ?.find {
+                    it.episode == episode && it.season == season
+                }?.id ?: throw NullPointerException("Couldn't find episode/season queried.")
+
+            mediaIdToUse = newId.toString()
+        }
+
+        val response = client.newCall(
+            GET(
+                "$baseUrl/v1/$mode/view?expand=streams,subtitles&id=$mediaIdToUse"
+            )
+        ).execute()
+            .body
+            ?.charStream()
+            ?.asString()
+            ?: throw Exception("Error getting $mediaIdToUse data from LookMovie")
+
+        val data = fromJson<LookMovieMediaDetail>(response)
+
+        // For rapid parallel iterations
+        asyncCalls(
+            {
+                (data.subtitles
+                    ?.map { it.copy(url = baseUrl + it.url) }
+                    ?.distinctBy { it.url }
+                    ?: emptyList())
+                    .map(onSubtitleLoaded)
+            },
+            {
+                data.streams?.forEach { (key, value) ->
+                    onLinkLoaded(SourceLink("$key server", value))
+                }
+            }
+        )
+    }
+
+    private fun getTvShow(mediaId: String): LookMovieMediaDetail {
+        val data = client.newCall(
+            GET(
+                "$baseUrl/v1/shows?expand=episodes&id=$mediaId"
+            )
+        ).execute()
+            .body
+            ?.charStream()
+            ?.asString()
+            ?: throw Exception("Error getting $mediaId from LookMovie")
+
+        return fromJson<LookMovieMediaDetail>(data)
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieMediaDetail.kt b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/dto/LookMovieMediaDetail.kt
similarity index 72%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieMediaDetail.kt
rename to provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/dto/LookMovieMediaDetail.kt
index cd437c3ee..1d0131ab8 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieMediaDetail.kt
+++ b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/dto/LookMovieMediaDetail.kt
@@ -1,30 +1,30 @@
-package com.flixclusive.providers.models.providers.lookmovie
-
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.models.common.Subtitle
-import com.flixclusive.providers.utils.toValidReleaseDate
-import com.google.gson.annotations.SerializedName
-
-data class LookMovieMediaDetail(
-    val episodes: List<Episode>? = null,
-    val streams: Map<String, String>? = null,
-    val subtitles: List<Subtitle>? = null,
-    val title: String = "",
-    val year: Int? = null,
-    @SerializedName("id_show", alternate = ["id_movie"]) val id: Int,
-    @SerializedName("first_air_date", alternate = ["release_date"]) val releaseDate: String? = null
-) {
-   data class Episode(
-       val id: Int,
-       val episode: Int,
-       val season: Int,
-    )
-
-    companion object {
-        fun LookMovieMediaDetail.toMediaInfo() = MediaInfo(
-            id = id.toString(),
-            title = title,
-            yearReleased = releaseDate.toValidReleaseDate("yyyy-MM-dd HH:mm:ss")?.split("-")?.first() ?: year.toString()
-        )
-    }
+package com.flixclusive.provider.lookmovie.dto
+
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.dto.FilmInfo
+import com.flixclusive.provider.base.util.toValidReleaseDate
+import com.google.gson.annotations.SerializedName
+
+data class LookMovieMediaDetail(
+    val episodes: List<Episode>? = null,
+    val streams: Map<String, String>? = null,
+    val subtitles: List<Subtitle>? = null,
+    val title: String = "",
+    val year: Int? = null,
+    @SerializedName("id_show", alternate = ["id_movie"]) val id: Int,
+    @SerializedName("first_air_date", alternate = ["release_date"]) val releaseDate: String? = null
+) {
+   data class Episode(
+       val id: Int,
+       val episode: Int,
+       val season: Int,
+    )
+
+    companion object {
+        fun LookMovieMediaDetail.toMediaInfo() = FilmInfo(
+            id = id.toString(),
+            title = title,
+            yearReleased = releaseDate.toValidReleaseDate("yyyy-MM-dd HH:mm:ss")?.split("-")?.first() ?: year.toString()
+        )
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieSearchResponse.kt b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/dto/LookMovieSearchResponse.kt
similarity index 79%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieSearchResponse.kt
rename to provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/dto/LookMovieSearchResponse.kt
index f53ebe161..21d42bea1 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieSearchResponse.kt
+++ b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/dto/LookMovieSearchResponse.kt
@@ -1,45 +1,45 @@
-package com.flixclusive.providers.models.providers.lookmovie
-
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SearchResultItem
-import com.flixclusive.providers.models.common.SearchResults
-import com.google.gson.annotations.SerializedName
-
-data class LookMovieSearchResponse(
-    val items: List<LookMovieSearchItem>,
-    @SerializedName("_meta") val pageResult: Result
-) {
-    data class Result(
-        val totalCount: Int? = 0,
-        val pageCount: Int? = 0,
-        val currentPage: Int? = 1,
-    )
-    data class LookMovieSearchItem(
-        @SerializedName("id_show", alternate = ["id_movie"]) val id: Int? = null,
-        val title: String = "",
-        @SerializedName("tmdb_id", alternate = ["tmdb_prefix"]) val tmdbId: Int? = null,
-        @SerializedName("in_production") val inProduction: Int? = null,
-        val year: Int? = null
-    )
-
-    companion object {
-        private fun LookMovieSearchItem.toSearchResultItem() = SearchResultItem(
-            id = id.toString(),
-            tmdbId = tmdbId,
-            title = title,
-            releaseDate = year.toString(),
-            mediaType = if(inProduction != null) MediaType.TvShow else MediaType.Movie,
-        )
-
-        fun LookMovieSearchResponse.toSearchResponse(): SearchResults {
-            val currentPage = pageResult.currentPage ?: 1
-            val pageCount = pageResult.pageCount ?: 0
-
-            return SearchResults(
-                currentPage = currentPage,
-                hasNextPage = currentPage < pageCount && pageCount > 0,
-                results = items.map { it.toSearchResultItem() }
-            )
-        }
-    }
+package com.flixclusive.provider.lookmovie.dto
+
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.provider.base.dto.SearchResultItem
+import com.flixclusive.provider.base.dto.SearchResults
+import com.google.gson.annotations.SerializedName
+
+data class LookMovieSearchResponse(
+    val items: List<LookMovieSearchItem>,
+    @SerializedName("_meta") val pageResult: Result
+) {
+    data class Result(
+        val totalCount: Int? = 0,
+        val pageCount: Int? = 0,
+        val currentPage: Int? = 1,
+    )
+    data class LookMovieSearchItem(
+        @SerializedName("id_show", alternate = ["id_movie"]) val id: Int? = null,
+        val title: String = "",
+        @SerializedName("tmdb_id", alternate = ["tmdb_prefix"]) val tmdbId: Int? = null,
+        @SerializedName("in_production") val inProduction: Int? = null,
+        val year: Int? = null
+    )
+
+    companion object {
+        private fun LookMovieSearchItem.toSearchResultItem() = SearchResultItem(
+            id = id.toString(),
+            tmdbId = tmdbId,
+            title = title,
+            releaseDate = year.toString(),
+            filmType = if(inProduction != null) FilmType.TV_SHOW else FilmType.MOVIE,
+        )
+
+        fun LookMovieSearchResponse.toSearchResponse(): SearchResults {
+            val currentPage = pageResult.currentPage ?: 1
+            val pageCount = pageResult.pageCount ?: 0
+
+            return SearchResults(
+                currentPage = currentPage,
+                hasNextPage = currentPage < pageCount && pageCount > 0,
+                results = items.map { it.toSearchResultItem() }
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/provider/lookmovie/src/test/kotlin/com/flixclusive/provider/lookmovie/LookMovieTest.kt b/provider/lookmovie/src/test/kotlin/com/flixclusive/provider/lookmovie/LookMovieTest.kt
new file mode 100644
index 000000000..c150d8f94
--- /dev/null
+++ b/provider/lookmovie/src/test/kotlin/com/flixclusive/provider/lookmovie/LookMovieTest.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.provider.lookmovie
+
+import com.flixclusive.provider.base.testing.BaseProviderTest
+import okhttp3.OkHttpClient
+import org.junit.Before
+
+class LookMovieTest : BaseProviderTest() {
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+
+        sourceProvider = LookMovie(OkHttpClient())
+    }
+}
\ No newline at end of file
diff --git a/provider/superstream/.gitignore b/provider/superstream/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/provider/superstream/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/provider/superstream/build.gradle.kts b/provider/superstream/build.gradle.kts
new file mode 100644
index 000000000..464dcf756
--- /dev/null
+++ b/provider/superstream/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    alias(libs.plugins.flixclusive.library)
+}
+
+android {
+    namespace = "com.flixclusive.provider.superstream"
+}
+
+dependencies {
+    implementation(projects.provider.base)
+
+    // TODO: Conventional Testing
+    testImplementation(libs.mockk)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.espresso.core)
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/superstream/SuperStream.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStream.kt
similarity index 58%
rename from providers/src/main/java/com/flixclusive/providers/sources/superstream/SuperStream.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStream.kt
index f7538d201..9e1404650 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/superstream/SuperStream.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStream.kt
@@ -1,237 +1,235 @@
-package com.flixclusive.providers.sources.superstream
-
-import com.flixclusive.providers.interfaces.SourceProvider
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SearchResults
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import com.flixclusive.providers.models.providers.flixhq.TvShowCacheData
-import com.flixclusive.providers.models.providers.superstream.SuperStreamDownloadResponse
-import com.flixclusive.providers.models.providers.superstream.SuperStreamMediaDetailResponse
-import com.flixclusive.providers.models.providers.superstream.SuperStreamMediaDetailResponse.Companion.toMediaInfo
-import com.flixclusive.providers.models.providers.superstream.SuperStreamSearchResponse
-import com.flixclusive.providers.models.providers.superstream.SuperStreamSearchResponse.SuperStreamSearchItem.Companion.toSearchResultItem
-import com.flixclusive.providers.models.providers.superstream.SuperStreamSubtitleResponse
-import com.flixclusive.providers.models.providers.superstream.SuperStreamSubtitleResponse.SuperStreamSubtitleItem.Companion.toValidSubtitleFilePath
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.apiUrl
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.appIdSecond
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.appKey
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.appVersion
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.appVersionCode
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.iv
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.key
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.secondApiUrl
-import com.flixclusive.providers.sources.superstream.utils.CipherUtils
-import com.flixclusive.providers.sources.superstream.utils.CipherUtils.getVerify
-import com.flixclusive.providers.sources.superstream.utils.MD5Utils
-import com.flixclusive.providers.sources.superstream.utils.SuperStreamUtils.getExpiryDate
-import com.flixclusive.providers.sources.superstream.utils.SuperStreamUtils.isError
-import com.flixclusive.providers.sources.superstream.utils.SuperStreamUtils.randomToken
-import com.flixclusive.providers.utils.DecryptUtils.base64Encode
-import com.flixclusive.providers.utils.JsonUtils.fromJson
-import com.flixclusive.providers.utils.asyncCalls
-import com.flixclusive.providers.utils.mapAsync
-import com.flixclusive.providers.utils.network.OkHttpUtils.POST
-import com.flixclusive.providers.utils.network.OkHttpUtils.asString
-import okhttp3.Headers.Companion.toHeaders
-import okhttp3.OkHttpClient
-
-/**
- *
- * SuperStream = SS
- *
- * Based off:
- * https://github.com/movie-web/providers/tree/dev/src/providers/sources/superstream
- * https://codeberg.org/cloudstream/cloudstream-extensions/src/branch/master/SuperStream/src/main/kotlin/com/lagradost/SuperStream.kt
- *
- * */
-@Suppress("SpellCheckingInspection")
-class SuperStream(
-    client: OkHttpClient,
-) : SourceProvider(client) {
-    override var name = "SuperStream"
-
-    /**
-     *
-     * Cached data of previous called tv show.
-     * This will ease rapid (tv) episodes requests from
-     * the source/provider.
-     *
-     * */
-    private var tvCacheData: TvShowCacheData = TvShowCacheData()
-
-    private val headers = mapOf(
-        "Platform" to "android",
-        "Accept" to "charset=utf-8",
-    )
-
-    private inline fun <reified T : Any> requestCall(
-        query: String,
-        useAlternativeApi: Boolean = false,
-    ): T? {
-        val encryptedQuery = CipherUtils.encrypt(query, key, iv)!!
-        val appKeyHash = MD5Utils.md5(appKey)!!
-        val verify = getVerify(encryptedQuery, appKey, key)
-        val newBody =
-            """{"app_key":"$appKeyHash","verify":"$verify","encrypt_data":"$encryptedQuery"}"""
-
-        val data = mapOf(
-            "data" to base64Encode(newBody.toByteArray()),
-            "appid" to "27",
-            "platform" to "android",
-            "version" to appVersionCode,
-            // Probably best to randomize this
-            "medium" to "Website",
-            "token" to randomToken()
-        )
-
-        val errorMessage = "Failed to fetch SuperStream API"
-        val url = if (useAlternativeApi) secondApiUrl else apiUrl
-        val response = client.newCall(POST(
-            url = url,
-            data = data,
-            headers = headers.toHeaders()
-        )).execute()
-
-        val responseBody = response
-            .body
-            ?.charStream()
-            ?.asString()
-            ?: throw Exception(errorMessage)
-
-        if(
-            responseBody.contains(
-                other = """"msg":"success""",
-                ignoreCase = true
-            ).not()
-        ) throw Exception(errorMessage)
-
-        if (response.isSuccessful && responseBody.isNotBlank())
-            return fromJson(responseBody)
-        else throw Exception("$errorMessage: [${response.body.toString()}]")
-    }
-
-    override suspend fun search(query: String, page: Int, mediaType: MediaType): SearchResults {
-        val itemsPerPage = 20
-        val apiQuery =
-            // Originally 8 pagelimit
-            """{"childmode":"0","app_version":"$appVersion","appid":"$appIdSecond","module":"Search4","channel":"Website","page":"$page","lang":"en","type":"all","keyword":"$query","pagelimit":"$itemsPerPage","expired_date":"${getExpiryDate()}","platform":"android"}"""
-
-        val response = requestCall<SuperStreamSearchResponse>(apiQuery, true)
-
-        val mappedItems = response?.data?.results?.map {
-            it.toSearchResultItem()
-        } ?: throw NullPointerException("Cannot search on SuperStream")
-
-        return SearchResults(
-            currentPage = page,
-            results = mappedItems,
-            hasNextPage = (page * itemsPerPage) < response.data.total
-        )
-    }
-
-    override suspend fun getMediaInfo(mediaId: String, mediaType: MediaType): MediaInfo {
-        if (tvCacheData.mediaInfo?.id == mediaId)
-            return tvCacheData.mediaInfo!!
-
-        val apiQuery = if (mediaType == MediaType.Movie) {
-            """{"childmode":"0","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_detail","channel":"Website","mid":"$mediaId","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","oss":"","group":""}"""
-        } else {
-            """{"childmode":"0","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"TV_detail_1","display_all":"1","channel":"Website","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","tid":"$mediaId"}"""
-        }
-
-        val data = requestCall<SuperStreamMediaDetailResponse>(apiQuery)
-        data?.msg?.isError("Failed to fetch movie info.")
-
-
-        val result = data!!.toMediaInfo(mediaType == MediaType.Movie)
-        tvCacheData = TvShowCacheData(id = mediaId, result)
-
-        return result
-    }
-
-    override suspend fun getSourceLinks(
-        mediaId: String,
-        season: Int?,
-        episode: Int?,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    ) {
-        val isMovie = season == null && episode == null
-
-        val tvShowInfo = if(season != null) {
-            getMediaInfo(mediaId, MediaType.TvShow)
-        } else null
-
-        val seasonToUse = if(
-            tvShowInfo?.seasons != null
-            && tvShowInfo.episodes != null
-            && tvShowInfo.seasons <= season!!
-            && tvShowInfo.episodes >= episode!!
-        ) {
-            tvShowInfo.seasons
-        } else season
-
-        val query = if (isMovie) {
-            """{"childmode":"0","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_downloadurl_v3","channel":"Website","mid":"$mediaId","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","oss":"1","group":""}"""
-        } else {
-            """{"childmode":"0","app_version":"$appVersion","module":"TV_downloadurl_v3","channel":"Website","episode":"$episode","expired_date":"${getExpiryDate()}","platform":"android","tid":"$mediaId","oss":"1","uid":"","appid":"$appIdSecond","season":"$seasonToUse","lang":"en","group":""}"""
-        }
-
-        val downloadResponse = requestCall<SuperStreamDownloadResponse>(query, false)
-
-        downloadResponse?.msg?.isError("Failed to fetch source.")
-
-        val data = downloadResponse?.data?.list?.find {
-            it.path.isNullOrBlank().not()
-        } ?: throw Exception("Cannot find source")
-
-        // Should really run this query for every link :(
-        val subtitleQuery = if (isMovie) {
-            """{"childmode":"0","fid":"${data.fid}","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_srt_list_v2","channel":"Website","mid":"$mediaId","lang":"en","expired_date":"${getExpiryDate()}","platform":"android"}"""
-        } else {
-            """{"childmode":"0","fid":"${data.fid}","app_version":"$appVersion","module":"TV_srt_list_v2","channel":"Website","episode":"$episode","expired_date":"${getExpiryDate()}","platform":"android","tid":"$mediaId","uid":"","appid":"$appIdSecond","season":"$seasonToUse","lang":"en"}"""
-        }
-
-        val subtitlesResponse = requestCall<SuperStreamSubtitleResponse>(subtitleQuery)
-        subtitlesResponse?.msg?.isError("Failed to fetch subtitles.")
-
-        asyncCalls(
-            {
-                subtitlesResponse?.data?.list?.mapAsync { subtitle ->
-                    subtitle.subtitles
-                        .sortedWith(compareByDescending { it.order })
-                        .mapAsync {
-                            if(
-                                it.filePath != null
-                                && it.lang != null
-                            ) {
-                                onSubtitleLoaded(
-                                    Subtitle(
-                                        lang = "${it.language ?: "UNKNOWN"} [${it.lang}] - Votes: ${it.order}",
-                                        url = it.filePath.toValidSubtitleFilePath()
-                                    )
-                                )
-                            }
-                        }
-                }
-            },
-            {
-                downloadResponse.data.list.mapAsync {
-                    if(
-                        !it.path.isNullOrBlank()
-                        && !it.realQuality.isNullOrBlank()
-                    ) {
-                        onLinkLoaded(
-                            SourceLink(
-                                name = "${it.realQuality} server",
-                                url = it.path
-                            )
-                        )
-                    }
-                }
-            }
-        )
-    }
-}
+package com.flixclusive.provider.superstream
+
+import com.flixclusive.core.util.coroutines.asyncCalls
+import com.flixclusive.core.util.coroutines.mapAsync
+import com.flixclusive.core.util.film.FilmType
+import com.flixclusive.core.util.json.fromJson
+import com.flixclusive.model.provider.SourceLink
+import com.flixclusive.model.provider.Subtitle
+import com.flixclusive.provider.base.Provider
+import com.flixclusive.provider.base.dto.FilmInfo
+import com.flixclusive.provider.base.dto.SearchResults
+import com.flixclusive.provider.base.util.CryptographyHelper.base64Encode
+import com.flixclusive.provider.base.util.POST
+import com.flixclusive.provider.base.util.TvShowCacheData
+import com.flixclusive.provider.base.util.asString
+import com.flixclusive.provider.superstream.dto.SuperStreamDownloadResponse
+import com.flixclusive.provider.superstream.dto.SuperStreamMediaDetailResponse
+import com.flixclusive.provider.superstream.dto.SuperStreamMediaDetailResponse.Companion.toMediaInfo
+import com.flixclusive.provider.superstream.dto.SuperStreamSearchResponse
+import com.flixclusive.provider.superstream.dto.SuperStreamSearchResponse.SuperStreamSearchItem.Companion.toSearchResultItem
+import com.flixclusive.provider.superstream.dto.SuperStreamSubtitleResponse
+import com.flixclusive.provider.superstream.dto.SuperStreamSubtitleResponse.SuperStreamSubtitleItem.Companion.toValidSubtitleFilePath
+import com.flixclusive.provider.superstream.util.CipherUtils
+import com.flixclusive.provider.superstream.util.CipherUtils.getVerify
+import com.flixclusive.provider.superstream.util.MD5Utils
+import com.flixclusive.provider.superstream.util.SuperStreamUtils.getExpiryDate
+import com.flixclusive.provider.superstream.util.SuperStreamUtils.isError
+import com.flixclusive.provider.superstream.util.SuperStreamUtils.randomToken
+import com.flixclusive.provider.superstream.SuperStreamCommon.apiUrl
+import com.flixclusive.provider.superstream.SuperStreamCommon.appIdSecond
+import com.flixclusive.provider.superstream.SuperStreamCommon.appKey
+import com.flixclusive.provider.superstream.SuperStreamCommon.appVersion
+import com.flixclusive.provider.superstream.SuperStreamCommon.appVersionCode
+import com.flixclusive.provider.superstream.SuperStreamCommon.iv
+import com.flixclusive.provider.superstream.SuperStreamCommon.key
+import com.flixclusive.provider.superstream.SuperStreamCommon.secondApiUrl
+import okhttp3.Headers.Companion.toHeaders
+import okhttp3.OkHttpClient
+
+/**
+ *
+ * SuperStream = SS
+ *
+ * Based off:
+ * https://github.com/movie-web/provider/tree/dev/src/provider/source/superstream
+ * https://codeberg.org/cloudstream/cloudstream-extensions/src/branch/master/SuperStream/src/main/kotlin/com/lagradost/SuperStream.kt
+ *
+ * */
+@Suppress("SpellCheckingInspection")
+class SuperStream(
+    client: OkHttpClient,
+) : Provider(client) {
+    override var name = "SuperStream"
+
+    private var tvCacheData = TvShowCacheData()
+
+    private val headers = mapOf(
+        "Platform" to "android",
+        "Accept" to "charset=utf-8",
+    )
+
+    private inline fun <reified T : Any> requestCall(
+        query: String,
+        useAlternativeApi: Boolean = false,
+    ): T? {
+        val encryptedQuery = CipherUtils.encrypt(query, key, iv)!!
+        val appKeyHash = MD5Utils.md5(appKey)!!
+        val verify = getVerify(encryptedQuery, appKey, key)
+        val newBody =
+            """{"app_key":"$appKeyHash","verify":"$verify","encrypt_data":"$encryptedQuery"}"""
+
+        val data = mapOf(
+            "data" to base64Encode(newBody.toByteArray()),
+            "appid" to "27",
+            "platform" to "android",
+            "version" to appVersionCode,
+            // Probably best to randomize this
+            "medium" to "Website",
+            "token" to randomToken()
+        )
+
+        val errorMessage = "Failed to fetch SuperStream API"
+        val url = if (useAlternativeApi) secondApiUrl else apiUrl
+        val response = client.newCall(
+            POST(
+                url = url,
+                data = data,
+                headers = headers.toHeaders()
+            )
+        ).execute()
+
+        val responseBody = response
+            .body
+            ?.charStream()
+            ?.asString()
+            ?: throw Exception(errorMessage)
+
+        if(
+            responseBody.contains(
+                other = """"msg":"success""",
+                ignoreCase = true
+            ).not()
+        ) throw Exception(errorMessage)
+
+        if (response.isSuccessful && responseBody.isNotBlank())
+            return fromJson(responseBody)
+        else throw Exception("$errorMessage: [${response.body.toString()}]")
+    }
+
+    override suspend fun search(query: String, page: Int, filmType: FilmType): SearchResults {
+        val itemsPerPage = 20
+        val apiQuery =
+            // Originally 8 pagelimit
+            """{"childmode":"0","app_version":"$appVersion","appid":"$appIdSecond","module":"Search4","channel":"Website","page":"$page","lang":"en","type":"all","keyword":"$query","pagelimit":"$itemsPerPage","expired_date":"${getExpiryDate()}","platform":"android"}"""
+
+        val response = requestCall<SuperStreamSearchResponse>(apiQuery, true)
+
+        val mappedItems = response?.data?.results?.map {
+            it.toSearchResultItem()
+        } ?: throw NullPointerException("Cannot search on SuperStream")
+
+        return SearchResults(
+            currentPage = page,
+            results = mappedItems,
+            hasNextPage = (page * itemsPerPage) < response.data.total
+        )
+    }
+
+    override suspend fun getFilmInfo(
+        filmId: String,
+        filmType: FilmType,
+    ): FilmInfo {
+        if (tvCacheData.filmInfo?.id == filmId)
+            return tvCacheData.filmInfo!!
+
+        val apiQuery = if (filmType == FilmType.MOVIE) {
+            """{"childmode":"0","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_detail","channel":"Website","mid":"$filmId","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","oss":"","group":""}"""
+        } else {
+            """{"childmode":"0","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"TV_detail_1","display_all":"1","channel":"Website","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","tid":"$filmId"}"""
+        }
+
+        val data = requestCall<SuperStreamMediaDetailResponse>(apiQuery)
+        data?.msg?.isError("Failed to fetch movie info.")
+
+
+        val result = data!!.toMediaInfo(filmType == FilmType.MOVIE)
+        tvCacheData = TvShowCacheData(id = filmId, result)
+
+        return result
+    }
+
+    override suspend fun getSourceLinks(
+        filmId: String,
+        season: Int?,
+        episode: Int?,
+        onLinkLoaded: (SourceLink) -> Unit,
+        onSubtitleLoaded: (Subtitle) -> Unit,
+    ) {
+        val isMovie = season == null && episode == null
+
+        val tvShowInfo = if(season != null) {
+            getFilmInfo(filmId, FilmType.TV_SHOW)
+        } else null
+
+        val seasonToUse = if(
+            tvShowInfo?.seasons != null
+            && tvShowInfo.episodes != null
+            && tvShowInfo.seasons!! <= season!!
+            && tvShowInfo.episodes!! >= episode!!
+        ) {
+            tvShowInfo.seasons
+        } else season
+
+        val query = if (isMovie) {
+            """{"childmode":"0","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_downloadurl_v3","channel":"Website","mid":"$filmId","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","oss":"1","group":""}"""
+        } else {
+            """{"childmode":"0","app_version":"$appVersion","module":"TV_downloadurl_v3","channel":"Website","episode":"$episode","expired_date":"${getExpiryDate()}","platform":"android","tid":"$filmId","oss":"1","uid":"","appid":"$appIdSecond","season":"$seasonToUse","lang":"en","group":""}"""
+        }
+
+        val downloadResponse = requestCall<SuperStreamDownloadResponse>(query, false)
+
+        downloadResponse?.msg?.isError("Failed to fetch source.")
+
+        val data = downloadResponse?.data?.list?.find {
+            it.path.isNullOrBlank().not()
+        } ?: throw Exception("Cannot find source")
+
+        // Should really run this query for every link :(
+        val subtitleQuery = if (isMovie) {
+            """{"childmode":"0","fid":"${data.fid}","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_srt_list_v2","channel":"Website","mid":"$filmId","lang":"en","expired_date":"${getExpiryDate()}","platform":"android"}"""
+        } else {
+            """{"childmode":"0","fid":"${data.fid}","app_version":"$appVersion","module":"TV_srt_list_v2","channel":"Website","episode":"$episode","expired_date":"${getExpiryDate()}","platform":"android","tid":"$filmId","uid":"","appid":"$appIdSecond","season":"$seasonToUse","lang":"en"}"""
+        }
+
+        val subtitlesResponse = requestCall<SuperStreamSubtitleResponse>(subtitleQuery)
+        subtitlesResponse?.msg?.isError("Failed to fetch subtitles.")
+
+        asyncCalls(
+            {
+                subtitlesResponse?.data?.list?.mapAsync { subtitle ->
+                    subtitle.subtitles
+                        .sortedWith(compareByDescending { it.order })
+                        .mapAsync {
+                            if(
+                                it.filePath != null
+                                && it.lang != null
+                            ) {
+                                onSubtitleLoaded(
+                                    Subtitle(
+                                        lang = "${it.language ?: "UNKNOWN"} [${it.lang}] - Votes: ${it.order}",
+                                        url = it.filePath.toValidSubtitleFilePath()
+                                    )
+                                )
+                            }
+                        }
+                }
+            },
+            {
+                downloadResponse.data.list.mapAsync {
+                    if(
+                        !it.path.isNullOrBlank()
+                        && !it.realQuality.isNullOrBlank()
+                    ) {
+                        onLinkLoaded(
+                            SourceLink(
+                                name = "${it.realQuality} server",
+                                url = it.path
+                            )
+                        )
+                    }
+                }
+            }
+        )
+    }
+}
diff --git a/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStreamCommon.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStreamCommon.kt
new file mode 100644
index 000000000..f75547492
--- /dev/null
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStreamCommon.kt
@@ -0,0 +1,34 @@
+package com.flixclusive.provider.superstream
+
+import com.flixclusive.provider.base.util.CryptographyHelper.base64Decode
+
+internal object SuperStreamCommon {
+    // We do not want content scanners to notice this scraping going on so we've hidden all constants
+    // The source has its origins in China so I added some extra security with banned words
+    // Mayhaps a tiny bit unethical, but this source is just too good :)
+    // If you are copying this code please use precautions so they do not change their api.
+
+    // Free Tibet, The Tienanmen Square protests of 1989
+    val iv = base64Decode("d0VpcGhUbiE=")
+    val key = base64Decode("MTIzZDZjZWRmNjI2ZHk1NDIzM2FhMXc2")
+
+    private val baseApiUrl = base64Decode("aHR0cHM6Ly9zaG93Ym94LnNoZWd1Lm5ldA==")
+    val apiUrl =
+        "$baseApiUrl${base64Decode("L2FwaS9hcGlfY2xpZW50L2luZGV4Lw==")}"
+
+    // Another url because the first one sucks at searching
+    // This one was revealed to me in a dream
+    val secondApiUrl =
+        base64Decode("aHR0cHM6Ly9tYnBhcGkuc2hlZ3UubmV0L2FwaS9hcGlfY2xpZW50L2luZGV4Lw==")
+
+    val appKey = base64Decode("bW92aWVib3g=")
+    val appId = base64Decode("Y29tLnRkby5zaG93Ym94")
+    val appIdSecond = base64Decode("Y29tLm1vdmllYm94cHJvLmFuZHJvaWQ=")
+    val captionDomains =
+        arrayOf(
+            base64Decode("bWJwaW1hZ2VzLmNodWF4aW4uY29t"),
+            base64Decode("aW1hZ2VzLnNoZWd1Lm5ldA==")
+        )
+    const val appVersion = "14.7"
+    const val appVersionCode = "160"
+}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamDownloadResponse.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamDownloadResponse.kt
similarity index 90%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamDownloadResponse.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamDownloadResponse.kt
index 09ca18917..29d981030 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamDownloadResponse.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamDownloadResponse.kt
@@ -1,26 +1,26 @@
-package com.flixclusive.providers.models.providers.superstream
-
-import com.google.gson.annotations.SerializedName
-
-internal data class SuperStreamDownloadResponse(
-    val code: String? = null,
-    val msg: String? = null,
-    val data: DataResponse = DataResponse()
-) {
-    data class DataResponse(
-        val seconds: Int? = null,
-        val quality: List<String> = listOf(),
-        val list: List<DownloadItem> = listOf()
-    )
-
-    data class DownloadItem(
-        val path: String? = null,
-        val quality: String? = null,
-        @SerializedName("real_quality") val realQuality: String? = null,
-        val format: String? = null,
-        val fid: Int? = null,
-        val size: String? = null,
-        val width: Int? = null,
-        val height: Int? = null
-    )
+package com.flixclusive.provider.superstream.dto
+
+import com.google.gson.annotations.SerializedName
+
+internal data class SuperStreamDownloadResponse(
+    val code: String? = null,
+    val msg: String? = null,
+    val data: DataResponse = DataResponse()
+) {
+    data class DataResponse(
+        val seconds: Int? = null,
+        val quality: List<String> = listOf(),
+        val list: List<DownloadItem> = listOf()
+    )
+
+    data class DownloadItem(
+        val path: String? = null,
+        val quality: String? = null,
+        @SerializedName("real_quality") val realQuality: String? = null,
+        val format: String? = null,
+        val fid: Int? = null,
+        val size: String? = null,
+        val width: Int? = null,
+        val height: Int? = null
+    )
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamMediaDetailResponse.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamMediaDetailResponse.kt
similarity index 80%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamMediaDetailResponse.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamMediaDetailResponse.kt
index 0a0aff973..ff18cca12 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamMediaDetailResponse.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamMediaDetailResponse.kt
@@ -1,35 +1,35 @@
-package com.flixclusive.providers.models.providers.superstream
-
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.utils.toValidReleaseDate
-import com.google.gson.annotations.SerializedName
-
-
-internal data class SuperStreamMediaDetailResponse(
-    val code: Int? = null,
-    val msg: String? = null,
-    val data: MediaData? = null,
-) {
-    data class MediaData(
-        val id: Int? = null,
-        val title: String? = null,
-        val year: Int? = null,
-        val released: String? = null,
-        @SerializedName("max_season") val maxSeason: Int? = null,
-        @SerializedName("max_episode") val maxEpisode: Int? = null,
-    )
-
-    companion object {
-        fun SuperStreamMediaDetailResponse.toMediaInfo(isMovie: Boolean): MediaInfo {
-            return MediaInfo(
-                id = data?.id.toString(),
-                title = data?.title
-                    ?: throw NullPointerException("Movie title should not be blank or null!"),
-                yearReleased = if (isMovie) data.released!!.toValidReleaseDate()!!
-                else data.year.toString(),
-                seasons = data.maxSeason,
-                episodes = data.maxEpisode,
-            )
-        }
-    }
-}
+package com.flixclusive.provider.superstream.dto
+
+import com.flixclusive.provider.base.dto.FilmInfo
+import com.flixclusive.provider.base.util.toValidReleaseDate
+import com.google.gson.annotations.SerializedName
+
+
+internal data class SuperStreamMediaDetailResponse(
+    val code: Int? = null,
+    val msg: String? = null,
+    val data: MediaData? = null,
+) {
+    data class MediaData(
+        val id: Int? = null,
+        val title: String? = null,
+        val year: Int? = null,
+        val released: String? = null,
+        @SerializedName("max_season") val maxSeason: Int? = null,
+        @SerializedName("max_episode") val maxEpisode: Int? = null,
+    )
+
+    companion object {
+        fun SuperStreamMediaDetailResponse.toMediaInfo(isMovie: Boolean): FilmInfo {
+            return FilmInfo(
+                id = data?.id.toString(),
+                title = data?.title
+                    ?: throw NullPointerException("Movie title should not be blank or null!"),
+                yearReleased = if (isMovie) data.released!!.toValidReleaseDate()!!
+                else data.year.toString(),
+                seasons = data.maxSeason,
+                episodes = data.maxEpisode,
+            )
+        }
+    }
+}
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamSearchResponse.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamSearchResponse.kt
similarity index 75%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamSearchResponse.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamSearchResponse.kt
index 1d1171446..b9f5ca7b4 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamSearchResponse.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamSearchResponse.kt
@@ -1,33 +1,33 @@
-package com.flixclusive.providers.models.providers.superstream
-
-import com.flixclusive.providers.models.common.SearchResultItem
-import com.flixclusive.providers.sources.superstream.utils.SuperStreamUtils
-import com.google.gson.annotations.SerializedName
-
-internal data class SuperStreamSearchResponse(
-    val code: String? = null,
-    val msg: String? = null,
-    val data: SuperStreamSearchResponseDataContent = SuperStreamSearchResponseDataContent()
-) {
-    data class SuperStreamSearchResponseDataContent(
-        @SerializedName("list") val results: List<SuperStreamSearchItem> = listOf(),
-        val total: Int = 0,
-    )
-    data class SuperStreamSearchItem(
-        val id: Int? = null,
-        @SerializedName("box_type") val boxType: Int? = null,
-        val title: String? = null,
-        val year: Int? = null,
-    ) {
-        companion object {
-            fun SuperStreamSearchItem.toSearchResultItem(): SearchResultItem {
-                return SearchResultItem(
-                    id = id.toString(),
-                    title = title,
-                    releaseDate = year.toString(),
-                    mediaType = SuperStreamUtils.SSMediaType.getSSMediaType(boxType).toMediaType(),
-                )
-            }
-        }
-    }
+package com.flixclusive.provider.superstream.dto
+
+import com.flixclusive.provider.base.dto.SearchResultItem
+import com.flixclusive.provider.superstream.util.SuperStreamUtils
+import com.google.gson.annotations.SerializedName
+
+internal data class SuperStreamSearchResponse(
+    val code: String? = null,
+    val msg: String? = null,
+    val data: SuperStreamSearchResponseDataContent = SuperStreamSearchResponseDataContent()
+) {
+    data class SuperStreamSearchResponseDataContent(
+        @SerializedName("list") val results: List<SuperStreamSearchItem> = listOf(),
+        val total: Int = 0,
+    )
+    data class SuperStreamSearchItem(
+        val id: Int? = null,
+        @SerializedName("box_type") val boxType: Int? = null,
+        val title: String? = null,
+        val year: Int? = null,
+    ) {
+        companion object {
+            fun SuperStreamSearchItem.toSearchResultItem(): SearchResultItem {
+                return SearchResultItem(
+                    id = id.toString(),
+                    title = title,
+                    releaseDate = year.toString(),
+                    filmType = SuperStreamUtils.SSMediaType.getSSMediaType(boxType).toFilmType(),
+                )
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamSubtitleResponse.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamSubtitleResponse.kt
similarity index 87%
rename from providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamSubtitleResponse.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamSubtitleResponse.kt
index a80c8df56..0cd98f85e 100644
--- a/providers/src/main/java/com/flixclusive/providers/models/providers/superstream/SuperStreamSubtitleResponse.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/dto/SuperStreamSubtitleResponse.kt
@@ -1,37 +1,37 @@
-package com.flixclusive.providers.models.providers.superstream
-
-import com.flixclusive.providers.sources.superstream.SuperStreamCommon.captionDomains
-import com.google.gson.annotations.SerializedName
-
-internal data class SuperStreamSubtitleResponse(
-    val code: Int? = null,
-    val msg: String? = null,
-    val data: SubtitleData = SubtitleData()
-) {
-    data class SuperStreamSubtitleItem(
-        @SerializedName("file_path") val filePath: String? = null,
-        val lang: String? = null,
-        val language: String? = null,
-        val order: Int? = null,
-    ) {
-        companion object {
-            fun String.toValidSubtitleFilePath(): String {
-                return replace(captionDomains[0], captionDomains[1])
-                    .replace(Regex("\\s"), "+")
-                    .replace(Regex("[()]")) { result ->
-                        "%" + result.value.toCharArray()[0].code.toByte().toString(16)
-                    }
-            }
-        }
-    }
-
-    data class SuperStreamSubtitle(
-        val language: String? = null,
-        val subtitles: List<SuperStreamSubtitleItem> = listOf()
-    )
-
-    data class SubtitleData(
-        val select: List<String> = listOf(),
-        val list: List<SuperStreamSubtitle> = listOf()
-    )
+package com.flixclusive.provider.superstream.dto
+
+import com.flixclusive.provider.superstream.SuperStreamCommon.captionDomains
+import com.google.gson.annotations.SerializedName
+
+internal data class SuperStreamSubtitleResponse(
+    val code: Int? = null,
+    val msg: String? = null,
+    val data: SubtitleData = SubtitleData()
+) {
+    data class SuperStreamSubtitleItem(
+        @SerializedName("file_path") val filePath: String? = null,
+        val lang: String? = null,
+        val language: String? = null,
+        val order: Int? = null,
+    ) {
+        companion object {
+            fun String.toValidSubtitleFilePath(): String {
+                return replace(captionDomains[0], captionDomains[1])
+                    .replace(Regex("\\s"), "+")
+                    .replace(Regex("[()]")) { result ->
+                        "%" + result.value.toCharArray()[0].code.toByte().toString(16)
+                    }
+            }
+        }
+    }
+
+    data class SuperStreamSubtitle(
+        val language: String? = null,
+        val subtitles: List<SuperStreamSubtitleItem> = listOf()
+    )
+
+    data class SubtitleData(
+        val select: List<String> = listOf(),
+        val list: List<SuperStreamSubtitle> = listOf()
+    )
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/CipherUtils.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/CipherUtils.kt
similarity index 92%
rename from providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/CipherUtils.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/CipherUtils.kt
index e989c92ef..9da9e5744 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/CipherUtils.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/CipherUtils.kt
@@ -1,68 +1,68 @@
-package com.flixclusive.providers.sources.superstream.utils
-
-import android.util.Base64
-import com.flixclusive.providers.sources.superstream.utils.MD5Utils.md5
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-internal object CipherUtils {
-    private const val ALGORITHM = "DESede"
-    private const val TRANSFORMATION = "DESede/CBC/PKCS5Padding"
-
-    fun encrypt(str: String, key: String, iv: String): String? {
-        return try {
-            val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
-            val bArr = ByteArray(24)
-            val bytes: ByteArray = key.toByteArray()
-            var length = if (bytes.size <= 24) bytes.size else 24
-            System.arraycopy(bytes, 0, bArr, 0, length)
-            while (length < 24) {
-                bArr[length] = 0
-                length++
-            }
-            cipher.init(
-                Cipher.ENCRYPT_MODE,
-                SecretKeySpec(bArr, ALGORITHM),
-                IvParameterSpec(iv.toByteArray())
-            )
-
-            Base64.encodeToString(cipher.doFinal(str.toByteArray()), 2)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    // Useful for deobfuscation
-    fun decrypt(str: String, key: String, iv: String): String? {
-        return try {
-            val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
-            val bArr = ByteArray(24)
-            val bytes: ByteArray = key.toByteArray()
-            var length = if (bytes.size <= 24) bytes.size else 24
-            System.arraycopy(bytes, 0, bArr, 0, length)
-            while (length < 24) {
-                bArr[length] = 0
-                length++
-            }
-            cipher.init(
-                Cipher.DECRYPT_MODE,
-                SecretKeySpec(bArr, ALGORITHM),
-                IvParameterSpec(iv.toByteArray())
-            )
-            val inputStr = Base64.decode(str.toByteArray(), Base64.DEFAULT)
-            cipher.doFinal(inputStr).decodeToString()
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    fun getVerify(str: String?, str2: String, str3: String): String? {
-        if (str != null) {
-            return md5(md5(str2) + str3 + str)
-        }
-        return null
-    }
+package com.flixclusive.provider.superstream.util
+
+import android.util.Base64
+import com.flixclusive.provider.superstream.util.MD5Utils.md5
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+internal object CipherUtils {
+    private const val ALGORITHM = "DESede"
+    private const val TRANSFORMATION = "DESede/CBC/PKCS5Padding"
+
+    fun encrypt(str: String, key: String, iv: String): String? {
+        return try {
+            val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
+            val bArr = ByteArray(24)
+            val bytes: ByteArray = key.toByteArray()
+            var length = if (bytes.size <= 24) bytes.size else 24
+            System.arraycopy(bytes, 0, bArr, 0, length)
+            while (length < 24) {
+                bArr[length] = 0
+                length++
+            }
+            cipher.init(
+                Cipher.ENCRYPT_MODE,
+                SecretKeySpec(bArr, ALGORITHM),
+                IvParameterSpec(iv.toByteArray())
+            )
+
+            Base64.encodeToString(cipher.doFinal(str.toByteArray()), 2)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    // Useful for deobfuscation
+    fun decrypt(str: String, key: String, iv: String): String? {
+        return try {
+            val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
+            val bArr = ByteArray(24)
+            val bytes: ByteArray = key.toByteArray()
+            var length = if (bytes.size <= 24) bytes.size else 24
+            System.arraycopy(bytes, 0, bArr, 0, length)
+            while (length < 24) {
+                bArr[length] = 0
+                length++
+            }
+            cipher.init(
+                Cipher.DECRYPT_MODE,
+                SecretKeySpec(bArr, ALGORITHM),
+                IvParameterSpec(iv.toByteArray())
+            )
+            val inputStr = Base64.decode(str.toByteArray(), Base64.DEFAULT)
+            cipher.doFinal(inputStr).decodeToString()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    fun getVerify(str: String?, str2: String, str3: String): String? {
+        if (str != null) {
+            return md5(md5(str2) + str3 + str)
+        }
+        return null
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/MD5Utils.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/MD5Utils.kt
similarity index 92%
rename from providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/MD5Utils.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/MD5Utils.kt
index ae625cd3a..bee96a07a 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/MD5Utils.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/MD5Utils.kt
@@ -1,34 +1,34 @@
-package com.flixclusive.providers.sources.superstream.utils
-
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-
-internal object MD5Utils {
-    private val HEX_DIGITS = charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F')
-
-    @JvmOverloads
-    fun toHexString(bArr: ByteArray, i: Int = 0, i2: Int = bArr.size): String {
-        val cArr = CharArray(i2 * 2)
-        var i3 = 0
-        for (i4 in i until i + i2) {
-            val b = bArr[i4].toInt()
-            val i5 = i3 + 1
-            val cArr2 = HEX_DIGITS
-            cArr[i3] = cArr2[b ushr 4 and 15]
-            i3 = i5 + 1
-            cArr[i5] = cArr2[b and 15]
-        }
-        return String(cArr)
-    }
-
-    fun md5(hash: String): String? {
-        return try {
-            val digest = MessageDigest.getInstance("MD5")
-            digest.update(hash.toByteArray())
-            toHexString(digest.digest()).lowercase()
-        } catch (e: NoSuchAlgorithmException) {
-            e.printStackTrace()
-            null
-        }
-    }
+package com.flixclusive.provider.superstream.util
+
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+internal object MD5Utils {
+    private val HEX_DIGITS = charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F')
+
+    @JvmOverloads
+    fun toHexString(bArr: ByteArray, i: Int = 0, i2: Int = bArr.size): String {
+        val cArr = CharArray(i2 * 2)
+        var i3 = 0
+        for (i4 in i until i + i2) {
+            val b = bArr[i4].toInt()
+            val i5 = i3 + 1
+            val cArr2 = HEX_DIGITS
+            cArr[i3] = cArr2[b ushr 4 and 15]
+            i3 = i5 + 1
+            cArr[i5] = cArr2[b and 15]
+        }
+        return String(cArr)
+    }
+
+    fun md5(hash: String): String? {
+        return try {
+            val digest = MessageDigest.getInstance("MD5")
+            digest.update(hash.toByteArray())
+            toHexString(digest.digest()).lowercase()
+        } catch (e: NoSuchAlgorithmException) {
+            e.printStackTrace()
+            null
+        }
+    }
 }
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/SuperStreamUtils.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/SuperStreamUtils.kt
similarity index 70%
rename from providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/SuperStreamUtils.kt
rename to provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/SuperStreamUtils.kt
index babb26a39..7968fdcd1 100644
--- a/providers/src/main/java/com/flixclusive/providers/sources/superstream/utils/SuperStreamUtils.kt
+++ b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/util/SuperStreamUtils.kt
@@ -1,41 +1,38 @@
-package com.flixclusive.providers.sources.superstream.utils
-
-import com.flixclusive.providers.models.common.MediaType
-
-internal object SuperStreamUtils {
-    // Random 32 length string
-    fun randomToken(): String {
-        return (0..31).joinToString("") {
-            (('0'..'9') + ('a'..'f')).random().toString()
-        }
-    }
-
-    enum class SSMediaType(val value: Int) {
-        Series(2),
-        Movies(1);
-
-        fun toMediaType(): MediaType {
-            return if (this == Series) MediaType.TvShow else MediaType.Movie
-        }
-
-        companion object {
-            fun getSSMediaType(value: Int?): SSMediaType {
-                return values().firstOrNull { it.value == value } ?: Movies
-            }
-        }
-    }
-
-    fun getExpiryDate(): Long {
-        // Current time + 12 hours
-        return (System.currentTimeMillis() / 1000) + 60 * 60 * 12
-    }
-
-    fun String.isError(lazyMessage: String) {
-        if(
-            contains(
-                other = "error",
-                ignoreCase = true
-            )
-        ) throw Exception(lazyMessage)
-    }
+package com.flixclusive.provider.superstream.util
+
+import com.flixclusive.core.util.film.FilmType
+
+internal object SuperStreamUtils {
+    // Random 32 length string
+    fun randomToken(): String {
+        return (0..31).joinToString("") {
+            (('0'..'9') + ('a'..'f')).random().toString()
+        }
+    }
+
+    enum class SSMediaType(val value: Int) {
+        Series(2),
+        Movies(1);
+
+        fun toFilmType() = if (this == Series) FilmType.TV_SHOW else FilmType.MOVIE
+        companion object {
+            fun getSSMediaType(value: Int?): SSMediaType {
+                return entries.firstOrNull { it.value == value } ?: Movies
+            }
+        }
+    }
+
+    fun getExpiryDate(): Long {
+        // Current time + 12 hours
+        return (System.currentTimeMillis() / 1000) + 60 * 60 * 12
+    }
+
+    fun String.isError(lazyMessage: String) {
+        if(
+            contains(
+                other = "error",
+                ignoreCase = true
+            )
+        ) throw Exception(lazyMessage)
+    }
 }
\ No newline at end of file
diff --git a/provider/superstream/src/test/kotlin/com/flixclusive/provider/superstream/SuperStreamTest.kt b/provider/superstream/src/test/kotlin/com/flixclusive/provider/superstream/SuperStreamTest.kt
new file mode 100644
index 000000000..c91fe108e
--- /dev/null
+++ b/provider/superstream/src/test/kotlin/com/flixclusive/provider/superstream/SuperStreamTest.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.provider.superstream
+
+import com.flixclusive.provider.base.testing.BaseProviderTest
+import okhttp3.OkHttpClient
+import org.junit.Before
+
+class SuperStreamTest : BaseProviderTest() {
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+
+        sourceProvider = SuperStream(OkHttpClient())
+    }
+}
\ No newline at end of file
diff --git a/providers/build.gradle.kts b/providers/build.gradle.kts
deleted file mode 100644
index f68b9ad62..000000000
--- a/providers/build.gradle.kts
+++ /dev/null
@@ -1,62 +0,0 @@
-plugins {
-    id("com.android.library")
-    id("kotlin-android")
-}
-
-android {
-    namespace = "com.flixclusive.providers"
-    compileSdk = 33
-
-    defaultConfig {
-        minSdk = 21
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_18
-        targetCompatibility = JavaVersion.VERSION_18
-    }
-
-    kotlinOptions {
-        jvmTarget = "18"
-    }
-}
-
-dependencies {
-    val coroutinesTest = "1.7.3"
-    val mock = "1.13.8"
-
-    implementation(kotlin("stdlib"))
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-    
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-
-    // OkHttp
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
-    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.0")
-
-    // Gson
-    implementation("com.google.code.gson:gson:2.10.1")
-
-    // HTML Parser
-    implementation("org.jsoup:jsoup:1.16.1")
-
-    testImplementation("io.mockk:mockk:$mock")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesTest")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-}
\ No newline at end of file
diff --git a/providers/consumer-rules.pro b/providers/consumer-rules.pro
deleted file mode 100644
index e69de29bb..000000000
diff --git a/providers/proguard-rules.pro b/providers/proguard-rules.pro
deleted file mode 100644
index 6af899db8..000000000
--- a/providers/proguard-rules.pro
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-
-## -- Suppressed Warnings
--dontwarn java.lang.invoke.StringConcatFactory
-
-##---------------Begin: proguard configuration for Retrofit2 ----------##
-# OkHttp proguard rules
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
-
-# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
--keep,allowobfuscation,allowshrinking interface retrofit2.Call
--keep,allowobfuscation,allowshrinking class retrofit2.Response
-
-# With R8 full mode generic signatures are stripped for classes that are not
-# kept. Suspend functions are wrapped in continuations where the type argument
-# is used.
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
-
-##---------------End: proguard configuration for Retrofit2 ----------##
-
-
-##---------------Begin: proguard configuration for Gson ----------##
-
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
--keepattributes Signature
-
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-
-# Gson specific classes
--dontwarn sun.misc.**
-#-keep class com.google.gson.stream.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
-#-keep class com.flixclusive.providers.models.common.** { *; }
-#-keep class com.flixclusive.providers.models.extractors.vidcloud.** { *; }
-#-keep class com.flixclusive.providers.models.providers.flixhq.** { *; }
-#-keep class com.flixclusive.providers.models.providers.superstream.** { *; }
-#-keep class com.flixclusive.providers.models.providers.lookmovie.** { *; }
-
-# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * extends com.google.gson.TypeAdapter
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
-# Prevent R8 from leaving Data object members always null
--keepclassmembers,allowobfuscation class * {
-    @com.google.gson.annotations.SerializedName *;
-}
-
-
-# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
--keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
--keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
-
-##---------------End: proguard configuration for Gson ----------##
-
diff --git a/providers/src/main/AndroidManifest.xml b/providers/src/main/AndroidManifest.xml
deleted file mode 100644
index 44008a433..000000000
--- a/providers/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/interfaces/Extractor.kt b/providers/src/main/java/com/flixclusive/providers/interfaces/Extractor.kt
deleted file mode 100644
index 923dd6504..000000000
--- a/providers/src/main/java/com/flixclusive/providers/interfaces/Extractor.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.flixclusive.providers.interfaces
-
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import java.net.URL
-
-interface Extractor {
-    val name: String
-
-    suspend fun extract(
-        url: URL,
-        mediaId: String,
-        episodeId: String,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    )
-}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/interfaces/SourceProvider.kt b/providers/src/main/java/com/flixclusive/providers/interfaces/SourceProvider.kt
deleted file mode 100644
index 9386faff8..000000000
--- a/providers/src/main/java/com/flixclusive/providers/interfaces/SourceProvider.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.flixclusive.providers.interfaces
-
-import com.flixclusive.providers.models.common.MediaInfo
-import com.flixclusive.providers.models.common.MediaType
-import com.flixclusive.providers.models.common.SearchResults
-import com.flixclusive.providers.models.common.SourceLink
-import com.flixclusive.providers.models.common.Subtitle
-import okhttp3.OkHttpClient
-
-abstract class SourceProvider(protected val client: OkHttpClient) {
-    abstract val name: String
-    open val baseUrl: String = ""
-
-    /**
-     *
-     * The embeds, extractors or servers of
-     * this provider instance.
-     *
-     * */
-    open val supportedExtractors: List<Extractor> = emptyList()
-
-    abstract suspend fun search(query: String, page: Int = 1, mediaType: MediaType): SearchResults
-
-    abstract suspend fun getMediaInfo(
-        mediaId: String,
-        mediaType: MediaType,
-    ): MediaInfo
-
-    /**
-     *
-     * Obtains source links for the film provided.
-     *
-     * */
-    abstract suspend fun getSourceLinks(
-        mediaId: String,
-        season: Int? = null,
-        episode: Int? = null,
-        onLinkLoaded: (SourceLink) -> Unit,
-        onSubtitleLoaded: (Subtitle) -> Unit,
-    )
-}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/EmbedData.kt b/providers/src/main/java/com/flixclusive/providers/models/common/EmbedData.kt
deleted file mode 100644
index e22a433f6..000000000
--- a/providers/src/main/java/com/flixclusive/providers/models/common/EmbedData.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.flixclusive.providers.models.common
-
-data class EmbedData(
-    val servers: List<SourceLink>,
-    val subtitles: List<Subtitle> = emptyList()
-)
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/models/common/MediaType.kt b/providers/src/main/java/com/flixclusive/providers/models/common/MediaType.kt
deleted file mode 100644
index 24a00b45e..000000000
--- a/providers/src/main/java/com/flixclusive/providers/models/common/MediaType.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.flixclusive.providers.models.common
-
-enum class MediaType(
-    val type: String
-) {
-    TvShow("tv"),
-    Movie("movie")
-}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/sources/superstream/SuperStreamCommon.kt b/providers/src/main/java/com/flixclusive/providers/sources/superstream/SuperStreamCommon.kt
deleted file mode 100644
index 533508da2..000000000
--- a/providers/src/main/java/com/flixclusive/providers/sources/superstream/SuperStreamCommon.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.flixclusive.providers.sources.superstream
-
-import com.flixclusive.providers.utils.DecryptUtils
-
-internal object SuperStreamCommon {
-    // We do not want content scanners to notice this scraping going on so we've hidden all constants
-    // The source has its origins in China so I added some extra security with banned words
-    // Mayhaps a tiny bit unethical, but this source is just too good :)
-    // If you are copying this code please use precautions so they do not change their api.
-
-    // Free Tibet, The Tienanmen Square protests of 1989
-    val iv = DecryptUtils.base64Decode("d0VpcGhUbiE=")
-    val key = DecryptUtils.base64Decode("MTIzZDZjZWRmNjI2ZHk1NDIzM2FhMXc2")
-
-    private val baseApiUrl = DecryptUtils.base64Decode("aHR0cHM6Ly9zaG93Ym94LnNoZWd1Lm5ldA==")
-    val apiUrl =
-        "$baseApiUrl${DecryptUtils.base64Decode("L2FwaS9hcGlfY2xpZW50L2luZGV4Lw==")}"
-
-    // Another url because the first one sucks at searching
-    // This one was revealed to me in a dream
-    val secondApiUrl =
-        DecryptUtils.base64Decode("aHR0cHM6Ly9tYnBhcGkuc2hlZ3UubmV0L2FwaS9hcGlfY2xpZW50L2luZGV4Lw==")
-
-    val appKey = DecryptUtils.base64Decode("bW92aWVib3g=")
-    val appId = DecryptUtils.base64Decode("Y29tLnRkby5zaG93Ym94")
-    val appIdSecond = DecryptUtils.base64Decode("Y29tLm1vdmllYm94cHJvLmFuZHJvaWQ=")
-    val captionDomains =
-        arrayOf(
-            DecryptUtils.base64Decode("bWJwaW1hZ2VzLmNodWF4aW4uY29t"),
-            DecryptUtils.base64Decode("aW1hZ2VzLnNoZWd1Lm5ldA==")
-        )
-    const val appVersion = "14.7"
-    const val appVersionCode = "160"
-}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/Constants.kt b/providers/src/main/java/com/flixclusive/providers/utils/Constants.kt
deleted file mode 100644
index ca29cbcbb..000000000
--- a/providers/src/main/java/com/flixclusive/providers/utils/Constants.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.flixclusive.providers.utils
-
-object Constants {
-    const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36"
-}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/JsonUtils.kt b/providers/src/main/java/com/flixclusive/providers/utils/JsonUtils.kt
deleted file mode 100644
index 9c0b0ba06..000000000
--- a/providers/src/main/java/com/flixclusive/providers/utils/JsonUtils.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flixclusive.providers.utils
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-
-internal object JsonUtils {
-    inline fun <reified T> fromJson(json: String): T {
-        return Gson().fromJson(json, object : TypeToken<T>() {}.type)
-    }
-}
\ No newline at end of file
diff --git a/providers/src/main/java/com/flixclusive/providers/utils/network/OkHttpUtils.kt b/providers/src/main/java/com/flixclusive/providers/utils/network/OkHttpUtils.kt
deleted file mode 100644
index ec6daf009..000000000
--- a/providers/src/main/java/com/flixclusive/providers/utils/network/OkHttpUtils.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.flixclusive.providers.utils.network
-
-import android.annotation.SuppressLint
-import com.flixclusive.providers.utils.Constants.USER_AGENT
-import com.flixclusive.providers.utils.network.OkHttpUtils.RequestBodyType.Companion.toMediaTypeOrNull
-import okhttp3.FormBody
-import okhttp3.Headers
-import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import org.json.JSONArray
-import org.json.JSONObject
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import java.io.Reader
-import java.security.SecureRandom
-import java.security.cert.X509Certificate
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManager
-import javax.net.ssl.X509TrustManager
-
-@Suppress("FunctionName")
-object OkHttpUtils {
-    private val mustHaveBody = listOf("POST", "PUT")
-
-    internal enum class RequestBodyType(val type: String) {
-        JSON("application/json;charset=utf-8"),
-        TEXT("text/plain;charset=utf-8");
-
-        companion object {
-            fun RequestBodyType.toMediaTypeOrNull(): MediaType? {
-                return type.toMediaTypeOrNull()
-            }
-        }
-    }
-
-    internal fun Reader?.asString(): String? {
-        return use {
-            val string = it?.readText()
-            it?.close()
-
-            return@use string
-        }
-    }
-
-    internal fun GET(
-        url: String,
-        headers: Headers = Headers.headersOf(),
-        userAgent: String = USER_AGENT,
-    ): Request {
-        val headersToUse = Headers.Builder()
-            .add("User-Agent", userAgent)
-            .addAll(headers)
-            .build()
-
-        return Request.Builder()
-            .url(url)
-            .headers(headersToUse)
-            .build()
-    }
-
-    internal fun POST(
-        url: String,
-        data: Map<String, String>? = null,
-        json: Any? = null,
-        headers: Headers = Headers.headersOf(),
-        userAgent: String = USER_AGENT,
-    ): Request {
-        val method = "POST"
-        val headersToUse = Headers.Builder()
-            .add("User-Agent", userAgent)
-            .addAll(headers)
-            .build()
-
-        val body = getRequestBody(method, data, json)
-
-        return Request.Builder()
-            .url(url)
-            .method(method, body)
-            .headers(headersToUse)
-            .build()
-    }
-
-    internal fun Response.asJsoup(html: String? = null): Document {
-        return Jsoup.parse(html ?: body!!.string(), request.url.toString())
-    }
-
-    private fun Map<String, String>.toFormBody(): FormBody {
-        val builder = FormBody.Builder()
-        forEach {
-            builder.addEncoded(it.key, it.value)
-        }
-        return builder.build()
-    }
-
-    private fun jsonToRequestBody(data: Any): RequestBody {
-        val jsonString = when (data) {
-            is JSONObject -> data.toString()
-            is JSONArray -> data.toString()
-            is String -> data
-            else -> data.toString()
-        }
-
-        val type = if (data is String)
-            RequestBodyType.TEXT
-        else RequestBodyType.JSON
-
-        return jsonString.toRequestBody(type.toMediaTypeOrNull())
-    }
-
-    private fun getRequestBody(
-        method: String,
-        data: Map<String, String>? = null,
-        json: Any? = null,
-    ): RequestBody? {
-        return when {
-            data != null -> data.toFormBody()
-            json != null -> jsonToRequestBody(json)
-            else -> if(mustHaveBody.contains(method)) FormBody.Builder().build() else null
-        }
-    }
-
-    // https://stackoverflow.com/a/59322754
-    fun OkHttpClient.Builder.ignoreAllSSLErrors(): OkHttpClient.Builder {
-        val naiveTrustManager = SSLTrustManager()
-
-        val insecureSocketFactory = SSLContext.getInstance("SSL").apply {
-            val trustAllCerts = arrayOf<TrustManager>(naiveTrustManager)
-            init(null, trustAllCerts, SecureRandom())
-        }.socketFactory
-
-        sslSocketFactory(insecureSocketFactory, naiveTrustManager)
-        hostnameVerifier { _, _ -> true }
-        return this
-    }
-
-    @SuppressLint("CustomX509TrustManager")
-    class SSLTrustManager : X509TrustManager {
-        override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
-        override fun checkClientTrusted(certs: Array<X509Certificate>, authType: String) = Unit
-        override fun checkServerTrusted(certs: Array<X509Certificate>, authType: String) = Unit
-    }
-}
\ No newline at end of file
diff --git a/providers/src/test/java/com/flixclusive/providers/extractors/MixDropTest.kt b/providers/src/test/java/com/flixclusive/providers/extractors/MixDropTest.kt
deleted file mode 100644
index de59e0924..000000000
--- a/providers/src/test/java/com/flixclusive/providers/extractors/MixDropTest.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.flixclusive.providers.extractors
-
-import com.flixclusive.providers.extractors.mixdrop.MixDrop
-import okhttp3.OkHttpClient
-import org.junit.Before
-
-class MixDropTest {
-    lateinit var mixDrop: MixDrop
-
-    @Before
-    fun setUp() {
-        mixDrop = MixDrop(OkHttpClient())
-    }
-
-    //@Test
-    //fun `Extraction test`() = runTest {
-    //    val testUrl = "https://mixdrop.co/e/zp7gv9wehwlq60"
-    //    val result = mixDrop.extract(
-    //        url = URL(testUrl),
-    //        mediaId = "",
-    //        episodeId = ""
-    //    )
-    //
-    //    assert(result.servers.isNotEmpty())
-    //}
-}
\ No newline at end of file
diff --git a/providers/src/test/java/com/flixclusive/providers/sources/LookMovieTest.kt b/providers/src/test/java/com/flixclusive/providers/sources/LookMovieTest.kt
deleted file mode 100644
index 46605f3a7..000000000
--- a/providers/src/test/java/com/flixclusive/providers/sources/LookMovieTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.flixclusive.providers.sources
-
-import com.flixclusive.providers.BaseSourceProviderTest
-import com.flixclusive.providers.sources.lookmovie.LookMovie
-import okhttp3.OkHttpClient
-import org.junit.Before
-
-class LookMovieTest : BaseSourceProviderTest() {
-
-    @Before
-    override fun setUp() {
-        super.setUp()
-
-        sourceProvider = LookMovie(OkHttpClient())
-    }
-}
\ No newline at end of file
diff --git a/providers/src/test/java/com/flixclusive/providers/sources/SuperStreamTest.kt b/providers/src/test/java/com/flixclusive/providers/sources/SuperStreamTest.kt
deleted file mode 100644
index da9f24096..000000000
--- a/providers/src/test/java/com/flixclusive/providers/sources/SuperStreamTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.flixclusive.providers.sources
-
-import com.flixclusive.providers.BaseSourceProviderTest
-import com.flixclusive.providers.sources.superstream.SuperStream
-import okhttp3.OkHttpClient
-import org.junit.Before
-
-class SuperStreamTest : BaseSourceProviderTest() {
-
-    @Before
-    override fun setUp() {
-        super.setUp()
-
-        sourceProvider = SuperStream(OkHttpClient())
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 6d8f3b83e..000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-rootProject.name = "Flixclusive"
-include ':app'
-include ':providers'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 000000000..fe552500e
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,58 @@
+pluginManagement {
+    includeBuild("build-logic")
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url = uri("https://jitpack.io") }
+    }
+}
+
+rootProject.name = "Flixclusive"
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+include(":app")
+
+include(":feature:mobile:home")
+
+include(":model:tmdb")
+include(":model:configuration")
+include(":model:datastore")
+include(":model:provider")
+include(":model:database")
+
+include(":domain:database")
+include(":domain:home")
+include(":domain:provider")
+include(":domain:tmdb")
+
+include(":data:configuration")
+include(":data:provider")
+include(":data:tmdb")
+include(":data:user")
+include(":data:util")
+include(":data:watch_history")
+include(":data:watchlist")
+
+include(":extractor:base")
+include(":extractor:mixdrop")
+include(":extractor:upcloud")
+
+include(":provider:base")
+include(":provider:flixhq")
+include(":provider:lookmovie")
+include(":provider:superstream")
+
+include(":core:util")
+include(":core:network")
+include(":core:database")
+include(":core:datastore")
+include(":core:theme")
+include(":core:ui")