diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 3979531280..a1c5f342d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -25,9 +25,8 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 @Suppress("unused")
 abstract class ActivitiesModule {
 
-    @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): info.nightscout.androidaps.dana.activities.DanaRHistoryActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
     @ContributesAndroidInjector abstract fun contributeEnterPinActivity(): EnterPinActivity
     @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index cb5e4bd8e7..ad1c3e435b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -7,13 +7,15 @@ import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.core.dependencyInjection.CoreModule
 import info.nightscout.androidaps.danars.dependencyInjection.DanaRSActivitiesModule
+import info.nightscout.androidaps.danars.dependencyInjection.DanaRSCommModule
 import javax.inject.Singleton
 
 @Singleton
 @Component(
     modules = [
         AndroidInjectionModule::class,
-        CoreModule::class,
+        PluginsModule::class,
+        SkinsModule::class,
         ActivitiesModule::class,
         FragmentsModule::class,
         AppModule::class,
@@ -30,6 +32,7 @@ import javax.inject.Singleton
         DataClassesModule::class,
         SMSModule::class,
         UIModule::class,
+        CoreModule::class,
         DanaRSCommModule::class,
         DanaRSActivitiesModule::class
     ]
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index cbf5dbb806..c6f1303866 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -26,9 +26,7 @@ import info.nightscout.androidaps.utils.storage.Storage
 import javax.inject.Singleton
 
 @Module(includes = [
-    AppModule.AppBindings::class,
-    PluginsModule::class,
-    SkinsModule::class
+    AppModule.AppBindings::class
 ])
 open class AppModule {
 
@@ -64,12 +62,12 @@ open class AppModule {
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
         @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
-        @Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
-        @Binds fun configInterfaceProvider(config: Config): ConfigInterface
-        @Binds fun configBuilderInterfaceProvider(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilderInterface
-        @Binds fun treatmentInterfaceProvider(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
-        @Binds fun provideDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
-        @Binds fun provideUploadQueueInterface(uploadQueue: UploadQueue): UploadQueueInterface
-        @Binds fun provideNotificationHolderInterface(notificationHolder: NotificationHolder): NotificationHolderInterface
+        @Binds fun bindCommandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
+        @Binds fun bindConfigInterface(config: Config): ConfigInterface
+        @Binds fun bindConfigBuilderInterface(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilderInterface
+        @Binds fun bindTreatmentInterface(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
+        @Binds fun bindDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
+        @Binds fun bindUploadQueueInterface(uploadQueue: UploadQueue): UploadQueueInterface
+        @Binds fun bindNotificationHolderInterface(notificationHolder: NotificationHolder): NotificationHolderInterface
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
index 9c6f172262..b4bf2b4b43 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.dependencyInjection
+package info.nightscout.androidaps.danars.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector