From 9f70a2678d82831e6ad34a5ba14a2e81fbe078c8 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 24 Apr 2026 11:27:29 +0200
Subject: [PATCH] Rebuid project

---
 build.xml                    | 1010 ++++++++++---
 samples/fitch/build.xml      |  368 ++++-
 samples/lambdacalc/build.xml |   88 +-
 samples/mpscore/build.xml    | 2615 ++++++++++++++++++++++++++++------
 4 files changed, 3440 insertions(+), 641 deletions(-)

diff --git a/build.xml b/build.xml
index ad420587..f5529f25 100644
--- a/build.xml
+++ b/build.xml
@@ -3570,11 +3570,6 @@
       <plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
       <plugin path="${artifacts.mps}/plugins/mps-junit5" id="jetbrains.mps.junit5" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" id="jetbrains.mps.testing" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
       <chunk>
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" />
@@ -3660,13 +3655,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
       </classpath>
     </javac>
     <copy todir="${build.tmp}/java/out/coderules-ideaplugin">
@@ -3703,13 +3726,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
       </classpath>
     </javac>
@@ -3779,13 +3830,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
@@ -3833,13 +3912,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
@@ -3902,13 +4009,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -3983,13 +4118,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections-generator.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -4046,13 +4209,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.runtime.jar" />
         <fileset file="${artifacts.mps}/lib/junit4.jar" />
@@ -4154,13 +4345,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -4246,13 +4465,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -4333,13 +4580,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -4419,13 +4694,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
@@ -4512,13 +4815,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -4594,13 +4925,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -4684,13 +5043,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -4761,13 +5148,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -4851,13 +5266,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -4949,13 +5392,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -5020,13 +5491,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       </classpath>
@@ -5113,13 +5612,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -5192,13 +5719,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -5259,13 +5814,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -5334,13 +5917,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -5416,13 +6027,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -5502,13 +6141,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -5581,13 +6248,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -5650,11 +6345,6 @@
       </jvmargs>
       
       
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
       
       <plugin id="com.intellij.modules.mps" path="${artifacts.mps}/lib/mps-workbench.jar" />
       <plugin id="com.intellij.java" path="${artifacts.mps}/plugins/java" />
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 7bb19c99..524a566c 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -846,10 +846,6 @@
       <plugin path="${artifacts.mps}/plugins/mps-java" id="jetbrains.mps.ide.java" />
       <plugin path="${artifacts.mps}/plugins/mps-junit5" id="jetbrains.mps.junit5" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" id="jetbrains.mps.testing" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       <chunk>
         <module file="${basedir}/languages/samples.fitch/samples.fitch.mpl" />
         <module file="${basedir}/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl" />
@@ -932,13 +928,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
@@ -1012,13 +1036,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       </classpath>
@@ -1076,13 +1128,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1172,13 +1252,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       </classpath>
@@ -1237,13 +1345,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1334,13 +1470,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       </classpath>
@@ -1400,13 +1564,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -1496,13 +1688,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       </classpath>
@@ -1565,13 +1785,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -1626,10 +1874,6 @@
       </jvmargs>
       
       
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       <library file="${build.layout}/modules/samples.fitch.jar" />
       <library file="${build.layout}/modules/samples.fitch.firstOrderLogic.jar" />
       <library file="${build.layout}/modules/samples.fitch.herbrandLogic.jar" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 4a08f6c6..2592c662 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -274,10 +274,6 @@
       <library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
       <library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.test.jar" />
       <library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.typechecking.testlang.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       <chunk bootstrap="true">
         <module file="${basedir}/languages/samples.lambdacalc/samples.lambdacalc.mpl" bootstrap="true" />
       </chunk>
