diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
index 67ea1166e5..36df705147 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
 import info.nightscout.androidaps.events.EventNewBG
+import info.nightscout.androidaps.insight.database.InsightDatabase
 import info.nightscout.androidaps.interfaces.DataSyncSelector
 import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -21,7 +22,6 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt
similarity index 86%
rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt
rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt
index fba16c1767..4546409145 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightBolusID.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightBolusID.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.insight.database
+package info.nightscout.androidaps.insight.database
 
 import androidx.room.Entity
 import androidx.room.Index
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt
similarity index 93%
rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt
rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt
index 0ea04dd351..e7e45423a4 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabase.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabase.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.insight.database
+package info.nightscout.androidaps.insight.database
 
 import android.content.Context
 import androidx.room.Database
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt
similarity index 95%
rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt
rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt
index 9d00b3a49f..7bffe694ef 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightDatabaseDao.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.insight.database
+package info.nightscout.androidaps.insight.database
 
 import androidx.room.Dao
 import androidx.room.Insert
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt
similarity index 81%
rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt
rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt
index 9a94d37175..8c1d45111c 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightHistoryOffset.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightHistoryOffset.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.insight.database
+package info.nightscout.androidaps.insight.database
 
 import androidx.room.Entity
 import androidx.room.Index
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt
similarity index 85%
rename from insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt
rename to insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt
index 24e38862cc..901c04a2b8 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/database/InsightPumpID.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/database/InsightPumpID.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.insight.database
+package info.nightscout.androidaps.insight.database
 
 import androidx.room.Entity
 import androidx.room.Index
diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt
index c55a0481ad..251c372cbd 100644
--- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightDatabaseModule.kt
@@ -3,8 +3,8 @@ package info.nightscout.androidaps.insight.di
 import android.content.Context
 import dagger.Module
 import dagger.Provides
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabase
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao
+import info.nightscout.androidaps.insight.database.InsightDatabase
+import info.nightscout.androidaps.insight.database.InsightDatabaseDao
 import javax.inject.Singleton
 
 @Module
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 71a71f3f8b..f6f80dcb4c 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -35,6 +35,10 @@ import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
+import info.nightscout.androidaps.insight.database.InsightBolusID;
+import info.nightscout.androidaps.insight.database.InsightDatabaseDao;
+import info.nightscout.androidaps.insight.database.InsightHistoryOffset;
+import info.nightscout.androidaps.insight.database.InsightPumpID;
 import info.nightscout.androidaps.insight.R;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Config;
@@ -104,10 +108,6 @@ import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetPumpS
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.GetTotalDailyDoseMessage;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.status.ResetPumpStatusRegisterMessage;
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightDatabaseDao;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
-import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBasalRate;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveBolus;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.ActiveTBR;