diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0d6023c..624ae5e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    namespace = "com.mindmachine.mvp"
+    namespace = "solutions.tretter.mindmachine"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.mindmachine.mvp"
+        applicationId = "solutions.tretter.mindmachine"
         minSdk = 26
         targetSdk = 35
         versionCode = 5
diff --git a/app/src/androidTest/java/com/mindmachine/mvp/session/TimelineEditorGestureTest.kt b/app/src/androidTest/java/com/mindmachine/mvp/session/TimelineEditorGestureTest.kt
index 1f5b3e2..e96226b 100644
--- a/app/src/androidTest/java/com/mindmachine/mvp/session/TimelineEditorGestureTest.kt
+++ b/app/src/androidTest/java/com/mindmachine/mvp/session/TimelineEditorGestureTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
diff --git a/app/src/main/java/com/mindmachine/mvp/MainActivity.kt b/app/src/main/java/com/mindmachine/mvp/MainActivity.kt
index 4a54059..35c24b1 100644
--- a/app/src/main/java/com/mindmachine/mvp/MainActivity.kt
+++ b/app/src/main/java/com/mindmachine/mvp/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
 import android.app.Activity
 import android.content.pm.ActivityInfo
@@ -9,8 +9,8 @@ import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.foundation.background
-import com.mindmachine.mvp.session.DurationSliderCard
-import com.mindmachine.mvp.session.SetupTimelineEditor
+import solutions.tretter.mindmachine.session.DurationSliderCard
+import solutions.tretter.mindmachine.session.SetupTimelineEditor
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
@@ -98,24 +98,24 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.google.android.gms.ads.MobileAds
-import com.mindmachine.mvp.audio.BinauralAudioEngine
-import com.mindmachine.mvp.audio.HeadsetMonitor
-import com.mindmachine.mvp.ads.AdBanner
-import com.mindmachine.mvp.ads.rememberInterstitialController
-import com.mindmachine.mvp.data.SettingsRepository
-import com.mindmachine.mvp.data.UserProgramRepository
-import com.mindmachine.mvp.domain.RuntimeState
-import com.mindmachine.mvp.session.FlashColor
-import com.mindmachine.mvp.session.MainViewModel
-import com.mindmachine.mvp.session.SplitFlashFrame
+import solutions.tretter.mindmachine.audio.BinauralAudioEngine
+import solutions.tretter.mindmachine.audio.HeadsetMonitor
+import solutions.tretter.mindmachine.ads.AdBanner
+import solutions.tretter.mindmachine.ads.rememberInterstitialController
+import solutions.tretter.mindmachine.data.SettingsRepository
+import solutions.tretter.mindmachine.data.UserProgramRepository
+import solutions.tretter.mindmachine.domain.RuntimeState
+import solutions.tretter.mindmachine.session.FlashColor
+import solutions.tretter.mindmachine.session.MainViewModel
+import solutions.tretter.mindmachine.session.SplitFlashFrame
 import kotlinx.coroutines.launch
-import com.mindmachine.mvp.session.SplitFlashSequencer
-import com.mindmachine.mvp.session.flashIntervalMsToSeconds
-import com.mindmachine.mvp.session.flashIntervalSecondsToMs
-import com.mindmachine.mvp.session.formatDuration
-import com.mindmachine.mvp.session.sessionProgressFraction
-import com.mindmachine.mvp.session.shouldShowActiveControlsByDefault
-import com.mindmachine.mvp.session.shouldUseImmersiveFullscreen
+import solutions.tretter.mindmachine.session.SplitFlashSequencer
+import solutions.tretter.mindmachine.session.flashIntervalMsToSeconds
+import solutions.tretter.mindmachine.session.flashIntervalSecondsToMs
+import solutions.tretter.mindmachine.session.formatDuration
+import solutions.tretter.mindmachine.session.sessionProgressFraction
+import solutions.tretter.mindmachine.session.shouldShowActiveControlsByDefault
+import solutions.tretter.mindmachine.session.shouldUseImmersiveFullscreen
 import kotlinx.coroutines.delay
 import kotlin.math.roundToInt
 import java.util.Locale
