diff --git a/dev-tools/idea/.idea/compiler.xml b/dev-tools/idea/.idea/compiler.xml
index ad9a660ffd2..892573d0af2 100644
--- a/dev-tools/idea/.idea/compiler.xml
+++ b/dev-tools/idea/.idea/compiler.xml
@@ -1,48 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions>
-      <entry name=".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
     <wildcardResourcePatterns>
-      <entry name="?*.aff"/>
-      <entry name="?*.brk" />
-      <entry name="?*.bz2" />
-      <entry name="?*.csv" />
-      <entry name="?*.dat" />
-      <entry name="?*.dic" />
-      <entry name="?*.docx"/>
-      <entry name="?*.dtd" />
-      <entry name="?*.ftl" />
-      <entry name="?*.gif" />
-      <entry name="?*.gz" />
-      <entry name="?*.htm" />
-      <entry name="?*.html" />
-      <entry name="?*.incl" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.json" />
-      <entry name="?*.mem" />
-      <entry name="?*.mt" />
-      <entry name="?*.nrm" />
-      <entry name="?*.pdf" />
-      <entry name="?*.png" />
-      <entry name="?*.properties" />
-      <entry name="?*.rslp"/>
-      <entry name="?*.tbl" />
-      <entry name="?*.tld" />
-      <entry name="?*.txt" />
-      <entry name="?*.utf8"/>
-      <entry name="?*.utf-8"/>
-      <entry name="?*.xml" />
-      <entry name="?*.xsl" />
-      <entry name="?*.vm" />
-      <entry name="?*.zip" />
-      <entry name="org.apache.lucene.codecs*" />
-      <entry name="README*" />
-      <entry name="[a-zA-Z][a-zA-Z]" />
-      <entry name="[a-zA-Z][a-zA-Z]-[a-zA-Z][a-zA-Z]" />
+      <entry name="!*.(cpp|java|jflex|jflex-macro|jj|js|pl|py)"/>
     </wildcardResourcePatterns>
   </component>
   <component name="JavacSettings">
diff --git a/dev-tools/idea/.idea/libraries/Morfologik_library.xml b/dev-tools/idea/.idea/libraries/Morfologik_library.xml
new file mode 100644
index 00000000000..5519be6943f
--- /dev/null
+++ b/dev-tools/idea/.idea/libraries/Morfologik_library.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Morfologik library">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/modules/analysis/morfologik/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/modules/analysis/morfologik/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml b/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml
deleted file mode 100644
index 344198b314f..00000000000
--- a/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Servlet API 2.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/solr/lib/servlet-api-2.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
diff --git a/dev-tools/idea/lucene/contrib/misc/misc.iml b/dev-tools/idea/lucene/contrib/misc/misc.iml
index 5fc3b344837..aba8711d322 100644
--- a/dev-tools/idea/lucene/contrib/misc/misc.iml
+++ b/dev-tools/idea/lucene/contrib/misc/misc.iml
@@ -5,7 +5,6 @@
     <output-test url="file://$MODULE_DIR$/../../build/contrib/misc/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
     </content>
diff --git a/dev-tools/idea/modules/analysis/common/analysis-common.iml b/dev-tools/idea/modules/analysis/common/analysis-common.iml
index 4882b813b62..961936a394b 100644
--- a/dev-tools/idea/modules/analysis/common/analysis-common.iml
+++ b/dev-tools/idea/modules/analysis/common/analysis-common.iml
@@ -7,7 +7,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/java/tools" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/dev-tools/idea/modules/benchmark/benchmark.iml b/dev-tools/idea/modules/benchmark/benchmark.iml
index 9a8790280ea..eeeb1e6803f 100644
--- a/dev-tools/idea/modules/benchmark/benchmark.iml
+++ b/dev-tools/idea/modules/benchmark/benchmark.iml
@@ -7,6 +7,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/conf" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/work" />
     </content>
diff --git a/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml b/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
index cb43b7f03ac..78d27321e2f 100644
--- a/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
+++ b/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
@@ -22,7 +22,9 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="Solr library" level="project" />
+    <orderEntry type="library" name="Morfologik library" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" module-name="morfologik" />
     <orderEntry type="module" module-name="icu" />
     <orderEntry type="module" module-name="smartcn" />
     <orderEntry type="module" module-name="solr" />