diff --git a/app/src/main/kotlin/app/aaps/di/AppComponent.kt b/app/src/main/kotlin/app/aaps/di/AppComponent.kt
index 65aaf8ea01..c395f47632 100644
--- a/app/src/main/kotlin/app/aaps/di/AppComponent.kt
+++ b/app/src/main/kotlin/app/aaps/di/AppComponent.kt
@@ -17,6 +17,7 @@ import app.aaps.plugins.sync.di.SyncModule
 import app.aaps.pump.virtual.di.VirtualPumpModule
 import app.aaps.shared.impl.di.SharedImplModule
 import app.aaps.ui.di.UiModule
+import app.aaps.workflow.di.WorkflowModule
 import dagger.BindsInstance
 import dagger.Component
 import dagger.android.AndroidInjectionModule
@@ -37,7 +38,6 @@ import info.nightscout.pump.dana.di.DanaModule
 import info.nightscout.pump.danars.di.DanaRSModule
 import info.nightscout.pump.diaconn.di.DiaconnG8Module
 import info.nightscout.pump.medtrum.di.MedtrumModule
-import info.nightscout.workflow.di.WorkflowModule
 import javax.inject.Singleton
 
 @Singleton
diff --git a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
index 7017bc35e6..e184a55721 100644
--- a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
+++ b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt
@@ -30,22 +30,9 @@ import app.aaps.core.main.workflow.CalculationWorkflow.Companion.PASS
 import app.aaps.core.utils.receivers.DataWorkerStorage
 import app.aaps.core.utils.worker.then
 import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import app.aaps.workflow.iob.IobCobOref1Worker
+import app.aaps.workflow.iob.IobCobOrefWorker
 import dagger.android.HasAndroidInjector