@@ -142,7 +142,7 @@ private val MindMachineColors = darkColorScheme(
 class MainActivity : ComponentActivity() {
     private val settingsRepo by lazy { SettingsRepository(applicationContext) }
     private val billingManager by lazy {
-        com.mindmachine.mvp.billing.BillingManager(
+        solutions.tretter.mindmachine.billing.BillingManager(
             applicationContext,
             onNoAdsEntitlementChanged = { hasNoAds ->
                 lifecycleScope.launch { settingsRepo.updateNoAds(hasNoAds) }
@@ -173,7 +173,7 @@ class MainActivity : ComponentActivity() {
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun App(vm: MainViewModel = viewModel(), billingManager: com.mindmachine.mvp.billing.BillingManager) {
+fun App(vm: MainViewModel = viewModel(), billingManager: solutions.tretter.mindmachine.billing.BillingManager) {
     val nav = rememberNavController()
     val ui by vm.ui.collectAsStateWithLifecycle()
     val lifecycle = LocalLifecycleOwner.current.lifecycle
@@ -876,7 +876,7 @@ fun SettingsScreen(vm: MainViewModel, onRemoveAds: () -> Unit) {
 }
 
 @Composable
-fun RemoveAdsScreen(billingManager: com.mindmachine.mvp.billing.BillingManager, vm: MainViewModel) {
+fun RemoveAdsScreen(billingManager: solutions.tretter.mindmachine.billing.BillingManager, vm: MainViewModel) {
     val ui by vm.ui.collectAsStateWithLifecycle()
     val activity = LocalContext.current as? Activity
     val details by billingManager.productDetails.collectAsStateWithLifecycle()
@@ -898,19 +898,19 @@ fun RemoveAdsScreen(billingManager: com.mindmachine.mvp.billing.BillingManager,
         Button(
             enabled = activity != null && !ui.settings.noAds,
             onClick = {
-                activity?.let { billingManager.launchPurchase(it, com.mindmachine.mvp.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY) }
+                activity?.let { billingManager.launchPurchase(it, solutions.tretter.mindmachine.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY) }
             }
         ) {
-            Text(details[com.mindmachine.mvp.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY]?.name ?: "Subscribe: $1/month")
+            Text(details[solutions.tretter.mindmachine.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY]?.name ?: "Subscribe: $1/month")
         }
 
         Button(
             enabled = activity != null && !ui.settings.noAds,
             onClick = {
-                activity?.let { billingManager.launchPurchase(it, com.mindmachine.mvp.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER) }
+                activity?.let { billingManager.launchPurchase(it, solutions.tretter.mindmachine.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER) }
             }
         ) {
-            Text(details[com.mindmachine.mvp.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER]?.name ?: "Buy: $20 one-time")
+            Text(details[solutions.tretter.mindmachine.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER]?.name ?: "Buy: $20 one-time")
         }
 
         TextButton(onClick = { billingManager.refresh() }) { Text("Restore / Refresh purchases") }
diff --git a/app/src/main/java/com/mindmachine/mvp/ads/AdUnits.kt b/app/src/main/java/com/mindmachine/mvp/ads/AdUnits.kt
index 8e60873..f5f72eb 100644
--- a/app/src/main/java/com/mindmachine/mvp/ads/AdUnits.kt
+++ b/app/src/main/java/com/mindmachine/mvp/ads/AdUnits.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.ads
+package solutions.tretter.mindmachine.ads
 
 object AdUnits {
     // Google test ad unit ids. Replace with your real unit ids before release.
diff --git a/app/src/main/java/com/mindmachine/mvp/ads/AdsComposable.kt b/app/src/main/java/com/mindmachine/mvp/ads/AdsComposable.kt
index 74569b4..53a41db 100644
--- a/app/src/main/java/com/mindmachine/mvp/ads/AdsComposable.kt
+++ b/app/src/main/java/com/mindmachine/mvp/ads/AdsComposable.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.ads
+package solutions.tretter.mindmachine.ads
 
 import android.app.Activity
 import android.view.ViewGroup
diff --git a/app/src/main/java/com/mindmachine/mvp/audio/BinauralAudioEngine.kt b/app/src/main/java/com/mindmachine/mvp/audio/BinauralAudioEngine.kt
index e3d0204..667e57c 100644
--- a/app/src/main/java/com/mindmachine/mvp/audio/BinauralAudioEngine.kt
+++ b/app/src/main/java/com/mindmachine/mvp/audio/BinauralAudioEngine.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.audio
+package solutions.tretter.mindmachine.audio
 
 import android.media.AudioAttributes
 import android.media.AudioFormat
diff --git a/app/src/main/java/com/mindmachine/mvp/audio/HeadsetMonitor.kt b/app/src/main/java/com/mindmachine/mvp/audio/HeadsetMonitor.kt
index dfa1b49..965c076 100644
--- a/app/src/main/java/com/mindmachine/mvp/audio/HeadsetMonitor.kt
+++ b/app/src/main/java/com/mindmachine/mvp/audio/HeadsetMonitor.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.audio
+package solutions.tretter.mindmachine.audio
 
 import android.content.Context
 import android.media.AudioDeviceInfo
diff --git a/app/src/main/java/com/mindmachine/mvp/billing/BillingManager.kt b/app/src/main/java/com/mindmachine/mvp/billing/BillingManager.kt
index cecdd61..18420b1 100644
--- a/app/src/main/java/com/mindmachine/mvp/billing/BillingManager.kt
+++ b/app/src/main/java/com/mindmachine/mvp/billing/BillingManager.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.billing
+package solutions.tretter.mindmachine.billing
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/com/mindmachine/mvp/billing/BillingProducts.kt b/app/src/main/java/com/mindmachine/mvp/billing/BillingProducts.kt
index 49f799b..f5dc901 100644
--- a/app/src/main/java/com/mindmachine/mvp/billing/BillingProducts.kt
+++ b/app/src/main/java/com/mindmachine/mvp/billing/BillingProducts.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.billing
+package solutions.tretter.mindmachine.billing
 
 object BillingProducts {
     // Configure these in Google Play Console
diff --git a/app/src/main/java/com/mindmachine/mvp/data/SettingsRepository.kt b/app/src/main/java/com/mindmachine/mvp/data/SettingsRepository.kt
index 435d65d..a06ad38 100644
--- a/app/src/main/java/com/mindmachine/mvp/data/SettingsRepository.kt
+++ b/app/src/main/java/com/mindmachine/mvp/data/SettingsRepository.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.data
+package solutions.tretter.mindmachine.data
 
 import android.content.Context
 import androidx.datastore.preferences.core.booleanPreferencesKey
@@ -6,7 +6,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
-import com.mindmachine.mvp.domain.AppSettings
+import solutions.tretter.mindmachine.domain.AppSettings
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
diff --git a/app/src/main/java/com/mindmachine/mvp/data/UserProgramRepository.kt b/app/src/main/java/com/mindmachine/mvp/data/UserProgramRepository.kt
index 3e7affd..dbdc52f 100644
--- a/app/src/main/java/com/mindmachine/mvp/data/UserProgramRepository.kt
+++ b/app/src/main/java/com/mindmachine/mvp/data/UserProgramRepository.kt
@@ -1,15 +1,15 @@
-package com.mindmachine.mvp.data
+package solutions.tretter.mindmachine.data
 
 import android.content.Context
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
-import com.mindmachine.mvp.session.TimelineCurve
-import com.mindmachine.mvp.session.TimelineEditorState
-import com.mindmachine.mvp.session.TimelinePoint
-import com.mindmachine.mvp.session.TIMELINE_DEFAULT_GRANULARITY_SEC
-import com.mindmachine.mvp.session.TimelineSelection
-import com.mindmachine.mvp.session.TimelineViewport
+import solutions.tretter.mindmachine.session.TimelineCurve
+import solutions.tretter.mindmachine.session.TimelineEditorState
+import solutions.tretter.mindmachine.session.TimelinePoint
+import solutions.tretter.mindmachine.session.TIMELINE_DEFAULT_GRANULARITY_SEC
+import solutions.tretter.mindmachine.session.TimelineSelection
+import solutions.tretter.mindmachine.session.TimelineViewport
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.json.JSONArray
diff --git a/app/src/main/java/com/mindmachine/mvp/domain/Models.kt b/app/src/main/java/com/mindmachine/mvp/domain/Models.kt
index 6ac5dae..be285da 100644
--- a/app/src/main/java/com/mindmachine/mvp/domain/Models.kt
+++ b/app/src/main/java/com/mindmachine/mvp/domain/Models.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.domain
+package solutions.tretter.mindmachine.domain
 
 enum class VisualPattern { FLASH, PULSE }
 enum class SessionMode { AUDIO_VISUAL, AUDIO_ONLY, VISUAL_ONLY }
diff --git a/app/src/main/java/com/mindmachine/mvp/session/ActiveSessionUi.kt b/app/src/main/java/com/mindmachine/mvp/session/ActiveSessionUi.kt
index a39e9a1..c9abe1b 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/ActiveSessionUi.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/ActiveSessionUi.kt
@@ -1,6 +1,6 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
-import com.mindmachine.mvp.domain.RuntimeState
+import solutions.tretter.mindmachine.domain.RuntimeState
 
 fun shouldShowActiveControlsByDefault(runtimeState: RuntimeState): Boolean {
     return runtimeState != RuntimeState.RUNNING && runtimeState != RuntimeState.COUNTDOWN
diff --git a/app/src/main/java/com/mindmachine/mvp/session/DurationFormat.kt b/app/src/main/java/com/mindmachine/mvp/session/DurationFormat.kt
index 7f42240..a718a64 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/DurationFormat.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/DurationFormat.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import java.util.Locale
 
diff --git a/app/src/main/java/com/mindmachine/mvp/session/DurationSliderCard.kt b/app/src/main/java/com/mindmachine/mvp/session/DurationSliderCard.kt
index 3d9c7ba..edbd4ed 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/DurationSliderCard.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/DurationSliderCard.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/mindmachine/mvp/session/FlashIntervalUi.kt b/app/src/main/java/com/mindmachine/mvp/session/FlashIntervalUi.kt
index 1bd9d37..1b0a2ad 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/FlashIntervalUi.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/FlashIntervalUi.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/com/mindmachine/mvp/session/ImmersiveMode.kt b/app/src/main/java/com/mindmachine/mvp/session/ImmersiveMode.kt
index 855cff1..6e70d82 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/ImmersiveMode.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/ImmersiveMode.kt
@@ -1,6 +1,6 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
-import com.mindmachine.mvp.domain.RuntimeState
+import solutions.tretter.mindmachine.domain.RuntimeState
 
 fun shouldUseImmersiveFullscreen(isVisualMode: Boolean, runtimeState: RuntimeState): Boolean {
     return isVisualMode && (runtimeState == RuntimeState.COUNTDOWN || runtimeState == RuntimeState.RUNNING)
diff --git a/app/src/main/java/com/mindmachine/mvp/session/MainViewModel.kt b/app/src/main/java/com/mindmachine/mvp/session/MainViewModel.kt
index efa1d17..1094841 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/MainViewModel.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/MainViewModel.kt
@@ -1,20 +1,20 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import com.mindmachine.mvp.audio.BinauralAudioEngine
-import com.mindmachine.mvp.audio.HeadsetMonitor
-import com.mindmachine.mvp.data.SettingsRepository
-import com.mindmachine.mvp.data.UserProgramEntity
-import com.mindmachine.mvp.data.UserProgramRepository
-import com.mindmachine.mvp.domain.AppSettings
-import com.mindmachine.mvp.domain.Presets
-import com.mindmachine.mvp.domain.RuntimeState
-import com.mindmachine.mvp.domain.SessionConfig
-import com.mindmachine.mvp.domain.SessionMode
-import com.mindmachine.mvp.domain.SessionPreset
-import com.mindmachine.mvp.domain.toConfig
+import solutions.tretter.mindmachine.audio.BinauralAudioEngine
+import solutions.tretter.mindmachine.audio.HeadsetMonitor
+import solutions.tretter.mindmachine.data.SettingsRepository
+import solutions.tretter.mindmachine.data.UserProgramEntity
+import solutions.tretter.mindmachine.data.UserProgramRepository
+import solutions.tretter.mindmachine.domain.AppSettings
+import solutions.tretter.mindmachine.domain.Presets
+import solutions.tretter.mindmachine.domain.RuntimeState
+import solutions.tretter.mindmachine.domain.SessionConfig
+import solutions.tretter.mindmachine.domain.SessionMode
+import solutions.tretter.mindmachine.domain.SessionPreset
+import solutions.tretter.mindmachine.domain.toConfig
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -80,7 +80,7 @@ class MainViewModel(
     private val userProgramRepository: UserProgramRepository,
     private val headsetMonitor: HeadsetMonitor,
     private val audioEngine: BinauralAudioEngine,
-    private val billingManager: com.mindmachine.mvp.billing.BillingManager,
+    private val billingManager: solutions.tretter.mindmachine.billing.BillingManager,
 ) : ViewModel() {
     private val _ui = MutableStateFlow(UiState())
     val ui: StateFlow<UiState> = _ui.asStateFlow()
@@ -488,7 +488,7 @@ class MainViewModel(
         private val userProgramRepository: UserProgramRepository,
         private val headsetMonitor: HeadsetMonitor,
         private val audioEngine: BinauralAudioEngine,
-        private val billingManager: com.mindmachine.mvp.billing.BillingManager,
+        private val billingManager: solutions.tretter.mindmachine.billing.BillingManager,
     ) : ViewModelProvider.Factory {
         override fun <T : ViewModel> create(modelClass: Class<T>): T =
             MainViewModel(settingsRepository, userProgramRepository, headsetMonitor, audioEngine, billingManager) as T
diff --git a/app/src/main/java/com/mindmachine/mvp/session/ParameterMapping.kt b/app/src/main/java/com/mindmachine/mvp/session/ParameterMapping.kt
index c55769b..d4aeebf 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/ParameterMapping.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/ParameterMapping.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import kotlin.math.ln
 import kotlin.math.pow
diff --git a/app/src/main/java/com/mindmachine/mvp/session/ParameterRanges.kt b/app/src/main/java/com/mindmachine/mvp/session/ParameterRanges.kt
index 7bf4cad..f91ae30 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/ParameterRanges.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/ParameterRanges.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 object ParameterRanges {
     const val FLASH_INTERVAL_MS_MIN = 50f
diff --git a/app/src/main/java/com/mindmachine/mvp/session/RuntimeParams.kt b/app/src/main/java/com/mindmachine/mvp/session/RuntimeParams.kt
index c49ae48..1ccf19b 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/RuntimeParams.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/RuntimeParams.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 /**
  * Concrete runtime parameters evaluated from the timeline curves at a specific time.
diff --git a/app/src/main/java/com/mindmachine/mvp/session/SessionValidator.kt b/app/src/main/java/com/mindmachine/mvp/session/SessionValidator.kt
index ae1f6fc..c758201 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/SessionValidator.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/SessionValidator.kt
@@ -1,6 +1,6 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
-import com.mindmachine.mvp.domain.SessionConfig
+import solutions.tretter.mindmachine.domain.SessionConfig
 object SessionValidator {
     fun validate(config: SessionConfig): String? {
         if (config.durationSec !in 60..(8 * 60 * 60)) return "Duration must be 1 minute to 8 hours."
diff --git a/app/src/main/java/com/mindmachine/mvp/session/SetupTimelineEditor.kt b/app/src/main/java/com/mindmachine/mvp/session/SetupTimelineEditor.kt
index c292787..9b9a530 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/SetupTimelineEditor.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/SetupTimelineEditor.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorScreen.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorScreen.kt
index 2aa9b1f..9dcea4d 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorScreen.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorScreen.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import android.view.HapticFeedbackConstants
 import androidx.activity.compose.BackHandler
@@ -45,7 +45,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
-import com.mindmachine.mvp.session.TimelineEditorState.ActiveCurve
+import solutions.tretter.mindmachine.session.TimelineEditorState.ActiveCurve
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorState.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorState.kt
index 11889b1..965046b 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorState.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineEditorState.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import kotlin.math.max
 import kotlin.math.min
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineModel.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineModel.kt
index ab74cfc..78416b2 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineModel.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineModel.kt
@@ -1,8 +1,8 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
-import com.mindmachine.mvp.domain.SessionConfig
-import com.mindmachine.mvp.domain.SessionMode
-import com.mindmachine.mvp.domain.SessionPreset
+import solutions.tretter.mindmachine.domain.SessionConfig
+import solutions.tretter.mindmachine.domain.SessionMode
+import solutions.tretter.mindmachine.domain.SessionPreset
 import kotlin.math.roundToInt
 
 /**
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineParameterControl.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineParameterControl.kt
index 8d44bab..c6453c9 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineParameterControl.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineParameterControl.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineParameters.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineParameters.kt
index eb85e95..33d451b 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineParameters.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineParameters.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import kotlin.math.ln
 import kotlin.math.pow
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineProgramFactory.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineProgramFactory.kt
index cd331d8..f82dc47 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineProgramFactory.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineProgramFactory.kt
@@ -1,7 +1,7 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
-import com.mindmachine.mvp.domain.SessionPreset
-import com.mindmachine.mvp.domain.VisualPattern
+import solutions.tretter.mindmachine.domain.SessionPreset
+import solutions.tretter.mindmachine.domain.VisualPattern
 
 object TimelineProgramFactory {
     fun fromPreset(preset: SessionPreset): TimelineEditorState {
diff --git a/app/src/main/java/com/mindmachine/mvp/session/TimelineRuntimeEvaluator.kt b/app/src/main/java/com/mindmachine/mvp/session/TimelineRuntimeEvaluator.kt
index 84ba738..a02f33f 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/TimelineRuntimeEvaluator.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/TimelineRuntimeEvaluator.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 object TimelineRuntimeEvaluator {
     fun evaluate(state: TimelineEditorState, tSec: Float): RuntimeParams {
diff --git a/app/src/main/java/com/mindmachine/mvp/session/VisualSignal.kt b/app/src/main/java/com/mindmachine/mvp/session/VisualSignal.kt
index f76a357..2e374b1 100644
--- a/app/src/main/java/com/mindmachine/mvp/session/VisualSignal.kt
+++ b/app/src/main/java/com/mindmachine/mvp/session/VisualSignal.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 enum class FlashColor {
     RED,
diff --git a/app/src/test/java/com/mindmachine/mvp/ActiveSessionUiTest.kt b/app/src/test/java/com/mindmachine/mvp/ActiveSessionUiTest.kt
index 561cc48..73dd318 100644
--- a/app/src/test/java/com/mindmachine/mvp/ActiveSessionUiTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/ActiveSessionUiTest.kt
@@ -1,10 +1,10 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.domain.RuntimeState
-import com.mindmachine.mvp.session.sessionProgressFraction
-import com.mindmachine.mvp.session.shouldRevealSystemBarsOnTap
-import com.mindmachine.mvp.session.shouldShowActiveControlsByDefault
-import com.mindmachine.mvp.session.shouldUseImmersiveFullscreen
+import solutions.tretter.mindmachine.domain.RuntimeState
+import solutions.tretter.mindmachine.session.sessionProgressFraction
+import solutions.tretter.mindmachine.session.shouldRevealSystemBarsOnTap
+import solutions.tretter.mindmachine.session.shouldShowActiveControlsByDefault
+import solutions.tretter.mindmachine.session.shouldUseImmersiveFullscreen
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
diff --git a/app/src/test/java/com/mindmachine/mvp/DragGestureTest.kt b/app/src/test/java/com/mindmachine/mvp/DragGestureTest.kt
index d310dea..6dafba6 100644
--- a/app/src/test/java/com/mindmachine/mvp/DragGestureTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/DragGestureTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.compose.ui.geometry.Offset
 import org.junit.Assert.*
diff --git a/app/src/test/java/com/mindmachine/mvp/DurationSliderRangeTest.kt b/app/src/test/java/com/mindmachine/mvp/DurationSliderRangeTest.kt
index 4ab9b45..92e4dad 100644
--- a/app/src/test/java/com/mindmachine/mvp/DurationSliderRangeTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/DurationSliderRangeTest.kt
@@ -1,6 +1,6 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.session.TimelineEditorState
+import solutions.tretter.mindmachine.session.TimelineEditorState
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/app/src/test/java/com/mindmachine/mvp/FlashIntervalUiTest.kt b/app/src/test/java/com/mindmachine/mvp/FlashIntervalUiTest.kt
index 1585760..309a3fc 100644
--- a/app/src/test/java/com/mindmachine/mvp/FlashIntervalUiTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/FlashIntervalUiTest.kt
@@ -1,7 +1,7 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.session.flashIntervalMsToSeconds
-import com.mindmachine.mvp.session.flashIntervalSecondsToMs
+import solutions.tretter.mindmachine.session.flashIntervalMsToSeconds
+import solutions.tretter.mindmachine.session.flashIntervalSecondsToMs
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/app/src/test/java/com/mindmachine/mvp/PinchZoomGestureTest.kt b/app/src/test/java/com/mindmachine/mvp/PinchZoomGestureTest.kt
index 4e21c61..3adb60e 100644
--- a/app/src/test/java/com/mindmachine/mvp/PinchZoomGestureTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/PinchZoomGestureTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import org.junit.Assert.*
 import org.junit.Test
diff --git a/app/src/test/java/com/mindmachine/mvp/PresetDefaultsTest.kt b/app/src/test/java/com/mindmachine/mvp/PresetDefaultsTest.kt
index cdcba53..796736b 100644
--- a/app/src/test/java/com/mindmachine/mvp/PresetDefaultsTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/PresetDefaultsTest.kt
@@ -1,7 +1,7 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.domain.Presets
-import com.mindmachine.mvp.domain.VisualPattern
+import solutions.tretter.mindmachine.domain.Presets
+import solutions.tretter.mindmachine.domain.VisualPattern
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/app/src/test/java/com/mindmachine/mvp/SessionValidatorTest.kt b/app/src/test/java/com/mindmachine/mvp/SessionValidatorTest.kt
index df1f145..0a6e327 100644
--- a/app/src/test/java/com/mindmachine/mvp/SessionValidatorTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/SessionValidatorTest.kt
@@ -1,9 +1,9 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.domain.SessionConfig
-import com.mindmachine.mvp.domain.SessionMode
-import com.mindmachine.mvp.domain.VisualPattern
-import com.mindmachine.mvp.session.SessionValidator
+import solutions.tretter.mindmachine.domain.SessionConfig
+import solutions.tretter.mindmachine.domain.SessionMode
+import solutions.tretter.mindmachine.domain.VisualPattern
+import solutions.tretter.mindmachine.session.SessionValidator
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
diff --git a/app/src/test/java/com/mindmachine/mvp/SetupScreenUiLogicTest.kt b/app/src/test/java/com/mindmachine/mvp/SetupScreenUiLogicTest.kt
index b28eb4b..b0eadf5 100644
--- a/app/src/test/java/com/mindmachine/mvp/SetupScreenUiLogicTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/SetupScreenUiLogicTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
diff --git a/app/src/test/java/com/mindmachine/mvp/TimelineCurveGestureTest.kt b/app/src/test/java/com/mindmachine/mvp/TimelineCurveGestureTest.kt
index b786a8e..cd958b4 100644
--- a/app/src/test/java/com/mindmachine/mvp/TimelineCurveGestureTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/TimelineCurveGestureTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import androidx.compose.ui.geometry.Offset
 import org.junit.Assert.*
diff --git a/app/src/test/java/com/mindmachine/mvp/TimelineGraphConfigTest.kt b/app/src/test/java/com/mindmachine/mvp/TimelineGraphConfigTest.kt
index f9143a7..0cdae79 100644
--- a/app/src/test/java/com/mindmachine/mvp/TimelineGraphConfigTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/TimelineGraphConfigTest.kt
@@ -1,7 +1,7 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
 import androidx.compose.ui.graphics.toArgb
-import com.mindmachine.mvp.session.TimelineCurveColors
+import solutions.tretter.mindmachine.session.TimelineCurveColors
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/app/src/test/java/com/mindmachine/mvp/TimelineParametersTest.kt b/app/src/test/java/com/mindmachine/mvp/TimelineParametersTest.kt
index 6103a6c..cf6a7c5 100644
--- a/app/src/test/java/com/mindmachine/mvp/TimelineParametersTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/TimelineParametersTest.kt
@@ -1,7 +1,7 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.session.TimelineEditorState
-import com.mindmachine.mvp.session.TimelineParameters
+import solutions.tretter.mindmachine.session.TimelineEditorState
+import solutions.tretter.mindmachine.session.TimelineParameters
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
diff --git a/app/src/test/java/com/mindmachine/mvp/TimelineViewportGestureTest.kt b/app/src/test/java/com/mindmachine/mvp/TimelineViewportGestureTest.kt
index 0161724..cf0db63 100644
--- a/app/src/test/java/com/mindmachine/mvp/TimelineViewportGestureTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/TimelineViewportGestureTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/app/src/test/java/com/mindmachine/mvp/VisualSignalTest.kt b/app/src/test/java/com/mindmachine/mvp/VisualSignalTest.kt
index 9df08c7..c9f6940 100644
--- a/app/src/test/java/com/mindmachine/mvp/VisualSignalTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/VisualSignalTest.kt
@@ -1,8 +1,8 @@
-package com.mindmachine.mvp
+package solutions.tretter.mindmachine
 
-import com.mindmachine.mvp.session.FlashColor
-import com.mindmachine.mvp.session.SplitFlashSequencer
-import com.mindmachine.mvp.session.computeSplitFlashFrame
+import solutions.tretter.mindmachine.session.FlashColor
+import solutions.tretter.mindmachine.session.SplitFlashSequencer
+import solutions.tretter.mindmachine.session.computeSplitFlashFrame
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/app/src/test/java/com/mindmachine/mvp/session/DurationFormatTest.kt b/app/src/test/java/com/mindmachine/mvp/session/DurationFormatTest.kt
index a047142..179e9c9 100644
--- a/app/src/test/java/com/mindmachine/mvp/session/DurationFormatTest.kt
+++ b/app/src/test/java/com/mindmachine/mvp/session/DurationFormatTest.kt
@@ -1,4 +1,4 @@
-package com.mindmachine.mvp.session
+package solutions.tretter.mindmachine.session
 
 import org.junit.Assert.assertEquals
 import org.junit.Test