diff --git a/js/js.libraries/.idea/.name b/js/js.libraries/.idea/.name
deleted file mode 100644
index 6ee8c70eed4..00000000000
--- a/js/js.libraries/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-js.libraries
\ No newline at end of file
diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index cb9f4173303..4eb49b881b6 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -17,9 +17,9 @@ def commonSrcDir = "${buildDir}/common-sources"
 def commonTestSrcDir = "${buildDir}/common-test-sources"
 def builtinsDir = "${rootDir}/core/builtins"
 def experimentalSrcDir = "${rootDir}/libraries/stdlib/experimental"
-def jsLibrariesDir = "${rootDir}/js/js.libraries"
-def jsSrcDir = "${jsLibrariesDir}/src"
-def jsTestSrcDir = "${jsLibrariesDir}/test"
+def jsSrcGeneratedDir = "${rootDir}/js/js.libraries/src/core/generated" // to be removed soon
+def jsSrcDir = "src"
+def jsTestSrcDir = "test"
 def jsSrcJsDir = "${jsSrcDir}/js"
 def jsOutputFile = "${buildDir}/classes/kotlin.js"
 
@@ -34,7 +34,7 @@ sourceSets {
     builtins {
         kotlin {
             srcDir builtinsSrcDir2
-            srcDir "${jsSrcDir}/builtins"
+            srcDir 'runtime'
         }
     }
 
@@ -42,7 +42,7 @@ sourceSets {
         kotlin {
             srcDir builtinsSrcDir
             srcDir jsSrcDir
-            exclude "builtins"
+            srcDir jsSrcGeneratedDir
             srcDir commonSrcDir
         }
     }
@@ -143,7 +143,7 @@ compileKotlin2Js {
         outputFile = "${buildDir}/classes/main/kotlin.js"
         sourceMap = true
         sourceMapPrefix = "./"
-        freeCompilerArgs += [ "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir ].join(File.pathSeparator) ]
+        freeCompilerArgs += [ "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir].collect { file(it).absoluteFile }.join(File.pathSeparator) ]
     }
 }
 
@@ -212,17 +212,20 @@ task compileJs(type: JavaExec) {
 
         def sourceMapBasePaths = [
                 "./",
-                "/js.libraries/src/js/"
+                "libraries/stdlib/js/src/js/",
+                "libraries/stdlib/js/src/",
         ]
         sourceMap.sources = sourceMap.sources.collect { sourcePath ->
             def prefixToRemove = sourceMapBasePaths.find { basePath -> sourcePath.startsWith(basePath) }
             if (prefixToRemove != null) sourcePath.substring(prefixToRemove.length()) else sourcePath
         }
 
-        def sourceMapSourcesBaseDirs = [ jsSrcDir, builtinsSrcDir2, builtinsSrcDir, commonSrcDir, rootDir ]
+        def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, jsSrcGeneratedDir, builtinsSrcDir, commonSrcDir, projectDir]
 
         sourceMap.sourcesContent = sourceMap.sources.collect { sourceName ->
-            sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() && it.name != "kotlin.js" }?.text
+            def text = sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() }?.text
+            if (text == null) logger.warn("Sources missing for file $sourceName")
+            text
         }
 
         sourceMapFile.text = groovy.json.JsonOutput.toJson(sourceMap)
@@ -263,8 +266,12 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from (sourceSets.main.allSource) {
         into 'kotlin'
         exclude '**/*.java'
+        exclude 'org.w3c/**'
         exclude 'js/**'
     }
+    from (sourceSets.main.allSource) {
+        include 'org.w3c/**'
+    }
     from (sourceSets.experimental.allSource) {
         into 'kotlin'
     }
