diff --git a/.idea/misc.xml b/.idea/misc.xml
index 46567025c..1d921d38b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,7 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="IntelliJ IDEA IU-143.381.42" project-jdk-type="IDEA JDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="IntelliJ IDEA IU-143.381.42" project-jdk-type="IDEA JDK">
+    <output url="file://$PROJECT_DIR$/build" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/editor_basics.xml b/.idea/runConfigurations/editor_basics.xml
new file mode 100644
index 000000000..477e1437d
--- /dev/null
+++ b/.idea/runConfigurations/editor_basics.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="editor_basics" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="editor_basics" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/facet_basics.xml b/.idea/runConfigurations/facet_basics.xml
new file mode 100644
index 000000000..65fbb04df
--- /dev/null
+++ b/.idea/runConfigurations/facet_basics.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="facet_basics" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="facet_basics" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/framework.xml b/.idea/runConfigurations/framework.xml
new file mode 100644
index 000000000..0dd24f673
--- /dev/null
+++ b/.idea/runConfigurations/framework.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="framework" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="framework" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/inspection.xml b/.idea/runConfigurations/inspection.xml
new file mode 100644
index 000000000..ae351b187
--- /dev/null
+++ b/.idea/runConfigurations/inspection.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="inspection" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="inspection" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/intellij_sdk_docs.xml b/.idea/runConfigurations/intellij_sdk_docs.xml
new file mode 100644
index 000000000..420425b14
--- /dev/null
+++ b/.idea/runConfigurations/intellij_sdk_docs.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="intellij-sdk-docs" type="docker-deploy" factoryName="Docker Deployment" server-name="Docker">
+    <deployment type="dockerfile" path="$PROJECT_DIR$/Dockerfile">
+      <settings>
+        <option name="JSONFilePath" value="$PROJECT_DIR$/container_settings.json" />
+        <option name="command" value="" />
+        <option name="containerName" value="" />
+        <option name="entrypoint" value="" />
+        <option name="envVarsExpanded" value="true" />
+        <option name="imageTag" value="intellij-sdk-docs" />
+        <option name="startBrowserSettings">
+          <browser start="true" />
+        </option>
+        <option name="volumeBindings">
+          <list>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/usr/src/app" />
+              <option name="hostPath" value="C:\Users\breandan\WebstormProjects\intellij-sdk-docs" />
+            </DockerVolumeBindingImpl>
+          </list>
+        </option>
+      </settings>
+    </deployment>
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/module.xml b/.idea/runConfigurations/module.xml
new file mode 100644
index 000000000..613b013b9
--- /dev/null
+++ b/.idea/runConfigurations/module.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="module" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="module" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/plugin_sample.xml b/.idea/runConfigurations/plugin_sample.xml
new file mode 100644
index 000000000..0932be75e
--- /dev/null
+++ b/.idea/runConfigurations/plugin_sample.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="plugin_sample" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="plugin_sample" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/project_model.xml b/.idea/runConfigurations/project_model.xml
new file mode 100644
index 000000000..faac073d0
--- /dev/null
+++ b/.idea/runConfigurations/project_model.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="project_model" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="project_model" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/project_view_pane.xml b/.idea/runConfigurations/project_view_pane.xml
new file mode 100644
index 000000000..97c6011ec
--- /dev/null
+++ b/.idea/runConfigurations/project_view_pane.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="project_view_pane" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="project_view_pane" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/project_wizard.xml b/.idea/runConfigurations/project_wizard.xml
new file mode 100644
index 000000000..fe5ca9ed4
--- /dev/null
+++ b/.idea/runConfigurations/project_wizard.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="project_wizard" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="project_wizard" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/register_actions.xml b/.idea/runConfigurations/register_actions.xml
new file mode 100644
index 000000000..19342c2ad
--- /dev/null
+++ b/.idea/runConfigurations/register_actions.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="register_actions" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="register_actions" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/runIdea.xml b/.idea/runConfigurations/runIdea.xml
new file mode 100644
index 000000000..1baa848a9
--- /dev/null
+++ b/.idea/runConfigurations/runIdea.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="runIdea" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/code_samples/gradle_plugin_demo/build.gradle" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="--stacktrace" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runIdea" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/run_configuration.xml b/.idea/runConfigurations/run_configuration.xml
new file mode 100644
index 000000000..1e157d78d
--- /dev/null
+++ b/.idea/runConfigurations/run_configuration.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="run_configuration" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="run_configuration" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/simple_language_plugin.xml b/.idea/runConfigurations/simple_language_plugin.xml
index c72beef52..adb27b133 100644
--- a/.idea/runConfigurations/simple_language_plugin.xml
+++ b/.idea/runConfigurations/simple_language_plugin.xml
@@ -3,6 +3,7 @@
     <module name="simple_language_plugin" />
     <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
     <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/simple_language_plugin_tests.xml b/.idea/runConfigurations/simple_language_plugin_tests.xml
