1. make settingsSync a platform module 2. rename platform module to settingsSync.core and don't include jba module

(cherry picked from commit b94ad2175dc954823f17bf1571548d4779945793)
Signed-off-by: Sergey Pak <sergey.pak@jetbrains.com>

GitOrigin-RevId: 08fc765db4cd295b5b9eebb9378ba992c341dce8

.idea/modules.xml

@@ -918,10 +918,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" filepath="$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/intellij.settingsSync.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/fileSystem/intellij.settingsSync.fileSystem.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/fileSystem/intellij.settingsSync.fileSystem.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/git/intellij.settingsSync.git.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/git/intellij.settingsSync.git.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.jba.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.jba.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/tests/intellij.sh.copyright.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/tests/intellij.sh.copyright.tests.iml" />

community-resources/resources/META-INF/IdeaPlugin.xml

@@ -14,6 +14,7 @@
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ide.newUsersOnboarding"/>
     <module name="intellij.ide.startup.importSettings"/>
+    <module name="intellij.settingsSync.core"/>
     <module name="intellij.kotlin.onboarding-promoter"/>
     <module name="intellij.idea.customization.base"/>
     <module name="intellij.platform.tips"/>

intellij.idea.community.main.iml

@@ -147,10 +147,7 @@
     <orderEntry type="module" module-name="intellij.space.java.jps" scope="TEST" />
     <orderEntry type="module" module-name="intellij.emojipicker" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.gradle.dependencyUpdater" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.settingsSync" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.settingsSync.core" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.settingsSync.git" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.settingsSync.jba" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.settingsSync.fileSystem" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.featuresTrainer" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.idea.community.build.tasks" scope="TEST" />
     <orderEntry type="module" module-name="intellij.junit.v5.rt.tests" scope="TEST" />

platform/settings-sync-core/intellij.settingsSync.core.iml

@@ -40,7 +40,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" scope="TEST" name="cloud-config-client" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
@@ -54,8 +54,14 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.performanceTesting" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
+    <orderEntry type="module" module-name="intellij.vcs.git" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.dvcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
   </component>
 </module>

platform/settings-sync-core/resources/intellij.settingsSync.core.xml

@@ -1,37 +1,21 @@
-<idea-plugin>
+<idea-plugin package="com.intellij.settingsSync.core">
-  <name>Backup and Sync</name>
+  <dependencies>
-  <id>com.intellij.settingsSync</id>
+    <plugin id="Git4Idea"/>
-  <category>IDE Settings</category>
+  </dependencies>
-  <description><![CDATA[
-    <p>Synchronizes settings across all JetBrains IDE instances using your JetBrains account.
-    The list of synced settings is customizable and includes UI, keymaps, code style, plugins, and much more.</p>
-  ]]></description>
-  <vendor>JetBrains</vendor>
-  <resource-bundle>messages.SettingsSyncBundle</resource-bundle>
-
-  <content>
-    <module name="intellij.settingsSync.git"/>
-    <module name="intellij.settingsSync.jba"/>
-    <!--<module name="intellij.settingsSync.fileSystem"/>-->
-  </content>
-
-  <depends>com.intellij.modules.platform</depends>
-  <depends optional="true" config-file="settingsSync-performance-plugin-support.xml">com.jetbrains.performancePlugin</depends>
-
   <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceImplementation="com.intellij.settingsSync.SettingsSyncSettings"/>
+    <applicationService serviceImplementation="com.intellij.settingsSync.core.SettingsSyncSettings"/>
-    <applicationService serviceImplementation="com.intellij.settingsSync.notification.NotificationServiceImpl"
+    <applicationService serviceImplementation="com.intellij.settingsSync.core.notification.NotificationServiceImpl"
-                        serviceInterface="com.intellij.settingsSync.notification.NotificationService"/>
+                        serviceInterface="com.intellij.settingsSync.core.notification.NotificationService"/>
     <!--suppress PluginXmlDynamicPlugin -->
-    <applicationActivity implementation="com.intellij.settingsSync.SettingsSynchronizerApplicationInitializedListener"/>
+    <applicationActivity implementation="com.intellij.settingsSync.core.SettingsSynchronizerApplicationInitializedListener"/>
     <applicationConfigurable id="settings.sync"
                              key="title.settings.sync"
                              bundle="messages.SettingsSyncBundle"
-                             provider="com.intellij.settingsSync.config.SettingsSyncConfigurableProvider"
+                             provider="com.intellij.settingsSync.core.config.SettingsSyncConfigurableProvider"
                              groupId="root"
                              groupWeight="5"/>
-    <applicationService serviceInterface="com.intellij.settingsSync.plugins.PluginManagerProxy"
+    <applicationService serviceInterface="com.intellij.settingsSync.core.plugins.PluginManagerProxy"
-                        serviceImplementation="com.intellij.settingsSync.plugins.CorePluginManagerProxy"/>
+                        serviceImplementation="com.intellij.settingsSync.core.plugins.CorePluginManagerProxy"/>
     <notificationGroup displayType="STICKY_BALLOON" id="settingsSync.errors"
                        bundle="messages.SettingsSyncBundle" key="settingsSync.errors.notificationGroup"/>
 
@@ -44,41 +28,46 @@
                  description="Whether to show GotIt tooltip with promotion to enable the Backup and Sync
                               on Apply button click in the Settings dialog"/>
 
