diff --git a/.idea/modules.xml b/.idea/modules.xml
index 73e287cf10b9..4b03482685e1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -96,7 +96,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/java/java-analysis-api/java-analysis-api.iml" filepath="$PROJECT_DIR$/java/java-analysis-api/java-analysis-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-analysis-impl/java-analysis-impl.iml" filepath="$PROJECT_DIR$/java/java-analysis-impl/java-analysis-impl.iml" group="java" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/java-decompiler/java-decompiler.iml" filepath="$PROJECT_DIR$/plugins/java-decompiler/java-decompiler.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/java-decompiler/engine/java-decompiler-engine.iml" filepath="$PROJECT_DIR$/plugins/java-decompiler/engine/java-decompiler-engine.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/java-decompiler/plugin/java-decompiler-plugin.iml" filepath="$PROJECT_DIR$/plugins/java-decompiler/plugin/java-decompiler-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" filepath="$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" group="java" />
diff --git a/community-main.iml b/community-main.iml
index 98b163ed9224..fb5c537266cc 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -100,7 +100,7 @@
     <orderEntry type="module" module-name="java-tests" scope="TEST" />
     <orderEntry type="module" module-name="community-tests" scope="TEST" />
     <orderEntry type="module" module-name="jira" />
-    <orderEntry type="module" module-name="java-decompiler" />
+    <orderEntry type="module" module-name="java-decompiler-plugin" />
     <orderEntry type="module" module-name="structuralsearch" />
     <orderEntry type="module" module-name="structuralsearch-java" />
     <orderEntry type="module" module-name="structuralsearch-tests" scope="TEST" />
@@ -109,5 +109,4 @@
     <orderEntry type="module" module-name="json-tests" scope="TEST" />
     <orderEntry type="module" module-name="typeMigration" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
index 84f706448ce2..82888ce1a794 100644
--- a/java/java-tests/java-tests.iml
+++ b/java/java-tests/java-tests.iml
@@ -32,7 +32,6 @@
     <orderEntry type="module" module-name="junit_rt" scope="TEST" />
     <orderEntry type="module" module-name="xml-psi-impl" scope="TEST" />
     <orderEntry type="module" module-name="properties-psi-api" scope="TEST" />
-    <orderEntry type="module" module-name="java-decompiler" />
+    <orderEntry type="module" module-name="java-decompiler-plugin" scope="TEST" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/plugins/java-decompiler/engine/java-decompiler-engine.iml b/plugins/java-decompiler/engine/java-decompiler-engine.iml
new file mode 100644
index 000000000000..d56249d739ea
--- /dev/null
+++ b/plugins/java-decompiler/engine/java-decompiler-engine.iml
@@ -0,0 +1,13 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/java-decompiler/java-decompiler.iml b/plugins/java-decompiler/plugin/java-decompiler-plugin.iml
similarity index 74%
rename from plugins/java-decompiler/java-decompiler.iml
rename to plugins/java-decompiler/plugin/java-decompiler-plugin.iml
index 69167bfd0cb3..6b5b607979f4 100644
--- a/plugins/java-decompiler/java-decompiler.iml
+++ b/plugins/java-decompiler/plugin/java-decompiler-plugin.iml
@@ -5,19 +5,15 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/engine/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/engine/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/engine/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="java-decompiler-engine" exported="" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="java-psi-api" />
     <orderEntry type="module" module-name="java-psi-impl" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="library" name="asm5" level="project" />
     <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/plugins/java-decompiler/src/META-INF/plugin.xml b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
similarity index 100%
rename from plugins/java-decompiler/src/META-INF/plugin.xml
rename to plugins/java-decompiler/plugin/src/META-INF/plugin.xml
diff --git a/plugins/java-decompiler/src/messages/Decompiler.properties b/plugins/java-decompiler/plugin/src/messages/Decompiler.properties
similarity index 100%
rename from plugins/java-decompiler/src/messages/Decompiler.properties
rename to plugins/java-decompiler/plugin/src/messages/Decompiler.properties
diff --git a/plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaDecompiler.java b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.java
similarity index 100%
rename from plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaDecompiler.java
rename to plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.java
diff --git a/plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.java b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.java
similarity index 100%
rename from plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.java
rename to plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.java
diff --git a/plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaLogger.java b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaLogger.java
similarity index 100%
rename from plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaLogger.java
rename to plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaLogger.java
diff --git a/plugins/java-decompiler/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.java b/plugins/java-decompiler/plugin/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.java
similarity index 100%
rename from plugins/java-decompiler/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.java
rename to plugins/java-decompiler/plugin/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.java
diff --git a/plugins/java-decompiler/testData/Navigation.class b/plugins/java-decompiler/plugin/testData/Navigation.class
similarity index 100%
rename from plugins/java-decompiler/testData/Navigation.class
rename to plugins/java-decompiler/plugin/testData/Navigation.class
diff --git a/plugins/java-decompiler/testData/Navigation.java b/plugins/java-decompiler/plugin/testData/Navigation.java
similarity index 100%
rename from plugins/java-decompiler/testData/Navigation.java
rename to plugins/java-decompiler/plugin/testData/Navigation.java