diff --git a/libraries/idl/org.khronos.webgl.idl b/libraries/stdlib/js/idl/org.khronos.webgl.idl
similarity index 100%
rename from libraries/idl/org.khronos.webgl.idl
rename to libraries/stdlib/js/idl/org.khronos.webgl.idl
diff --git a/libraries/idl/org.w3c.dom.css.ext.idl b/libraries/stdlib/js/idl/org.w3c.dom.css.ext.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.css.ext.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.css.ext.idl
diff --git a/libraries/idl/org.w3c.dom.css.idl b/libraries/stdlib/js/idl/org.w3c.dom.css.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.css.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.css.idl
diff --git a/libraries/idl/org.w3c.dom.events.idl b/libraries/stdlib/js/idl/org.w3c.dom.events.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.events.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.events.idl
diff --git a/libraries/idl/org.w3c.dom.idl b/libraries/stdlib/js/idl/org.w3c.dom.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.idl
diff --git a/libraries/idl/org.w3c.dom.parsing.idl b/libraries/stdlib/js/idl/org.w3c.dom.parsing.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.parsing.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.parsing.idl
diff --git a/libraries/idl/org.w3c.dom.svg.idl b/libraries/stdlib/js/idl/org.w3c.dom.svg.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.svg.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.svg.idl
diff --git a/libraries/idl/org.w3c.dom.url.idl b/libraries/stdlib/js/idl/org.w3c.dom.url.idl
similarity index 100%
rename from libraries/idl/org.w3c.dom.url.idl
rename to libraries/stdlib/js/idl/org.w3c.dom.url.idl
diff --git a/libraries/idl/org.w3c.fetch.idl b/libraries/stdlib/js/idl/org.w3c.fetch.idl
similarity index 100%
rename from libraries/idl/org.w3c.fetch.idl
rename to libraries/stdlib/js/idl/org.w3c.fetch.idl
diff --git a/libraries/idl/org.w3c.files.idl b/libraries/stdlib/js/idl/org.w3c.files.idl
similarity index 100%
rename from libraries/idl/org.w3c.files.idl
rename to libraries/stdlib/js/idl/org.w3c.files.idl
diff --git a/libraries/idl/org.w3c.fullscreen.idl b/libraries/stdlib/js/idl/org.w3c.fullscreen.idl
similarity index 100%
rename from libraries/idl/org.w3c.fullscreen.idl
rename to libraries/stdlib/js/idl/org.w3c.fullscreen.idl
diff --git a/libraries/idl/org.w3c.notifications.idl b/libraries/stdlib/js/idl/org.w3c.notifications.idl
similarity index 100%
rename from libraries/idl/org.w3c.notifications.idl
rename to libraries/stdlib/js/idl/org.w3c.notifications.idl
diff --git a/libraries/idl/org.w3c.performance.idl b/libraries/stdlib/js/idl/org.w3c.performance.idl
similarity index 100%
rename from libraries/idl/org.w3c.performance.idl
rename to libraries/stdlib/js/idl/org.w3c.performance.idl
diff --git a/libraries/idl/org.w3c.vibration.idl b/libraries/stdlib/js/idl/org.w3c.vibration.idl
similarity index 100%
rename from libraries/idl/org.w3c.vibration.idl
rename to libraries/stdlib/js/idl/org.w3c.vibration.idl
diff --git a/libraries/idl/org.w3c.webidl.idl b/libraries/stdlib/js/idl/org.w3c.webidl.idl
similarity index 100%
rename from libraries/idl/org.w3c.webidl.idl
rename to libraries/stdlib/js/idl/org.w3c.webidl.idl
diff --git a/libraries/idl/org.w3c.workers.idl b/libraries/stdlib/js/idl/org.w3c.workers.idl
similarity index 100%
rename from libraries/idl/org.w3c.workers.idl
rename to libraries/stdlib/js/idl/org.w3c.workers.idl
diff --git a/libraries/idl/org.w3c.xhr.idl b/libraries/stdlib/js/idl/org.w3c.xhr.idl
similarity index 100%
rename from libraries/idl/org.w3c.xhr.idl
rename to libraries/stdlib/js/idl/org.w3c.xhr.idl
diff --git a/js/js.libraries/src/builtins/Enum.kt b/libraries/stdlib/js/runtime/Enum.kt
similarity index 100%
rename from js/js.libraries/src/builtins/Enum.kt
rename to libraries/stdlib/js/runtime/Enum.kt
diff --git a/js/js.libraries/src/builtins/arrayUtils.kt b/libraries/stdlib/js/runtime/arrayUtils.kt
similarity index 100%
rename from js/js.libraries/src/builtins/arrayUtils.kt
rename to libraries/stdlib/js/runtime/arrayUtils.kt
diff --git a/js/js.libraries/src/builtins/declarations.kt b/libraries/stdlib/js/runtime/declarations.kt
similarity index 100%
rename from js/js.libraries/src/builtins/declarations.kt
rename to libraries/stdlib/js/runtime/declarations.kt
diff --git a/js/js.libraries/src/builtins/hacks.kt b/libraries/stdlib/js/runtime/hacks.kt
similarity index 100%
rename from js/js.libraries/src/builtins/hacks.kt
rename to libraries/stdlib/js/runtime/hacks.kt
diff --git a/js/js.libraries/src/builtins/primitiveCompanionObjects.kt b/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt
similarity index 100%
rename from js/js.libraries/src/builtins/primitiveCompanionObjects.kt
rename to libraries/stdlib/js/runtime/primitiveCompanionObjects.kt
diff --git a/js/js.libraries/src/deprecated/jquery/common.kt b/libraries/stdlib/js/src/jquery/common.kt
similarity index 100%
rename from js/js.libraries/src/deprecated/jquery/common.kt
rename to libraries/stdlib/js/src/jquery/common.kt
diff --git a/js/js.libraries/src/deprecated/jquery/ui.kt b/libraries/stdlib/js/src/jquery/ui.kt
similarity index 100%
rename from js/js.libraries/src/deprecated/jquery/ui.kt
rename to libraries/stdlib/js/src/jquery/ui.kt
diff --git a/js/js.libraries/src/js/arrayUtils.js b/libraries/stdlib/js/src/js/arrayUtils.js
similarity index 100%
rename from js/js.libraries/src/js/arrayUtils.js
rename to libraries/stdlib/js/src/js/arrayUtils.js
diff --git a/js/js.libraries/src/js/callableReferenceUtils.js b/libraries/stdlib/js/src/js/callableReferenceUtils.js
similarity index 100%
rename from js/js.libraries/src/js/callableReferenceUtils.js
rename to libraries/stdlib/js/src/js/callableReferenceUtils.js
diff --git a/js/js.libraries/src/js/conversions.js b/libraries/stdlib/js/src/js/conversions.js
similarity index 100%
rename from js/js.libraries/src/js/conversions.js
rename to libraries/stdlib/js/src/js/conversions.js
diff --git a/js/js.libraries/src/js/core.js b/libraries/stdlib/js/src/js/core.js
similarity index 100%
rename from js/js.libraries/src/js/core.js
rename to libraries/stdlib/js/src/js/core.js
diff --git a/js/js.libraries/src/js/long.js b/libraries/stdlib/js/src/js/long.js
similarity index 100%
rename from js/js.libraries/src/js/long.js
rename to libraries/stdlib/js/src/js/long.js
diff --git a/js/js.libraries/src/js/markerFunctions.js b/libraries/stdlib/js/src/js/markerFunctions.js
similarity index 100%
rename from js/js.libraries/src/js/markerFunctions.js
rename to libraries/stdlib/js/src/js/markerFunctions.js
diff --git a/js/js.libraries/src/js/misc.js b/libraries/stdlib/js/src/js/misc.js
similarity index 100%
rename from js/js.libraries/src/js/misc.js
rename to libraries/stdlib/js/src/js/misc.js
diff --git a/js/js.libraries/src/js/polyfills.js b/libraries/stdlib/js/src/js/polyfills.js
similarity index 100%
rename from js/js.libraries/src/js/polyfills.js
rename to libraries/stdlib/js/src/js/polyfills.js
diff --git a/js/js.libraries/src/js/rtti.js b/libraries/stdlib/js/src/js/rtti.js
similarity index 100%
rename from js/js.libraries/src/js/rtti.js
rename to libraries/stdlib/js/src/js/rtti.js
diff --git a/js/js.libraries/src/core/Comparator.kt b/libraries/stdlib/js/src/kotlin/Comparator.kt
similarity index 100%
rename from js/js.libraries/src/core/Comparator.kt
rename to libraries/stdlib/js/src/kotlin/Comparator.kt
diff --git a/js/js.libraries/src/core/annotations.kt b/libraries/stdlib/js/src/kotlin/annotations.kt
similarity index 100%
rename from js/js.libraries/src/core/annotations.kt
rename to libraries/stdlib/js/src/kotlin/annotations.kt
diff --git a/js/js.libraries/src/core/annotationsJVM.kt b/libraries/stdlib/js/src/kotlin/annotationsJVM.kt
similarity index 100%
rename from js/js.libraries/src/core/annotationsJVM.kt
rename to libraries/stdlib/js/src/kotlin/annotationsJVM.kt
diff --git a/js/js.libraries/src/browser/declarations.kt b/libraries/stdlib/js/src/kotlin/browser/declarations.kt
similarity index 100%
rename from js/js.libraries/src/browser/declarations.kt
rename to libraries/stdlib/js/src/kotlin/browser/declarations.kt
diff --git a/js/js.libraries/src/core/builtins.kt b/libraries/stdlib/js/src/kotlin/builtins.kt
similarity index 100%
rename from js/js.libraries/src/core/builtins.kt
rename to libraries/stdlib/js/src/kotlin/builtins.kt
diff --git a/js/js.libraries/src/core/char.kt b/libraries/stdlib/js/src/kotlin/char.kt
similarity index 100%
rename from js/js.libraries/src/core/char.kt
rename to libraries/stdlib/js/src/kotlin/char.kt
diff --git a/js/js.libraries/src/core/collections.kt b/libraries/stdlib/js/src/kotlin/collections.kt
similarity index 100%
rename from js/js.libraries/src/core/collections.kt
rename to libraries/stdlib/js/src/kotlin/collections.kt
diff --git a/js/js.libraries/src/core/collections/AbstractMutableCollection.kt b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableCollection.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/AbstractMutableCollection.kt
rename to libraries/stdlib/js/src/kotlin/collections/AbstractMutableCollection.kt
diff --git a/js/js.libraries/src/core/collections/AbstractMutableList.kt b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableList.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/AbstractMutableList.kt
rename to libraries/stdlib/js/src/kotlin/collections/AbstractMutableList.kt
diff --git a/js/js.libraries/src/core/collections/AbstractMutableMap.kt b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableMap.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/AbstractMutableMap.kt
rename to libraries/stdlib/js/src/kotlin/collections/AbstractMutableMap.kt
diff --git a/js/js.libraries/src/core/collections/AbstractMutableSet.kt b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableSet.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/AbstractMutableSet.kt
rename to libraries/stdlib/js/src/kotlin/collections/AbstractMutableSet.kt
diff --git a/js/js.libraries/src/core/collections/ArrayList.kt b/libraries/stdlib/js/src/kotlin/collections/ArrayList.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/ArrayList.kt
rename to libraries/stdlib/js/src/kotlin/collections/ArrayList.kt
diff --git a/js/js.libraries/src/core/collections/EqualityComparator.kt b/libraries/stdlib/js/src/kotlin/collections/EqualityComparator.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/EqualityComparator.kt
rename to libraries/stdlib/js/src/kotlin/collections/EqualityComparator.kt
diff --git a/js/js.libraries/src/core/collections/HashMap.kt b/libraries/stdlib/js/src/kotlin/collections/HashMap.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/HashMap.kt
rename to libraries/stdlib/js/src/kotlin/collections/HashMap.kt
diff --git a/js/js.libraries/src/core/collections/HashSet.kt b/libraries/stdlib/js/src/kotlin/collections/HashSet.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/HashSet.kt
rename to libraries/stdlib/js/src/kotlin/collections/HashSet.kt
diff --git a/js/js.libraries/src/core/collections/InternalHashCodeMap.kt b/libraries/stdlib/js/src/kotlin/collections/InternalHashCodeMap.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/InternalHashCodeMap.kt
rename to libraries/stdlib/js/src/kotlin/collections/InternalHashCodeMap.kt
diff --git a/js/js.libraries/src/core/collections/InternalMap.kt b/libraries/stdlib/js/src/kotlin/collections/InternalMap.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/InternalMap.kt
rename to libraries/stdlib/js/src/kotlin/collections/InternalMap.kt
diff --git a/js/js.libraries/src/core/collections/InternalStringMap.kt b/libraries/stdlib/js/src/kotlin/collections/InternalStringMap.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/InternalStringMap.kt
rename to libraries/stdlib/js/src/kotlin/collections/InternalStringMap.kt
diff --git a/js/js.libraries/src/core/collections/LinkedHashMap.kt b/libraries/stdlib/js/src/kotlin/collections/LinkedHashMap.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/LinkedHashMap.kt
rename to libraries/stdlib/js/src/kotlin/collections/LinkedHashMap.kt
diff --git a/js/js.libraries/src/core/collections/LinkedHashSet.kt b/libraries/stdlib/js/src/kotlin/collections/LinkedHashSet.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/LinkedHashSet.kt
rename to libraries/stdlib/js/src/kotlin/collections/LinkedHashSet.kt
diff --git a/js/js.libraries/src/core/collections/RandomAccess.kt b/libraries/stdlib/js/src/kotlin/collections/RandomAccess.kt
similarity index 100%
rename from js/js.libraries/src/core/collections/RandomAccess.kt
rename to libraries/stdlib/js/src/kotlin/collections/RandomAccess.kt
diff --git a/js/js.libraries/src/core/concurrent.kt b/libraries/stdlib/js/src/kotlin/concurrent.kt
similarity index 100%
rename from js/js.libraries/src/core/concurrent.kt
rename to libraries/stdlib/js/src/kotlin/concurrent.kt
diff --git a/js/js.libraries/src/core/console.kt b/libraries/stdlib/js/src/kotlin/console.kt
similarity index 100%
rename from js/js.libraries/src/core/console.kt
rename to libraries/stdlib/js/src/kotlin/console.kt
diff --git a/js/js.libraries/src/core/core.kt b/libraries/stdlib/js/src/kotlin/core.kt
similarity index 100%
rename from js/js.libraries/src/core/core.kt
rename to libraries/stdlib/js/src/kotlin/core.kt
diff --git a/js/js.libraries/src/core/coroutines.kt b/libraries/stdlib/js/src/kotlin/coroutines.kt
similarity index 100%
rename from js/js.libraries/src/core/coroutines.kt
rename to libraries/stdlib/js/src/kotlin/coroutines.kt
diff --git a/js/js.libraries/src/core/coroutinesIntrinsics.kt b/libraries/stdlib/js/src/kotlin/coroutinesIntrinsics.kt
similarity index 100%
rename from js/js.libraries/src/core/coroutinesIntrinsics.kt
rename to libraries/stdlib/js/src/kotlin/coroutinesIntrinsics.kt
diff --git a/js/js.libraries/src/core/date.kt b/libraries/stdlib/js/src/kotlin/date.kt
similarity index 100%
rename from js/js.libraries/src/core/date.kt
rename to libraries/stdlib/js/src/kotlin/date.kt
diff --git a/js/js.libraries/src/core/debug.kt b/libraries/stdlib/js/src/kotlin/debug.kt
similarity index 100%
rename from js/js.libraries/src/core/debug.kt
rename to libraries/stdlib/js/src/kotlin/debug.kt
diff --git a/js/js.libraries/src/dom/Builders.kt b/libraries/stdlib/js/src/kotlin/dom/Builders.kt
similarity index 100%
rename from js/js.libraries/src/dom/Builders.kt
rename to libraries/stdlib/js/src/kotlin/dom/Builders.kt
diff --git a/js/js.libraries/src/dom/Classes.kt b/libraries/stdlib/js/src/kotlin/dom/Classes.kt
similarity index 100%
rename from js/js.libraries/src/dom/Classes.kt
rename to libraries/stdlib/js/src/kotlin/dom/Classes.kt
diff --git a/js/js.libraries/src/dom/Dom.kt b/libraries/stdlib/js/src/kotlin/dom/Dom.kt
similarity index 100%
rename from js/js.libraries/src/dom/Dom.kt
rename to libraries/stdlib/js/src/kotlin/dom/Dom.kt
diff --git a/js/js.libraries/src/dom/EventListener.kt b/libraries/stdlib/js/src/kotlin/dom/EventListener.kt
similarity index 100%
rename from js/js.libraries/src/dom/EventListener.kt
rename to libraries/stdlib/js/src/kotlin/dom/EventListener.kt
diff --git a/js/js.libraries/src/dom/ItemArrayLike.kt b/libraries/stdlib/js/src/kotlin/dom/ItemArrayLike.kt
similarity index 100%
rename from js/js.libraries/src/dom/ItemArrayLike.kt
rename to libraries/stdlib/js/src/kotlin/dom/ItemArrayLike.kt
diff --git a/js/js.libraries/src/dom/Mutations.kt b/libraries/stdlib/js/src/kotlin/dom/Mutations.kt
similarity index 100%
rename from js/js.libraries/src/dom/Mutations.kt
rename to libraries/stdlib/js/src/kotlin/dom/Mutations.kt
diff --git a/js/js.libraries/src/core/dynamic.kt b/libraries/stdlib/js/src/kotlin/dynamic.kt
similarity index 100%
rename from js/js.libraries/src/core/dynamic.kt
rename to libraries/stdlib/js/src/kotlin/dynamic.kt
diff --git a/js/js.libraries/src/core/exceptionUtils.kt b/libraries/stdlib/js/src/kotlin/exceptionUtils.kt
similarity index 100%
rename from js/js.libraries/src/core/exceptionUtils.kt
rename to libraries/stdlib/js/src/kotlin/exceptionUtils.kt
diff --git a/js/js.libraries/src/core/exceptions.kt b/libraries/stdlib/js/src/kotlin/exceptions.kt
similarity index 100%
rename from js/js.libraries/src/core/exceptions.kt
rename to libraries/stdlib/js/src/kotlin/exceptions.kt
diff --git a/js/js.libraries/src/core/grouping.kt b/libraries/stdlib/js/src/kotlin/grouping.kt
similarity index 100%
rename from js/js.libraries/src/core/grouping.kt
rename to libraries/stdlib/js/src/kotlin/grouping.kt
diff --git a/js/js.libraries/src/core/io.kt b/libraries/stdlib/js/src/kotlin/io.kt
similarity index 100%
rename from js/js.libraries/src/core/io.kt
rename to libraries/stdlib/js/src/kotlin/io.kt
diff --git a/js/js.libraries/src/core/js.math.kt b/libraries/stdlib/js/src/kotlin/js.math.kt
similarity index 100%
rename from js/js.libraries/src/core/js.math.kt
rename to libraries/stdlib/js/src/kotlin/js.math.kt
diff --git a/js/js.libraries/src/core/json.kt b/libraries/stdlib/js/src/kotlin/json.kt
similarity index 100%
rename from js/js.libraries/src/core/json.kt
rename to libraries/stdlib/js/src/kotlin/json.kt
diff --git a/js/js.libraries/src/core/kotlin.kt b/libraries/stdlib/js/src/kotlin/kotlin.kt
similarity index 100%
rename from js/js.libraries/src/core/kotlin.kt
rename to libraries/stdlib/js/src/kotlin/kotlin.kt
diff --git a/js/js.libraries/src/core/math.kt b/libraries/stdlib/js/src/kotlin/math.kt
similarity index 100%
rename from js/js.libraries/src/core/math.kt
rename to libraries/stdlib/js/src/kotlin/math.kt
diff --git a/js/js.libraries/src/core/numberConversions.kt b/libraries/stdlib/js/src/kotlin/numberConversions.kt
similarity index 100%
rename from js/js.libraries/src/core/numberConversions.kt
rename to libraries/stdlib/js/src/kotlin/numberConversions.kt
diff --git a/js/js.libraries/src/core/numbers.kt b/libraries/stdlib/js/src/kotlin/numbers.kt
similarity index 100%
rename from js/js.libraries/src/core/numbers.kt
rename to libraries/stdlib/js/src/kotlin/numbers.kt
diff --git a/js/js.libraries/src/core/promise.kt b/libraries/stdlib/js/src/kotlin/promise.kt
similarity index 100%
rename from js/js.libraries/src/core/promise.kt
rename to libraries/stdlib/js/src/kotlin/promise.kt
diff --git a/js/js.libraries/src/core/ranges.kt b/libraries/stdlib/js/src/kotlin/ranges.kt
similarity index 100%
rename from js/js.libraries/src/core/ranges.kt
rename to libraries/stdlib/js/src/kotlin/ranges.kt
diff --git a/js/js.libraries/src/reflect/JsClass.kt b/libraries/stdlib/js/src/kotlin/reflect/JsClass.kt
similarity index 100%
rename from js/js.libraries/src/reflect/JsClass.kt
rename to libraries/stdlib/js/src/kotlin/reflect/JsClass.kt
diff --git a/js/js.libraries/src/reflect/KClassImpl.kt b/libraries/stdlib/js/src/kotlin/reflect/KClassImpl.kt
similarity index 100%
rename from js/js.libraries/src/reflect/KClassImpl.kt
rename to libraries/stdlib/js/src/kotlin/reflect/KClassImpl.kt
diff --git a/js/js.libraries/src/reflect/primitives.kt b/libraries/stdlib/js/src/kotlin/reflect/primitives.kt
similarity index 100%
rename from js/js.libraries/src/reflect/primitives.kt
rename to libraries/stdlib/js/src/kotlin/reflect/primitives.kt
diff --git a/js/js.libraries/src/reflect/reflection.kt b/libraries/stdlib/js/src/kotlin/reflect/reflection.kt
similarity index 100%
rename from js/js.libraries/src/reflect/reflection.kt
rename to libraries/stdlib/js/src/kotlin/reflect/reflection.kt
diff --git a/js/js.libraries/src/core/regex.kt b/libraries/stdlib/js/src/kotlin/regex.kt
similarity index 100%
rename from js/js.libraries/src/core/regex.kt
rename to libraries/stdlib/js/src/kotlin/regex.kt
diff --git a/js/js.libraries/src/core/regexp.kt b/libraries/stdlib/js/src/kotlin/regexp.kt
similarity index 100%
rename from js/js.libraries/src/core/regexp.kt
rename to libraries/stdlib/js/src/kotlin/regexp.kt
diff --git a/js/js.libraries/src/core/sequence.kt b/libraries/stdlib/js/src/kotlin/sequence.kt
similarity index 100%
rename from js/js.libraries/src/core/sequence.kt
rename to libraries/stdlib/js/src/kotlin/sequence.kt
diff --git a/js/js.libraries/src/core/string.kt b/libraries/stdlib/js/src/kotlin/string.kt
similarity index 100%
rename from js/js.libraries/src/core/string.kt
rename to libraries/stdlib/js/src/kotlin/string.kt
diff --git a/js/js.libraries/src/core/stringsCode.kt b/libraries/stdlib/js/src/kotlin/stringsCode.kt
similarity index 100%
rename from js/js.libraries/src/core/stringsCode.kt
rename to libraries/stdlib/js/src/kotlin/stringsCode.kt
diff --git a/js/js.libraries/src/core/text.kt b/libraries/stdlib/js/src/kotlin/text.kt
similarity index 100%
rename from js/js.libraries/src/core/text.kt
rename to libraries/stdlib/js/src/kotlin/text.kt
diff --git a/js/js.libraries/src/generated/org.khronos.webgl.kt b/libraries/stdlib/js/src/org.w3c/org.khronos.webgl.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.khronos.webgl.kt
rename to libraries/stdlib/js/src/org.w3c/org.khronos.webgl.kt
diff --git a/js/js.libraries/src/generated/org.w3c.dom.css.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.dom.css.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.dom.css.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.dom.css.kt
diff --git a/js/js.libraries/src/generated/org.w3c.dom.events.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.dom.events.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.dom.events.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.dom.events.kt
diff --git a/js/js.libraries/src/generated/org.w3c.dom.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.dom.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.dom.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.dom.kt
diff --git a/js/js.libraries/src/generated/org.w3c.dom.parsing.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.dom.parsing.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.dom.parsing.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.dom.parsing.kt
diff --git a/js/js.libraries/src/generated/org.w3c.dom.svg.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.dom.svg.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.dom.svg.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.dom.svg.kt
diff --git a/js/js.libraries/src/generated/org.w3c.dom.url.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.dom.url.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.dom.url.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.dom.url.kt
diff --git a/js/js.libraries/src/generated/org.w3c.fetch.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.fetch.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.fetch.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.fetch.kt
diff --git a/js/js.libraries/src/generated/org.w3c.files.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.files.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.files.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.files.kt
diff --git a/js/js.libraries/src/generated/org.w3c.notifications.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.notifications.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.notifications.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.notifications.kt
diff --git a/js/js.libraries/src/generated/org.w3c.performance.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.performance.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.performance.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.performance.kt
diff --git a/js/js.libraries/src/generated/org.w3c.workers.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.workers.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.workers.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.workers.kt
diff --git a/js/js.libraries/src/generated/org.w3c.xhr.kt b/libraries/stdlib/js/src/org.w3c/org.w3c.xhr.kt
similarity index 100%
rename from js/js.libraries/src/generated/org.w3c.xhr.kt
rename to libraries/stdlib/js/src/org.w3c/org.w3c.xhr.kt
diff --git a/js/js.libraries/src/wrapper.js b/libraries/stdlib/js/src/wrapper.js
similarity index 100%
rename from js/js.libraries/src/wrapper.js
rename to libraries/stdlib/js/src/wrapper.js
diff --git a/js/js.libraries/test/core/JsonTest.kt b/libraries/stdlib/js/test/core/JsonTest.kt
similarity index 100%
rename from js/js.libraries/test/core/JsonTest.kt
rename to libraries/stdlib/js/test/core/JsonTest.kt
diff --git a/js/js.libraries/test/core/NumbersJsTest.kt b/libraries/stdlib/js/test/core/NumbersJsTest.kt
similarity index 100%
rename from js/js.libraries/test/core/NumbersJsTest.kt
rename to libraries/stdlib/js/test/core/NumbersJsTest.kt
diff --git a/js/js.libraries/test/core/PromiseTest.kt b/libraries/stdlib/js/test/core/PromiseTest.kt
similarity index 100%
rename from js/js.libraries/test/core/PromiseTest.kt
rename to libraries/stdlib/js/test/core/PromiseTest.kt
diff --git a/js/js.libraries/test/core/RegExpTest.kt b/libraries/stdlib/js/test/core/RegExpTest.kt
similarity index 100%
rename from js/js.libraries/test/core/RegExpTest.kt
rename to libraries/stdlib/js/test/core/RegExpTest.kt
diff --git a/js/js.libraries/test/core/testUtils.kt b/libraries/stdlib/js/test/core/testUtils.kt
similarity index 100%
rename from js/js.libraries/test/core/testUtils.kt
rename to libraries/stdlib/js/test/core/testUtils.kt
diff --git a/libraries/tools/idl2k/src/main/kotlin/download.kt b/libraries/tools/idl2k/src/main/kotlin/download.kt
index 453c2037744..8261f7e983c 100644
--- a/libraries/tools/idl2k/src/main/kotlin/download.kt
+++ b/libraries/tools/idl2k/src/main/kotlin/download.kt
@@ -24,7 +24,7 @@ import java.io.File
 import java.net.URL
 
 fun main(args: Array<String>) {
-    val dir = File("../../idl")
+    val dir = File("../../stdlib/js/idl")
     dir.mkdirs()
 
     var packageFilter: String? = null
diff --git a/libraries/tools/idl2k/src/main/kotlin/main.kt b/libraries/tools/idl2k/src/main/kotlin/main.kt
index 7edefc03a0b..9146eea24be 100644
--- a/libraries/tools/idl2k/src/main/kotlin/main.kt
+++ b/libraries/tools/idl2k/src/main/kotlin/main.kt
@@ -8,8 +8,8 @@ import kotlin.collections.HashSet
 
 fun main(args: Array<String>) {
     val mdnCacheFile = File("target/mdn-cache.txt")
-    val outDir = File("../../../js/js.libraries/src/generated")
-    val srcDir = File("../../idl")
+    val outDir = File("../../stdlib/js/src/org.w3c")
+    val srcDir = File("../../stdlib/js/idl")
     if (!srcDir.exists()) {
         System.err?.println("Directory ${srcDir.absolutePath} doesn't exist")
         System.exit(1)
diff --git a/license/README.md b/license/README.md
index b9e37f6fdf7..02c461450c4 100644
--- a/license/README.md
+++ b/license/README.md
@@ -39,18 +39,6 @@ the Kotlin IntelliJ IDEA plugin:
      - License: BSD (license/third_party/dart_LICENSE.txt)
      - Origin: Originally part of the Dart compiler, (c) 2011 the Dart Project Authors,
    
- - Path: js/js.libraries/src/core/collections
-      - License: Apache 2 (license/third_party/gwt_license.txt)
-      - Origin: Derived from GWT, (C) 2007-08 Google Inc.
- 
- - Path: js/js.libraries/src/js/long.js
-      - License: Apache 2 (license/third_party/closure-compiler_LICENSE.txt)
-      - Origin: Google Closure Library, Copyright 2009 The Closure Library Authors
-      
- - Path: js/js.libraries/src/js/polyfills.js
-      - License: Boost Software License 1.0 (license/third_party/boost_LICENSE.txt)
-      - Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
- 
  - Path: js/js.parser/src/com/google
       - License: Netscape Public License 1.1 (license/third_party/rhino_LICENSE.txt)
       - Origin: Originally part of GWT, (C) 2007-08 Google Inc., distributed under the Apache 2 license. The code 
@@ -69,6 +57,18 @@ the Kotlin IntelliJ IDEA plugin:
       - License: Boost Software License 1.0 (license/third_party/boost_LICENSE.txt)
       - Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
 
+ - Path: libraries/stdlib/js/src/kotlin/collections
+      - License: Apache 2 (license/third_party/gwt_license.txt)
+      - Origin: Derived from GWT, (C) 2007-08 Google Inc.
+ 
+ - Path: libraries/stdlib/js/src/js/long.js
+      - License: Apache 2 (license/third_party/closure-compiler_LICENSE.txt)
+      - Origin: Google Closure Library, Copyright 2009 The Closure Library Authors
+      
+ - Path: libraries/stdlib/js/src/js/polyfills.js
+      - License: Boost Software License 1.0 (license/third_party/boost_LICENSE.txt)
+      - Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
+ 
  - Path: plugins/lint/android-annotations
       - License: Apache 2 (license/third_party/aosp_license.txt)
       - Origin: Copyright (C) 2011-15 The Android Open Source Project