diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 06f698053971..7ad0282482ac 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -454,6 +454,7 @@ public def layoutCommunityPlugins(String home, boolean maySkipAndroidPlugin = fa
       }
       jar("remote-servers-git.jar") {
         moduleOptional("remote-servers-git")
+        moduleOptional("remote-servers-git-java")
       }
       fileset(dir: "$home/plugins/git4idea/lib") {
         include(name: "trilead-ssh2.jar")
diff --git a/plugins/git4idea/remote-servers-git-java/remote-servers-git-java.iml b/plugins/git4idea/remote-servers-git-java/remote-servers-git-java.iml
new file mode 100644
index 000000000000..db72cc7f2eae
--- /dev/null
+++ b/plugins/git4idea/remote-servers-git-java/remote-servers-git-java.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="remote-servers-git" />
+    <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="openapi" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/git4idea/remote-servers-git-java/src/META-INF/remote-servers-git-java.xml b/plugins/git4idea/remote-servers-git-java/src/META-INF/remote-servers-git-java.xml
new file mode 100644
index 000000000000..4b764065194a
--- /dev/null
+++ b/plugins/git4idea/remote-servers-git-java/src/META-INF/remote-servers-git-java.xml
@@ -0,0 +1,13 @@
+<idea-plugin url="https://www.jetbrains.com/idea">
+
+  <extensions defaultExtensionNs="com.intellij">
+    <projectStructureDetector implementation="com.intellij.remoteServer.util.importProject.CloudGitProjectStructureDetector"/>
+  </extensions>
+
+  <project-components>
+    <component>
+      <implementation-class>com.intellij.remoteServer.util.importProject.CloudGitRemoteDetector</implementation-class>
+    </component>
+  </project-components>
+
+</idea-plugin>
diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java
similarity index 100%
rename from plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java
rename to plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java
diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java
similarity index 100%
rename from plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java
rename to plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java
diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java
similarity index 100%
rename from plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java
rename to plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java
diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetector.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetector.java
similarity index 100%
rename from plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetector.java
rename to plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetector.java
diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java
similarity index 100%
rename from plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java
rename to plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java
diff --git a/plugins/git4idea/remote-servers-git/remote-servers-git.iml b/plugins/git4idea/remote-servers-git/remote-servers-git.iml
index 754094b7fb98..a67b65bc5c20 100644
--- a/plugins/git4idea/remote-servers-git/remote-servers-git.iml
+++ b/plugins/git4idea/remote-servers-git/remote-servers-git.iml
@@ -10,15 +10,12 @@
     <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" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="remote-servers-api" exported="" />
+    <orderEntry type="module" module-name="git4idea" exported="" />
+    <orderEntry type="module" module-name="remote-servers-impl" exported="" />
+    <orderEntry type="module" module-name="lang-api" exported="" />
+    <orderEntry type="module" module-name="lang-impl" exported="" />
     <orderEntry type="module" module-name="vcs-impl" />
     <orderEntry type="module" module-name="dvcs-api" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml b/plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml
index 8900c7821740..ccd2da479907 100644
--- a/plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml
+++ b/plugins/git4idea/remote-servers-git/src/META-INF/remote-servers-git.xml
@@ -5,14 +5,4 @@
                     interface="com.intellij.remoteServer.util.CloudGitDeploymentDetector"/>
   </extensionPoints>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <projectStructureDetector implementation="com.intellij.remoteServer.util.importProject.CloudGitProjectStructureDetector"/>
-  </extensions>
-
-  <project-components>
-    <component>
-      <implementation-class>com.intellij.remoteServer.util.importProject.CloudGitRemoteDetector</implementation-class>
-    </component>
-  </project-components>
-
 </idea-plugin>
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index cdd6879f9747..d261de41faea 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -23,6 +23,9 @@
   <xi:include href="/META-INF/remote-servers-git.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
+  <xi:include href="/META-INF/remote-servers-git-java.xml" xpointer="xpointer(/idea-plugin/*)">
+    <xi:fallback/>
+  </xi:include>
 
   <actions>