diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1727c7771..611136e55 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,6 @@ detekt = "1.22.0"
 [libraries]
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-kotlin-stdlib-wasm-js = { module = "org.jetbrains.kotlin:kotlin-stdlib-wasm-js", version.ref = "kotlin" }
 
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations", version.ref = "kotlin" }
diff --git a/includedBuild/gradleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt b/includedBuild/gradleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt
index d7f7506f2..7667bd1d1 100644
--- a/includedBuild/gradleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt
+++ b/includedBuild/gradleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt
@@ -62,9 +62,6 @@ class MppConfigurationPlugin : Plugin<Project> {
                 maybeCreate("jvmJsCommonMain").dependsOn(getByName("commonMain"))
                 maybeCreate("jvmJsCommonTest").dependsOn(getByName("commonTest"))
 
-                maybeCreate("jsWasmJsCommonMain").dependsOn(getByName("commonMain"))
-                maybeCreate("jsWasmJsCommonTest").dependsOn(getByName("commonTest"))
-
                 maybeCreate("jvmNativeCommonMain").dependsOn(getByName("commonMain"))
                 maybeCreate("jvmNativeCommonTest").dependsOn(getByName("commonTest"))
 
@@ -83,23 +80,14 @@ class MppConfigurationPlugin : Plugin<Project> {
                 maybeCreate("androidMain").dependsOn(getByName("jvmCommonMain"))
                 maybeCreate("androidUnitTest").dependsOn(getByName("jvmCommonTest"))
 
-                maybeCreate("jsMain").apply {
-                    dependsOn(getByName("jvmJsCommonMain"))
-                    dependsOn(getByName("jsWasmJsCommonMain"))
-                }
-                maybeCreate("jsTest").apply {
-                    dependsOn(getByName("jvmJsCommonTest"))
-                    dependsOn(getByName("jsWasmJsCommonTest"))
-                }
+                maybeCreate("jsCommonMain").dependsOn(getByName("jvmJsCommonMain"))
+                maybeCreate("jsCommonTest").dependsOn(getByName("jvmJsCommonTest"))
 
-                maybeCreate("wasmJsMain").apply {
-                    dependsOn(getByName("jvmJsCommonMain"))
-                    dependsOn(getByName("jsWasmJsCommonMain"))
-                }
-                maybeCreate("wasmJsTest").apply {
-                    dependsOn(getByName("jvmJsCommonTest"))
-                    dependsOn(getByName("jsWasmJsCommonTest"))
-                }
+                maybeCreate("jsMain").dependsOn(getByName("jsCommonMain"))
+                maybeCreate("jsTest").dependsOn(getByName("jsCommonTest"))
+
+                maybeCreate("wasmJsMain").dependsOn(getByName("jsCommonMain"))
+                maybeCreate("wasmJsTest").dependsOn(getByName("jsCommonTest"))
 
                 maybeCreate("nativeCommonMain").dependsOn(getByName("jvmNativeCommonMain"))
                 maybeCreate("nativeCommonTest").dependsOn(getByName("jvmNativeCommonTest"))
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/base/exceptions/CompositeException.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/base/exceptions/CompositeException.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/base/exceptions/CompositeException.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/base/exceptions/CompositeException.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/disposable/Various.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/disposable/Various.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/disposable/Various.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/disposable/Various.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateComputationScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateComputationScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateComputationScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateComputationScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateIoScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateIoScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateIoScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateIoScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateMainScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateMainScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateMainScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateMainScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateNewThreadScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateNewThreadScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateNewThreadScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateNewThreadScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateSingleScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateSingleScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateSingleScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateSingleScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateTrampolineScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateTrampolineScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateTrampolineScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/CreateTrampolineScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/JsFunctions.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/MainScheduler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/MainScheduler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/scheduler/MainScheduler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/scheduler/MainScheduler.kt
diff --git a/reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/CreateDefaultUncaughtErrorHandler.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/CreateDefaultUncaughtErrorHandler.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/CreateDefaultUncaughtErrorHandler.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/CreateDefaultUncaughtErrorHandler.kt
diff --git a/reaktive/src/jsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt b/reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt
similarity index 100%
rename from reaktive/src/jsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt
rename to reaktive/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt
diff --git a/reaktive/src/jsWasmJsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt b/reaktive/src/jsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt
similarity index 100%
rename from reaktive/src/jsWasmJsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt
rename to reaktive/src/jsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt
diff --git a/reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt b/reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt
deleted file mode 100644
index 5a2292d95..000000000
--- a/reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.badoo.reaktive.utils
-
-internal actual inline fun <T> synchronizedCompat(lock: Any, block: () -> T): T = block()
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/CurrentThread.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/CurrentThread.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/CurrentThread.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/CurrentThread.kt
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicBoolean.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicBoolean.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicBoolean.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicBoolean.kt
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicInt.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicInt.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicInt.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicInt.kt
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicLong.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicLong.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicLong.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicLong.kt
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicReference.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicReference.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicReference.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/atomic/AtomicReference.kt
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/lock/ConditionLock.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/lock/ConditionLock.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/lock/ConditionLock.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/lock/ConditionLock.kt
diff --git a/utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/lock/Lock.kt b/utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/lock/Lock.kt
similarity index 100%
rename from utils-internal/src/jsWasmJsCommonMain/kotlin/com/badoo/reaktive/utils/lock/Lock.kt
rename to utils-internal/src/jsCommonMain/kotlin/com/badoo/reaktive/utils/lock/Lock.kt