diff --git a/.gitignore b/.gitignore
index f11257de9699..bfb350bc9195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,6 @@
 /build/resources/openJDK
 classes
 classes_gen
-kotlin_gen
 testclasses
 teamcity-info.xml
 *.hprof
diff --git a/.mps/modules.xml b/.mps/modules.xml
index 254b727c107d..1f7c1d8e68de 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -327,7 +327,7 @@
       <modulePath path="$PROJECT_DIR$/plugins/mps-kotlin/solutions/kotlin.baseLanguage.runtime/jetbrains.mps.kotlin.baseLanguage.runtime.msd" folder="core.languages.kotlin.interop" />
       <modulePath path="$PROJECT_DIR$/plugins/mps-kotlin/solutions/kotlin.make/jetbrains.mps.kotlin.make.msd" folder="core.languages.kotlin.execution" />
       <modulePath path="$PROJECT_DIR$/plugins/mps-kotlin/solutions/kotlin.runtime/jetbrains.mps.kotlin.runtime.msd" folder="core.languages.kotlin" />
-      <modulePath path="$PROJECT_DIR$/plugins/mps-kotlin/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" folder="core.languages.kotlin" />
+      <modulePath path="$PROJECT_DIR$/plugins/mps-kotlin/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" folder="core.languages.kotlin" />
       <modulePath path="$PROJECT_DIR$/plugins/mps-make/jetbrains.mps.ide.make.msd" folder="platform" />
       <modulePath path="$PROJECT_DIR$/plugins/mps-migration/migration-platform/solutions/component/jetbrains.mps.migration.component.msd" folder="platform.migration" />
       <modulePath path="$PROJECT_DIR$/plugins/mps-migration/solutions/migration.workbench/jetbrains.mps.migration.workbench.msd" folder="platform.migration" />
diff --git a/build/getDependencies.xml b/build/getDependencies.xml
index cc887086258e..445a0fb471e0 100644
--- a/build/getDependencies.xml
+++ b/build/getDependencies.xml
@@ -360,6 +360,10 @@
     <unzip src="${basedir}/../plugins/mps-kotlin/lib/kotlin-compiler-embeddable-${kotlin.version}.jar" dest="${basedir}/../plugins/mps-kotlin/lib/kotlin-builtins/">
       <patternset>
         <include name="**/*.kotlin_builtins"/>
+
+        <!-- TODO for some reason data in kotlin reflect is duplicated in kotlin-common-stdlib, until some adequate merging is performed it is better to keep it
+        this way -->
+        <exclude name="kotlin/reflect/reflect.kotlin_builtins"/>
       </patternset>
     </unzip>
     <jar basedir="${basedir}/../plugins/mps-kotlin/lib/kotlin-builtins/" destfile="${basedir}/../plugins/mps-kotlin/lib/kotlin-builtins.jar"/>
diff --git a/build/mpsKotlinPlugin.xml b/build/mpsKotlinPlugin.xml
index 20f4a6d6f102..d6d745fae393 100644
--- a/build/mpsKotlinPlugin.xml
+++ b/build/mpsKotlinPlugin.xml
@@ -152,7 +152,6 @@
           <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" />
           <language id="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" />
-          <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
           <language id="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" />
@@ -473,6 +472,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" kind="cl" />
@@ -522,7 +522,7 @@
       </module>
     </echoxml>
     <jar destfile="${build.layout}/mps-kotlin/languages/kotlin/jetbrains.mps.kotlin.stdlib.jar" duplicate="preserve">
-      <zipfileset file="${plugin_home}/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" prefix="module" />
+      <zipfileset file="${plugin_home}/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" prefix="module" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.kotlin.stdlib.jar" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.kotlin.make.jar" />
@@ -792,7 +792,7 @@
         <module file="${plugin_home}/languages/kotlin.javaRefs/jetbrains.mps.kotlin.javaRefs.mpl" />
         <module file="${plugin_home}/solutions/kotlin.make/jetbrains.mps.kotlin.make.msd" />
         <module file="${plugin_home}/solutions/kotlin.runtime/jetbrains.mps.kotlin.runtime.msd" />
-        <module file="${plugin_home}/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" />
+        <module file="${plugin_home}/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" />
       </chunk>
       <jvmargs>
         <arg value="-ea" />
diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps
index cdabf0475130..d2d1214b43c4 100644
--- a/plugins/mps-build/solutions/mpsBuild/models/build.mps
+++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps
@@ -52015,6 +52015,11 @@
             <ref role="3bR37D" node="Ye$g8PO8Uc" resolve="jetbrains.mps.kotlin" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1pD7IS3nHrA" role="3bR37C">
