diff --git a/.idea/modules.xml b/.idea/modules.xml
index 101efac37338..9f60bd4226c6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -218,6 +218,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" filepath="$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" group="plugins"/>
+
     </modules>
   </component>
 </project>
diff --git a/editorconfig/LICENSE.txt b/plugins/editorconfig/LICENSE.txt
similarity index 100%
rename from editorconfig/LICENSE.txt
rename to plugins/editorconfig/LICENSE.txt
diff --git a/editorconfig/META-INF/plugin.xml b/plugins/editorconfig/META-INF/plugin.xml
similarity index 100%
rename from editorconfig/META-INF/plugin.xml
rename to plugins/editorconfig/META-INF/plugin.xml
diff --git a/editorconfig/README.md b/plugins/editorconfig/README.md
similarity index 100%
rename from editorconfig/README.md
rename to plugins/editorconfig/README.md
diff --git a/editorconfig/editorconfig-jetbrains.iml b/plugins/editorconfig/editorconfig.iml
similarity index 56%
rename from editorconfig/editorconfig-jetbrains.iml
rename to plugins/editorconfig/editorconfig.iml
index c3f36fd27f32..8d67b1cc8c76 100644
--- a/editorconfig/editorconfig-jetbrains.iml
+++ b/plugins/editorconfig/editorconfig.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
@@ -8,18 +8,21 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
+    <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../editorconfig-core-java/lib/editorconfig-core-java.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/editorconfig-core-java.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../editorconfig-core-java/lib/editorconfig-core-java.jar!/" />
-          <root url="jar://$MODULE_DIR$/../editorconfig-core-java/lib/editorconfig-core-java.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/editorconfig-core-java.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="core-api" />
+    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="lang-api" />
   </component>
 </module>
 
diff --git a/plugins/editorconfig/lib/editorconfig-core-java.jar b/plugins/editorconfig/lib/editorconfig-core-java.jar
new file mode 100644
index 000000000000..f115b7480336
Binary files /dev/null and b/plugins/editorconfig/lib/editorconfig-core-java.jar differ
diff --git a/editorconfig/src/org/editorconfig/Utils.java b/plugins/editorconfig/src/org/editorconfig/Utils.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/Utils.java
rename to plugins/editorconfig/src/org/editorconfig/Utils.java
diff --git a/editorconfig/src/org/editorconfig/configmanagement/CodeStyleManager.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/CodeStyleManager.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/configmanagement/CodeStyleManager.java
rename to plugins/editorconfig/src/org/editorconfig/configmanagement/CodeStyleManager.java
diff --git a/editorconfig/src/org/editorconfig/configmanagement/EditorSettingsManager.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorSettingsManager.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/configmanagement/EditorSettingsManager.java
rename to plugins/editorconfig/src/org/editorconfig/configmanagement/EditorSettingsManager.java
diff --git a/editorconfig/src/org/editorconfig/configmanagement/EncodingManager.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/EncodingManager.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/configmanagement/EncodingManager.java
rename to plugins/editorconfig/src/org/editorconfig/configmanagement/EncodingManager.java
diff --git a/editorconfig/src/org/editorconfig/configmanagement/LineEndingsManager.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/LineEndingsManager.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/configmanagement/LineEndingsManager.java
rename to plugins/editorconfig/src/org/editorconfig/configmanagement/LineEndingsManager.java
diff --git a/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java
rename to plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java
diff --git a/editorconfig/src/org/editorconfig/plugincomponents/SettingsProviderComponent.java b/plugins/editorconfig/src/org/editorconfig/plugincomponents/SettingsProviderComponent.java
similarity index 100%
rename from editorconfig/src/org/editorconfig/plugincomponents/SettingsProviderComponent.java
rename to plugins/editorconfig/src/org/editorconfig/plugincomponents/SettingsProviderComponent.java