-    <settingsEntryPointIconCustomizer implementation="com.intellij.settingsSync.config.SettingsSyncStatusAction$IconCustomizer"/>
+    <settingsEntryPointIconCustomizer implementation="com.intellij.settingsSync.core.config.SettingsSyncStatusAction$IconCustomizer"/>
-    <statistics.applicationUsagesCollector implementation="com.intellij.settingsSync.statistics.SettingsSyncStateStatistics"/>
+    <statistics.applicationUsagesCollector implementation="com.intellij.settingsSync.core.statistics.SettingsSyncStateStatistics"/>
-    <statistics.counterUsagesCollector implementationClass="com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics"/>
+    <statistics.counterUsagesCollector implementationClass="com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics"/>
 
+    <registryKey key="settingsSync.ui.new.toolwindow.show" defaultValue="true"
+                 description="Use new toolwindow to display Backup and Sync history."/>
+    <toolWindow id="Backup and Sync History" secondary="false" icon="AllIcons.Toolwindows.SettingSync" anchor="left"
+                factoryClass="com.intellij.settingsSync.core.git.SettingsHistoryToolWindowFactory"/>
   </extensions>
 
   <applicationListeners>
-    <listener class="com.intellij.settingsSync.SettingsSynchronizer" topic="com.intellij.openapi.application.ApplicationActivationListener"
+    <listener class="com.intellij.settingsSync.core.SettingsSynchronizer" topic="com.intellij.openapi.application.ApplicationActivationListener"
-              activeInTestMode="false" activeInHeadlessMode="false"/>
-    <listener class="com.intellij.settingsSync.jba.SettingsSyncPromotion" topic="com.intellij.openapi.options.newEditor.SettingsDialogListener"
               activeInTestMode="false" activeInHeadlessMode="false"/>
   </applicationListeners>
 
   <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.settingsSyncMigration" interface="com.intellij.settingsSync.SettingsSyncMigration" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.settingsSyncMigration" interface="com.intellij.settingsSync.core.SettingsSyncMigration" dynamic="true"/>
-    <extensionPoint interface="com.intellij.settingsSync.SettingsProvider" dynamic="true" name="settingsProvider"/>
+    <extensionPoint qualifiedName="com.intellij.settingsSync.settingsProvider" interface="com.intellij.settingsSync.core.SettingsProvider" dynamic="true" />
-    <extensionPoint interface="com.intellij.settingsSync.communicator.SettingsSyncCommunicatorProvider" dynamic="true" name="communicatorProvider"/>
+    <extensionPoint qualifiedName="com.intellij.settingsSync.communicatorProvider" interface="com.intellij.settingsSync.core.communicator.SettingsSyncCommunicatorProvider" dynamic="true"/>
   </extensionPoints>
 
-  <actions>
+  <actions resource-bundle="messages.SettingsSyncBundle">
     <group id="SettingsSync">
-      <action class="com.intellij.settingsSync.ManualPushAction" id="settingsSync.manualPush" icon="AllIcons.Chooser.Top" internal="true"/>
+      <action class="com.intellij.settingsSync.core.ManualPushAction" id="settingsSync.manualPush" icon="AllIcons.Chooser.Top" internal="true"/>
     </group>
 
     <action id="SettingsSyncSeparator" class="com.intellij.openapi.actionSystem.Separator">
       <add-to-group group-id="SettingsEntryPointGroup" anchor="after" relative-to-action="WelcomeScreen.Plugins"/>
     </action>
 
-    <action id="SettingsSyncStatusAction" class="com.intellij.settingsSync.config.SettingsSyncStatusAction">
+    <action id="SettingsSyncStatusAction" class="com.intellij.settingsSync.core.config.SettingsSyncStatusAction">
       <add-to-group group-id="SettingsEntryPointGroup" anchor="after" relative-to-action="SettingsSyncSeparator"/>
     </action>
 
-    <action id="SettingsSyncOpenSettingsAction" class="com.intellij.settingsSync.config.SettingsSyncOpenSettingsAction$Simple">
+    <action id="SettingsSyncOpenSettingsAction" class="com.intellij.settingsSync.core.config.SettingsSyncOpenSettingsAction$Simple">
       <add-to-group group-id="ExportImportGroup" anchor="last"/>
     </action>
+
+    <action class="com.intellij.settingsSync.core.git.SettingsSyncHistoryAction" id="settingsSync.history" icon="AllIcons.Vcs.History" />
+
   </actions>
 
 </idea-plugin>

platform/settings-sync-core/src/com/intellij/settingsSync/core/AbstractServerCommunicator.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.application.ApplicationNamesInfo
 import com.intellij.openapi.diagnostic.logger

platform/settings-sync-core/src/com/intellij/settingsSync/core/FileState.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.SystemIndependent

platform/settings-sync-core/src/com/intellij/settingsSync/core/GitSettingsLog.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.PathManager
@@ -6,15 +6,14 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.settingsSync.SettingsSnapshot.MetaInfo
+import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo
-import com.intellij.settingsSync.SettingsSnapshotZipSerializer.deserializeSettingsProviders
+import com.intellij.settingsSync.core.SettingsSnapshotZipSerializer.deserializeSettingsProviders
-import com.intellij.settingsSync.SettingsSnapshotZipSerializer.serializeSettingsProviders
+import com.intellij.settingsSync.core.SettingsSnapshotZipSerializer.serializeSettingsProviders
-import com.intellij.settingsSync.communicator.SettingsSyncUserData
+import com.intellij.settingsSync.core.communicator.SettingsSyncUserData
-import com.intellij.settingsSync.notification.NotificationService
+import com.intellij.settingsSync.core.notification.NotificationService
-import com.intellij.settingsSync.plugins.SettingsSyncPluginsState
+import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState
-import com.intellij.settingsSync.plugins.SettingsSyncPluginsStateMerger.mergePluginStates
+import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsStateMerger.mergePluginStates
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
-import com.intellij.ui.JBAccountInfoService
 import com.intellij.util.io.createParentDirectories
 import com.intellij.util.io.write
 import kotlinx.serialization.encodeToString

