diff --git a/app/build.gradle b/app/build.gradle
index 72f8d7cb18..c1a9ba8c2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -200,7 +200,6 @@ dependencies {
     implementation project(':plugins:constraints')
     implementation project(':plugins:insulin')
     implementation project(':plugins:main')
-    implementation project(':plugins:openhumans')
     implementation project(':plugins:sensitivity')
     implementation project(':plugins:smoothing')
     implementation project(':plugins:source')
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 27b1cd28a2..50a4030a9b 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
+import info.nightscout.plugins.sync.openhumans.OpenHumansUploaderPlugin
 import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
index 229407090f..def98a723c 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.insight.di.InsightDatabaseModule
 import info.nightscout.androidaps.insight.di.InsightModule
-import info.nightscout.androidaps.plugin.general.openhumans.di.OpenHumansModule
+import info.nightscout.plugins.sync.di.OpenHumansModule
 import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule
 import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchModule
 import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
diff --git a/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt b/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
index e300898224..b30a77bf89 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt
@@ -7,7 +7,7 @@ import dagger.multibindings.IntoMap
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
+import info.nightscout.plugins.sync.openhumans.OpenHumansUploaderPlugin
 import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
diff --git a/crowdin.yml b/crowdin.yml
index afe25013e0..1f24db5d0d 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -17,8 +17,6 @@ files:
     translation: /plugins/constraints/src/main/res/values-%android_code%/%original_file_name%
   - source: /plugins/automation/src/main/res/values/strings.xml
     translation: /plugins/automation/src/main/res/values-%android_code%/strings.xml
-  - source: /plugins/openhumans/src/main/res/values/strings.xml
-    translation: /plugins/openhumans/src/main/res/values-%android_code%/strings.xml
   - source: /plugins/sensitivity/src/main/res/values/strings.xml
     translation: /plugins/sensitivity/src/main/res/values-%android_code%/strings.xml
   - source: /plugins/source/src/main/res/values/strings.xml
@@ -35,6 +33,8 @@ files:
     translation: /plugins/sync/src/main/res/values-%android_code%/strings.xml
     translate_attributes: 0
     content_segmentation: 0
+  - source: /plugins/sync/src/main/res/values/oh_strings.xml
+    translation: /plugins/sync/src/main/res/values-%android_code%/oh_strings.xml
   - source: /plugins/constraints/src/main/res/values/strings.xml
     translation: /plugins/constraints/src/main/res/values-%android_code%/strings.xml
   - source: /core/graph/src/main/res/values/strings.xml
diff --git a/plugins/openhumans/.gitignore b/plugins/openhumans/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/plugins/openhumans/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/plugins/openhumans/build.gradle b/plugins/openhumans/build.gradle
deleted file mode 100644
index 1d38b3c79d..0000000000
--- a/plugins/openhumans/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-    id 'com.hiya.jacoco-android'
-}
-
-apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-android {
-    namespace 'info.nightscout.androidaps.plugin.general.openhumans'
-}
-
-
-dependencies {
-    implementation project(':database:entities')
-    implementation project(':database:impl')
-    implementation project(':core:interfaces')
-    implementation project(':app-wear-shared:shared')
-
-    api "com.squareup.okhttp3:okhttp:$okhttp3_version"
-    api "com.squareup.retrofit2:retrofit:$retrofit2_version"
-
-    api "androidx.browser:browser:1.5.0"
-
-    //WorkManager
-    api "androidx.work:work-runtime-ktx:$work_version"
-    //api "androidx.work:work-rxjava3:$work_version"
-    //api 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
-
-    api "com.google.android.material:material:$material_version"
-
-}
\ No newline at end of file
diff --git a/plugins/openhumans/consumer-rules.pro b/plugins/openhumans/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/plugins/openhumans/proguard-rules.pro b/plugins/openhumans/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/plugins/openhumans/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/plugins/openhumans/src/main/AndroidManifest.xml b/plugins/openhumans/src/main/AndroidManifest.xml
deleted file mode 100644
index dd07493863..0000000000
--- a/plugins/openhumans/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <application>
-        <activity
-            android:name=".ui.OHLoginActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/OpenHumans"
-            android:label="Setup Open Humans"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="setup-openhumans"
-                    android:scheme="androidaps" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
\ No newline at end of file
diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle
index 1194a86950..961797ec39 100644
--- a/plugins/sync/build.gradle
+++ b/plugins/sync/build.gradle
@@ -31,6 +31,13 @@ dependencies {
     testImplementation project(':implementation')
     testImplementation project(':plugins:aps')
 
+    // OpenHuman
+    api "com.squareup.okhttp3:okhttp:$okhttp3_version"
+    api "com.squareup.retrofit2:retrofit:$retrofit2_version"
+    api "androidx.browser:browser:1.5.0"
+    api "androidx.work:work-runtime-ktx:$work_version"
+    api "com.google.android.material:material:$material_version"
+
     // NSClient, Tidepool
     api("io.socket:socket.io-client:2.1.0")
     api "com.squareup.okhttp3:okhttp:$okhttp3_version"
diff --git a/plugins/sync/src/main/AndroidManifest.xml b/plugins/sync/src/main/AndroidManifest.xml
index 47878c2105..4c933afaca 100644
--- a/plugins/sync/src/main/AndroidManifest.xml
+++ b/plugins/sync/src/main/AndroidManifest.xml
@@ -1,11 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <application>
 
         <service
             android:name=".nsclient.services.NSClientService"
             android:enabled="true"
             android:exported="true" />
+        <activity
+            android:name=".openhumans.ui.OHLoginActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/OpenHumans"
+            android:label="Setup Open Humans"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="setup-openhumans"
+                    android:scheme="androidaps" />
+            </intent-filter>
+        </activity>
 
     </application>
 
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/Helpers.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/Helpers.kt
similarity index 94%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/Helpers.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/di/Helpers.kt
index 5e6f855c59..da14910a39 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/Helpers.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/Helpers.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.di
+package info.nightscout.plugins.sync.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/OpenHumansModule.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/OpenHumansModule.kt
similarity index 77%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/OpenHumansModule.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/di/OpenHumansModule.kt
index 41f6c2e2a9..d55beeb8df 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/di/OpenHumansModule.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/di/OpenHumansModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.di
+package info.nightscout.plugins.sync.di
 
 import androidx.lifecycle.ViewModel
 import dagger.Binds
@@ -6,11 +6,11 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoMap
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansWorker
-import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHStateDelegate
-import info.nightscout.androidaps.plugin.general.openhumans.ui.OHFragment
-import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity
-import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginViewModel
+import info.nightscout.plugins.sync.openhumans.OpenHumansWorker
+import info.nightscout.plugins.sync.openhumans.delegates.OHStateDelegate
+import info.nightscout.plugins.sync.openhumans.ui.OHFragment
+import info.nightscout.plugins.sync.openhumans.ui.OHLoginActivity
+import info.nightscout.plugins.sync.openhumans.ui.OHLoginViewModel
 
 @Module
 abstract class OpenHumansModule {
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/AllowedPreferenceKeys.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/AllowedPreferenceKeys.kt
similarity index 98%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/AllowedPreferenceKeys.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/AllowedPreferenceKeys.kt
index 1a17565dc5..e6b72e844c 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/AllowedPreferenceKeys.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/AllowedPreferenceKeys.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans
+package info.nightscout.plugins.sync.openhumans
 
 import java.util.*
 
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansAPI.kt
similarity index 95%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansAPI.kt
index 18be8d0335..21a81ba4dd 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansAPI.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugin.general.openhumans
+package info.nightscout.plugins.sync.openhumans
 
 import android.annotation.SuppressLint
 import android.util.Base64
-import info.nightscout.androidaps.plugin.general.openhumans.di.BaseUrl
-import info.nightscout.androidaps.plugin.general.openhumans.di.ClientId
-import info.nightscout.androidaps.plugin.general.openhumans.di.ClientSecret
-import info.nightscout.androidaps.plugin.general.openhumans.di.RedirectUrl
+import info.nightscout.plugins.sync.di.BaseUrl
+import info.nightscout.plugins.sync.di.ClientId
+import info.nightscout.plugins.sync.di.ClientSecret
+import info.nightscout.plugins.sync.di.RedirectUrl
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.*
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansState.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansState.kt
similarity index 75%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansState.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansState.kt
index b981bbb60c..583ce8cf03 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansState.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansState.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans
+package info.nightscout.plugins.sync.openhumans
 
 internal data class OpenHumansState(
     val accessToken: String,
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploaderPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt
similarity index 98%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploaderPlugin.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt
index 8dc4c3ba4a..be227e5b92 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploaderPlugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansUploaderPlugin.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans
+package info.nightscout.plugins.sync.openhumans
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -19,11 +19,11 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHAppIDDelegate
-import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHCounterDelegate
-import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHStateDelegate
-import info.nightscout.androidaps.plugin.general.openhumans.ui.OHFragment
-import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity
+import info.nightscout.plugins.sync.openhumans.delegates.OHAppIDDelegate
+import info.nightscout.plugins.sync.openhumans.delegates.OHCounterDelegate
+import info.nightscout.plugins.sync.openhumans.delegates.OHStateDelegate
+import info.nightscout.plugins.sync.openhumans.ui.OHFragment
+import info.nightscout.plugins.sync.openhumans.ui.OHLoginActivity
 import info.nightscout.database.entities.data.Block
 import info.nightscout.database.entities.interfaces.TraceableDBEntry
 import info.nightscout.database.impl.AppRepository
@@ -31,6 +31,7 @@ import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.sync.Sync
+import info.nightscout.plugins.sync.R
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventPreferenceChange
 import info.nightscout.rx.logging.AAPSLogger
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt
similarity index 94%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansWorker.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt
index cf0da5ad23..f99cac294b 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/OpenHumansWorker.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans
+package info.nightscout.plugins.sync.openhumans
 
 import android.content.Context
 import androidx.work.CoroutineWorker
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHAppIDDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt
similarity index 91%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHAppIDDelegate.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt
index dab0e1aa28..8dcb7c0347 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHAppIDDelegate.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHAppIDDelegate.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.delegates
+package info.nightscout.plugins.sync.openhumans.delegates
 
 import info.nightscout.shared.sharedPreferences.SP
 import java.util.*
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHCounterDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt
similarity index 88%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHCounterDelegate.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt
index ef5de5b895..6d1e15755a 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHCounterDelegate.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHCounterDelegate.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.delegates
+package info.nightscout.plugins.sync.openhumans.delegates
 
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHStateDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt
similarity index 93%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHStateDelegate.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt
index 28cc5dac17..08749ea288 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHStateDelegate.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/delegates/OHStateDelegate.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugin.general.openhumans.delegates
+package info.nightscout.plugins.sync.openhumans.delegates
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansState
+import info.nightscout.plugins.sync.openhumans.OpenHumansState
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHFragment.kt
similarity index 89%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHFragment.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHFragment.kt
index a1a87acd5f..e25d06fa63 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHFragment.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHFragment.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.ui
+package info.nightscout.plugins.sync.openhumans.ui
 
 import android.content.Intent
 import android.os.Bundle
@@ -10,15 +10,16 @@ import androidx.appcompat.view.ContextThemeWrapper
 import androidx.lifecycle.LiveData
 import com.google.android.material.button.MaterialButton
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansState
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
-import info.nightscout.androidaps.plugin.general.openhumans.R
+import info.nightscout.plugins.sync.openhumans.OpenHumansState
+import info.nightscout.plugins.sync.openhumans.OpenHumansUploaderPlugin
+import info.nightscout.plugins.sync.R
 import javax.inject.Inject
 
 class OHFragment : DaggerFragment() {
 
     @Inject
     internal lateinit var stateLiveData: LiveData<OpenHumansState?>
+
     @Inject
     internal lateinit var plugin: OpenHumansUploaderPlugin
 
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt
similarity index 93%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt
index 801e83db7c..243200311d 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugin.general.openhumans.ui
+package info.nightscout.plugins.sync.openhumans.ui
 
 import android.content.Intent
 import android.net.Uri
@@ -16,9 +16,9 @@ import androidx.core.widget.NestedScrollView
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.button.MaterialButton
 import dagger.android.support.DaggerAppCompatActivity
-import info.nightscout.androidaps.plugin.general.openhumans.R
-import info.nightscout.androidaps.plugin.general.openhumans.di.AuthUrl
-import info.nightscout.androidaps.plugin.general.openhumans.di.ViewModelFactory
+import info.nightscout.plugins.sync.di.AuthUrl
+import info.nightscout.plugins.sync.di.ViewModelFactory
+import info.nightscout.plugins.sync.R
 import javax.inject.Inject
 
 class OHLoginActivity : DaggerAppCompatActivity() {
diff --git a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginViewModel.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginViewModel.kt
similarity index 90%
rename from plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginViewModel.kt
rename to plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginViewModel.kt
index 17653ac93d..50b7d182ae 100644
--- a/plugins/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginViewModel.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginViewModel.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugin.general.openhumans.ui
+package info.nightscout.plugins.sync.openhumans.ui
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploaderPlugin
+import info.nightscout.plugins.sync.openhumans.OpenHumansUploaderPlugin
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -31,7 +31,7 @@ internal class OHLoginViewModel @Inject constructor(
             _state.value = State.CONSENT
             true
         }
-        else -> false
+        else          -> false
     }
 
     fun submitBearerToken(bearerToken: String) {
diff --git a/plugins/openhumans/src/main/res/drawable/dot.xml b/plugins/sync/src/main/res/drawable/dot.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/drawable/dot.xml
rename to plugins/sync/src/main/res/drawable/dot.xml
diff --git a/plugins/openhumans/src/main/res/drawable/open_humans.xml b/plugins/sync/src/main/res/drawable/open_humans.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/drawable/open_humans.xml
rename to plugins/sync/src/main/res/drawable/open_humans.xml
diff --git a/plugins/openhumans/src/main/res/drawable/open_humans_notification.xml b/plugins/sync/src/main/res/drawable/open_humans_notification.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/drawable/open_humans_notification.xml
rename to plugins/sync/src/main/res/drawable/open_humans_notification.xml
diff --git a/plugins/openhumans/src/main/res/drawable/open_humans_white.xml b/plugins/sync/src/main/res/drawable/open_humans_white.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/drawable/open_humans_white.xml
rename to plugins/sync/src/main/res/drawable/open_humans_white.xml
diff --git a/plugins/openhumans/src/main/res/drawable/tick_mark.xml b/plugins/sync/src/main/res/drawable/tick_mark.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/drawable/tick_mark.xml
rename to plugins/sync/src/main/res/drawable/tick_mark.xml
diff --git a/plugins/openhumans/src/main/res/font/montserrat.xml b/plugins/sync/src/main/res/font/montserrat.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/font/montserrat.xml
rename to plugins/sync/src/main/res/font/montserrat.xml
diff --git a/plugins/openhumans/src/main/res/font/montserrat_bold.ttf b/plugins/sync/src/main/res/font/montserrat_bold.ttf
similarity index 100%
rename from plugins/openhumans/src/main/res/font/montserrat_bold.ttf
rename to plugins/sync/src/main/res/font/montserrat_bold.ttf
diff --git a/plugins/openhumans/src/main/res/font/montserrat_light.ttf b/plugins/sync/src/main/res/font/montserrat_light.ttf
similarity index 100%
rename from plugins/openhumans/src/main/res/font/montserrat_light.ttf
rename to plugins/sync/src/main/res/font/montserrat_light.ttf
diff --git a/plugins/openhumans/src/main/res/font/montserrat_medium.ttf b/plugins/sync/src/main/res/font/montserrat_medium.ttf
similarity index 100%
rename from plugins/openhumans/src/main/res/font/montserrat_medium.ttf
rename to plugins/sync/src/main/res/font/montserrat_medium.ttf
diff --git a/plugins/openhumans/src/main/res/font/montserrat_regular.ttf b/plugins/sync/src/main/res/font/montserrat_regular.ttf
similarity index 100%
rename from plugins/openhumans/src/main/res/font/montserrat_regular.ttf
rename to plugins/sync/src/main/res/font/montserrat_regular.ttf
diff --git a/plugins/openhumans/src/main/res/layout/activity_open_humans_login_new.xml b/plugins/sync/src/main/res/layout/activity_open_humans_login_new.xml
similarity index 99%
rename from plugins/openhumans/src/main/res/layout/activity_open_humans_login_new.xml
rename to plugins/sync/src/main/res/layout/activity_open_humans_login_new.xml
index 24c440080c..dd1b1002e8 100644
--- a/plugins/openhumans/src/main/res/layout/activity_open_humans_login_new.xml
+++ b/plugins/sync/src/main/res/layout/activity_open_humans_login_new.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    tools:context="info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity">
+    tools:context=".openhumans.ui.OHLoginActivity">
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/plugins/openhumans/src/main/res/layout/fragment_open_humans_new.xml b/plugins/sync/src/main/res/layout/fragment_open_humans_new.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/layout/fragment_open_humans_new.xml
rename to plugins/sync/src/main/res/layout/fragment_open_humans_new.xml
diff --git a/plugins/openhumans/src/main/res/values-af-rZA/strings.xml b/plugins/sync/src/main/res/values-af-rZA/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-af-rZA/strings.xml
rename to plugins/sync/src/main/res/values-af-rZA/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-bg-rBG/strings.xml b/plugins/sync/src/main/res/values-bg-rBG/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-bg-rBG/strings.xml
rename to plugins/sync/src/main/res/values-bg-rBG/oh_strings.xml
index 8e76bd2326..1c4e2f15a2 100644
--- a/plugins/openhumans/src/main/res/values-bg-rBG/strings.xml
+++ b/plugins/sync/src/main/res/values-bg-rBG/oh_strings.xml
@@ -25,5 +25,4 @@
     <string name="agree">Разбирам и съм съгласен.</string>
     <string name="cancel">Откажи</string>
     <string name="close">Затвори</string>
-    <string name="upload_now">Качи сега</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-ca-rES/strings.xml b/plugins/sync/src/main/res/values-ca-rES/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-ca-rES/strings.xml
rename to plugins/sync/src/main/res/values-ca-rES/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-cs-rCZ/strings.xml b/plugins/sync/src/main/res/values-cs-rCZ/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-cs-rCZ/strings.xml
rename to plugins/sync/src/main/res/values-cs-rCZ/oh_strings.xml
index 6afb9f9662..9682385213 100644
--- a/plugins/openhumans/src/main/res/values-cs-rCZ/strings.xml
+++ b/plugins/sync/src/main/res/values-cs-rCZ/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Jsme hotovi!</string>
     <string name="silently_upload_date_note">Od této chvíle bude telefon čas od času tiše nahrávat data na pozadí.</string>
     <string name="close">Zavřít</string>
-    <string name="upload_now">Nahrát nyní</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-da-rDK/strings.xml b/plugins/sync/src/main/res/values-da-rDK/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-da-rDK/strings.xml
rename to plugins/sync/src/main/res/values-da-rDK/oh_strings.xml
index 56f6d1f82c..5a87308ed0 100644
--- a/plugins/openhumans/src/main/res/values-da-rDK/strings.xml
+++ b/plugins/sync/src/main/res/values-da-rDK/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Vi er færdige!</string>
     <string name="silently_upload_date_note">Fra nu af vil telefonen lydløst uploade data i baggrunden fra tid til anden.</string>
     <string name="close">Luk</string>
-    <string name="upload_now">Upload nu</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-de-rDE/strings.xml b/plugins/sync/src/main/res/values-de-rDE/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-de-rDE/strings.xml
rename to plugins/sync/src/main/res/values-de-rDE/oh_strings.xml
index cd778d9270..8ff69aa406 100644
--- a/plugins/openhumans/src/main/res/values-de-rDE/strings.xml
+++ b/plugins/sync/src/main/res/values-de-rDE/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Wir sind fertig!</string>
     <string name="silently_upload_date_note">Von nun an wird Ihr Telefon von Zeit zu Zeit stillschweigend Daten im Hintergrund hochladen.</string>
     <string name="close">Schließen</string>
-    <string name="upload_now">Jetzt hochladen</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-el-rGR/strings.xml b/plugins/sync/src/main/res/values-el-rGR/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-el-rGR/strings.xml
rename to plugins/sync/src/main/res/values-el-rGR/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-es-rES/strings.xml b/plugins/sync/src/main/res/values-es-rES/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-es-rES/strings.xml
rename to plugins/sync/src/main/res/values-es-rES/oh_strings.xml
index a5e0492963..c8820ff9c7 100644
--- a/plugins/openhumans/src/main/res/values-es-rES/strings.xml
+++ b/plugins/sync/src/main/res/values-es-rES/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">¡Terminamos!</string>
     <string name="silently_upload_date_note">A partir de ahora, el teléfono cargará datos silenciosamente en segundo plano, de vez en cuando.</string>
     <string name="close">Cerrar</string>
-    <string name="upload_now">Subir ahora</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-fr-rFR/strings.xml b/plugins/sync/src/main/res/values-fr-rFR/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-fr-rFR/strings.xml
rename to plugins/sync/src/main/res/values-fr-rFR/oh_strings.xml
index 07c68e7d7e..01928b315b 100644
--- a/plugins/openhumans/src/main/res/values-fr-rFR/strings.xml
+++ b/plugins/sync/src/main/res/values-fr-rFR/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Nous avons terminé !</string>
     <string name="silently_upload_date_note">Désormais, votre téléphone téléversera les données en arrière-plan de temps en temps.</string>
     <string name="close">Fermer</string>
-    <string name="upload_now">Télécharger maintenant</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-ga-rIE/strings.xml b/plugins/sync/src/main/res/values-ga-rIE/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-ga-rIE/strings.xml
rename to plugins/sync/src/main/res/values-ga-rIE/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-hr-rHR/strings.xml b/plugins/sync/src/main/res/values-hr-rHR/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-hr-rHR/strings.xml
rename to plugins/sync/src/main/res/values-hr-rHR/oh_strings.xml
index d4ec8aeeec..7181571f22 100644
--- a/plugins/openhumans/src/main/res/values-hr-rHR/strings.xml
+++ b/plugins/sync/src/main/res/values-hr-rHR/oh_strings.xml
@@ -39,5 +39,4 @@
     <string name="we_re_done">Gotovi smo!</string>
     <string name="silently_upload_date_note">Od sada će vaš telefon s vremena na vrijeme tiho prenositi podatke u pozadini.</string>
     <string name="close">Zatvori</string>
-    <string name="upload_now">Pošalji sada</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-hu-rHU/strings.xml b/plugins/sync/src/main/res/values-hu-rHU/oh_strings.xml
similarity index 96%
rename from plugins/openhumans/src/main/res/values-hu-rHU/strings.xml
rename to plugins/sync/src/main/res/values-hu-rHU/oh_strings.xml
index c3ec179317..bafb9f6854 100644
--- a/plugins/openhumans/src/main/res/values-hu-rHU/strings.xml
+++ b/plugins/sync/src/main/res/values-hu-rHU/oh_strings.xml
@@ -18,5 +18,4 @@
     <string name="settings">Beállítások</string>
     <string name="nightscout_url">Nightscout URL</string>
     <string name="cancel">Mégse</string>
-    <string name="upload_now">Feltöltés most</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-it-rIT/strings.xml b/plugins/sync/src/main/res/values-it-rIT/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-it-rIT/strings.xml
rename to plugins/sync/src/main/res/values-it-rIT/oh_strings.xml
index 799889c8dd..7ba990547e 100644
--- a/plugins/openhumans/src/main/res/values-it-rIT/strings.xml
+++ b/plugins/sync/src/main/res/values-it-rIT/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Abbiamo fatto!</string>
     <string name="silently_upload_date_note">D\'ora in poi, il tuo telefono caricherà i dati in background di tanto in tanto.</string>
     <string name="close">Chiudi</string>
-    <string name="upload_now">Carica adesso</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-iw-rIL/strings.xml b/plugins/sync/src/main/res/values-iw-rIL/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-iw-rIL/strings.xml
rename to plugins/sync/src/main/res/values-iw-rIL/oh_strings.xml
index f88dba3f0a..6320110416 100644
--- a/plugins/openhumans/src/main/res/values-iw-rIL/strings.xml
+++ b/plugins/sync/src/main/res/values-iw-rIL/oh_strings.xml
@@ -52,5 +52,4 @@
     <string name="we_re_done">סיימנו!</string>
     <string name="silently_upload_date_note">מעתה ואילך, הטלפון שלכם יעלה מדי פעם נתונים ברקע.</string>
     <string name="close">סגור</string>
-    <string name="upload_now">העלה עכשיו</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-ja-rJP/strings.xml b/plugins/sync/src/main/res/values-ja-rJP/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-ja-rJP/strings.xml
rename to plugins/sync/src/main/res/values-ja-rJP/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-ko-rKR/strings.xml b/plugins/sync/src/main/res/values-ko-rKR/oh_strings.xml
similarity index 97%
rename from plugins/openhumans/src/main/res/values-ko-rKR/strings.xml
rename to plugins/sync/src/main/res/values-ko-rKR/oh_strings.xml
index 707299d0c7..82034f5aa8 100644
--- a/plugins/openhumans/src/main/res/values-ko-rKR/strings.xml
+++ b/plugins/sync/src/main/res/values-ko-rKR/oh_strings.xml
@@ -25,5 +25,4 @@
     <string name="agree">이해하고 동의합니다.</string>
     <string name="cancel">취소</string>
     <string name="close">닫기</string>
-    <string name="upload_now">지금 업로드하기</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-lt-rLT/strings.xml b/plugins/sync/src/main/res/values-lt-rLT/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-lt-rLT/strings.xml
rename to plugins/sync/src/main/res/values-lt-rLT/oh_strings.xml
index a48b1a25be..e3b43032f1 100644
--- a/plugins/openhumans/src/main/res/values-lt-rLT/strings.xml
+++ b/plugins/sync/src/main/res/values-lt-rLT/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Užbaigta!</string>
     <string name="silently_upload_date_note">Nuo šiol telefonas kartkartėmis tyliai fone įkels duomenis.</string>
     <string name="close">Uždaryti</string>
-    <string name="upload_now">Įkelti dabar</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-nl-rNL/strings.xml b/plugins/sync/src/main/res/values-nl-rNL/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-nl-rNL/strings.xml
rename to plugins/sync/src/main/res/values-nl-rNL/oh_strings.xml
index 41bca11f74..03c5c1dc77 100644
--- a/plugins/openhumans/src/main/res/values-nl-rNL/strings.xml
+++ b/plugins/sync/src/main/res/values-nl-rNL/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">We zijn klaar!</string>
     <string name="silently_upload_date_note">Voortaan zal je telefoon zo nu en dan op de achtergrond gegevens uploaden.</string>
     <string name="close">Sluiten</string>
-    <string name="upload_now">Nu Uploaden</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-no-rNO/strings.xml b/plugins/sync/src/main/res/values-no-rNO/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-no-rNO/strings.xml
rename to plugins/sync/src/main/res/values-no-rNO/oh_strings.xml
index ae2801db85..c33f512c0d 100644
--- a/plugins/openhumans/src/main/res/values-no-rNO/strings.xml
+++ b/plugins/sync/src/main/res/values-no-rNO/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Vi er ferdig!</string>
     <string name="silently_upload_date_note">Fra nå av vil telefonen din med jevne mellomrom i bakgrunnen overføre en kopi av dine nye brukerdata.</string>
     <string name="close">Lukk</string>
-    <string name="upload_now">Last opp nå</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-pl-rPL/strings.xml b/plugins/sync/src/main/res/values-pl-rPL/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-pl-rPL/strings.xml
rename to plugins/sync/src/main/res/values-pl-rPL/oh_strings.xml
index fa0dec5209..051eadba38 100644
--- a/plugins/openhumans/src/main/res/values-pl-rPL/strings.xml
+++ b/plugins/sync/src/main/res/values-pl-rPL/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Gotowe!</string>
     <string name="silently_upload_date_note">Od teraz Twój telefon będzie od czasu do czasu przesyłać dane w tle.</string>
     <string name="close">Zamknij</string>
-    <string name="upload_now">Prześlij teraz</string>
-</resources>
+ </resources>
diff --git a/plugins/openhumans/src/main/res/values-pt-rBR/strings.xml b/plugins/sync/src/main/res/values-pt-rBR/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-pt-rBR/strings.xml
rename to plugins/sync/src/main/res/values-pt-rBR/oh_strings.xml
index d213d49300..e9d96f20d2 100644
--- a/plugins/openhumans/src/main/res/values-pt-rBR/strings.xml
+++ b/plugins/sync/src/main/res/values-pt-rBR/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Estamos prontos!</string>
     <string name="silently_upload_date_note">De agora em diante, o telefone fará o upload silencioso de dados em segundo plano de vez em quando.</string>
     <string name="close">Fechar</string>
-    <string name="upload_now">Enviar agora</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-pt-rPT/strings.xml b/plugins/sync/src/main/res/values-pt-rPT/oh_strings.xml
similarity index 97%
rename from plugins/openhumans/src/main/res/values-pt-rPT/strings.xml
rename to plugins/sync/src/main/res/values-pt-rPT/oh_strings.xml
index 097406c32e..13fed0f8fc 100644
--- a/plugins/openhumans/src/main/res/values-pt-rPT/strings.xml
+++ b/plugins/sync/src/main/res/values-pt-rPT/oh_strings.xml
@@ -25,5 +25,4 @@
     <string name="agree">Compreendo e concordo.</string>
     <string name="cancel">Cancelar</string>
     <string name="close">Fechar</string>
-    <string name="upload_now">Fazer o upload agora</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-ro-rRO/strings.xml b/plugins/sync/src/main/res/values-ro-rRO/oh_strings.xml
similarity index 97%
rename from plugins/openhumans/src/main/res/values-ro-rRO/strings.xml
rename to plugins/sync/src/main/res/values-ro-rRO/oh_strings.xml
index 0e8f6e57bf..147409a50c 100644
--- a/plugins/openhumans/src/main/res/values-ro-rRO/strings.xml
+++ b/plugins/sync/src/main/res/values-ro-rRO/oh_strings.xml
@@ -25,5 +25,4 @@
     <string name="agree">Înţeleg şi sunt de acord.</string>
     <string name="cancel">Renunță</string>
     <string name="close">Închide</string>
-    <string name="upload_now">Încarcă acum</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-ru-rRU/strings.xml b/plugins/sync/src/main/res/values-ru-rRU/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-ru-rRU/strings.xml
rename to plugins/sync/src/main/res/values-ru-rRU/oh_strings.xml
index 119e1c47e2..03f89ca280 100644
--- a/plugins/openhumans/src/main/res/values-ru-rRU/strings.xml
+++ b/plugins/sync/src/main/res/values-ru-rRU/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Готово!</string>
     <string name="silently_upload_date_note">С этого момента ваш телефон будет иногда загружать данные в фоновом режиме.</string>
     <string name="close">Закрыть</string>
-    <string name="upload_now">Начать передачу данных</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-sk-rSK/strings.xml b/plugins/sync/src/main/res/values-sk-rSK/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-sk-rSK/strings.xml
rename to plugins/sync/src/main/res/values-sk-rSK/oh_strings.xml
index eefe3c1a9c..7138f51213 100644
--- a/plugins/openhumans/src/main/res/values-sk-rSK/strings.xml
+++ b/plugins/sync/src/main/res/values-sk-rSK/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Skončili sme!</string>
     <string name="silently_upload_date_note">Od tejto chvíle bude telefón čas od času potichu nahrávať dáta na pozadí.</string>
     <string name="close">Zavrieť</string>
-    <string name="upload_now">Nahrať teraz</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-sl-rSI/strings.xml b/plugins/sync/src/main/res/values-sl-rSI/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-sl-rSI/strings.xml
rename to plugins/sync/src/main/res/values-sl-rSI/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-sr-rCS/strings.xml b/plugins/sync/src/main/res/values-sr-rCS/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-sr-rCS/strings.xml
rename to plugins/sync/src/main/res/values-sr-rCS/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-sv-rSE/strings.xml b/plugins/sync/src/main/res/values-sv-rSE/oh_strings.xml
similarity index 97%
rename from plugins/openhumans/src/main/res/values-sv-rSE/strings.xml
rename to plugins/sync/src/main/res/values-sv-rSE/oh_strings.xml
index 8f4275740b..96b8ec42e0 100644
--- a/plugins/openhumans/src/main/res/values-sv-rSE/strings.xml
+++ b/plugins/sync/src/main/res/values-sv-rSE/oh_strings.xml
@@ -25,5 +25,4 @@
     <string name="agree">Jag förstår och instämmer.</string>
     <string name="cancel">Avbryt</string>
     <string name="close">Stäng</string>
-    <string name="upload_now">Ladda upp nu</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-ta-rIN/strings.xml b/plugins/sync/src/main/res/values-ta-rIN/oh_strings.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values-ta-rIN/strings.xml
rename to plugins/sync/src/main/res/values-ta-rIN/oh_strings.xml
diff --git a/plugins/openhumans/src/main/res/values-tr-rTR/strings.xml b/plugins/sync/src/main/res/values-tr-rTR/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-tr-rTR/strings.xml
rename to plugins/sync/src/main/res/values-tr-rTR/oh_strings.xml
index 89075bc76a..4baee81aef 100644
--- a/plugins/openhumans/src/main/res/values-tr-rTR/strings.xml
+++ b/plugins/sync/src/main/res/values-tr-rTR/oh_strings.xml
@@ -53,5 +53,4 @@
     <string name="we_re_done">Bitirdik!</string>
     <string name="silently_upload_date_note">Artık telefonunuz zaman zaman arka planda sessizce veri yükleyecektir.</string>
     <string name="close">Kapat</string>
-    <string name="upload_now">Şimdi yükle</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values-zh-rCN/strings.xml b/plugins/sync/src/main/res/values-zh-rCN/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values-zh-rCN/strings.xml
rename to plugins/sync/src/main/res/values-zh-rCN/oh_strings.xml
index b1147a67c9..0651a78f31 100644
--- a/plugins/openhumans/src/main/res/values-zh-rCN/strings.xml
+++ b/plugins/sync/src/main/res/values-zh-rCN/oh_strings.xml
@@ -52,5 +52,4 @@
     <string name="we_re_done">成功完成！</string>
     <string name="silently_upload_date_note">从现在起，您的手机将不时在后台自动上传数据</string>
     <string name="close">关闭</string>
-    <string name="upload_now">现在上传</string>
 </resources>
diff --git a/plugins/openhumans/src/main/res/values/colors.xml b/plugins/sync/src/main/res/values/oh_colors.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values/colors.xml
rename to plugins/sync/src/main/res/values/oh_colors.xml
diff --git a/plugins/openhumans/src/main/res/values/strings.xml b/plugins/sync/src/main/res/values/oh_strings.xml
similarity index 98%
rename from plugins/openhumans/src/main/res/values/strings.xml
rename to plugins/sync/src/main/res/values/oh_strings.xml
index 8c63ed9c69..646ff82672 100644
--- a/plugins/openhumans/src/main/res/values/strings.xml
+++ b/plugins/sync/src/main/res/values/oh_strings.xml
@@ -54,6 +54,4 @@
     <string name="we_re_done">We\'re done!</string>
     <string name="silently_upload_date_note">From now on, your phone will silently upload data in the background from time to time.</string>
     <string name="close">Close</string>
-    <string name="upload_now">Upload now</string>
-
 </resources>
\ No newline at end of file
diff --git a/plugins/openhumans/src/main/res/values/styles.xml b/plugins/sync/src/main/res/values/oh_styles.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/values/styles.xml
rename to plugins/sync/src/main/res/values/oh_styles.xml
diff --git a/plugins/openhumans/src/main/res/xml/pref_openhumans.xml b/plugins/sync/src/main/res/xml/pref_openhumans.xml
similarity index 100%
rename from plugins/openhumans/src/main/res/xml/pref_openhumans.xml
rename to plugins/sync/src/main/res/xml/pref_openhumans.xml
diff --git a/settings.gradle b/settings.gradle
index 34dc7baf44..137cc8c2bd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,6 @@ include ':plugins:configuration'
 include ':plugins:constraints'
 include ':plugins:insulin'
 include ':plugins:main'
-include ':plugins:openhumans'
 include ':plugins:sensitivity'
 include ':plugins:smoothing'
 include ':plugins:source'