diff --git a/.idea/modules.xml b/.idea/modules.xml
index 506563d4c325..b597c3ba5169 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -116,7 +116,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" filepath="$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" group="plugins/VCS/cvs" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/spellchecker.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/bindSvn/bindSvn.iml" filepath="$PROJECT_DIR$/plugins/bindSvn/bindSvn.iml" group="plugins/VCS" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/bindSvn/bindSvn.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/bindSvn/bindSvn.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/tasks/tasks-api/tasks-api.iml" filepath="$PROJECT_DIR$/plugins/tasks/tasks-api/tasks-api.iml" group="plugins/tasks" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index c28b9f7aa1b1..16c241d07b51 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -300,11 +300,11 @@ public def layoutCommunityPlugins(String home) {
     }
 
     layoutPlugin("svn4idea") {
+      jar("bindSvn.jar") {
+        module("bindSvn")
+      }
       fileset(dir: "$home/plugins/svn4idea/lib", excludes: "**/svnkitsrc.zip")
     }
-    layoutPlugin("bindSvn") {
-      fileset(dir: "$home/plugins/svn4idea/lib", includes: "**/javahl.jar")
-    }
 
     layoutPlugin("junit", "junit", "idea-junit") {
       jar("junit-rt.jar") {
diff --git a/plugins/bindSvn/bindSvn.iml b/plugins/svn4idea/bindSvn/bindSvn.iml
similarity index 100%
rename from plugins/bindSvn/bindSvn.iml
rename to plugins/svn4idea/bindSvn/bindSvn.iml
diff --git a/plugins/bindSvn/lib/javahl.jar b/plugins/svn4idea/bindSvn/lib/javahl.jar
similarity index 100%
rename from plugins/bindSvn/lib/javahl.jar
rename to plugins/svn4idea/bindSvn/lib/javahl.jar
diff --git a/plugins/bindSvn/lib/javahlsrc.zip b/plugins/svn4idea/bindSvn/lib/javahlsrc.zip
similarity index 100%
rename from plugins/bindSvn/lib/javahlsrc.zip
rename to plugins/svn4idea/bindSvn/lib/javahlsrc.zip
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/AuthenticationCallback.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/AuthenticationCallback.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/AuthenticationCallback.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/AuthenticationCallback.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/CommitEventHandler.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/CommitEventHandler.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/CommitEventHandler.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/CommitEventHandler.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/CommitEventType.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/CommitEventType.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/CommitEventType.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/CommitEventType.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/SvnBindClient.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/SvnBindClient.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/SvnBindClient.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/SvnBindClient.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/SvnCommitRunner.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/SvnCommitRunner.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/SvnCommitRunner.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/SvnCommitRunner.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/Util.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/Util.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/Util.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/Util.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/LineCommandListener.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/LineCommandListener.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/LineCommandListener.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/LineCommandListener.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommand.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommand.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommand.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommand.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommandName.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommandName.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommandName.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnCommandName.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnLineCommand.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnLineCommand.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnLineCommand.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnLineCommand.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnSimpleCommand.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnSimpleCommand.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnSimpleCommand.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/commandLine/SvnSimpleCommand.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/config/SvnBindException.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/config/SvnBindException.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/config/SvnBindException.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/config/SvnBindException.java
diff --git a/plugins/bindSvn/src/org/jetbrains/idea/svn/status/LockWrapper.java b/plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/status/LockWrapper.java
similarity index 100%
rename from plugins/bindSvn/src/org/jetbrains/idea/svn/status/LockWrapper.java
rename to plugins/svn4idea/bindSvn/src/org/jetbrains/idea/svn/status/LockWrapper.java
diff --git a/plugins/bindSvn/src/org/tigris/subversion/javahl/BindClientException.java b/plugins/svn4idea/bindSvn/src/org/tigris/subversion/javahl/BindClientException.java
similarity index 100%
rename from plugins/bindSvn/src/org/tigris/subversion/javahl/BindClientException.java
rename to plugins/svn4idea/bindSvn/src/org/tigris/subversion/javahl/BindClientException.java
diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml
index 447f1dc1be62..a2785e1261f5 100644
--- a/plugins/svn4idea/svn4idea.iml
+++ b/plugins/svn4idea/svn4idea.iml
@@ -91,17 +91,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/javahl.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/lib/javahlsrc.zip!/src" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -114,6 +103,15 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="bindSvn" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/bindSvn/lib/javahl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>