diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 102a13c1..d934f858 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
 
     <application
         android:usesCleartextTraffic="true"
-        android:requestLegacyExternalStorage="true"
         android:label="@string/app_name"
         tools:targetApi="34"
         android:enableOnBackInvokedCallback="true"
@@ -23,7 +22,7 @@
             android:value="true" />
         <meta-data
             android:name="xposeddescription"
-            android:value="Enhanced Snapchat" />
+            android:value="SnapEnhance by rhunk" />
         <meta-data
             android:name="xposedminversion"
             android:value="93" />
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt
index 9b9b1544..c2175ea2 100644
--- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt
+++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/MainActivity.kt
@@ -47,7 +47,7 @@ class MainActivity : ComponentActivity() {
         }
 
         sections = EnumSection.values().toList().associateWith {
-            it.section.constructors.first().call()
+            it.section.java.constructors.first().newInstance() as Section
         }.onEach { (section, instance) ->
             with(instance) {
                 enumSection = section
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/PickLanguageScreen.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/PickLanguageScreen.kt
index 8756d2a8..e3da9e93 100644
--- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/PickLanguageScreen.kt
+++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/PickLanguageScreen.kt
@@ -14,11 +14,7 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt
index faefcbaa..1b9ef429 100644
--- a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt
+++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt
@@ -8,8 +8,8 @@ import me.rhunk.snapenhance.Constants
 import me.rhunk.snapenhance.core.Logger
 import me.rhunk.snapenhance.core.bridge.FileLoaderWrapper
 import me.rhunk.snapenhance.core.bridge.types.BridgeFileType
-import me.rhunk.snapmapper.Mapper
-import me.rhunk.snapmapper.impl.*
+import me.rhunk.snapenhance.mapper.Mapper
+import me.rhunk.snapenhance.mapper.impl.*
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.system.measureTimeMillis
 
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/AbstractClassMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/AbstractClassMapper.kt
similarity index 83%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/AbstractClassMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/AbstractClassMapper.kt
index d1496a9f..b87b1f4d 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/AbstractClassMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/AbstractClassMapper.kt
@@ -1,4 +1,4 @@
-package me.rhunk.snapmapper
+package me.rhunk.snapenhance.mapper
 
 import kotlin.reflect.KClass
 
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/Mapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/Mapper.kt
similarity index 98%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/Mapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/Mapper.kt
index ae8b1409..c0004dfe 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/Mapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/Mapper.kt
@@ -1,4 +1,4 @@
-package me.rhunk.snapmapper
+package me.rhunk.snapenhance.mapper
 
 import com.google.gson.JsonObject
 import kotlinx.coroutines.Dispatchers
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/MapperContext.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/MapperContext.kt
similarity index 97%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/MapperContext.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/MapperContext.kt
index 729d2547..34e0721e 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/MapperContext.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/MapperContext.kt
@@ -1,4 +1,4 @@
-package me.rhunk.snapmapper
+package me.rhunk.snapenhance.mapper
 
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/ext/DexClassDef.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexClassDef.kt
similarity index 96%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/ext/DexClassDef.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexClassDef.kt
index 9f2f44ae..832d4cef 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/ext/DexClassDef.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexClassDef.kt
@@ -1,4 +1,4 @@
-package me.rhunk.snapmapper.ext
+package me.rhunk.snapenhance.mapper.ext
 
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.iface.ClassDef
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/ext/DexMethod.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexMethod.kt
similarity index 97%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/ext/DexMethod.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexMethod.kt
index c5e46b6f..29b0af3d 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/ext/DexMethod.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexMethod.kt
@@ -1,4 +1,4 @@
-package me.rhunk.snapmapper.ext
+package me.rhunk.snapenhance.mapper.ext
 
 import org.jf.dexlib2.iface.MethodImplementation
 import org.jf.dexlib2.iface.instruction.formats.Instruction21c
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/BCryptClassMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt
similarity index 81%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/BCryptClassMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt
index 1d0dee10..946857ba 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/BCryptClassMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt
@@ -1,9 +1,9 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.getStaticConstructor
-import me.rhunk.snapmapper.ext.isFinal
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getStaticConstructor
+import me.rhunk.snapenhance.mapper.ext.isFinal
 import org.jf.dexlib2.iface.instruction.formats.ArrayPayload
 
 class BCryptClassMapper : AbstractClassMapper() {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/CallbackMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CallbackMapper.kt
similarity index 73%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/CallbackMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CallbackMapper.kt
index 9b5dc4af..437865f6 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/CallbackMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CallbackMapper.kt
@@ -1,10 +1,10 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.getClassName
-import me.rhunk.snapmapper.ext.getSuperClassName
-import me.rhunk.snapmapper.ext.isFinal
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.ext.getSuperClassName
+import me.rhunk.snapenhance.mapper.ext.isFinal
 
 class CallbackMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/CompositeConfigurationProviderMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CompositeConfigurationProviderMapper.kt
similarity index 87%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/CompositeConfigurationProviderMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CompositeConfigurationProviderMapper.kt
index f667d4d3..74191b63 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/CompositeConfigurationProviderMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CompositeConfigurationProviderMapper.kt
@@ -1,11 +1,11 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
-import me.rhunk.snapmapper.ext.getClassName
-import me.rhunk.snapmapper.ext.hasStaticConstructorString
-import me.rhunk.snapmapper.ext.isEnum
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.ext.hasStaticConstructorString
+import me.rhunk.snapenhance.mapper.ext.isEnum
 import java.lang.reflect.Modifier
 
 class CompositeConfigurationProviderMapper : AbstractClassMapper() {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/DefaultMediaItemMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/DefaultMediaItemMapper.kt
similarity index 80%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/DefaultMediaItemMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/DefaultMediaItemMapper.kt
index 60a7c8bb..71998751 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/DefaultMediaItemMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/DefaultMediaItemMapper.kt
@@ -1,8 +1,8 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.isAbstract
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.isAbstract
 
 class DefaultMediaItemMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/EnumMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/EnumMapper.kt
similarity index 60%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/EnumMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/EnumMapper.kt
index bfe5f2bd..702edee1 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/EnumMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/EnumMapper.kt
@@ -1,10 +1,10 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.getClassName
-import me.rhunk.snapmapper.ext.hasStaticConstructorString
-import me.rhunk.snapmapper.ext.isEnum
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.ext.hasStaticConstructorString
+import me.rhunk.snapenhance.mapper.ext.isEnum
 
 class EnumMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/FriendRelationshipChangerMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/FriendRelationshipChangerMapper.kt
similarity index 75%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/FriendRelationshipChangerMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/FriendRelationshipChangerMapper.kt
index d76a53db..88bc0ffa 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/FriendRelationshipChangerMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/FriendRelationshipChangerMapper.kt
@@ -1,10 +1,10 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
-import me.rhunk.snapmapper.ext.getClassName
-import me.rhunk.snapmapper.ext.isEnum
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.ext.isEnum
 
 class FriendRelationshipChangerMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/FriendsFeedEventDispatcherMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/FriendsFeedEventDispatcherMapper.kt
similarity index 80%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/FriendsFeedEventDispatcherMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/FriendsFeedEventDispatcherMapper.kt
index 8131a9ce..7f16e816 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/FriendsFeedEventDispatcherMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/FriendsFeedEventDispatcherMapper.kt
@@ -1,9 +1,9 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
-import me.rhunk.snapmapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
 
 
 class FriendsFeedEventDispatcherMapper : AbstractClassMapper() {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/MediaQualityLevelProviderMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt
similarity index 80%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/MediaQualityLevelProviderMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt
index cd2c7f7c..b1c231b9 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/MediaQualityLevelProviderMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt
@@ -1,8 +1,8 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.isAbstract
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.isAbstract
 import org.jf.dexlib2.AccessFlags
 
 class MediaQualityLevelProviderMapper : AbstractClassMapper(EnumMapper::class) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/OperaPageViewControllerMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaPageViewControllerMapper.kt
similarity index 85%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/OperaPageViewControllerMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaPageViewControllerMapper.kt
index 6f67484b..937796b4 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/OperaPageViewControllerMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaPageViewControllerMapper.kt
@@ -1,11 +1,11 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.hasConstructorString
-import me.rhunk.snapmapper.ext.hasStaticConstructorString
-import me.rhunk.snapmapper.ext.isAbstract
-import me.rhunk.snapmapper.ext.isEnum
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.hasConstructorString
+import me.rhunk.snapenhance.mapper.ext.hasStaticConstructorString
+import me.rhunk.snapenhance.mapper.ext.isAbstract
+import me.rhunk.snapenhance.mapper.ext.isEnum
 
 class OperaPageViewControllerMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/PlatformAnalyticsCreatorMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlatformAnalyticsCreatorMapper.kt
similarity index 73%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/PlatformAnalyticsCreatorMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlatformAnalyticsCreatorMapper.kt
index e55795f1..7fa7fe0e 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/PlatformAnalyticsCreatorMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlatformAnalyticsCreatorMapper.kt
@@ -1,10 +1,10 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
-import me.rhunk.snapmapper.ext.getStaticConstructor
-import me.rhunk.snapmapper.ext.isEnum
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getStaticConstructor
+import me.rhunk.snapenhance.mapper.ext.isEnum
 
 class PlatformAnalyticsCreatorMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/PlusSubscriptionMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlusSubscriptionMapper.kt
similarity index 82%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/PlusSubscriptionMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlusSubscriptionMapper.kt
index 91d038c5..92271a3f 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/PlusSubscriptionMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/PlusSubscriptionMapper.kt
@@ -1,8 +1,8 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
 
 class PlusSubscriptionMapper : AbstractClassMapper(){
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ScCameraSettingsMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScCameraSettingsMapper.kt
similarity index 69%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ScCameraSettingsMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScCameraSettingsMapper.kt
index 5a34d1e3..71a8d067 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ScCameraSettingsMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScCameraSettingsMapper.kt
@@ -1,10 +1,10 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
-import me.rhunk.snapmapper.ext.getStaticConstructor
-import me.rhunk.snapmapper.ext.isEnum
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getStaticConstructor
+import me.rhunk.snapenhance.mapper.ext.isEnum
 
 class ScCameraSettingsMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ScoreUpdateMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScoreUpdateMapper.kt
similarity index 74%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ScoreUpdateMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScoreUpdateMapper.kt
index a91fb8b0..f72de805 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ScoreUpdateMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ScoreUpdateMapper.kt
@@ -1,9 +1,9 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
-import me.rhunk.snapmapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.ext.getClassName
 
 class ScoreUpdateMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/StoryBoostStateMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/StoryBoostStateMapper.kt
similarity index 78%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/StoryBoostStateMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/StoryBoostStateMapper.kt
index c96bb240..765f75b1 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/StoryBoostStateMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/StoryBoostStateMapper.kt
@@ -1,8 +1,8 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.findConstString
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.findConstString
 
 class StoryBoostStateMapper : AbstractClassMapper() {
     override fun run(context: MapperContext) {
diff --git a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ViewBinderMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ViewBinderMapper.kt
similarity index 80%
rename from mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ViewBinderMapper.kt
rename to mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ViewBinderMapper.kt
index f7a5ec4f..9c15fec6 100644
--- a/mapper/src/main/kotlin/me/rhunk/snapmapper/impl/ViewBinderMapper.kt
+++ b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/ViewBinderMapper.kt
@@ -1,10 +1,10 @@
-package me.rhunk.snapmapper.impl
+package me.rhunk.snapenhance.mapper.impl
 
-import me.rhunk.snapmapper.AbstractClassMapper
-import me.rhunk.snapmapper.MapperContext
-import me.rhunk.snapmapper.ext.getClassName
-import me.rhunk.snapmapper.ext.isAbstract
-import me.rhunk.snapmapper.ext.isInterface
+import me.rhunk.snapenhance.mapper.AbstractClassMapper
+import me.rhunk.snapenhance.mapper.MapperContext
+import me.rhunk.snapenhance.mapper.ext.getClassName
+import me.rhunk.snapenhance.mapper.ext.isAbstract
+import me.rhunk.snapenhance.mapper.ext.isInterface
 import java.lang.reflect.Modifier
 
 class ViewBinderMapper  : AbstractClassMapper() {
diff --git a/mapper/src/test/kotlin/me/rhunk/snapenhance/mapper/tests/TestMappings.kt b/mapper/src/test/kotlin/me/rhunk/snapenhance/mapper/tests/TestMappings.kt
index 636e2025..6bb5e2bd 100644
--- a/mapper/src/test/kotlin/me/rhunk/snapenhance/mapper/tests/TestMappings.kt
+++ b/mapper/src/test/kotlin/me/rhunk/snapenhance/mapper/tests/TestMappings.kt
@@ -1,8 +1,8 @@
 package me.rhunk.snapenhance.mapper.tests
 
 import com.google.gson.GsonBuilder
-import me.rhunk.snapmapper.Mapper
-import me.rhunk.snapmapper.impl.*
+import me.rhunk.snapenhance.mapper.Mapper
+import me.rhunk.snapenhance.mapper.impl.*
 import org.junit.Test
 import java.io.File