diff --git a/core/build.gradle b/core/build.gradle
index e8c8867b8b..c2c390f97a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -51,11 +51,16 @@ dependencies {
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
+    //Logger
     implementation 'org.slf4j:slf4j-api:1.7.30'
+    //Fabric
     implementation 'com.google.firebase:firebase-core:17.3.0'
     implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true;
     }
+    //RxBus
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "org.apache.commons:commons-lang3:3.9"
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/app/src/main/java/info/nightscout/androidaps/events/Event.kt b/core/src/main/java/info/nightscout/androidaps/events/Event.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/Event.kt
rename to core/src/main/java/info/nightscout/androidaps/events/Event.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt