diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/AgentTaskExecutor.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/AgentTaskExecutor.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/AgentTaskExecutor.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/AgentTaskExecutor.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CallbackWrapper.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CallbackWrapper.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CallbackWrapper.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CallbackWrapper.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudConfigurableBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurableBase.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudConfigurableBase.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurableBase.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudConfigurationBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurationBase.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudConfigurationBase.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurationBase.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudConnectionTask.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConnectionTask.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudConnectionTask.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConnectionTask.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameConfiguration.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameConfiguration.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameConfiguration.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameConfiguration.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.form b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.form
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.form
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.form
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameProvider.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameProvider.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudDeploymentNameProvider.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameProvider.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudServerRuntimeInstance.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudServerRuntimeInstance.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudServerRuntimeInstance.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudServerRuntimeInstance.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/DeploymentNameConfiguration.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/DeploymentNameConfiguration.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/DeploymentNameConfiguration.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/DeploymentNameConfiguration.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/ServerRuntimeException.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/ServerRuntimeException.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/ServerRuntimeException.java
rename to platform/remote-servers/impl/src/com/intellij/remoteServer/util/ServerRuntimeException.java
diff --git a/platform/remote-servers/util/remote-servers-util.iml b/plugins/git4idea/remote-servers-git/remote-servers-git.iml
similarity index 76%
rename from platform/remote-servers/util/remote-servers-util.iml
rename to plugins/git4idea/remote-servers-git/remote-servers-git.iml
index e3c631600634..07e0637a9be8 100644
--- a/platform/remote-servers/util/remote-servers-util.iml
+++ b/plugins/git4idea/remote-servers-git/remote-servers-git.iml
@@ -4,16 +4,16 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../sandbox/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="git4idea" exported="" />
-    <orderEntry type="module" module-name="remote-servers-impl" exported="" />
-    <orderEntry type="module" module-name="core-api" exported="" />
-    <orderEntry type="module" module-name="remote-servers-api" />
+    <orderEntry type="module" module-name="remote-servers-agent-rt" />
+    <orderEntry type="module" module-name="core-api" />
     <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="remote-servers-api" />
+    <orderEntry type="module" module-name="git4idea" />
+    <orderEntry type="module" module-name="remote-servers-impl" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
   </component>
diff --git a/platform/remote-servers/util/resources/resources/cloud.properties b/plugins/git4idea/remote-servers-git/resources/resources/cloud.properties
similarity index 100%
rename from platform/remote-servers/util/resources/resources/cloud.properties
rename to plugins/git4idea/remote-servers-git/resources/resources/cloud.properties
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudBundle.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudBundle.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudBundle.java
rename to plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudBundle.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
rename to plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java
similarity index 99%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java
rename to plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java
index acc9a1c60539..79c2dfa7c281 100644
--- a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java
+++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java
@@ -65,7 +65,7 @@ public abstract class CloudGitServerRuntimeInstanceBase<
   @NotNull
   @Override
   public String getDeploymentName(@NotNull DeploymentSource source) {
-    return DEFAULT_NAME_PROVIDER.getDeploymentName(source);
+    return CloudDeploymentNameProvider.DEFAULT_NAME_PROVIDER.getDeploymentName(source);
   }
 
   public void connect(final ServerConnector.ConnectionCallback<DC> callback) {
diff --git a/platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudSupportConfigurableBase.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudSupportConfigurableBase.java
similarity index 100%
rename from platform/remote-servers/util/src/com/intellij/remoteServer/util/CloudSupportConfigurableBase.java
rename to plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudSupportConfigurableBase.java