index 1f3b270fd..1f38ddc12 100644
--- a/.idea/runConfigurations/simple_language_plugin_tests.xml
+++ b/.idea/runConfigurations/simple_language_plugin_tests.xml
@@ -3,14 +3,14 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="simple_language_plugin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="directory" />
     <option name="VM_PARAMETERS" value="-ea -Xbootclasspath/p:../out/classes/production/boot -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m -Didea.system.path=../test-system -Didea.home.path=. -Didea.config.path=../test-config -Didea.test.group=ALL_EXCLUDE_DEFINED" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$USER_HOME$/ultimate/community" />
+    <option name="WORKING_DIRECTORY" value="" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
diff --git a/.idea/runConfigurations/tool_window.xml b/.idea/runConfigurations/tool_window.xml
new file mode 100644
index 000000000..7de9e78cf
--- /dev/null
+++ b/.idea/runConfigurations/tool_window.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tool_window" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="tool_window" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/tree_structure_provider.xml b/.idea/runConfigurations/tree_structure_provider.xml
new file mode 100644
index 000000000..5485c1c71
--- /dev/null
+++ b/.idea/runConfigurations/tree_structure_provider.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tree_structure_provider" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+    <module name="tree_structure_provider" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <log_file path="$USER_HOME$/.IntelliJIdea15/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/code_samples/editor_basics/editor_basics.iml b/code_samples/editor_basics/editor_basics.iml
index 1820d90c4..d1076ac92 100644
--- a/code_samples/editor_basics/editor_basics.iml
+++ b/code_samples/editor_basics/editor_basics.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA IU-140.1021" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/code_samples/facet_basics/facet_basics.iml b/code_samples/facet_basics/facet_basics.iml
index c263a60ba..b1d6be3ab 100644
--- a/code_samples/facet_basics/facet_basics.iml
+++ b/code_samples/facet_basics/facet_basics.iml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA IU-140.1021" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/code_samples/framework/framework.iml b/code_samples/framework/framework.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/framework/framework.iml
+++ b/code_samples/framework/framework.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/gradle_plugin_demo/gradle_plugin_demo.iml b/code_samples/gradle_plugin_demo/gradle_plugin_demo.iml
index d0b492653..386fdbbad 100644
--- a/code_samples/gradle_plugin_demo/gradle_plugin_demo.iml
+++ b/code_samples/gradle_plugin_demo/gradle_plugin_demo.iml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="gradle_plugin_demo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.jetbrains" external.system.module.version="0.0.1-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
diff --git a/code_samples/inspection/inspection.iml b/code_samples/inspection/inspection.iml
index 61dbfac62..b1d6be3ab 100644
--- a/code_samples/inspection/inspection.iml
+++ b/code_samples/inspection/inspection.iml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/scr" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/code_samples/inspection/scr/com/intellij/tutorials/inspection/DemoCodeInspection.java b/code_samples/inspection/src/com/intellij/tutorials/inspection/DemoCodeInspection.java
similarity index 100%
rename from code_samples/inspection/scr/com/intellij/tutorials/inspection/DemoCodeInspection.java
rename to code_samples/inspection/src/com/intellij/tutorials/inspection/DemoCodeInspection.java
diff --git a/code_samples/inspection/scr/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java b/code_samples/inspection/src/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java
similarity index 100%
rename from code_samples/inspection/scr/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java
rename to code_samples/inspection/src/com/intellij/tutorials/inspection/DemoInspectionToolProvider.java
diff --git a/code_samples/inspection/scr/com/intellij/tutorials/inspection/DemoInspectionVisitor.java b/code_samples/inspection/src/com/intellij/tutorials/inspection/DemoInspectionVisitor.java
similarity index 100%
rename from code_samples/inspection/scr/com/intellij/tutorials/inspection/DemoInspectionVisitor.java
rename to code_samples/inspection/src/com/intellij/tutorials/inspection/DemoInspectionVisitor.java
diff --git a/code_samples/inspection/scr/inspectionDescriptions/DemoCode.html b/code_samples/inspection/src/inspectionDescriptions/DemoCode.html
similarity index 100%
rename from code_samples/inspection/scr/inspectionDescriptions/DemoCode.html
rename to code_samples/inspection/src/inspectionDescriptions/DemoCode.html
diff --git a/code_samples/module/module.iml b/code_samples/module/module.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/module/module.iml
+++ b/code_samples/module/module.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/plugin_sample/plugin_sample.iml b/code_samples/plugin_sample/plugin_sample.iml
index b513413c1..347e916d5 100644
--- a/code_samples/plugin_sample/plugin_sample.iml
+++ b/code_samples/plugin_sample/plugin_sample.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA IU-139.224.1" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/code_samples/project_model/project_model.iml b/code_samples/project_model/project_model.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/project_model/project_model.iml
+++ b/code_samples/project_model/project_model.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/project_view_pane/project_view_pane.iml b/code_samples/project_view_pane/project_view_pane.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/project_view_pane/project_view_pane.iml
+++ b/code_samples/project_view_pane/project_view_pane.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/project_wizard/project_wizard.iml b/code_samples/project_wizard/project_wizard.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/project_wizard/project_wizard.iml
+++ b/code_samples/project_wizard/project_wizard.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/register_actions/register_actions.iml b/code_samples/register_actions/register_actions.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/register_actions/register_actions.iml
+++ b/code_samples/register_actions/register_actions.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/run_configuration/run_configuration.iml b/code_samples/run_configuration/run_configuration.iml
index cc8a8a9d4..b1d6be3ab 100644
--- a/code_samples/run_configuration/run_configuration.iml
+++ b/code_samples/run_configuration/run_configuration.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
diff --git a/code_samples/simple_language_plugin/simple_language_plugin.iml b/code_samples/simple_language_plugin/simple_language_plugin.iml
index 4f37844bf..4d7e4548e 100644
--- a/code_samples/simple_language_plugin/simple_language_plugin.iml
+++ b/code_samples/simple_language_plugin/simple_language_plugin.iml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-142.4245.2" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/code_samples/tool_window/tool_window.iml b/code_samples/tool_window/tool_window.iml
index 59886e3c4..3700dfbf1 100644
--- a/code_samples/tool_window/tool_window.iml
+++ b/code_samples/tool_window/tool_window.iml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/out" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
diff --git a/code_samples/tree_structure_provider/tree_structure_provider.iml b/code_samples/tree_structure_provider/tree_structure_provider.iml
index 0c175fd02..a033c1683 100644
--- a/code_samples/tree_structure_provider/tree_structure_provider.iml
+++ b/code_samples/tree_structure_provider/tree_structure_provider.iml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/scr" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA IU-140.1021" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file