@@ -347,13 +343,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
@@ -428,13 +452,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -495,10 +547,6 @@
       <library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
       <library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.logic.test.jar" />
       <library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.typechecking.testlang.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       <library file="${build.layout}/lambdacalc/samples.lambdacalc.jar" />
       
       <plugin id="jetbrains.mps.coderules" path="${artifacts.coderules}/jetbrains.mps.coderules" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 97d41b58..14a2c316 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -10813,11 +10813,6 @@
       <plugin path="${artifacts.mps}/plugins/mps-kotlin" id="jetbrains.mps.kotlin" />
       <plugin path="${artifacts.mps}/plugins/mps-make" id="jetbrains.mps.ide.make" />
       <plugin path="${artifacts.mps}/plugins/mps-testing" id="jetbrains.mps.testing" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.extension.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       <chunk>
         <module file="${basedir}/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl" />
         <module file="${basedir}/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl" />
@@ -10942,13 +10937,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -11030,18 +11053,52 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
@@ -11099,13 +11156,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -11188,13 +11273,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -11258,13 +11371,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -11340,13 +11481,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -11409,13 +11578,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -11498,13 +11695,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -11569,13 +11794,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -11657,13 +11910,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -11727,13 +12008,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -11816,13 +12125,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -11890,13 +12227,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -11980,13 +12345,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -12048,13 +12441,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -12131,13 +12552,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -12201,13 +12650,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -12289,13 +12766,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -12357,13 +12862,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -12439,13 +12972,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -12511,13 +13072,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -12600,13 +13189,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -12679,13 +13296,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -12768,13 +13413,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -12837,13 +13510,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -12928,13 +13629,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -13003,13 +13732,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -13094,13 +13851,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -13168,13 +13953,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -13247,13 +14060,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -13312,13 +14153,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -13395,13 +14264,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -13465,13 +14362,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -13551,13 +14476,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -13622,13 +14575,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -13709,13 +14690,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -13778,13 +14787,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -13861,13 +14898,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -13927,13 +14992,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14007,13 +15100,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.baseLanguage.kotlinRefs.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14093,13 +15214,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-kotlin/languages/kotlin/jetbrains.mps.baseLanguage.kotlinRefs.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14164,13 +15313,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14250,13 +15427,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14319,13 +15524,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -14413,13 +15646,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -14480,13 +15741,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -14571,13 +15860,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -14638,13 +15955,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -14731,13 +16076,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14814,13 +16187,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -14882,13 +16283,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -14965,13 +16394,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -15033,13 +16490,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -15115,13 +16600,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -15186,13 +16699,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -15275,13 +16816,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -15354,13 +16923,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -15448,13 +17045,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -15522,13 +17147,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -15617,13 +17270,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
@@ -15720,13 +17401,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -15818,13 +17527,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -15914,13 +17651,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -16008,13 +17773,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
@@ -16106,13 +17899,41 @@
         <fileset file="${artifacts.mps}/lib/jps-model.jar" />
         <fileset file="${artifacts.mps}/lib/testFramework.jar" />
         <fileset file="${artifacts.mps}/lib/stats.jar" />
+        <fileset file="${artifacts.mps}/lib/hamcrest.jar" />
         <fileset file="${artifacts.mps}/lib/platform-loader.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
-        <fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.asm.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.fastutil.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.gson.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.collections.immutable.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.kotlinx.coroutines.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.miglayout.swing.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.buffer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.netty.codec.http.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.libraries.swingx.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.analysis.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.builtInServer.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.core.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.debugger.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.diff.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.ide.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.lang.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.locking.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectFrame.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.projectModel.impl.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ex.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.util.ui.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.platform.vcs.core.jar" />
+        <fileset file="${artifacts.mps}/lib/intellij.xml.parser.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
@@ -16175,10 +17996,6 @@
       </jvmargs>
       
       
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
-      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
-      <library file="${artifacts.mps}/languages/workbench-stub.jar" />
-      <library file="${artifacts.mps}/languages/workbench/jetbrains.mps.ide.jar" />
       
       <plugin id="jetbrains.mps.coderules" path="${artifacts.coderules}/jetbrains.mps.coderules" />
       <plugin id="com.intellij.modules.mps" path="${artifacts.mps}/lib/mps-workbench.jar" />