+          <node concept="3bR9La" id="1pD7IS3nHrB" role="1SiIV1">
+            <ref role="3bR37D" node="44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="Ye$g8PO9xV" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -52025,13 +52030,10 @@
           <ref role="398BVh" node="1fy59xXoa5p" resolve="plugin_home" />
           <node concept="2Ry0Ak" id="Ye$g8PO9xX" role="iGT6I">
             <property role="2Ry0Am" value="solutions" />
-            <node concept="2Ry0Ak" id="Ye$g8PO9xY" role="2Ry0An">
-              <property role="2Ry0Am" value="stubs" />
-              <node concept="2Ry0Ak" id="Ye$g8PO9xZ" role="2Ry0An">
-                <property role="2Ry0Am" value="kotlin.stdlib" />
-                <node concept="2Ry0Ak" id="Ye$g8PO9y0" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.kotlin.stdlib.msd" />
-                </node>
+            <node concept="2Ry0Ak" id="Ye$g8PO9xZ" role="2Ry0An">
+              <property role="2Ry0Am" value="kotlin.stdlib" />
+              <node concept="2Ry0Ak" id="Ye$g8PO9y0" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.kotlin.stdlib.msd" />
               </node>
             </node>
           </node>
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
index 0caf2a2a29ff..2968a75a9d4e 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<product version="3" modelHash="-aeglp40mwj9o5g92unrnc5j3aom022q">
+<product version="3" modelHash="-9fe7smbhmp58zx2cleqabrdxwcav090">
   <files names="Info.plist.xml:installer.nsi:jetpad.xml:mps.bat:mps.sh:mps.vmoptions:mps.xml:mps64.vmoptions:mpsBootstrapCore.xml:mpsBuild.xml:mpsBuildUI.xml:mpsConsolePlugin.xml:mpsContextActionsTool.xml:mpsCore.xml:mpsDebuggerPlugin.xml:mpsDevKit.xml:mpsDiagramEditor.xml:mpsDistribution.xml:mpsExecutionPlugin.xml:mpsHttpSupportPlugin.xml:mpsJava.xml:mpsJavaCore.xml:mpsJavaCorePre.xml:mpsJavaPlatform.xml:mpsJavaPlatformPre.xml:mpsJavaPre.xml:mpsKotlinPlugin.xml:mpsMakePlugin.xml:mpsMaven.xml:mpsMigration.xml:mpsMigrationCore.xml:mpsPlugins.xml:mpsSpellCheckPlugin.xml:mpsStandalone.xml:mpsTesting.xml:mpsTooltips.xml:mpsTroveCollections.xml:mpsTrueBootstrap.xml:mpsVcs.xml:mpsVcsPlatform.xml:mpsVcsStandaloneJar.xml:mpsWorkbench.xml" />
 </product>
 
diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
index 20f4a6d6f102..d6d745fae393 100644
--- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
+++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsKotlinPlugin.xml
@@ -152,7 +152,6 @@
           <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" />
           <language id="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" />
-          <language id="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" />
           <language id="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" />
@@ -473,6 +472,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" kind="rt" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" kind="cl" />
@@ -522,7 +522,7 @@
       </module>
     </echoxml>
     <jar destfile="${build.layout}/mps-kotlin/languages/kotlin/jetbrains.mps.kotlin.stdlib.jar" duplicate="preserve">
-      <zipfileset file="${plugin_home}/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" prefix="module" />
+      <zipfileset file="${plugin_home}/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" prefix="module" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.kotlin.stdlib.jar" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.kotlin.make.jar" />
@@ -792,7 +792,7 @@
         <module file="${plugin_home}/languages/kotlin.javaRefs/jetbrains.mps.kotlin.javaRefs.mpl" />
         <module file="${plugin_home}/solutions/kotlin.make/jetbrains.mps.kotlin.make.msd" />
         <module file="${plugin_home}/solutions/kotlin.runtime/jetbrains.mps.kotlin.runtime.msd" />
-        <module file="${plugin_home}/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" />
+        <module file="${plugin_home}/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd" />
       </chunk>
       <jvmargs>
         <arg value="-ea" />
diff --git a/plugins/mps-kotlin/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd b/plugins/mps-kotlin/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd
similarity index 100%
rename from plugins/mps-kotlin/solutions/stubs/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd
rename to plugins/mps-kotlin/solutions/kotlin.stdlib/jetbrains.mps.kotlin.stdlib.msd