platform/settings-sync-core/src/com/intellij/settingsSync/core/InvalidVersionIdException.kt

@@ -0,0 +1,2 @@
+package com.intellij.settingsSync.core
+

platform/settings-sync-core/src/com/intellij/settingsSync/core/LocalHostNameProvider.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service

platform/settings-sync-core/src/com/intellij/settingsSync/core/ManualPushAction.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingSyncNotifications.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsChangeListener.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.util.NlsSafe
 import org.jetbrains.annotations.ApiStatus.Internal

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsLog.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import org.jetbrains.annotations.ApiStatus

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsProvider.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.extensions.ExtensionPointName

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshot.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.PathManager
@@ -6,7 +6,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.util.BuildNumber
 import com.intellij.openapi.util.JDOMUtil
-import com.intellij.settingsSync.plugins.SettingsSyncPluginsState
+import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState
 import com.intellij.util.SystemProperties
 import com.intellij.util.xmlb.XmlSerializer
 import org.jetbrains.annotations.ApiStatus

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSnapshotZipSerializer.kt

@@ -1,12 +1,11 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.util.BuildNumber
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.settingsSync.notification.NotificationService
+import com.intellij.settingsSync.core.plugins.SettingsSyncPluginsState
-import com.intellij.settingsSync.plugins.SettingsSyncPluginsState
 import com.intellij.util.io.Compressor
 import com.intellij.util.io.Decompressor
 import kotlinx.serialization.encodeToString

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBridge.kt

@@ -1,13 +1,13 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.codeInsight.template.impl.TemplateSettings
 import com.intellij.configurationStore.saveSettings
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.platform.util.progress.withProgressText
-import com.intellij.settingsSync.SettingsSyncBridge.PushRequestMode.*
+import com.intellij.settingsSync.core.SettingsSyncBridge.PushRequestMode.*
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
 import com.intellij.util.containers.ContainerUtil
 import kotlinx.coroutines.*
 import org.jetbrains.annotations.ApiStatus

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncBundle.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.DynamicBundle
 import org.jetbrains.annotations.ApiStatus

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncEvents.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
@@ -85,7 +85,8 @@ internal class RestartForPluginInstall(val plugins: Collection<String>) : Restar
   }
 
   override fun getMultiReasonNotificationListEntry(number: Int): String {
-    return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.install", plugins.size, plugins.take(2).joinToString(", "))
+    return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.install", plugins.size,
+                                                    plugins.take(2).joinToString(", "))
   }
 }
 
@@ -97,7 +98,8 @@ internal class RestartForPluginEnable(val plugins: Collection<String>) : Restart
   }
 
   override fun getMultiReasonNotificationListEntry(number: Int): String {
-    return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.enable", plugins.size, plugins.take(2).joinToString(", "))
+    return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.enable", plugins.size,
+                                                    plugins.take(2).joinToString(", "))
   }
 }
 
@@ -109,6 +111,7 @@ internal class RestartForPluginDisable(val plugins: Collection<String>) : Restar
   }
 
   override fun getMultiReasonNotificationListEntry(number: Int): String {
-    return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.disable", plugins.size, plugins.take(2).joinToString(", "))
+    return "$number. " + SettingsSyncBundle.message("sync.notification.restart.message.list.entry.plugin.disable", plugins.size,
+                                                    plugins.take(2).joinToString(", "))
   }
 }

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncFiltering.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.configurationStore.getPerOsSettingsStorageFolderName
 import com.intellij.configurationStore.schemeManager.SchemeManagerFactoryBase
@@ -8,7 +8,7 @@ import com.intellij.openapi.editor.colors.impl.AppEditorFontOptions
 import com.intellij.openapi.options.SchemeManagerFactory
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.serviceContainer.ComponentManagerImpl
-import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID
+import com.intellij.settingsSync.core.config.EDITOR_FONT_SUBCATEGORY_ID
 import java.util.concurrent.ConcurrentHashMap
 
 internal fun isSyncCategoryEnabled(fileSpec: String): Boolean {

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediator.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import org.jetbrains.annotations.ApiStatus
 import java.nio.file.Path

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncIdeMediatorImpl.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.concurrency.ConcurrentCollectionFactory
 import com.intellij.configurationStore.*
@@ -9,9 +9,9 @@ import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl
 import com.intellij.openapi.util.registry.Registry
-import com.intellij.settingsSync.SettingsSnapshot.MetaInfo
+import com.intellij.settingsSync.core.SettingsSnapshot.MetaInfo
-import com.intellij.settingsSync.notification.NotificationService
+import com.intellij.settingsSync.core.notification.NotificationService
-import com.intellij.settingsSync.plugins.SettingsSyncPluginManager
+import com.intellij.settingsSync.core.plugins.SettingsSyncPluginManager
 import com.intellij.ui.NewUiValue
 import com.intellij.util.io.inputStreamIfExists
 import com.intellij.util.io.write
@@ -77,6 +77,7 @@ internal class SettingsSyncIdeMediatorImpl(private val componentStore: Component
       SettingsSyncPluginManager.getInstance().pushChangesToIde(snapshot.plugins)
     }
 
+    if (!AppMode.isRemoteDevHost()) {
       // 3. after that update the rest of changed settings
       val regularFileStates = snapshot.fileStates.filter { it != settingsSyncFileState }
       writeStatesToAppConfig(regularFileStates)
@@ -92,6 +93,7 @@ internal class SettingsSyncIdeMediatorImpl(private val componentStore: Component
           LOG.warn("Couldn't find provider for id '$id' and state '${state.javaClass}'")
         }
       }
+    }
     notifyRestartNeeded()
   }
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncLocalSettings.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.*

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMain.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.configurationStore.ComponentStoreImpl
 import com.intellij.openapi.Disposable
