diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 317ea36c99ba..0d945a85ff54 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -489,10 +489,8 @@ public def layoutCommunityPlugins(String home) {
     }
 
     layoutPlugin("devkit") {
-      dir("jps") {
-        jar("devkit-jps-plugin.jar") {
-          module("devkit-jps-plugin")
-        }
+      jar("devkit-jps-plugin.jar") {
+        module("devkit-jps-plugin")
       }
       fileset(dir: "${home}/plugins/devkit/lib") {
         include(name: "**/*.jar")
diff --git a/plugins/devkit/devkit.iml b/plugins/devkit/devkit.iml
index 7e0ce3973e0b..72329902a0e5 100644
--- a/plugins/devkit/devkit.iml
+++ b/plugins/devkit/devkit.iml
@@ -45,6 +45,7 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="testFramework" />
     <orderEntry type="module" module-name="dom-impl" />
+    <orderEntry type="module" module-name="devkit-jps-plugin" />
   </component>
 </module>
 
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 396d6209ff3d..d92839c2df6c 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -50,7 +50,7 @@
     <configurationType implementation="org.jetbrains.idea.devkit.run.PluginConfigurationType"/>
     <moduleType id="PLUGIN_MODULE" implementationClass="org.jetbrains.idea.devkit.module.PluginModuleType" classpathProvider="true"/>
     <sdkType implementation="org.jetbrains.idea.devkit.projectRoots.IdeaJdk"/>
-    <compileServer.plugin classpath="jps/devkit-jps-plugin.jar"/>
+    <compileServer.plugin classpath="devkit-jps-plugin.jar"/>
     <fileTemplateGroup implementation="org.jetbrains.idea.devkit.DevKitFileTemplatesFactory"/>
     <lang.documentationProvider language="XML"
                                 implementationClass="org.jetbrains.idea.devkit.references.extensions.ExtensionPointDocumentationProvider"/>