diff --git a/plugins/spellchecker/core/lib-src/jazzy-0.5.2.src.zip b/plugins/spellchecker/lib-src/jazzy-0.5.2.src.zip
similarity index 100%
rename from plugins/spellchecker/core/lib-src/jazzy-0.5.2.src.zip
rename to plugins/spellchecker/lib-src/jazzy-0.5.2.src.zip
diff --git a/plugins/spellchecker/core/lib/jazzy-core.jar b/plugins/spellchecker/lib/jazzy-core.jar
similarity index 100%
rename from plugins/spellchecker/core/lib/jazzy-core.jar
rename to plugins/spellchecker/lib/jazzy-core.jar
diff --git a/plugins/spellchecker/spellchecker.iml b/plugins/spellchecker/spellchecker.iml
new file mode 100644
index 000000000000..3c976c5f6267
--- /dev/null
+++ b/plugins/spellchecker/spellchecker.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" 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="properties" exported="" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jazzy-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/lib-src/jazzy-0.5.2.src.zip!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="xml-openapi" />
+  </component>
+</module>
+
diff --git a/plugins/spellchecker/core/src/META-INF/plugin.xml b/plugins/spellchecker/src/META-INF/plugin.xml
similarity index 100%
rename from plugins/spellchecker/core/src/META-INF/plugin.xml
rename to plugins/spellchecker/src/META-INF/plugin.xml
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/CheckArea.java b/plugins/spellchecker/src/com/intellij/spellchecker/CheckArea.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/CheckArea.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/CheckArea.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/DictionarySuggestionProvider.java b/plugins/spellchecker/src/com/intellij/spellchecker/DictionarySuggestionProvider.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/DictionarySuggestionProvider.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/DictionarySuggestionProvider.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/SpellCheckerManager.java b/plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/SpellCheckerManager.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/SpellCheckerSeveritiesProvider.java b/plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerSeveritiesProvider.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/SpellCheckerSeveritiesProvider.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerSeveritiesProvider.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/TextSplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/TextSplitter.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/TextSplitter.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/TextSplitter.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/actions/CompleteWordFromDictionaryAction.java b/plugins/spellchecker/src/com/intellij/spellchecker/actions/CompleteWordFromDictionaryAction.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/actions/CompleteWordFromDictionaryAction.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/actions/CompleteWordFromDictionaryAction.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java b/plugins/spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/dictionary/Dictionary.java b/plugins/spellchecker/src/com/intellij/spellchecker/dictionary/Dictionary.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/dictionary/Dictionary.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/dictionary/Dictionary.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/dictionary/ProjectDictionary.java b/plugins/spellchecker/src/com/intellij/spellchecker/dictionary/ProjectDictionary.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/dictionary/ProjectDictionary.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/dictionary/ProjectDictionary.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/dictionary/UserDictionary.java b/plugins/spellchecker/src/com/intellij/spellchecker/dictionary/UserDictionary.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/dictionary/UserDictionary.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/dictionary/UserDictionary.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/engine/JazzySpellChecker.java b/plugins/spellchecker/src/com/intellij/spellchecker/engine/JazzySpellChecker.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/engine/JazzySpellChecker.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/engine/JazzySpellChecker.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/engine/SpellChecker.java b/plugins/spellchecker/src/com/intellij/spellchecker/engine/SpellChecker.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/engine/SpellChecker.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/engine/SpellChecker.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/engine/SpellCheckerFactory.java b/plugins/spellchecker/src/com/intellij/spellchecker/engine/SpellCheckerFactory.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/engine/SpellCheckerFactory.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/engine/SpellCheckerFactory.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/english.dic b/plugins/spellchecker/src/com/intellij/spellchecker/english.dic
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/english.dic
rename to plugins/spellchecker/src/com/intellij/spellchecker/english.dic
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/inspections/SpellCheckerInspectionToolProvider.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckerInspectionToolProvider.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/inspections/SpellCheckerInspectionToolProvider.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckerInspectionToolProvider.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/jetbrains.dic b/plugins/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/jetbrains.dic
rename to plugins/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/CachedDictionaryState.java b/plugins/spellchecker/src/com/intellij/spellchecker/options/CachedDictionaryState.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/CachedDictionaryState.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/CachedDictionaryState.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/ProjectDictionarySplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/options/ProjectDictionarySplitter.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/ProjectDictionarySplitter.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/ProjectDictionarySplitter.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/ProjectDictionaryState.java b/plugins/spellchecker/src/com/intellij/spellchecker/options/ProjectDictionaryState.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/ProjectDictionaryState.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/ProjectDictionaryState.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerConfigurable.java b/plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerConfigurable.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerConfigurable.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerConfigurable.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerConfiguration.java b/plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerConfiguration.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerConfiguration.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerConfiguration.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerOptions.form b/plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerOptions.form
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerOptions.form
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerOptions.form
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerOptions.java b/plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerOptions.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/options/SpellCheckerOptions.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/options/SpellCheckerOptions.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/ChangeTo.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/ChangeTo.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/RenameTo.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/RenameTo.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/SpellCheckerQuickFix.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/SpellCheckerQuickFix.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/quickfixes/SpellCheckerQuickFix.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/SpellCheckerQuickFix.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/CommentTokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/CommentTokenizer.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/CommentTokenizer.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/CommentTokenizer.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/HtmlSpellcheckingStrategy.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/HtmlSpellcheckingStrategy.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/HtmlSpellcheckingStrategy.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/HtmlSpellcheckingStrategy.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/PsiIdentifierOwnerTokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/PsiIdentifierOwnerTokenizer.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/PsiIdentifierOwnerTokenizer.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/PsiIdentifierOwnerTokenizer.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/TextTokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/TextTokenizer.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/TextTokenizer.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/TextTokenizer.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/Token.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/Token.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/Token.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/Token.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/Tokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/Tokenizer.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/Tokenizer.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/Tokenizer.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/XmlAttributeTokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlAttributeTokenizer.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/XmlAttributeTokenizer.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlAttributeTokenizer.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java b/plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/XmlTextTokenizer.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/util/SpellCheckerBundle.java b/plugins/spellchecker/src/com/intellij/spellchecker/util/SpellCheckerBundle.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/util/SpellCheckerBundle.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/util/SpellCheckerBundle.java
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/util/SpellCheckerBundle.properties b/plugins/spellchecker/src/com/intellij/spellchecker/util/SpellCheckerBundle.properties
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/util/SpellCheckerBundle.properties
rename to plugins/spellchecker/src/com/intellij/spellchecker/util/SpellCheckerBundle.properties
diff --git a/plugins/spellchecker/core/src/com/intellij/spellchecker/util/Strings.java b/plugins/spellchecker/src/com/intellij/spellchecker/util/Strings.java
similarity index 100%
rename from plugins/spellchecker/core/src/com/intellij/spellchecker/util/Strings.java
rename to plugins/spellchecker/src/com/intellij/spellchecker/util/Strings.java
diff --git a/plugins/spellchecker/core/src/inspectionDescriptions/SpellCheckingInspection.html b/plugins/spellchecker/src/inspectionDescriptions/SpellCheckingInspection.html
similarity index 100%
rename from plugins/spellchecker/core/src/inspectionDescriptions/SpellCheckingInspection.html
rename to plugins/spellchecker/src/inspectionDescriptions/SpellCheckingInspection.html