diff --git a/.gitignore b/.gitignore
index 1aad52983e4..e6eef81b84e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,11 @@ workspace.xml
 *.versionsBackup
 /idea/testData/debugger/tinyApp/classes*
 /jps-plugin/testData/kannotator
+ultimate/.DS_Store
+ultimate/.idea/shelf
+ultimate/dependencies
+ultimate/ideaSDK
+ultimate/out
+ultimate/tmp
+ultimate/workspace.xml
+ultimate/*.versionsBackup
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index c37a9990918..1eb3897786f 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -47,7 +47,6 @@
           <element id="module-output" name="idea-repl" />
           <element id="module-output" name="idea-live-templates" />
           <element id="module-output" name="resolution" />
-          <element id="module-output" name="plugin-api" />
           <element id="module-output" name="idea-ultimate" />
         </element>
         <element id="library" level="project" name="javax.inject" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ecfd35f4f91..a6a8109750f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -47,7 +47,6 @@
       <module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-ultimate/idea-ultimate.iml" filepath="$PROJECT_DIR$/idea/idea-ultimate/idea-ultimate.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
diff --git a/ReadMe.md b/ReadMe.md
index 437b5fa924e..b15bf23a922 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -34,11 +34,6 @@ which will setup the dependencies on
 
 * intellij-core: is a part of command line compiler and contains only necessary APIs.
 * idea-full: is a full blown IntelliJ IDEA Community Edition to be used in former plugin module.
-* idea-ultimate-full: is a full blown IntelliJ IDEA Ultimate Edition to be used in former plugin module.
-
-If you are not dealing with IDEA Ultimate-specific features, you may want to disable corresponding project dependency.
-(that will also relieve you from necessity to download the IDEA Ultimate distribution during dependency update process)
-To do so change "use.ultimate.by.default" property to false (update_dependencies.xml) before running dependency update
 
 Then, you need to run
 
@@ -72,9 +67,6 @@ plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which descr
 
 From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest and greatest IDEA plugin
 
-If you've decided to disable IDEA Ultimate configuration during dependency update, you also need to locally disable the compilation of its dependent code.
-To do so you can either delete idea-ultimate module using IDEA action in the Project View, or remove corresponding line in .idea/modules.xml
-
 * VCS -> Git -> Pull
 * Run IntelliJ IDEA
 * a child IntelliJ IDEA with the Kotlin plugin will then startup
diff --git a/generators/generators.iml b/generators/generators.iml
index 2b0b9a476c2..c1adce0e190 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -38,6 +38,5 @@
     <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
     <orderEntry type="module" module-name="idea-android" scope="TEST" />
     <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
-    <orderEntry type="module" module-name="idea-ultimate" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index e37da052342..b7ddad9d633 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -99,10 +99,6 @@ import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest
 import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest
 import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest
 import org.jetbrains.kotlin.idea.resolve.*
-import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest
-import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest
-import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionTest
-import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceNavigationTest
 import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest
 import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest
 import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest
@@ -795,32 +791,6 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("idea/idea-ultimate/tests", "idea/testData") {
-        testClass<AbstractInspectionTest>("UltimateInspectionTestGenerated") {
-            model("ultimateInspections", pattern = "^(inspections\\.test)$", singleClass = true)
-        }
-
-        testClass<AbstractQuickFixTest>("UltimateQuickFixTestGenerated") {
-            model("ultimateQuickFixes", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true)
-        }
-
-        testClass<AbstractSpringReferenceCompletionHandlerTest>() {
-            model("spring/core/references/completion/handler")
-        }
-
-        testClass<AbstractSpringReferenceCompletionTest>() {
-            model("spring/core/references/completion/variants")
-        }
-
-        testClass<AbstractSpringReferenceNavigationTest>() {
-            model("spring/core/references/navigation")
-        }
-
-        testClass<AbstractGenerateSpringDependencyActionTest>() {
-            model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true)
-        }
-    }
-
     testGroup("idea/tests", "compiler/testData") {
         testClass<AbstractResolveByStubTest>() {
             model("loadJava/compiledKotlin")
@@ -1132,7 +1102,7 @@ fun main(args: Array<String>) {
     }
 }
 
-internal class TestGroup(val testsRoot: String, val testDataRoot: String) {
+class TestGroup(val testsRoot: String, val testDataRoot: String) {
     inline fun <reified T: TestCase> testClass(
             suiteTestClass: String = getDefaultSuiteTestClass(T::class.java),
             noinline init: TestClass.() -> Unit
@@ -1196,11 +1166,11 @@ internal class TestGroup(val testsRoot: String, val testDataRoot: String) {
 
 }
 
-private fun testGroup(testsRoot: String, testDataRoot: String, init: TestGroup.() -> Unit) {
+fun testGroup(testsRoot: String, testDataRoot: String, init: TestGroup.() -> Unit) {
     TestGroup(testsRoot, testDataRoot).init()
 }
 
-private fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String {
+fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String {
     val baseName = baseTestClass.simpleName
     if (!baseName.startsWith("Abstract")) {
         throw IllegalArgumentException("Doesn't start with \"Abstract\": $baseName")
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt
index 4d43cbbc46c..2f10667b367 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt
@@ -37,4 +37,5 @@ fun CodeInsightTestFixture.configureWithExtraFile(path: String, vararg extraName
     configureByFiles(*(listOf(path) + extraPaths).toTypedArray())
 }
 
+@Suppress("unused") // Used in kotlin-ultimate
 inline fun <reified T: Any> Any?.assertInstanceOf() = UsefulTestCase.assertInstanceOf(this, T::class.java)
\ No newline at end of file
diff --git a/idea/idea-ultimate/idea-ultimate.iml b/idea/idea-ultimate/idea-ultimate.iml
deleted file mode 100644
index 9626bf90871..00000000000
--- a/idea/idea-ultimate/idea-ultimate.iml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="intellilang-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="testng-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="copyright-plugin" level="project" />
-    <orderEntry type="module" module-name="j2k" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="idea-jps-common" />
-    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
-    <orderEntry type="module" module-name="eval4j" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="idea-analysis" exported="" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="markdown" level="project" />
-    <orderEntry type="module" module-name="idea-completion" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="daemon-client" />
-    <orderEntry type="module" module-name="idea-repl" scope="TEST" />
-    <orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="generators" scope="TEST" />
-    <orderEntry type="library" scope="PROVIDED" name="spring-support" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="javaee-support" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="persistence-support" level="project" />
-    <orderEntry type="library" name="database-support" level="project" />
-    <orderEntry type="library" name="css-support" level="project" />
-    <orderEntry type="library" name="jsp-support" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 5c9c3c2d7c9..eec930825c4 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -18,12 +18,8 @@
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
   <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
-  <depends optional="true" config-file="kotlin-spring.xml">com.intellij.spring</depends>
-  <depends optional="true">com.intellij.javaee</depends>
-  <depends optional="true">com.intellij.persistence</depends>
-  <depends optional="true">com.intellij.database</depends>
-  <depends optional="true">com.intellij.css</depends>
-  <depends optional="true">com.intellij.jsp</depends>
+
+  <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
   <project-components>
     <component>
diff --git a/ultimate/.gitignore b/ultimate/.gitignore
new file mode 100644
index 00000000000..25cdab965cb
--- /dev/null
+++ b/ultimate/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+.idea/shelf
+dependencies
+ideaSDK
+out
+tmp
+workspace.xml
+*.versionsBackup
\ No newline at end of file
diff --git a/ultimate/.idea/.name b/ultimate/.idea/.name
new file mode 100644
index 00000000000..45a157fd34d
--- /dev/null
+++ b/ultimate/.idea/.name
@@ -0,0 +1 @@
+kotlin-ultimate
\ No newline at end of file
diff --git a/ultimate/.idea/ant.xml b/ultimate/.idea/ant.xml
new file mode 100644
index 00000000000..9b72ed2e713
--- /dev/null
+++ b/ultimate/.idea/ant.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/update_dependencies.xml" />
+    <buildFile url="file://$PROJECT_DIR$/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/../idea-runner/runner.xml" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ultimate/.idea/artifacts/Dummy.xml b/ultimate/.idea/artifacts/Dummy.xml
new file mode 100644
index 00000000000..b7badbb7f8f
--- /dev/null
+++ b/ultimate/.idea/artifacts/Dummy.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact name="Dummy">
+    <output-path>$PROJECT_DIR$/out/artifacts/Dummy</output-path>
+    <root id="root">
+      <element id="module-output" name="kotlin-ultimate" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/codeInsightSettings.xml b/ultimate/.idea/codeInsightSettings.xml
new file mode 100644
index 00000000000..37f806f2e3e
--- /dev/null
+++ b/ultimate/.idea/codeInsightSettings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaProjectCodeInsightSettings">
+    <excluded-names>
+      <name>kotlin.reflect.jvm.internal.impl</name>
+    </excluded-names>
+  </component>
+</project>
\ No newline at end of file
diff --git a/ultimate/.idea/compiler.xml b/ultimate/.idea/compiler.xml
index 5a3d3f7bee2..a105e8629e8 100644
--- a/ultimate/.idea/compiler.xml
+++ b/ultimate/.idea/compiler.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <option name="BUILD_PROCESS_HEAP_SIZE" value="2000" />
     <resourceExtensions />
-    <wildcardResourcePatterns />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
   </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/ultimate/.idea/copyright/apache.xml b/ultimate/.idea/copyright/apache.xml
new file mode 100644
index 00000000000..9b100320269
--- /dev/null
+++ b/ultimate/.idea/copyright/apache.xml
@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="keyword" value="Copyright" />
+    <option name="allowReplaceKeyword" value="JetBrains" />
+    <option name="myName" value="apache" />
+    <option name="myLocal" value="true" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/copyright/profiles_settings.xml b/ultimate/.idea/copyright/profiles_settings.xml
index 1c2e0fa5db1..5fbc0e59e10 100644
--- a/ultimate/.idea/copyright/profiles_settings.xml
+++ b/ultimate/.idea/copyright/profiles_settings.xml
@@ -1,5 +1,8 @@
 <component name="CopyrightManager">
   <settings default="">
+    <module2copyright>
+      <element module="all except testData" copyright="apache" />
+    </module2copyright>
     <LanguageOptions name="Groovy">
       <option name="fileTypeOverride" value="1" />
     </LanguageOptions>
diff --git a/ultimate/.idea/dictionaries/Nikolay_Krasko.xml b/ultimate/.idea/dictionaries/Nikolay_Krasko.xml
new file mode 100644
index 00000000000..2995eb1ba67
--- /dev/null
+++ b/ultimate/.idea/dictionaries/Nikolay_Krasko.xml
@@ -0,0 +1,24 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Nikolay.Krasko">
+    <words>
+      <w>accessors</w>
+      <w>fqname</w>
+      <w>goto</w>
+      <w>gradle</w>
+      <w>intrinsics</w>
+      <w>kdoc</w>
+      <w>kompiler</w>
+      <w>memoize</w>
+      <w>memoized</w>
+      <w>multiline</w>
+      <w>preload</w>
+      <w>preloader</w>
+      <w>preloading</w>
+      <w>preprocess</w>
+      <w>redeclarations</w>
+      <w>subclassed</w>
+      <w>subgraph</w>
+      <w>substep</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/dictionaries/abreslav.xml b/ultimate/.idea/dictionaries/abreslav.xml
new file mode 100644
index 00000000000..9035118b0b9
--- /dev/null
+++ b/ultimate/.idea/dictionaries/abreslav.xml
@@ -0,0 +1,22 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="abreslav">
+    <words>
+      <w>accessor</w>
+      <w>covariantly</w>
+      <w>deserialized</w>
+      <w>dominator</w>
+      <w>inferrer</w>
+      <w>iterable</w>
+      <w>nondeterministic</w>
+      <w>nullable</w>
+      <w>overridable</w>
+      <w>pseudocode</w>
+      <w>substitutor</w>
+      <w>subtyping</w>
+      <w>supertype</w>
+      <w>supertypes</w>
+      <w>tuple</w>
+      <w>unary</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/dictionaries/bashor.xml b/ultimate/.idea/dictionaries/bashor.xml
new file mode 100644
index 00000000000..fa362eaa919
--- /dev/null
+++ b/ultimate/.idea/dictionaries/bashor.xml
@@ -0,0 +1,10 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="bashor">
+    <words>
+      <w>ctor</w>
+      <w>interner</w>
+      <w>lookups</w>
+      <w>unescape</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/dictionaries/dzharkov.xml b/ultimate/.idea/dictionaries/dzharkov.xml
new file mode 100644
index 00000000000..2e8cb56c4fb
--- /dev/null
+++ b/ultimate/.idea/dictionaries/dzharkov.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="dzharkov">
+    <words>
+      <w>checkcast</w>
+      <w>insn</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/dictionaries/geevee.xml b/ultimate/.idea/dictionaries/geevee.xml
new file mode 100644
index 00000000000..c83493eb226
--- /dev/null
+++ b/ultimate/.idea/dictionaries/geevee.xml
@@ -0,0 +1,13 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="geevee">
+    <words>
+      <w>builtins</w>
+      <w>callables</w>
+      <w>klass</w>
+      <w>proto</w>
+      <w>protoc</w>
+      <w>protos</w>
+      <w>ubuntu</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/dictionaries/max.xml b/ultimate/.idea/dictionaries/max.xml
new file mode 100644
index 00000000000..064d7e3b1c4
--- /dev/null
+++ b/ultimate/.idea/dictionaries/max.xml
@@ -0,0 +1,9 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="max">
+    <words>
+      <w>classfiles</w>
+      <w>codegen</w>
+      <w>kotlin</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/dictionaries/valentin.xml b/ultimate/.idea/dictionaries/valentin.xml
new file mode 100644
index 00000000000..b033708428b
--- /dev/null
+++ b/ultimate/.idea/dictionaries/valentin.xml
@@ -0,0 +1,25 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="valentin">
+    <words>
+      <w>decapitalize</w>
+      <w>delegator</w>
+      <w>funs</w>
+      <w>immediates</w>
+      <w>initializers</w>
+      <w>inserter</w>
+      <w>negatable</w>
+      <w>pparent</w>
+      <w>precheck</w>
+      <w>prioritizer</w>
+      <w>processings</w>
+      <w>rbrace</w>
+      <w>rbracket</w>
+      <w>renderers</w>
+      <w>rparenth</w>
+      <w>selectioner</w>
+      <w>summand</w>
+      <w>unpluralize</w>
+      <w>weighers</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/encodings.xml b/ultimate/.idea/encodings.xml
index 97626ba4544..f758959656c 100644
--- a/ultimate/.idea/encodings.xml
+++ b/ultimate/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ultimate/.idea/inspectionProfiles/idea_default.xml b/ultimate/.idea/inspectionProfiles/idea_default.xml
new file mode 100644
index 00000000000..ca6e2ba2d81
--- /dev/null
+++ b/ultimate/.idea/inspectionProfiles/idea_default.xml
@@ -0,0 +1,426 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0" is_locked="false">
+    <option name="myName" value="idea.default" />
+    <option name="myLocal" value="false" />
+    <inspection_tool class="AbstractMethodCallInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ArchaicSystemPropertyAccess" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AssignmentToForLoopParameter" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_checkForeachParameters" value="false" />
+    </inspection_tool>
+    <inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="AssignmentUsedAsCondition" enabled="false" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AutoBoxing" enabled="true" level="WARNING" enabled_by_default="false">
+      <scope name="runtime.classes" level="WARNING" enabled="true">
+        <option name="ignoreAddedToCollection" value="false" />
+      </scope>
+      <option name="ignoreAddedToCollection" value="false" />
+    </inspection_tool>
+    <inspection_tool class="AutoUnboxing" enabled="true" level="WARNING" enabled_by_default="false">
+      <scope name="runtime.classes" level="WARNING" enabled="true" />
+    </inspection_tool>
+    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BusyWait" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CStyleArrayDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ChainedEquality" enabled="false" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ClassNameSameAsAncestorName" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CloneCallsSuperClone" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CloneDeclaresCloneNotSupported" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ConditionalExpressionWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ConfusingOctalEscape" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ConstantConditionalExpression" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="runtime.classes" level="WARNING" enabled="false">
+        <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+        <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+      </scope>
+      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ConstantIfStatement" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="ContinueOrBreakFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CovariantCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CovariantEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="DeclareCollectionAsInterface" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoreLocalVariables" value="false" />
+      <option name="ignorePrivateMethodsAndFields" value="false" />
+    </inspection_tool>
+    <inspection_tool class="DoubleCheckedLocking" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreOnVolatileVariables" value="true" />
+    </inspection_tool>
+    <inspection_tool class="DuplicateCondition" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreMethodCalls" value="false" />
+    </inspection_tool>
+    <inspection_tool class="EmptyStatementBody" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_reportEmptyBlocks" value="false" />
+    </inspection_tool>
+    <inspection_tool class="EmptySynchronizedStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreSwitchStatementsWithDefault" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ExceptionNameDoesntEndWithException" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="FieldAccessedSynchronizedAndUnsynchronized" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="countGettersAndSetters" value="false" />
+    </inspection_tool>
+    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Finalize" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreTrivialFinalizers" value="true" />
+    </inspection_tool>
+    <inspection_tool class="FinalizeNotProtected" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ForLoopReplaceableByWhile" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_ignoreLoopsWithoutConditions" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ForLoopThatDoesntUseLoopVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="5">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="javascript" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="IOResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredTypesString" value="java.io.ByteArrayOutputStream,java.io.ByteArrayInputStream,java.io.StringBufferInputStream,java.io.CharArrayWriter,java.io.CharArrayReader,java.io.StringWriter,java.io.StringReader" />
+      <option name="insideTryAllowed" value="false" />
+    </inspection_tool>
+    <inspection_tool class="IfStatementWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InstanceofCatchParameter" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InstanceofIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JUnitTestClassNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_regex" value="[A-Z][A-Za-z0-9]*Test" />
+      <option name="m_minLength" value="8" />
+      <option name="m_maxLength" value="64" />
+    </inspection_tool>
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="false">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false">
+        <option name="TOP_LEVEL_CLASS_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="INNER_CLASS_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="METHOD_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+          </value>
+        </option>
+        <option name="FIELD_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="IGNORE_DEPRECATED" value="false" />
+        <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+        <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+        <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+        <option name="myAdditionalJavadocTags" value="" />
+      </scope>
+      <scope name="idea openapi" level="WARNING" enabled="true">
+        <option name="TOP_LEVEL_CLASS_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="INNER_CLASS_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="METHOD_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+          </value>
+        </option>
+        <option name="FIELD_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="IGNORE_DEPRECATED" value="true" />
+        <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+        <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+        <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+        <option name="myAdditionalJavadocTags" value="" />
+      </scope>
+      <scope name="runtime.classes" level="WARNING" enabled="true">
+        <option name="TOP_LEVEL_CLASS_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="INNER_CLASS_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="METHOD_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+          </value>
+        </option>
+        <option name="FIELD_OPTIONS">
+          <value>
+            <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+            <option name="REQUIRED_TAGS" value="" />
+          </value>
+        </option>
+        <option name="IGNORE_DEPRECATED" value="false" />
+        <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+        <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+        <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+        <option name="myAdditionalJavadocTags" value="" />
+      </scope>
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="" />
+    </inspection_tool>
+    <inspection_tool class="JavadocReference" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="ERROR" enabled="false" />
+      <scope name="idea openapi" level="WARNING" enabled="true" />
+      <scope name="runtime.classes" level="ERROR" enabled="true" />
+    </inspection_tool>
+    <inspection_tool class="MethodMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_onlyPrivateOrFinal" value="false" />
+      <option name="m_ignoreEmptyMethods" value="true" />
+    </inspection_tool>
+    <inspection_tool class="MethodNamesDifferOnlyByCase" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MethodOverridesPrivateMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MethodOverridesStaticMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreObjectMethods" value="true" />
+      <option name="ignoreAnonymousClassMethods" value="false" />
+    </inspection_tool>
+    <inspection_tool class="MisspelledCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MisspelledHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MisspelledSetUp" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MisspelledTearDown" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MisspelledToString" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreForLoopDeclarations" value="true" />
+    </inspection_tool>
+    <inspection_tool class="MultipleTypedDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="NestedSynchronizedStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="NoExplicitFinalizeCalls" enabled="true" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonExceptionNameEndsWithException" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="NonStaticFinalLogger" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false">
+        <option name="loggerClassName" value="java.util.logging.Logger" />
+      </scope>
+      <option name="loggerClassName" value="java.util.logging.Logger" />
+    </inspection_tool>
+    <inspection_tool class="NonSynchronizedMethodOverridesSynchronizedMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ObjectEqualsNull" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ObjectNotify" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreRequiredObsoleteCollectionTypes" value="false" />
+    </inspection_tool>
+    <inspection_tool class="PackageDirectoryMismatch" enabled="true" level="WARNING" enabled_by_default="false">
+      <scope name="all except testData" level="WARNING" enabled="true" />
+    </inspection_tool>
+    <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PublicFieldAccessedInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="fromVersion" value="2.4" />
+      <option name="toVersion" value="3.1" />
+    </inspection_tool>
+    <inspection_tool class="ReplaceAssignmentWithOperatorAssignment" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreLazyOperators" value="true" />
+      <option name="ignoreObscureOperators" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SSBasedInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <searchConfiguration name="SwingUtilities.invokeLater" text="SwingUtilities.invokeLater($runnable$)" recursive="false" caseInsensitive="false" type="JAVA">
+        <constraint name="Instance" regexp="SwingUtilities" minCount="0" target="true" within="" contains="" />
+        <constraint name="MethodCall" within="" contains="" />
+        <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="runnable" within="" contains="" />
+      </searchConfiguration>
+      <replaceConfiguration name="DirectCallOfDispose" text="$Instance$.dispose()" recursive="false" caseInsensitive="false" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="Disposer.dispose($Instance$)">
+        <constraint name="Instance" regexp="super" nameOfExprType="Disposable" withinHierarchy="true" exprTypeWithinHierarchy="true" minCount="0" negateName="true" within="" contains="" />
+        <constraint name="MethodCall" target="true" within="" contains="" />
+        <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
+        <constraint name="__context__" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="new Object[0]" text="new Object[0]" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.EMPTY_OBJECT_ARRAY" />
+      <replaceConfiguration name="new String[0]" text="new String[0]" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.EMPTY_STRING_ARRAY" />
+      <replaceConfiguration name="new Class[0]" text="new Class[0]" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.EMPTY_CLASS_ARRAY" />
+      <replaceConfiguration name="Log.error" text="$LOG$.assertTrue(false, $e$)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="$LOG$.error($e$)">
+        <constraint name="e" within="" contains="" />
+        <constraint name="LOG" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="toStringArray" text="$collection$.toArray(new String[$collection$.size()])" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.toStringArray($collection$)">
+        <constraint name="collection" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="toObjectArray" text="$collection$.toArray(new Object[$collection$.size()])" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.toObjectArray($collection$)">
+        <constraint name="collection" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="toStringArray0" text="$collection$.toArray(new String[0])" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.toStringArray($collection$)">
+        <constraint name="collection" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="toObjectArray0" text="$collection$.toArray(new Object[0])" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.toObjectArray($collection$)">
+        <constraint name="collection" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="toStringArray00" text="$collection$.toArray(ArrayUtil.EMPTY_STRING_ARRAY)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.toStringArray($collection$)">
+        <constraint name="collection" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="toObjectArray00" text="$collection$.toArray(ArrayUtil.EMPTY_OBJECT_ARRAY)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.toObjectArray($collection$)">
+        <constraint name="collection" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="File.createTempFile" text="java.io.File.createTempFile($prefix$, $suffix$)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.openapi.util.io.FileUtil.createTempFile($prefix$, $suffix$)">
+        <constraint name="prefix" within="" contains="" />
+        <constraint name="suffix" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="File.createTempFile(dir)" text="java.io.File.createTempFile($prefix$, $suffix$, $dir$)" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.openapi.util.io.FileUtil.createTempFile($dir$, $prefix$, $suffix$, true)">
+        <constraint name="prefix" within="" contains="" />
+        <constraint name="suffix" within="" contains="" />
+        <constraint name="dir" within="" contains="" />
+      </replaceConfiguration>
+      <searchConfiguration name="Use RecursionManager?" text="class $Class$ { &#10;  ThreadLocal&lt;$FieldType$&gt; $FieldName$ = $Init$;&#10;}" recursive="false" caseInsensitive="false" type="JAVA">
+        <constraint name="Class" script="&quot;&quot;" within="" contains="" />
+        <constraint name="FieldType" script="&quot;&quot;" regexp="Collection" withinHierarchy="true" maxCount="2147483647" target="true" wholeWordsOnly="true" within="" contains="" />
+        <constraint name="FieldName" script="&quot;&quot;" maxCount="2147483647" within="" contains="" />
+        <constraint name="Init" script="&quot;&quot;" minCount="0" maxCount="2147483647" within="" contains="" />
+        <constraint name="__context__" script="&quot;&quot;" within="" contains="" />
+      </searchConfiguration>
+    </inspection_tool>
+    <inspection_tool class="SetReplaceableByEnumSet" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SetupCallsSuperSetup" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SetupIsPublicVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SimplifiableIfStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Since15" enabled="true" level="ERROR" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="ERROR" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="SocketResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="insideTryAllowed" value="false" />
+    </inspection_tool>
+    <inspection_tool class="StaticCallOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StaticSuite" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StringConstructor" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoreSubstringArguments" value="false" />
+    </inspection_tool>
+    <inspection_tool class="StringEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringEqualsEmptyString" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SynchronizeOnThis" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="Tests" level="WARNING" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="TeardownCallsSuperTeardown" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TeardownIsPublicVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TestCaseWithConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TestCaseWithNoTestMethods" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreSupers" value="false" />
+    </inspection_tool>
+    <inspection_tool class="TestMethodIsPublicVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TestOnlyProblems" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TextLabelInSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ThreadDumpStack" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="ThreadRun" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ThreadStartInConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ThrowablePrintStackTrace" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="Tests" level="WARNING" enabled="false" />
+    </inspection_tool>
+    <inspection_tool class="TrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialStringConcatenation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UndeclaredTests" enabled="true" level="WARNING" enabled_by_default="false">
+      <scope name="Tests" level="WARNING" enabled="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessarilyQualifiedStaticUsage" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false">
+        <option name="m_ignoreStaticFieldAccesses" value="false" />
+        <option name="m_ignoreStaticMethodCalls" value="false" />
+        <option name="m_ignoreStaticAccessFromStaticContext" value="false" />
+      </scope>
+      <option name="m_ignoreStaticFieldAccesses" value="false" />
+      <option name="m_ignoreStaticMethodCalls" value="false" />
+      <option name="m_ignoreStaticAccessFromStaticContext" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryBoxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryFinalOnLocalVariableOrParameter" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="IDEA Test Sources" level="WARNING" enabled="false">
+        <option name="m_ignoreJavadoc" value="true" />
+      </scope>
+      <option name="m_ignoreJavadoc" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryLabelOnBreakStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnContinueStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="WaitNotInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="WaitWhileHoldingTwoLocks" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />
+      <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
+    </inspection_tool>
+    <inspection_tool class="WhileLoopSpinsOnField" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreNonEmtpyLoops" value="false" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/inspectionProfiles/profiles_settings.xml b/ultimate/.idea/inspectionProfiles/profiles_settings.xml
index 3b312839bf2..78f1346b901 100644
--- a/ultimate/.idea/inspectionProfiles/profiles_settings.xml
+++ b/ultimate/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,6 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="PROJECT_PROFILE" value="idea.default" />
     <option name="USE_PROJECT_PROFILE" value="true" />
     <version value="1.0" />
   </settings>
diff --git a/ultimate/.idea/kotlinc.xml b/ultimate/.idea/kotlinc.xml
new file mode 100644
index 00000000000..ea56145a5ba
--- /dev/null
+++ b/ultimate/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinCompilerSettings">
+    <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/css_support.xml b/ultimate/.idea/libraries/css_support.xml
similarity index 100%
rename from .idea/libraries/css_support.xml
rename to ultimate/.idea/libraries/css_support.xml
diff --git a/.idea/libraries/database_support.xml b/ultimate/.idea/libraries/database_support.xml
similarity index 100%
rename from .idea/libraries/database_support.xml
rename to ultimate/.idea/libraries/database_support.xml
diff --git a/ultimate/.idea/libraries/gradle_and_groovy_plugin.xml b/ultimate/.idea/libraries/gradle_and_groovy_plugin.xml
new file mode 100644
index 00000000000..d5c6cf7816a
--- /dev/null
+++ b/ultimate/.idea/libraries/gradle_and_groovy_plugin.xml
@@ -0,0 +1,19 @@
+<component name="libraryTable">
+  <library name="gradle-and-groovy-plugin">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/../annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" />
+      <root url="file://$PROJECT_DIR$/ideaSDK/plugins/Groovy/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/Groovy/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/idea_full.xml b/ultimate/.idea/libraries/idea_full.xml
new file mode 100644
index 00000000000..38b552dca00
--- /dev/null
+++ b/ultimate/.idea/libraries/idea_full.xml
@@ -0,0 +1,19 @@
+<component name="libraryTable">
+  <library name="idea-full">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/../annotations" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../dependencies/guava-17.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../dependencies/asm5-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/../dependencies/cli-parser-1.1.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/intellij_core.xml b/ultimate/.idea/libraries/intellij_core.xml
new file mode 100644
index 00000000000..0a5def14562
--- /dev/null
+++ b/ultimate/.idea/libraries/intellij_core.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="intellij-core">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/../annotations" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/core" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../dependencies/guava-17.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../dependencies/asm5-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/java_i18n.xml b/ultimate/.idea/libraries/java_i18n.xml
new file mode 100644
index 00000000000..4917d9c5249
--- /dev/null
+++ b/ultimate/.idea/libraries/java_i18n.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="java-i18n">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/../annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/java-i18n/lib/java-i18n.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/javaee_support.xml b/ultimate/.idea/libraries/javaee_support.xml
similarity index 100%
rename from .idea/libraries/javaee_support.xml
rename to ultimate/.idea/libraries/javaee_support.xml
diff --git a/ultimate/.idea/libraries/javax_inject.xml b/ultimate/.idea/libraries/javax_inject.xml
new file mode 100644
index 00000000000..dd28241051c
--- /dev/null
+++ b/ultimate/.idea/libraries/javax_inject.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="javax.inject">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../lib/javax.inject.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../lib/javax.inject-src.zip!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jsp_support.xml b/ultimate/.idea/libraries/jsp_support.xml
similarity index 100%
rename from .idea/libraries/jsp_support.xml
rename to ultimate/.idea/libraries/jsp_support.xml
diff --git a/ultimate/.idea/libraries/junit_plugin.xml b/ultimate/.idea/libraries/junit_plugin.xml
new file mode 100644
index 00000000000..8a6fddf51da
--- /dev/null
+++ b/ultimate/.idea/libraries/junit_plugin.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="junit-plugin">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/../annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/idea-junit.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/resources_en.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/kotlin_reflect.xml b/ultimate/.idea/libraries/kotlin_reflect.xml
new file mode 100644
index 00000000000..4e375061276
--- /dev/null
+++ b/ultimate/.idea/libraries/kotlin_reflect.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="kotlin-reflect">
+    <CLASSES>
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/kotlin_runtime.xml b/ultimate/.idea/libraries/kotlin_runtime.xml
new file mode 100644
index 00000000000..266d4c90c1e
--- /dev/null
+++ b/ultimate/.idea/libraries/kotlin_runtime.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="kotlin-runtime">
+    <CLASSES>
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../libraries/stdlib/src" />
+      <root url="file://$PROJECT_DIR$/../core/builtins/native" />
+      <root url="file://$PROJECT_DIR$/../core/builtins/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/main_project_production.xml b/ultimate/.idea/libraries/main_project_production.xml
new file mode 100644
index 00000000000..4effdebc0dc
--- /dev/null
+++ b/ultimate/.idea/libraries/main_project_production.xml
@@ -0,0 +1,99 @@
+<component name="libraryTable">
+  <library name="main-project-production">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../out/production/android-compiler-plugin" />
+      <root url="file://$PROJECT_DIR$/../out/production/android-extensions-compiler" />
+      <root url="file://$PROJECT_DIR$/../out/production/android-extensions-idea" />
+      <root url="file://$PROJECT_DIR$/../out/production/android-extensions-jps" />
+      <root url="file://$PROJECT_DIR$/../out/production/android-idea-plugin" />
+      <root url="file://$PROJECT_DIR$/../out/production/android-jps-plugin" />
+      <root url="file://$PROJECT_DIR$/../out/production/android-tests" />
+      <root url="file://$PROJECT_DIR$/../out/production/annotation-collector" />
+      <root url="file://$PROJECT_DIR$/../out/production/ant" />
+      <root url="file://$PROJECT_DIR$/../out/production/backend" />
+      <root url="file://$PROJECT_DIR$/../out/production/backend-common" />
+      <root url="file://$PROJECT_DIR$/../out/production/bare-plugin" />
+      <root url="file://$PROJECT_DIR$/../out/production/build" />
+      <root url="file://$PROJECT_DIR$/../out/production/build-common" />
+      <root url="file://$PROJECT_DIR$/../out/production/builtins" />
+      <root url="file://$PROJECT_DIR$/../out/production/builtins-serializer" />
+      <root url="file://$PROJECT_DIR$/../out/production/cli" />
+      <root url="file://$PROJECT_DIR$/../out/production/cli-common" />
+      <root url="file://$PROJECT_DIR$/../out/production/cli-runner" />
+      <root url="file://$PROJECT_DIR$/../out/production/conditional-preprocessor" />
+      <root url="file://$PROJECT_DIR$/../out/production/container" />
+      <root url="file://$PROJECT_DIR$/../out/production/daemon" />
+      <root url="file://$PROJECT_DIR$/../out/production/daemon-client" />
+      <root url="file://$PROJECT_DIR$/../out/production/daemon-common" />
+      <root url="file://$PROJECT_DIR$/../out/production/descriptor.loader.java" />
+      <root url="file://$PROJECT_DIR$/../out/production/descriptors" />
+      <root url="file://$PROJECT_DIR$/../out/production/descriptors.runtime" />
+      <root url="file://$PROJECT_DIR$/../out/production/deserialization" />
+      <root url="file://$PROJECT_DIR$/../out/production/eval4j" />
+      <root url="file://$PROJECT_DIR$/../out/production/frontend" />
+      <root url="file://$PROJECT_DIR$/../out/production/frontend.java" />
+      <root url="file://$PROJECT_DIR$/../out/production/ide-common" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-analysis" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-android" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-completion" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-core" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-jps-common" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-js" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-live-templates" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-repl" />
+      <root url="file://$PROJECT_DIR$/../out/production/instrumentation" />
+      <root url="file://$PROJECT_DIR$/../out/production/j2k" />
+      <root url="file://$PROJECT_DIR$/../out/production/jps-plugin" />
+      <root url="file://$PROJECT_DIR$/../out/production/js.dart-ast" />
+      <root url="file://$PROJECT_DIR$/../out/production/js.frontend" />
+      <root url="file://$PROJECT_DIR$/../out/production/js.inliner" />
+      <root url="file://$PROJECT_DIR$/../out/production/js.parser" />
+      <root url="file://$PROJECT_DIR$/../out/production/js.serializer" />
+      <root url="file://$PROJECT_DIR$/../out/production/js.translator" />
+      <root url="file://$PROJECT_DIR$/../out/production/kotlin-android-plugin" />
+      <root url="file://$PROJECT_DIR$/../out/production/kotlinr" />
+      <root url="file://$PROJECT_DIR$/../out/production/light-classes" />
+      <root url="file://$PROJECT_DIR$/../out/production/plugin-api" />
+      <root url="file://$PROJECT_DIR$/../out/production/preloader" />
+      <root url="file://$PROJECT_DIR$/../out/production/resolution" />
+      <root url="file://$PROJECT_DIR$/../out/production/rmi-interface" />
+      <root url="file://$PROJECT_DIR$/../out/production/rmi-server" />
+      <root url="file://$PROJECT_DIR$/../out/production/serialization" />
+      <root url="file://$PROJECT_DIR$/../out/production/util" />
+      <root url="file://$PROJECT_DIR$/../out/production/util.runtime" />
+      <root url="file://$PROJECT_DIR$/../out/production/Kotlin" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../idea/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/light-classes/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/backend-common/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/backend/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/android-tests/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/cli/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/cli/cli-common/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/frontend/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/frontend.java/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/preloader/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/preloader/instrumentation/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/resolution/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/serialization/src" />
+      <root url="file://$PROJECT_DIR$/../compiler/util/src" />
+      <root url="file://$PROJECT_DIR$/../core/descriptor.loader.java/src" />
+      <root url="file://$PROJECT_DIR$/../core/descriptors/src" />
+      <root url="file://$PROJECT_DIR$/../core/deserialization/src" />
+      <root url="file://$PROJECT_DIR$/../core/reflection.jvm/src" />
+      <root url="file://$PROJECT_DIR$/../core/runtime.jvm/src" />
+      <root url="file://$PROJECT_DIR$/../core/util.runtime/src" />
+      <root url="file://$PROJECT_DIR$/../idea/ide-common/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-analysis/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-android/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-completion/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-core/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-jps-common/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-live-templates/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-test-framework/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/libraries/main_project_tests.xml b/ultimate/.idea/libraries/main_project_tests.xml
new file mode 100644
index 00000000000..e3938da51a4
--- /dev/null
+++ b/ultimate/.idea/libraries/main_project_tests.xml
@@ -0,0 +1,21 @@
+<component name="libraryTable">
+  <library name="main-project-tests">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../out/test/compiler-tests" />
+      <root url="file://$PROJECT_DIR$/../out/test/idea-test-framework" />
+      <root url="file://$PROJECT_DIR$/../out/test/idea" />
+      <root url="file://$PROJECT_DIR$/../out/test/idea-completion" />
+      <root url="file://$PROJECT_DIR$/../out/test/generators" />
+      <root url="file://$PROJECT_DIR$/../out/test/tests-common" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../idea/idea-completion/tests" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-android/tests" />
+      <root url="file://$PROJECT_DIR$/../idea/tests" />
+      <root url="file://$PROJECT_DIR$/../generators/src" />
+      <root url="file://$PROJECT_DIR$/../generators/tests" />
+      <root url="file://$PROJECT_DIR$/../compiler/tests-common" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/persistence_support.xml b/ultimate/.idea/libraries/persistence_support.xml
similarity index 100%
rename from .idea/libraries/persistence_support.xml
rename to ultimate/.idea/libraries/persistence_support.xml
diff --git a/ultimate/.idea/libraries/properties.xml b/ultimate/.idea/libraries/properties.xml
new file mode 100644
index 00000000000..602d6d3d1e7
--- /dev/null
+++ b/ultimate/.idea/libraries/properties.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="properties">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/../annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/properties/lib/properties.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/spring_support.xml b/ultimate/.idea/libraries/spring_support.xml
similarity index 100%
rename from .idea/libraries/spring_support.xml
rename to ultimate/.idea/libraries/spring_support.xml
diff --git a/ultimate/.idea/misc.xml b/ultimate/.idea/misc.xml
index 74b9a26b5a2..9181bc9c69c 100644
--- a/ultimate/.idea/misc.xml
+++ b/ultimate/.idea/misc.xml
@@ -7,11 +7,58 @@
   </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
+    </list>
+  </component>
+  <component name="FacetAutodetectingManager">
+    <autodetection-disabled>
+      <facet-type id="Python">
+        <modules>
+          <module name="Jet" />
+        </modules>
+      </facet-type>
+    </autodetection-disabled>
+  </component>
+  <component name="IdProvider" IDEtalkID="71A301FF1940049D6D82F12C40F1E1D5" />
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/confluence-highlighting/pom.xml" />
+        <option value="$PROJECT_DIR$/confluence/pom.xml" />
+      </list>
+    </option>
   </component>
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" assert-keyword="false" jdk-15="false">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="SuppressABINotification">
+    <option name="isSuppressed" value="true" />
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
+  <component name="com.sixrr.metrics.MetricsReloaded">
+    <option name="selectedProfile" value="" />
+    <option name="autoscroll" value="false" />
+    <option name="showOnlyWarnings" value="false" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/ultimate/.idea/modules.xml b/ultimate/.idea/modules.xml
new file mode 100644
index 00000000000..4cf4939de41
--- /dev/null
+++ b/ultimate/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlin-ultimate.iml" filepath="$PROJECT_DIR$/kotlin-ultimate.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/ultimate/.idea/projectCodeStyle.xml b/ultimate/.idea/projectCodeStyle.xml
new file mode 100644
index 00000000000..25b91e81484
--- /dev/null
+++ b/ultimate/.idea/projectCodeStyle.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="LINE_SEPARATOR" value="&#10;" />
+        <option name="ELSE_ON_NEW_LINE" value="true" />
+        <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+        <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+        <option name="TERNARY_OPERATION_WRAP" value="5" />
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="IF_BRACE_FORCE" value="1" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="css">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="haml">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="js">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="php">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="py">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="sass">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="scala">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="2" />
+          <option name="TAB_SIZE" value="2" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="sql">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="JAVA">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+          <indentOptions />
+        </codeStyleSettings>
+        <codeStyleSettings language="JavaScript">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="PHP">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
+
diff --git a/ultimate/.idea/runConfigurations/Generate_Tests.xml b/ultimate/.idea/runConfigurations/Generate_Tests.xml
new file mode 100644
index 00000000000..08653927ea2
--- /dev/null
+++ b/ultimate/.idea/runConfigurations/Generate_Tests.xml
@@ -0,0 +1,31 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Generate Tests" type="Application" factoryName="Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+      <pattern>
+        <option name="PATTERN" value="org.jetbrains.kotlin.tests.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.tests.GenerateTestsKt" />
+    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/.." />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <module name="kotlin-ultimate" />
+    <envs />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Profile " />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/runConfigurations/IDEA.xml b/ultimate/.idea/runConfigurations/IDEA.xml
new file mode 100644
index 00000000000..1e6acf699f7
--- /dev/null
+++ b/ultimate/.idea/runConfigurations/IDEA.xml
@@ -0,0 +1,47 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IDEA" type="Application" factoryName="Application" singleton="true">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
+    <option name="VM_PARAMETERS" value="-Xmx900m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <module name="kotlin-ultimate" />
+    <envs />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="JavaRebel">
+      <option name="bootstrapPath" />
+      <option name="jrebelArgs" value="" />
+      <option name="loggingEnabled" value="false" />
+      <option name="useBootstrapDefaults" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="JavaRebel Debug">
+      <option name="bootstrapPath" />
+      <option name="debugPort" value="" />
+      <option name="jrebelArgs" value="" />
+      <option name="loggingEnabled" value="false" />
+      <option name="transport" value="0" />
+      <option name="useBootstrapDefaults" value="true" />
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Profile " />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Profile " />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method>
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="build_artifact" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/../idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
new file mode 100644
index 00000000000..73c810e7279
--- /dev/null
+++ b/ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
+    <option name="VM_PARAMETERS" value="-Xmx900m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <module name="kotlin-ultimate" />
+    <envs />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method>
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="build_artifact" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/../idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml b/ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml
new file mode 100644
index 00000000000..fc8896e9140
--- /dev/null
+++ b/ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml
@@ -0,0 +1,39 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ultimate Plugin Tests" type="JUnit" factoryName="JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+      <pattern>
+        <option name="PATTERN" value="org.jetbrains.kotlin.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <module name="kotlin-ultimate" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1200m -XX:MaxPermSize=400m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/.." />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="singleModule" />
+    </option>
+    <envs />
+    <patterns />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Profile " />
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method>
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="patch_outer_plugin_xml_for_tests" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/ultimate/.idea/uiDesigner.xml b/ultimate/.idea/uiDesigner.xml
index e96534fb27b..b9cf899ced5 100644
--- a/ultimate/.idea/uiDesigner.xml
+++ b/ultimate/.idea/uiDesigner.xml
@@ -120,5 +120,17 @@
         <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
       </item>
     </group>
+    <group name="Intellij">
+      <item class="com.intellij.ui.RawCommandLineEditor" icon="/com/intellij/uiDesigner/icons/panel.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="7" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.openapi.ui.TextFieldWithBrowseButton" icon="/com/intellij/uiDesigner/icons/panel.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.ui.ComboboxWithBrowseButton" icon="/com/intellij/uiDesigner/icons/panel.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+    </group>
   </component>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/ultimate/.idea/vcs.xml b/ultimate/.idea/vcs.xml
new file mode 100644
index 00000000000..cb0c670e825
--- /dev/null
+++ b/ultimate/.idea/vcs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="[A-Z]+\-\d+" />
+          <option name="linkRegexp" value="http://youtrack.jetbrains.com/issue/$0" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="EA\-(\d+)" />
+          <option name="linkRegexp" value="http://ea.jetbrains.com/browser/ea_problems/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
+
diff --git a/ultimate/build.xml b/ultimate/build.xml
new file mode 100644
index 00000000000..cc36d38d6bb
--- /dev/null
+++ b/ultimate/build.xml
@@ -0,0 +1,49 @@
+<project default="build_artifact">
+    <property name="artifact.root" value="out/artifacts/Kotlin"/>
+    <property name="production.root" value="out/production/kotlin-ultimate"/>
+    <property name="meta.inf" value="${production.root}/META-INF"/>
+    <property name="kotlin.plugin.jar" value="${artifact.root}/lib/kotlin-plugin.jar"/>
+
+    <macrodef name="merge_plugin_xml">
+        <attribute name="main.plugin.xml.dir" />
+
+        <sequential>
+            <loadfile srcfile="${meta.inf}/ultimate-plugin.xml" property="ultimate.plugin.xml.content">
+                <filterchain>
+                    <tokenfilter>
+                        <filetokenizer/>
+                        <replaceregex pattern="\&lt;idea-plugin\&gt;" replace="" />
+                        <replaceregex pattern="\&lt;/idea-plugin\&gt;" replace="" />
+                    </tokenfilter>
+                </filterchain>
+            </loadfile>
+
+            <replace file="@{main.plugin.xml.dir}/plugin.xml" token="&lt;!-- ULTIMATE-PLUGIN-PLACEHOLDER --&gt;" value="${ultimate.plugin.xml.content}"/>
+        </sequential>
+    </macrodef>
+
+    <target name="build_artifact">
+        <copy todir="${artifact.root}">
+            <fileset dir="../${artifact.root}"/>
+        </copy>
+
+        <unzip src="${kotlin.plugin.jar}" dest="${production.root}">
+            <patternset>
+                <include name="META-INF/plugin.xml"/>
+            </patternset>
+        </unzip>
+
+        <merge_plugin_xml main.plugin.xml.dir="${meta.inf}"/>
+
+        <jar destfile="${kotlin.plugin.jar}" update="true">
+            <fileset dir="${production.root}"/>
+            <file file="${meta.inf}/plugin.xml"/>
+        </jar>
+
+        <delete file="${meta.inf}/plugin.xml"/>
+    </target>
+
+    <target name="patch_outer_plugin_xml_for_tests">
+        <merge_plugin_xml main.plugin.xml.dir="../out/production/idea/META-INF" />
+    </target>
+</project>
\ No newline at end of file
diff --git a/ultimate/kotlin-ultimate.iml b/ultimate/kotlin-ultimate.iml
new file mode 100644
index 00000000000..398bda02821
--- /dev/null
+++ b/ultimate/kotlin-ultimate.iml
@@ -0,0 +1,31 @@
+<?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$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/dependencies" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="main-project-production" level="project" />
+    <orderEntry type="library" scope="TEST" name="main-project-tests" level="project" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
+    <orderEntry type="library" name="javax.inject" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="css-support" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="database-support" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="javaee-support" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="jsp-support" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="persistence-support" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="spring-support" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
+    <orderEntry type="library" name="idea-full" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/idea-ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html b/ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html
similarity index 100%
rename from idea/idea-ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html
rename to ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html
diff --git a/idea/idea-ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html b/ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html
similarity index 100%
rename from idea/idea-ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html
rename to ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html
diff --git a/idea/idea-ultimate/src/META-INF/kotlin-spring.xml b/ultimate/src/META-INF/kotlin-spring.xml
similarity index 100%
rename from idea/idea-ultimate/src/META-INF/kotlin-spring.xml
rename to ultimate/src/META-INF/kotlin-spring.xml
diff --git a/ultimate/src/META-INF/ultimate-plugin.xml b/ultimate/src/META-INF/ultimate-plugin.xml
new file mode 100644
index 00000000000..f40b3b56cf6
--- /dev/null
+++ b/ultimate/src/META-INF/ultimate-plugin.xml
@@ -0,0 +1,8 @@
+<idea-plugin>
+    <depends optional="true" config-file="kotlin-spring.xml">com.intellij.spring</depends>
+    <depends optional="true">com.intellij.javaee</depends>
+    <depends optional="true">com.intellij.persistence</depends>
+    <depends optional="true">com.intellij.database</depends>
+    <depends optional="true">com.intellij.css</depends>
+    <depends optional="true">com.intellij.jsp</depends>
+</idea-plugin>
\ No newline at end of file
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt
diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt
similarity index 100%
rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt
rename to ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt
diff --git a/idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml b/ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml
similarity index 100%
rename from idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml
rename to ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml
diff --git a/idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test b/ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test
similarity index 100%
rename from idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test
rename to ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test
diff --git a/idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/test.kt b/ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/test.kt
similarity index 100%
rename from idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/test.kt
rename to ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/test.kt
diff --git a/idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/expected.xml b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml
similarity index 100%
rename from idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/expected.xml
rename to ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml
diff --git a/idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/inspections.test b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test
similarity index 100%
rename from idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/inspections.test
rename to ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test
diff --git a/idea/testData/ultimateInspections/spring/unconfiguredFacet/test.kt b/ultimate/testData/inspections/spring/unconfiguredFacet/test.kt
similarity index 100%
rename from idea/testData/ultimateInspections/spring/unconfiguredFacet/test.kt
rename to ultimate/testData/inspections/spring/unconfiguredFacet/test.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/.inspection b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/.inspection
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/.inspection
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/.inspection
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt
diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after
similarity index 100%
rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after
rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt
rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after
rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after
diff --git a/idea/testData/spring/core/generate/autowiredDependencies/spring-config.xml b/ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/autowiredDependencies/spring-config.xml
rename to ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/property.kt
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/property.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt
diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
similarity index 100%
rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt
rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt
diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test
rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test
diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml
rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml
diff --git a/idea/testData/spring/core/gutter/autowiredProperty/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredProperty/Bean.kt
rename to ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt
diff --git a/idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test b/ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test
rename to ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test
diff --git a/idea/testData/spring/core/gutter/autowiredProperty/config.xml b/ultimate/testData/spring/core/gutter/autowiredProperty/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredProperty/config.xml
rename to ultimate/testData/spring/core/gutter/autowiredProperty/config.xml
diff --git a/idea/testData/spring/core/gutter/autowiredSetter/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredSetter/Bean.kt
rename to ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt
diff --git a/idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test b/ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test
rename to ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test
diff --git a/idea/testData/spring/core/gutter/autowiredSetter/config.xml b/ultimate/testData/spring/core/gutter/autowiredSetter/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/autowiredSetter/config.xml
rename to ultimate/testData/spring/core/gutter/autowiredSetter/config.xml
diff --git a/idea/testData/spring/core/gutter/classGutter/Bean.kt b/ultimate/testData/spring/core/gutter/classGutter/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutter/Bean.kt
rename to ultimate/testData/spring/core/gutter/classGutter/Bean.kt
diff --git a/idea/testData/spring/core/gutter/classGutter/classGutter.test b/ultimate/testData/spring/core/gutter/classGutter/classGutter.test
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutter/classGutter.test
rename to ultimate/testData/spring/core/gutter/classGutter/classGutter.test
diff --git a/idea/testData/spring/core/gutter/classGutter/config.xml b/ultimate/testData/spring/core/gutter/classGutter/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutter/config.xml
rename to ultimate/testData/spring/core/gutter/classGutter/config.xml
diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt
rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt
diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt
rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt
diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt
rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt
diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test
rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test
diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml
rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml
diff --git a/idea/testData/spring/core/gutter/componentScan/Bean.kt b/ultimate/testData/spring/core/gutter/componentScan/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/componentScan/Bean.kt
rename to ultimate/testData/spring/core/gutter/componentScan/Bean.kt
diff --git a/idea/testData/spring/core/gutter/componentScan/ComponentScan.kt b/ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/componentScan/ComponentScan.kt
rename to ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt
diff --git a/idea/testData/spring/core/gutter/componentScan/beans/MyController.kt b/ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/componentScan/beans/MyController.kt
rename to ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt
diff --git a/idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt b/ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt
rename to ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt
diff --git a/idea/testData/spring/core/gutter/componentScan/componentScan.test b/ultimate/testData/spring/core/gutter/componentScan/componentScan.test
similarity index 100%
rename from idea/testData/spring/core/gutter/componentScan/componentScan.test
rename to ultimate/testData/spring/core/gutter/componentScan/componentScan.test
diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt
rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt
diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt
rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt
diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test
similarity index 100%
rename from idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test
rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test
diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt
rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt
diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt
rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt
diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test
similarity index 100%
rename from idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test
rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test
diff --git a/idea/testData/spring/core/gutter/innerBean/InnerBean.kt b/ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/innerBean/InnerBean.kt
rename to ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt
diff --git a/idea/testData/spring/core/gutter/innerBean/innerBean.test b/ultimate/testData/spring/core/gutter/innerBean/innerBean.test
similarity index 100%
rename from idea/testData/spring/core/gutter/innerBean/innerBean.test
rename to ultimate/testData/spring/core/gutter/innerBean/innerBean.test
diff --git a/idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml b/ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml
rename to ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml
diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt
rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt
diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml
rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml
diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test
rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test
diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt
rename to ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt
diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/config.xml b/ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeFactory/config.xml
rename to ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml
diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test b/ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test
rename to ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test
diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt
rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt
diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml
rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml
diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test
rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test
diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt
rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt
diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/config.xml b/ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeMultiple/config.xml
rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml
diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test b/ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test
similarity index 100%
rename from idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test
rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test
diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt
rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt
diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml
rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml
diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test
similarity index 100%
rename from idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test
rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test
diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt
rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt
diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml
rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml
diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test
similarity index 100%
rename from idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test
rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test
diff --git a/idea/testData/spring/core/gutter/resourceGutter/Bean.kt b/ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/resourceGutter/Bean.kt
rename to ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt
diff --git a/idea/testData/spring/core/gutter/resourceGutter/Resource.kt b/ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/resourceGutter/Resource.kt
rename to ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt
diff --git a/idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt b/ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt
similarity index 100%
rename from idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt
rename to ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt
diff --git a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test
similarity index 100%
rename from idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test
rename to ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test
diff --git a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml
similarity index 100%
rename from idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml
rename to ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml
diff --git a/idea/testData/spring/core/references/completion/handler/scopeReference.kt b/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/scopeReference.kt
rename to ultimate/testData/spring/core/references/completion/handler/scopeReference.kt
diff --git a/idea/testData/spring/core/references/completion/handler/scopeReference.kt.after b/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/scopeReference.kt.after
rename to ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after
diff --git a/idea/testData/spring/core/references/completion/handler/spring-config.xml b/ultimate/testData/spring/core/references/completion/handler/spring-config.xml
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/spring-config.xml
rename to ultimate/testData/spring/core/references/completion/handler/spring-config.xml
diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt
rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt
diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after
rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after
diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt
rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt
diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after
similarity index 100%
rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after
rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after
diff --git a/idea/testData/spring/core/references/completion/variants/scopeReference.kt b/ultimate/testData/spring/core/references/completion/variants/scopeReference.kt
similarity index 100%
rename from idea/testData/spring/core/references/completion/variants/scopeReference.kt
rename to ultimate/testData/spring/core/references/completion/variants/scopeReference.kt
diff --git a/idea/testData/spring/core/references/completion/variants/spring-config.xml b/ultimate/testData/spring/core/references/completion/variants/spring-config.xml
similarity index 100%
rename from idea/testData/spring/core/references/completion/variants/spring-config.xml
rename to ultimate/testData/spring/core/references/completion/variants/spring-config.xml
diff --git a/idea/testData/spring/core/references/completion/variants/springBeanReference.kt b/ultimate/testData/spring/core/references/completion/variants/springBeanReference.kt
similarity index 100%
rename from idea/testData/spring/core/references/completion/variants/springBeanReference.kt
rename to ultimate/testData/spring/core/references/completion/variants/springBeanReference.kt
diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt
rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt
diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml
rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml
diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt
rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt
diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml
rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml
diff --git a/idea/testData/spring/core/references/navigation/scopeReference.kt b/ultimate/testData/spring/core/references/navigation/scopeReference.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/scopeReference.kt
rename to ultimate/testData/spring/core/references/navigation/scopeReference.kt
diff --git a/idea/testData/spring/core/references/navigation/scopeReference_config.xml b/ultimate/testData/spring/core/references/navigation/scopeReference_config.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/scopeReference_config.xml
rename to ultimate/testData/spring/core/references/navigation/scopeReference_config.xml
diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt
rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt
diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml
rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml
diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt
rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt
diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml
rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml
diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInResource.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springBeanRefInResource.kt
rename to ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt
diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInResource_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springBeanRefInResource_config.xml
rename to ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml
diff --git a/idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt b/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt
rename to ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt
diff --git a/idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml b/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml
similarity index 100%
rename from idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml
rename to ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java
similarity index 75%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java
index db0de661cb5..006e9123b14 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java
@@ -27,23 +27,23 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/ultimateInspections")
+@TestMetadata("ultimate/testData/inspections")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class UltimateInspectionTestGenerated extends AbstractInspectionTest {
-    public void testAllFilesPresentInUltimateInspections() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/ultimateInspections"), Pattern.compile("^(inspections\\.test)$"));
+    public void testAllFilesPresentInInspections() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/inspections"), Pattern.compile("^(inspections\\.test)$"));
     }
 
     @TestMetadata("spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test")
     public void testSpring_finalSpringAnnotatedDeclaration_inspectionData_Inspections_test() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test");
         doTest(fileName);
     }
 
     @TestMetadata("spring/unconfiguredFacet/inspectionData/inspections.test")
     public void testSpring_unconfiguredFacet_inspectionData_Inspections_test() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/inspections.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test");
         doTest(fileName);
     }
 }
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java
similarity index 72%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java
index bd81441132e..90c0646dbe6 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java
@@ -27,69 +27,69 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/ultimateQuickFixes")
+@TestMetadata("ultimate/testData/quickFixes")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class UltimateQuickFixTestGenerated extends AbstractQuickFixTest {
-    public void testAllFilesPresentInUltimateQuickFixes() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/ultimateQuickFixes"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+    public void testAllFilesPresentInQuickFixes() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
     }
 
-    @TestMetadata("idea/testData/ultimateQuickFixes/spring")
+    @TestMetadata("ultimate/testData/quickFixes/spring")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Spring extends AbstractQuickFixTest {
         public void testAllFilesPresentInSpring() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/ultimateQuickFixes/spring"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes/spring"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
         }
 
-        @TestMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration")
+        @TestMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class FinalSpringAnnotatedDeclaration extends AbstractQuickFixTest {
             public void testAllFilesPresentInFinalSpringAnnotatedDeclaration() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
             }
 
             @TestMetadata("classWithComponentRuntime.kt")
             public void testClassWithComponentRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("classWithConfigurationRuntime.kt")
             public void testClassWithConfigurationRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("classWithCustomConfigurationRuntime.kt")
             public void testClassWithCustomConfigurationRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("funWithBeanFinalClassRuntime.kt")
             public void testFunWithBeanFinalClassRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("funWithBeanOpenClassRuntime.kt")
             public void testFunWithBeanOpenClassRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("funWithCustomBeanFinalClassRuntime.kt")
             public void testFunWithCustomBeanFinalClassRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("funWithCustomBeanOpenClassRuntime.kt")
             public void testFunWithCustomBeanOpenClassRuntime() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt");
                 doTest(fileName);
             }
         }
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
similarity index 93%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
index 4b8a02a3f87..ba1d96cf48a 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
@@ -22,9 +22,8 @@ import com.intellij.spring.facet.SpringFacet
 import com.intellij.spring.facet.SpringFileSet
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.test.TestFixtureExtension
-import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.tests.ULTIMATE_TEST_ROOT
 import java.util.*
 
 @Suppress("unused")
@@ -38,7 +37,7 @@ class SpringTestFixtureExtension() : TestFixtureExtension {
         )
     }
 
-    val SPRING_LIBRARY_ROOT = "${KotlinTestUtils.getHomeDirectory()}/dependencies/spring"
+    val SPRING_LIBRARY_ROOT = "$ULTIMATE_TEST_ROOT/dependencies/spring"
 
     override fun setUp(module: Module) {
         this.module = module
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt
similarity index 100%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
similarity index 64%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
index a2ce2d0c364..50430df7051 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
@@ -27,89 +27,89 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/spring/core/generate")
+@TestMetadata("ultimate/testData/spring/core/generate")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class GenerateSpringDependencyActionTestGenerated extends AbstractGenerateSpringDependencyActionTest {
     public void testAllFilesPresentInGenerate() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/spring/core/generate"), Pattern.compile("^([\\w]+)\\.kt$"));
+        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/spring/core/generate"), Pattern.compile("^([\\w]+)\\.kt$"));
     }
 
     @TestMetadata("autowiredDependencies/duplicatingPropertyAnnotationConfig.kt")
     public void testAutowiredDependencies_DuplicatingPropertyAnnotationConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/duplicatingPropertyXmlConfig.kt")
     public void testAutowiredDependencies_DuplicatingPropertyXmlConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/multiplePropertiesAnnotationConfig.kt")
     public void testAutowiredDependencies_MultiplePropertiesAnnotationConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/multiplePropertiesXmlConfig.kt")
     public void testAutowiredDependencies_MultiplePropertiesXmlConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/propertyWithQualifierAnnotationConfig.kt")
     public void testAutowiredDependencies_PropertyWithQualifierAnnotationConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/propertyWithQualifierXmlConfig.kt")
     public void testAutowiredDependencies_PropertyWithQualifierXmlConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/singlePropertyAnnotationConfig.kt")
     public void testAutowiredDependencies_SinglePropertyAnnotationConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredDependencies/singlePropertyXmlConfig.kt")
     public void testAutowiredDependencies_SinglePropertyXmlConfig() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt");
         doTest(fileName);
     }
 
     @TestMetadata("beanDependenciesByXml/firstConstructor.kt")
     public void testBeanDependenciesByXml_FirstConstructor() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt");
         doTest(fileName);
     }
 
     @TestMetadata("beanDependenciesByXml/primaryConstructorAddParam.kt")
     public void testBeanDependenciesByXml_PrimaryConstructorAddParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt");
         doTest(fileName);
     }
 
     @TestMetadata("beanDependenciesByXml/property.kt")
     public void testBeanDependenciesByXml_Property() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/property.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt");
         doTest(fileName);
     }
 
     @TestMetadata("beanDependenciesByXml/secondaryConstructorAddParam.kt")
     public void testBeanDependenciesByXml_SecondaryConstructorAddParam() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt");
         doTest(fileName);
     }
 
     @TestMetadata("beanDependenciesByXml/setter.kt")
     public void testBeanDependenciesByXml_Setter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt");
         doTest(fileName);
     }
 }
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
similarity index 98%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
index 5968514fc60..3da7ba81172 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
@@ -20,7 +20,6 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import icons.SpringApiIcons
 import org.jetbrains.kotlin.idea.jsonUtils.getString
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
similarity index 63%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
index e334465c487..6da0890cde4 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
@@ -27,107 +27,107 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/spring/core/gutter")
+@TestMetadata("ultimate/testData/spring/core/gutter")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SpringClassAnnotatorTestGenerated extends AbstractSpringClassAnnotatorTest {
     public void testAllFilesPresentInGutter() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/spring/core/gutter"), Pattern.compile("^(.+)\\.test$"));
+        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/spring/core/gutter"), Pattern.compile("^(.+)\\.test$"));
     }
 
     @TestMetadata("autowiredBeanCandidates/autowiredBeanCandidates.test")
     public void testAutowiredBeanCandidates_AutowiredBeanCandidates() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredProperty/autowiredProperty.test")
     public void testAutowiredProperty_AutowiredProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test");
         doTest(fileName);
     }
 
     @TestMetadata("autowiredSetter/autowiredSetter.test")
     public void testAutowiredSetter_AutowiredSetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test");
         doTest(fileName);
     }
 
     @TestMetadata("classGutter/classGutter.test")
     public void testClassGutter_ClassGutter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/classGutter/classGutter.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/classGutter/classGutter.test");
         doTest(fileName);
     }
 
     @TestMetadata("classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test")
     public void testClassGutterAbstractShowMappedInheritors_ClassGutterAbstractShowMappedInheritors() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test");
         doTest(fileName);
     }
 
     @TestMetadata("componentScan/componentScan.test")
     public void testComponentScan_ComponentScan() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/componentScan/componentScan.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/componentScan/componentScan.test");
         doTest(fileName);
     }
 
     @TestMetadata("contextBeanInjectionPoints/contextBeanInjectionPoints.test")
     public void testContextBeanInjectionPoints_ContextBeanInjectionPoints() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test");
         doTest(fileName);
     }
 
     @TestMetadata("contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test")
     public void testContextBeanWithQualifierInjectionPoints_ContextBeanWithQualifierInjectionPoints() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test");
         doTest(fileName);
     }
 
     @TestMetadata("innerBean/innerBean.test")
     public void testInnerBean_InnerBean() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/innerBean/innerBean.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/innerBean/innerBean.test");
         doTest(fileName);
     }
 
     @TestMetadata("methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test")
     public void testMethodTypeDefaultInitMethod_MethodTypeDefaultInitMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test");
         doTest(fileName);
     }
 
     @TestMetadata("methodTypeFactory/methodTypeFactory.test")
     public void testMethodTypeFactory_MethodTypeFactory() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test");
         doTest(fileName);
     }
 
     @TestMetadata("methodTypeInitMethod/methodTypeInitMethod.test")
     public void testMethodTypeInitMethod_MethodTypeInitMethod() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test");
         doTest(fileName);
     }
 
     @TestMetadata("methodTypeMultiple/methodTypeMultiple.test")
     public void testMethodTypeMultiple_MethodTypeMultiple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test");
         doTest(fileName);
     }
 
     @TestMetadata("propertyGutterForProperty/propertyGutterForProperty.test")
     public void testPropertyGutterForProperty_PropertyGutterForProperty() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test");
         doTest(fileName);
     }
 
     @TestMetadata("propertyGutterForSetter/propertyGutterForSetter.test")
     public void testPropertyGutterForSetter_PropertyGutterForSetter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test");
         doTest(fileName);
     }
 
     @TestMetadata("resourceGutter/resourceGutter.test")
     public void testResourceGutter_ResourceGutter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test");
         doTest(fileName);
     }
 }
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
similarity index 100%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt
similarity index 100%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
similarity index 99%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
index b0fa8cb070c..53ba8756c94 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
@@ -27,7 +27,7 @@ abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletio
         super.setUpFixture(testPath)
 
         TestFixtureExtension
-                .loadFixture<SpringTestFixtureExtension>(myModule)!!
+                .loadFixture<SpringTestFixtureExtension>(myModule)
                 .configureFileSet(myFixture, listOf(PathUtil.toSystemIndependentName(File(testPath).parent + "/spring-config.xml")))
     }
 
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
similarity index 100%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java
similarity index 74%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java
index 13eeb71a123..1e4bccc5bab 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java
@@ -27,29 +27,29 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/spring/core/references/completion/handler")
+@TestMetadata("ultimate/testData/spring/core/references/completion/handler")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SpringReferenceCompletionHandlerTestGenerated extends AbstractSpringReferenceCompletionHandlerTest {
     public void testAllFilesPresentInHandler() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/spring/core/references/completion/handler"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/completion/handler"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("scopeReference.kt")
     public void testScopeReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/handler/scopeReference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/scopeReference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springBeanReferenceEnter.kt")
     public void testSpringBeanReferenceEnter() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springBeanReferenceTab.kt")
     public void testSpringBeanReferenceTab() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt");
         doTest(fileName);
     }
 }
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java
similarity index 77%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java
index 7ae8b2ce091..f23764fb260 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java
@@ -27,23 +27,23 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/spring/core/references/completion/variants")
+@TestMetadata("ultimate/testData/spring/core/references/completion/variants")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SpringReferenceCompletionTestGenerated extends AbstractSpringReferenceCompletionTest {
     public void testAllFilesPresentInVariants() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/spring/core/references/completion/variants"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/completion/variants"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("scopeReference.kt")
     public void testScopeReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/variants/scopeReference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/scopeReference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springBeanReference.kt")
     public void testSpringBeanReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/variants/springBeanReference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/springBeanReference.kt");
         doTest(fileName);
     }
 }
diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java
similarity index 67%
rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java
rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java
index 1edd7c95cc7..5f1edb48049 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java
@@ -27,53 +27,53 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/spring/core/references/navigation")
+@TestMetadata("ultimate/testData/spring/core/references/navigation")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class SpringReferenceNavigationTestGenerated extends AbstractSpringReferenceNavigationTest {
     public void testAllFilesPresentInNavigation() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/spring/core/references/navigation"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/navigation"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("fileReferenceInClasspathResource.kt")
     public void testFileReferenceInClasspathResource() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt");
         doTest(fileName);
     }
 
     @TestMetadata("fileReferenceInClasspathXmlContext.kt")
     public void testFileReferenceInClasspathXmlContext() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt");
         doTest(fileName);
     }
 
     @TestMetadata("scopeReference.kt")
     public void testScopeReference() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/scopeReference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/scopeReference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springBeanRefInFactoryContainsBean.kt")
     public void testSpringBeanRefInFactoryContainsBean() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springBeanRefInFactoryGetBean.kt")
     public void testSpringBeanRefInFactoryGetBean() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springBeanRefInResource.kt")
     public void testSpringBeanRefInResource() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springBeanRefInResource.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt");
         doTest(fileName);
     }
 
     @TestMetadata("springFactoryBeanRefInResource.kt")
     public void testSpringFactoryBeanRefInResource() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt");
         doTest(fileName);
     }
 }
diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt
new file mode 100644
index 00000000000..f6939eab41d
--- /dev/null
+++ b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.tests
+
+import org.jetbrains.kotlin.generators.tests.testGroup
+import org.jetbrains.kotlin.idea.codeInsight.AbstractInspectionTest
+import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest
+import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest
+import org.jetbrains.kotlin.idea.spring.tests.gutter.AbstractSpringClassAnnotatorTest
+import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest
+import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionTest
+import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceNavigationTest
+
+fun main(args: Array<String>) {
+    System.setProperty("java.awt.headless", "true")
+
+    testGroup("ultimate/tests", "ultimate/testData") {
+        testClass<AbstractInspectionTest>("UltimateInspectionTestGenerated") {
+            model("inspections", pattern = "^(inspections\\.test)$", singleClass = true)
+        }
+
+        testClass<AbstractQuickFixTest>("UltimateQuickFixTestGenerated") {
+            model("quickFixes", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true)
+        }
+
+        testClass<AbstractSpringClassAnnotatorTest>() {
+            model("spring/core/gutter", extension = "test", singleClass = true)
+        }
+
+        testClass<AbstractSpringReferenceCompletionHandlerTest>() {
+            model("spring/core/references/completion/handler")
+        }
+
+        testClass<AbstractSpringReferenceCompletionTest>() {
+            model("spring/core/references/completion/variants")
+        }
+
+        testClass<AbstractSpringReferenceNavigationTest>() {
+            model("spring/core/references/navigation")
+        }
+
+        testClass<AbstractGenerateSpringDependencyActionTest>() {
+            model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true)
+        }
+    }
+}
diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt b/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt
new file mode 100644
index 00000000000..5575f26c26c
--- /dev/null
+++ b/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.tests
+
+import org.jetbrains.kotlin.test.KotlinTestUtils
+
+val ULTIMATE_TEST_ROOT: String
+    get() = "${KotlinTestUtils.getHomeDirectory()}/ultimate"
diff --git a/ultimate/update_dependencies.xml b/ultimate/update_dependencies.xml
new file mode 100644
index 00000000000..530e3d6b429
--- /dev/null
+++ b/ultimate/update_dependencies.xml
@@ -0,0 +1,38 @@
+<project name="Update Ultimate Dependencies" default="update">
+    <dirname file="${basedir}" property="main.project.dir"/>
+
+    <property name="use.ultimate.by.default" value="true"/>
+    <property name="dependencies" value="${main.project.dir}/dependencies"/>
+    <property name="generators" value="${main.project.dir}/generators"/>
+
+    <import file="${main.project.dir}/update_dependencies.xml" as="main"/>
+
+    <property name="download" value="dependencies/download"/>
+
+    <macrodef name="get-spring-library">
+        <attribute name="lib"/>
+        <attribute name="version"/>
+
+        <sequential>
+            <get-maven-library
+                    server="http://central.maven.org/maven2"
+                    prefix="org/springframework"
+                    lib="@{lib}"
+                    version="@{version}"
+                    src="false"
+                    download="${download}"
+                    dependencies="dependencies/spring/@{version}"/>
+        </sequential>
+    </macrodef>
+
+    <target name="fetch-extras">
+        <mkdir dir="${download}"/>
+
+        <get-spring-library lib="spring-core" version="4.2.0.RELEASE"/>
+        <get-spring-library lib="spring-beans" version="4.2.0.RELEASE"/>
+        <get-spring-library lib="spring-context" version="4.2.0.RELEASE"/>
+    </target>
+
+    <!-- Override fetch-third-party from the main buildfile -->
+    <target name="fetch-third-party" depends="main.make-dependency-dirs,fetch-extras"/>
+</project>
\ No newline at end of file
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 44b0cf67436..2557c03b4f5 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -14,7 +14,7 @@
 
     <property name="bootstrap.build.no.tests" value="false"/>
 
-    <property name="use.ultimate.by.default" value="true"/>
+    <!--<property name="use.ultimate.by.default" value="true"/>-->
 
     <property name="sdk.version.prefix" value="IU" if:set="use.ultimate.by.default"/>
     <property name="sdk.version.prefix" value="IC" unless:set="use.ultimate.by.default"/>
@@ -139,21 +139,6 @@
         </sequential>
     </macrodef>
 
-    <macrodef name="get-spring-library">
-        <attribute name="lib"/>
-        <attribute name="version"/>
-
-        <sequential>
-            <get-maven-library
-                server="http://central.maven.org/maven2"
-                prefix="org/springframework"
-                lib="@{lib}"
-                version="@{version}"
-                src="false"
-                dependencies="dependencies/spring/@{version}"/>
-        </sequential>
-    </macrodef>
-
     <target name="make-native-platform-uberjar">
         <property name="dependencies" value="${dependencies}"/>
         <property name="download" value="${dependencies}/download"/>
@@ -196,10 +181,12 @@
 
     </target>
 
-    <target name="fetch-third-party" depends="make-native-platform-uberjar,fetch-idea-artifacts-for-compiler-tests">
+    <target name="make-dependency-dirs">
         <mkdir dir="${dependencies}"/>
         <mkdir dir="${dependencies}/download"/>
+    </target>
 
+    <target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests">
         <!-- ProGuard -->
         <get-maven-library prefix="net/sf/proguard" lib="proguard-base" version="5.1" target.jar.name.base="proguard" src="false"/>
         <get-maven-library prefix="net/sf/proguard" lib="proguard-anttask" version="5.1" target.jar.name.base="proguard-anttask" src="false"/>
@@ -338,12 +325,6 @@
         <antcall target="override-version"/>
 
         <download-or-build-markdown-parser/>
-
-        <sequential if:set="use.ultimate.by.default">
-            <get-spring-library lib="spring-core" version="4.2.0.RELEASE"/>
-            <get-spring-library lib="spring-beans" version="4.2.0.RELEASE"/>
-            <get-spring-library lib="spring-context" version="4.2.0.RELEASE"/>
-        </sequential>
     </target>
 
     <macrodef name="build-protobuf-java-lite">