-import info.nightscout.workflow.DummyWorker
-import info.nightscout.workflow.InvokeLoopWorker
-import info.nightscout.workflow.LoadBgDataWorker
-import info.nightscout.workflow.PrepareBasalDataWorker
-import info.nightscout.workflow.PrepareBgDataWorker
-import info.nightscout.workflow.PrepareBucketedDataWorker
-import info.nightscout.workflow.PrepareIobAutosensGraphDataWorker
-import info.nightscout.workflow.PreparePredictionsWorker
-import info.nightscout.workflow.PrepareTemporaryTargetDataWorker
-import info.nightscout.workflow.PrepareTreatmentsDataWorker
-import info.nightscout.workflow.UpdateGraphWorker
-import info.nightscout.workflow.UpdateIobCobSensWorker
-import info.nightscout.workflow.UpdateWidgetWorker
-import info.nightscout.workflow.iob.IobCobOref1Worker
-import info.nightscout.workflow.iob.IobCobOrefWorker
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import javax.inject.Inject
diff --git a/workflow/build.gradle b/workflow/build.gradle
index 9cf2954d14..815fd2bf14 100644
--- a/workflow/build.gradle
+++ b/workflow/build.gradle
@@ -11,7 +11,7 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 
 android {
-    namespace 'info.nightscout.workflow'
+    namespace 'app.aaps.workflow'
 }
 
 dependencies {
diff --git a/workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/DummyWorker.kt
similarity index 91%
rename from workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/DummyWorker.kt
index d959f48028..0cafe1e7f5 100644
--- a/workflow/src/main/java/info/nightscout/workflow/DummyWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/DummyWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/InvokeLoopWorker.kt
similarity index 98%
rename from workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/InvokeLoopWorker.kt
index 6ed5fd1f19..c3ca03be04 100644
--- a/workflow/src/main/java/info/nightscout/workflow/InvokeLoopWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/InvokeLoopWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/LoadBgDataWorker.kt
similarity index 98%
rename from workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/LoadBgDataWorker.kt
index 805339ce81..985f424b0b 100644
--- a/workflow/src/main/java/info/nightscout/workflow/LoadBgDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/LoadBgDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PrepareBasalDataWorker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PrepareBasalDataWorker.kt
index c779783801..f12e380ded 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBasalDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PrepareBasalDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import android.graphics.DashPathEffect
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PrepareBgDataWorker.kt
similarity index 98%
rename from workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PrepareBgDataWorker.kt
index b1db1f1e93..a38849f875 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBgDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PrepareBgDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PrepareBucketedDataWorker.kt
similarity index 98%
rename from workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PrepareBucketedDataWorker.kt
index e07f832bbe..16d7a8af90 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareBucketedDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PrepareBucketedDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PrepareIobAutosensGraphDataWorker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PrepareIobAutosensGraphDataWorker.kt
index 6e8f715d77..4df78914b1 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PrepareIobAutosensGraphDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import android.graphics.DashPathEffect
diff --git a/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PreparePredictionsWorker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PreparePredictionsWorker.kt
index 3ffbe186f7..ff57b7b4cf 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PreparePredictionsWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PreparePredictionsWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PrepareTemporaryTargetDataWorker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PrepareTemporaryTargetDataWorker.kt
index fd9b66264f..a865d7d3d4 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PrepareTemporaryTargetDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/PrepareTreatmentsDataWorker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/PrepareTreatmentsDataWorker.kt
index 7a3dcee145..8d692700c4 100644
--- a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/PrepareTreatmentsDataWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
diff --git a/workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/UpdateGraphWorker.kt
similarity index 97%
rename from workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/UpdateGraphWorker.kt
index d68a03a8ff..dff0036d64 100644
--- a/workflow/src/main/java/info/nightscout/workflow/UpdateGraphWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/UpdateGraphWorker.kt
@@ -1,13 +1,13 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import app.aaps.core.main.events.EventIobCalculationProgress
-import app.aaps.core.main.utils.worker.LoggingWorker
-import app.aaps.core.main.workflow.CalculationWorkflow
 import app.aaps.core.interfaces.plugin.ActivePlugin
 import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph
+import app.aaps.core.main.events.EventIobCalculationProgress
+import app.aaps.core.main.utils.worker.LoggingWorker
+import app.aaps.core.main.workflow.CalculationWorkflow
 import kotlinx.coroutines.Dispatchers
 import java.security.spec.InvalidParameterSpecException
 import javax.inject.Inject
diff --git a/workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/UpdateIobCobSensWorker.kt
similarity index 96%
rename from workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/UpdateIobCobSensWorker.kt
index 279a6cd9f5..b1311eab51 100644
--- a/workflow/src/main/java/info/nightscout/workflow/UpdateIobCobSensWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/UpdateIobCobSensWorker.kt
@@ -1,12 +1,12 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.core.interfaces.plugin.ActivePlugin
 import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventUpdateOverviewIobCob
 import app.aaps.core.interfaces.rx.events.EventUpdateOverviewSensitivity
+import app.aaps.core.main.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/UpdateWidgetWorker.kt
similarity index 94%
rename from workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/UpdateWidgetWorker.kt
index f73919198f..68e1fe2ef8 100644
--- a/workflow/src/main/java/info/nightscout/workflow/UpdateWidgetWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/UpdateWidgetWorker.kt
@@ -1,9 +1,9 @@
-package info.nightscout.workflow
+package app.aaps.workflow
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import app.aaps.core.main.utils.worker.LoggingWorker
 import app.aaps.core.interfaces.ui.UiInteraction
+import app.aaps.core.main.utils.worker.LoggingWorker
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
diff --git a/workflow/src/main/java/info/nightscout/workflow/di/WorkflowModule.kt b/workflow/src/main/kotlin/app/aaps/workflow/di/WorkflowModule.kt
similarity index 65%
rename from workflow/src/main/java/info/nightscout/workflow/di/WorkflowModule.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/di/WorkflowModule.kt
index 1832c73a9a..14270e9825 100644
--- a/workflow/src/main/java/info/nightscout/workflow/di/WorkflowModule.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/di/WorkflowModule.kt
@@ -1,22 +1,22 @@
-package info.nightscout.workflow.di
+package app.aaps.workflow.di
 
+import app.aaps.workflow.DummyWorker
+import app.aaps.workflow.InvokeLoopWorker
+import app.aaps.workflow.LoadBgDataWorker
+import app.aaps.workflow.PrepareBasalDataWorker
+import app.aaps.workflow.PrepareBgDataWorker
+import app.aaps.workflow.PrepareBucketedDataWorker
+import app.aaps.workflow.PrepareIobAutosensGraphDataWorker
+import app.aaps.workflow.PreparePredictionsWorker
+import app.aaps.workflow.PrepareTemporaryTargetDataWorker
+import app.aaps.workflow.PrepareTreatmentsDataWorker
+import app.aaps.workflow.UpdateGraphWorker
+import app.aaps.workflow.UpdateIobCobSensWorker
+import app.aaps.workflow.UpdateWidgetWorker
+import app.aaps.workflow.iob.IobCobOref1Worker
+import app.aaps.workflow.iob.IobCobOrefWorker
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.workflow.DummyWorker
-import info.nightscout.workflow.InvokeLoopWorker
-import info.nightscout.workflow.LoadBgDataWorker
-import info.nightscout.workflow.PrepareBasalDataWorker
-import info.nightscout.workflow.PrepareBgDataWorker
-import info.nightscout.workflow.PrepareBucketedDataWorker
-import info.nightscout.workflow.PrepareIobAutosensGraphDataWorker
-import info.nightscout.workflow.PreparePredictionsWorker
-import info.nightscout.workflow.PrepareTemporaryTargetDataWorker
-import info.nightscout.workflow.PrepareTreatmentsDataWorker
-import info.nightscout.workflow.UpdateGraphWorker
-import info.nightscout.workflow.UpdateIobCobSensWorker
-import info.nightscout.workflow.UpdateWidgetWorker
-import info.nightscout.workflow.iob.IobCobOref1Worker
-import info.nightscout.workflow.iob.IobCobOrefWorker
 
 @Module
 @Suppress("unused")
diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/CarbsInPastExtension.kt b/workflow/src/main/kotlin/app/aaps/workflow/iob/CarbsInPastExtension.kt
similarity index 97%
rename from workflow/src/main/java/info/nightscout/workflow/iob/CarbsInPastExtension.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/iob/CarbsInPastExtension.kt
index 3fd4c02dbb..7a0452b2e9 100644
--- a/workflow/src/main/java/info/nightscout/workflow/iob/CarbsInPastExtension.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/iob/CarbsInPastExtension.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow.iob
+package app.aaps.workflow.iob
 
 import app.aaps.core.interfaces.aps.AutosensData
 import app.aaps.core.interfaces.aps.SMBDefaults
diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt b/workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOref1Worker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOref1Worker.kt
index a8159cf0e2..d53e43b44f 100644
--- a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOref1Worker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOref1Worker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow.iob
+package app.aaps.workflow.iob
 
 import android.content.Context
 import android.os.SystemClock
diff --git a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt b/workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOrefWorker.kt
similarity index 99%
rename from workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt
rename to workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOrefWorker.kt
index c3482d9f93..fd24e32d75 100644
--- a/workflow/src/main/java/info/nightscout/workflow/iob/IobCobOrefWorker.kt
+++ b/workflow/src/main/kotlin/app/aaps/workflow/iob/IobCobOrefWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.workflow.iob
+package app.aaps.workflow.iob
 
 import android.content.Context
 import android.os.SystemClock