@@ -8,17 +8,11 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.components.impl.stores.stateStore
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
-import com.intellij.util.SystemProperties
 import kotlinx.coroutines.CoroutineScope
 import org.jetbrains.annotations.ApiStatus
 import java.nio.file.Path
 
-private const val SETTINGS_SYNC_ENABLED_PROPERTY = "idea.settings.sync.enabled"
-
-@ApiStatus.Internal
-fun isSettingsSyncEnabledByKey(): Boolean = SystemProperties.getBooleanProperty(SETTINGS_SYNC_ENABLED_PROPERTY, true)
-
 @ApiStatus.Internal
 fun isSettingsSyncEnabledInSettings(): Boolean = SettingsSyncSettings.getInstance().syncEnabled
 
@@ -33,7 +27,7 @@ class SettingsSyncMain(coroutineScope: CoroutineScope) : Disposable {
     val appConfigPath = PathManager.getConfigDir()
     val componentStore = ApplicationManager.getApplication().stateStore as ComponentStoreImpl
     val ideMediator = SettingsSyncIdeMediatorImpl(componentStore = componentStore, rootConfig = appConfigPath, enabledCondition = {
-      isSettingsSyncEnabledByKey() && isAvailable() && isSettingsSyncEnabledInSettings()
+      isAvailable() && isSettingsSyncEnabledInSettings()
     })
     controls = init(coroutineScope,
                     parentDisposable = this,

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncMigration.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import org.jetbrains.annotations.ApiStatus
 import java.nio.file.Path

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncPushResult.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.util.NlsSafe
 import org.jetbrains.annotations.ApiStatus

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncRemoteCommunicator.kt

@@ -1,8 +1,6 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.util.NlsSafe
-import com.intellij.settingsSync.auth.SettingsSyncAuthService
-import com.intellij.settingsSync.communicator.SettingsSyncUserData
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import org.jetbrains.annotations.ApiStatus
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncSettings.kt

@@ -1,8 +1,8 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.components.*
-import com.intellij.settingsSync.SettingsSyncSettings.Companion.COMPONENT_NAME
+import com.intellij.settingsSync.core.SettingsSyncSettings.Companion.COMPONENT_NAME
-import com.intellij.settingsSync.SettingsSyncSettings.Companion.FILE_SPEC
+import com.intellij.settingsSync.core.SettingsSyncSettings.Companion.FILE_SPEC
 import com.intellij.util.xmlb.annotations.Property
 import org.jetbrains.annotations.ApiStatus
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncStatusTracker.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
@@ -15,7 +15,7 @@ internal class SettingsSyncStatusTracker {
   private val eventDispatcher = EventDispatcher.create(Listener::class.java)
 
   init {
-    SettingsSyncEvents.getInstance().addListener(object: SettingsSyncEventListener{
+    SettingsSyncEvents.getInstance().addListener(object: SettingsSyncEventListener {
       override fun settingChanged(event: SyncSettingsEvent) {
         if (event is SyncSettingsEvent.CloudChange) {
           updateOnSuccess()

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSyncUpdateChecker.kt

@@ -1,8 +1,8 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import org.jetbrains.annotations.ApiStatus
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/SettingsSynchronizer.kt

@@ -1,21 +1,19 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 import com.intellij.ide.ApplicationActivity
 import com.intellij.openapi.application.ApplicationActivationListener
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.components.serviceAsync
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.openapi.extensions.ExtensionNotApplicableException
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.progress.blockingContext
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.wm.IdeFrame
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
-import com.intellij.settingsSync.migration.migrateIfNeeded
+import com.intellij.settingsSync.core.migration.migrateIfNeeded
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
 import com.intellij.util.concurrency.AppExecutorUtil
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import kotlinx.coroutines.coroutineScope

platform/settings-sync-core/src/com/intellij/settingsSync/core/ShareableSettings.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync
+package com.intellij.settingsSync.core
 
 internal interface ShareableSettings {
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/auth/SettingsSyncAuthService.kt

@@ -1,6 +1,6 @@
-package com.intellij.settingsSync.auth
+package com.intellij.settingsSync.core.auth
 
-import com.intellij.settingsSync.communicator.SettingsSyncUserData
+import com.intellij.settingsSync.core.communicator.SettingsSyncUserData
 import kotlinx.coroutines.Deferred
 import java.awt.Component
 import javax.swing.Icon

platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/RemoteCommunicatorHolder.kt

@@ -1,7 +1,9 @@
-package com.intellij.settingsSync.communicator
+package com.intellij.settingsSync.core.communicator
 
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.SettingsSyncEventListener
+import com.intellij.settingsSync.core.SettingsSyncLocalSettings
+import com.intellij.settingsSync.core.SettingsSyncRemoteCommunicator
 import com.intellij.util.resettableLazy
 import org.jetbrains.annotations.ApiStatus
 
@@ -71,7 +73,7 @@ object RemoteCommunicatorHolder : SettingsSyncEventListener {
     return extensionList
   }
 
-  fun getDefaultProvider(): SettingsSyncCommunicatorProvider {
+  fun getDefaultProvider(): SettingsSyncCommunicatorProvider? {
     return getProvider(DEFAULT_PROVIDER_CODE)!!
   }
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/communicator/SettingsSyncCommunicatorProvider.kt

@@ -1,8 +1,8 @@
-package com.intellij.settingsSync.communicator
+package com.intellij.settingsSync.core.communicator
 
 import com.intellij.openapi.extensions.ExtensionPointName
-import com.intellij.settingsSync.SettingsSyncRemoteCommunicator
+import com.intellij.settingsSync.core.SettingsSyncRemoteCommunicator
-import com.intellij.settingsSync.auth.SettingsSyncAuthService
+import com.intellij.settingsSync.core.auth.SettingsSyncAuthService
 
 interface SettingsSyncCommunicatorProvider {
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/EnableSettingsSyncDialog.kt

@@ -1,10 +1,10 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.openapi.ui.DialogWrapper
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
-import com.intellij.settingsSync.SettingsSyncLocalStateHolder
+import com.intellij.settingsSync.core.SettingsSyncLocalStateHolder
-import com.intellij.settingsSync.SettingsSyncState
+import com.intellij.settingsSync.core.SettingsSyncState
-import com.intellij.settingsSync.SettingsSyncStateHolder
+import com.intellij.settingsSync.core.SettingsSyncStateHolder
 import java.awt.event.ActionEvent
 import javax.swing.AbstractAction
 import javax.swing.Action

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncConfigurable.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 
 import com.intellij.icons.AllIcons
@@ -15,15 +15,14 @@ import com.intellij.openapi.ui.*
 import com.intellij.platform.ide.progress.ModalTaskOwner
 import com.intellij.platform.ide.progress.TaskCancellation
 import com.intellij.platform.ide.progress.runWithModalProgressBlocking
-import com.intellij.platform.ide.progress.withModalProgress
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.*
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.UpdateResult.*
-import com.intellij.settingsSync.UpdateResult.*
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.SettingsSyncCommunicatorProvider
-import com.intellij.settingsSync.communicator.SettingsSyncCommunicatorProvider
+import com.intellij.settingsSync.core.communicator.SettingsSyncUserData
-import com.intellij.settingsSync.communicator.SettingsSyncUserData
+import com.intellij.settingsSync.core.config.SettingsSyncEnabler.State
-import com.intellij.settingsSync.config.SettingsSyncEnabler.State
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
 import com.intellij.ui.components.DropDownLink
 import com.intellij.ui.dsl.builder.*
 import com.intellij.ui.dsl.listCellRenderer.groupedTextListCellRenderer
@@ -111,7 +110,7 @@ internal class SettingsSyncConfigurable(private val coroutineScope: CoroutineSco
       }.visibleIf(wasUsedBefore.not().and(hasMultipleProviders))
 
       row {
-        val defaultProvider = RemoteCommunicatorHolder.getDefaultProvider()
+        val defaultProvider = RemoteCommunicatorHolder.getDefaultProvider() ?: return@row
         button(message("config.button.login")) {
           login(defaultProvider, syncConfigPanel)
         }

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncEnabler.kt

@@ -1,10 +1,10 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.Task
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.*
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
 import com.intellij.util.EventDispatcher
 import java.util.*
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOldConfigurable.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.DataManager
@@ -13,20 +13,18 @@ import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.impl.stores.stateStore
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.options.BoundConfigurable
-import com.intellij.openapi.options.Configurable
-import com.intellij.openapi.options.ConfigurableProvider
 import com.intellij.openapi.options.ex.Settings
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.progress.runBlockingCancellable
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.Messages
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.*
-import com.intellij.settingsSync.UpdateResult.*
+import com.intellij.settingsSync.core.UpdateResult.*
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
 //import com.intellij.settingsSync.auth.SettingsSyncAuthService
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
 import com.intellij.ui.components.ActionLink
 import com.intellij.ui.dsl.builder.BottomGap
 import com.intellij.ui.dsl.builder.Cell

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncOpenSettingsAction.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.options.ShowSettingsUtil

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncPanelFactory.kt

@@ -1,12 +1,11 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.openapi.application.ApplicationNamesInfo
 import com.intellij.openapi.components.SettingsCategory
-import com.intellij.openapi.observable.properties.AtomicBooleanProperty
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.popup.JBPopupFactory
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.*
 import com.intellij.ui.CheckBoxList
 import com.intellij.ui.CheckBoxListListener
 import com.intellij.ui.SeparatorComponent

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncStatusAction.kt

@@ -1,15 +1,13 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.actions.SettingsEntryPointAction
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
-import com.intellij.settingsSync.SettingsSyncSettings
+import com.intellij.settingsSync.core.SettingsSyncSettings
-import com.intellij.settingsSync.SettingsSyncStatusTracker
+import com.intellij.settingsSync.core.SettingsSyncStatusTracker
-import com.intellij.settingsSync.auth.SettingsSyncAuthService
+import com.intellij.settingsSync.core.communicator.RemoteCommunicatorHolder
-import com.intellij.settingsSync.communicator.RemoteCommunicatorHolder
-import com.intellij.settingsSync.isSettingsSyncEnabledByKey
 import com.intellij.ui.BadgeIconSupplier
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
@@ -41,10 +39,6 @@ internal class SettingsSyncStatusAction : SettingsSyncOpenSettingsAction(),
 
   override fun update(e: AnActionEvent) {
     val p = e.presentation
-    if (!isSettingsSyncEnabledByKey()) {
-      p.isEnabledAndVisible = false
-      return
-    }
     val status = getStatus()
     when (status) {
       SyncStatus.ON ->

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SettingsSyncSubcategories.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import org.jetbrains.annotations.Nls
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncCategoryHolder.kt

@@ -1,9 +1,9 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.openapi.components.SettingsCategory
 import com.intellij.openapi.components.SettingsCategory.*
-import com.intellij.settingsSync.SettingsSyncState
+import com.intellij.settingsSync.core.SettingsSyncState
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
 import org.jetbrains.annotations.Nls
 import java.util.*
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncPluginsGroup.kt

@@ -1,9 +1,9 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.components.SettingsCategory
-import com.intellij.settingsSync.SettingsSyncBundle.message
+import com.intellij.settingsSync.core.SettingsSyncBundle.message
-import com.intellij.settingsSync.plugins.SettingsSyncPluginCategoryFinder
+import com.intellij.settingsSync.core.plugins.SettingsSyncPluginCategoryFinder
 import org.jetbrains.annotations.Nls
 
 internal const val BUNDLED_PLUGINS_ID = "bundled"

platform/settings-sync-core/src/com/intellij/settingsSync/core/config/SyncUiGroup.kt

@@ -1,6 +1,6 @@
-package com.intellij.settingsSync.config
+package com.intellij.settingsSync.core.config
 
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
 
 const val EDITOR_FONT_SUBCATEGORY_ID = "editorFont"
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUi.kt

@@ -1,9 +1,8 @@
-package com.intellij.settingsSync.git
+package com.intellij.settingsSync.core.git
 
 import com.intellij.vcs.log.VcsLogFilterUi
 import com.intellij.vcs.log.data.VcsLogData
 import com.intellij.vcs.log.impl.VcsLogUiProperties
-import com.intellij.vcs.log.impl.VcsLogUiPropertiesImpl
 import com.intellij.vcs.log.ui.VcsLogUiBase
 import com.intellij.vcs.log.ui.table.VcsLogCommitList
 import com.intellij.vcs.log.visible.VisiblePack

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryLogUiFactory.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git
+package com.intellij.settingsSync.core.git
 
 import com.intellij.openapi.project.Project
 import com.intellij.vcs.log.data.VcsLogData

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryPanel.kt

@@ -1,7 +1,7 @@
-package com.intellij.settingsSync.git
+package com.intellij.settingsSync.core.git
 
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableModel
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableModel
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.vcs.log.data.VcsLogData
 import com.intellij.vcs.log.visible.VisiblePackRefresher

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryToolWindowFactory.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git
+package com.intellij.settingsSync.core.git
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.application.ApplicationManager
@@ -13,7 +13,7 @@ import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowAnchor
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.openapi.wm.ToolWindowManager
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.*
 import git4idea.GitVcs
 import git4idea.log.showExternalGitLogInToolwindow
 import kotlinx.coroutines.CoroutineScope

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsHistoryUiProperties.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git
+package com.intellij.settingsSync.core.git
 
 import com.intellij.openapi.Disposable
 import com.intellij.vcs.log.impl.VcsLogUiProperties

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/SettingsSyncHistoryAction.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git
+package com.intellij.settingsSync.core.git
 
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -7,9 +7,8 @@ import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.wm.ToolWindowManager
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
-import com.intellij.settingsSync.SettingsSyncMain
+import com.intellij.settingsSync.core.SettingsSyncMain
-import com.intellij.settingsSync.isSettingsSyncEnabledByKey
 import git4idea.GitVcs
 import git4idea.log.showExternalGitLogInToolwindow
 import java.util.function.Supplier

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/ChangeRecord.kt

@@ -1,11 +1,11 @@
-package com.intellij.settingsSync.git.record
+package com.intellij.settingsSync.core.git.record
 
 import com.intellij.openapi.components.SettingsCategory
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.vcs.changes.Change
-import com.intellij.settingsSync.GitSettingsLog
+import com.intellij.settingsSync.core.GitSettingsLog
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
-import com.intellij.settingsSync.getRoamableCategory
+import com.intellij.settingsSync.core.getRoamableCategory
 import com.intellij.vcs.log.VcsFullCommitDetails
 import java.text.DateFormat
 import java.util.*

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/record/RecordService.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git.record
+package com.intellij.settingsSync.core.git.record
 
 import com.intellij.vcs.log.VcsFullCommitDetails
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryCellRenderer.kt

@@ -1,9 +1,9 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
-import com.intellij.settingsSync.git.table.FileRow
+import com.intellij.settingsSync.core.git.table.FileRow
-import com.intellij.settingsSync.git.table.SeparatorRow
+import com.intellij.settingsSync.core.git.table.SeparatorRow
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
 import com.intellij.ui.ColoredTableCellRenderer
 import com.intellij.ui.ExperimentalUI
 import com.intellij.ui.SimpleTextAttributes

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryEmptyCellRenderer.kt

@@ -1,7 +1,7 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
 
 internal class SettingsHistoryEmptyCellRenderer : SettingsHistoryCellRenderer() {
   override fun customizeHistoryCellRenderer(table: SettingsHistoryTable,

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryFileCellRenderer.kt

@@ -1,8 +1,8 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
-import com.intellij.settingsSync.git.table.FileRow
+import com.intellij.settingsSync.core.git.table.FileRow
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
 import com.intellij.ui.SimpleTextAttributes
 import com.intellij.util.IconUtil
 import com.intellij.util.ui.JBUI

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryNodeCellRenderer.kt

@@ -1,11 +1,11 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
-import com.intellij.settingsSync.git.record.ChangeRecord
+import com.intellij.settingsSync.core.git.record.ChangeRecord
-import com.intellij.settingsSync.git.record.HistoryRecord
+import com.intellij.settingsSync.core.git.record.HistoryRecord
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
-import com.intellij.settingsSync.git.table.TitleRow
+import com.intellij.settingsSync.core.git.table.TitleRow
 import com.intellij.util.ui.UIUtil
 import icons.SettingsSyncIcons
 import org.jetbrains.annotations.Nls

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryRestoreCellRenderer.kt

@@ -1,11 +1,11 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
 import com.intellij.icons.AllIcons
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
-import com.intellij.settingsSync.git.record.HistoryRecord
+import com.intellij.settingsSync.core.git.record.HistoryRecord
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
-import com.intellij.settingsSync.git.table.TitleRow
+import com.intellij.settingsSync.core.git.table.TitleRow
 import com.intellij.util.ui.JBUI
 
 internal class SettingsHistoryRestoreCellRenderer : SettingsHistoryCellRenderer() {

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistorySubtitleRenderer.kt

@@ -1,9 +1,9 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
 import com.intellij.icons.AllIcons
-import com.intellij.settingsSync.git.record.ChangeRecord
+import com.intellij.settingsSync.core.git.record.ChangeRecord
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
 import com.intellij.ui.SimpleTextAttributes
 import com.intellij.util.ui.JBUI
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/renderers/SettingsHistoryTitleCellRenderer.kt

@@ -1,7 +1,7 @@
-package com.intellij.settingsSync.git.renderers
+package com.intellij.settingsSync.core.git.renderers
 
-import com.intellij.settingsSync.git.table.SettingsHistoryTable
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTable
-import com.intellij.settingsSync.git.table.SettingsHistoryTableRow
+import com.intellij.settingsSync.core.git.table.SettingsHistoryTableRow
 import com.intellij.ui.ExpandableItemsHandler
 import com.intellij.ui.SimpleTextAttributes
 import com.intellij.util.ui.UIUtil

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/ExpandedRowFilter.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git.table
+package com.intellij.settingsSync.core.git.table
 
 import javax.swing.RowFilter
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTable.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.git.table
+package com.intellij.settingsSync.core.git.table
 
 import com.intellij.diff.util.DiffUserDataKeysEx
 import com.intellij.openapi.ListSelection
@@ -9,11 +9,16 @@ import com.intellij.openapi.vcs.changes.ChangesUtil
 import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction
 import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffContext
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
-import com.intellij.settingsSync.SettingsSyncEvents
+import com.intellij.settingsSync.core.SettingsSyncEvents
-import com.intellij.settingsSync.SyncSettingsEvent
+import com.intellij.settingsSync.core.SyncSettingsEvent
-import com.intellij.settingsSync.git.record.HistoryRecord
+import com.intellij.settingsSync.core.git.record.HistoryRecord
-import com.intellij.settingsSync.git.renderers.*
+import com.intellij.settingsSync.core.git.renderers.*
+import com.intellij.settingsSync.core.git.renderers.SettingsHistoryEmptyCellRenderer
+import com.intellij.settingsSync.core.git.renderers.SettingsHistoryFileCellRenderer
+import com.intellij.settingsSync.core.git.renderers.SettingsHistoryRestoreCellRenderer
+import com.intellij.settingsSync.core.git.renderers.SettingsHistorySubtitleRenderer
+import com.intellij.settingsSync.core.git.renderers.SettingsHistoryTitleCellRenderer
 import com.intellij.ui.SingleSelectionModel
 import com.intellij.ui.hover.TableHoverListener
 import com.intellij.ui.render.RenderingUtil

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableModel.kt

@@ -1,11 +1,11 @@
-package com.intellij.settingsSync.git.table
+package com.intellij.settingsSync.core.git.table
 
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.vcs.VcsException
-import com.intellij.settingsSync.git.record.ChangeRecord
+import com.intellij.settingsSync.core.git.record.ChangeRecord
-import com.intellij.settingsSync.git.record.HistoryRecord
+import com.intellij.settingsSync.core.git.record.HistoryRecord
-import com.intellij.settingsSync.git.record.RecordService
+import com.intellij.settingsSync.core.git.record.RecordService
 import com.intellij.vcs.log.Hash
 import com.intellij.vcs.log.VcsFullCommitDetails
 import com.intellij.vcs.log.VcsLogDataProvider

platform/settings-sync-core/src/com/intellij/settingsSync/core/git/table/SettingsHistoryTableRow.kt

@@ -1,8 +1,8 @@
-package com.intellij.settingsSync.git.table
+package com.intellij.settingsSync.core.git.table
 
 import com.intellij.openapi.vcs.changes.Change
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.settingsSync.git.record.ChangeRecord
+import com.intellij.settingsSync.core.git.record.ChangeRecord
 
 internal sealed class SettingsHistoryTableRow(val record: ChangeRecord)
 

platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/CloudConfigToSettingsSyncMigration.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.migration
+package com.intellij.settingsSync.core.migration
 
 import com.intellij.configurationStore.getPerOsSettingsStorageFolderName
 import com.intellij.ide.plugins.DisabledPluginsState
@@ -9,7 +9,8 @@ import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.settingsSync.*
-import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID
+import com.intellij.settingsSync.core.*
+import com.intellij.settingsSync.core.config.EDITOR_FONT_SUBCATEGORY_ID
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.nio.file.Files

platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigInfo.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.migration
+package com.intellij.settingsSync.core.migration
 
 import org.jetbrains.annotations.Nls
 import org.jetbrains.annotations.NonNls

platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/ConfigState.kt

@@ -1,8 +1,7 @@
-package com.intellij.settingsSync.migration
+package com.intellij.settingsSync.core.migration
 
 import com.intellij.ide.IdeBundle
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
-import org.jetbrains.annotations.Nls
 
 /**
  * The synchronization state of the given group of settings.

platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigration.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.migration
+package com.intellij.settingsSync.core.migration
 
 import com.intellij.codeInsight.template.impl.TemplateSettings
 import com.intellij.configurationStore.ComponentStoreImpl
@@ -14,11 +14,13 @@ import com.intellij.openapi.components.serviceAsync
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.settingsSync.*
+import com.intellij.settingsSync.core.*
-import com.intellij.settingsSync.plugins.PluginManagerProxy
+import com.intellij.settingsSync.core.NOTIFICATION_GROUP
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.SettingsSyncIdeMediatorImpl
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.INSTALL_SETTINGS_REPOSITORY
+import com.intellij.settingsSync.core.plugins.PluginManagerProxy
-import com.intellij.settingsSync.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.USE_NEW_SETTINGS_SYNC
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.INSTALL_SETTINGS_REPOSITORY
+import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.USE_NEW_SETTINGS_SYNC
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.nio.file.FileVisitResult

platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/StatusInfo.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.migration
+package com.intellij.settingsSync.core.migration
 
 /**
  * @author Alexander Lobas

platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationService.kt

@@ -1,7 +1,7 @@
-package com.intellij.settingsSync.notification
+package com.intellij.settingsSync.core.notification
 
 import com.intellij.openapi.components.service
-import com.intellij.settingsSync.RestartReason
+import com.intellij.settingsSync.core.RestartReason
 
 internal interface NotificationService {
   companion object {

platform/settings-sync-core/src/com/intellij/settingsSync/core/notification/NotificationServiceImpl.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.notification
+package com.intellij.settingsSync.core.notification
 
 import com.intellij.ide.util.propComponentProperty
 import com.intellij.notification.Notification
@@ -8,9 +8,9 @@ import com.intellij.notification.NotificationType
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ApplicationNamesInfo
 import com.intellij.openapi.application.ex.ApplicationEx
-import com.intellij.settingsSync.NOTIFICATION_GROUP
+import com.intellij.settingsSync.core.NOTIFICATION_GROUP
-import com.intellij.settingsSync.RestartReason
+import com.intellij.settingsSync.core.RestartReason
-import com.intellij.settingsSync.SettingsSyncBundle
+import com.intellij.settingsSync.core.SettingsSyncBundle
 
 internal class NotificationServiceImpl: NotificationService {
   override fun notifySateRestoreFailed() {

platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/AbstractPluginManagerProxy.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.plugins
+package com.intellij.settingsSync.core.plugins
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginEnabler

platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/CorePluginManagerProxy.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.plugins
+package com.intellij.settingsSync.core.plugins
 
 import com.intellij.ide.plugins.*
 import com.intellij.openapi.Disposable

platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/PluginManagerProxy.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.plugins
+package com.intellij.settingsSync.core.plugins
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginEnableStateChangedListener

platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginCategoryFinder.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.plugins
+package com.intellij.settingsSync.core.plugins
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
@@ -16,7 +16,7 @@ internal object SettingsSyncPluginCategoryFinder {
   )
 
   fun getPluginCategory(descriptor: IdeaPluginDescriptor): SettingsCategory {
-    if (UI_CATEGORIES.contains(descriptor.category)|| containsOnlyUIExtensions(descriptor)) {
+    if (UI_CATEGORIES.contains(descriptor.category) || containsOnlyUIExtensions(descriptor)) {
       return SettingsCategory.UI
     }
     return SettingsCategory.PLUGINS

platform/settings-sync-core/src/com/intellij/settingsSync/core/plugins/SettingsSyncPluginInstaller.kt

@@ -1,4 +1,4 @@
-package com.intellij.settingsSync.plugins
+package com.intellij.settingsSync.core.plugins
 
 import com.intellij.openapi.extensions.PluginId