Rename package names in web-core

androidx.compose.web -> org.jetbrains.compose.web androidx.compose.web.elements -> org.jetbrains.compose.web.dom
4 years ago · 898fa303ff
93 changed files with 385 additions and 385 deletions
--- a/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt
+++ b/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt
@ -1,13 +1,13 @@
 package org.jetbrainsc.compose.common.demo

-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.renderComposable
 import kotlinx.browser.document
 import org.w3c.dom.HTMLElement
 import org.jetbrains.compose.demo.falling.views.fallingBalls
 import org.jetbrains.compose.demo.falling.Game
 import androidx.compose.runtime.remember
 import kotlinx.browser.window
-import androidx.compose.web.css.Style
+import org.jetbrains.compose.web.css.Style
 import org.jetbrains.compose.web.ui.Styles

 class JsGame : Game() {
--- a/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt
+++ b/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt
@ -5,11 +5,11 @@ import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.foundation.layout.offset
 import org.jetbrains.compose.common.ui.unit.Dp
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.top
-import androidx.compose.web.css.left
-import androidx.compose.web.css.px
-import androidx.compose.web.css.position
-import androidx.compose.web.css.Position
+import org.jetbrains.compose.web.css.top
+import org.jetbrains.compose.web.css.left
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.position
+import org.jetbrains.compose.web.css.Position

@Composable
 actual fun Modifier.position(width: Dp, height: Dp): Modifier  = castOrCreate().apply {
--- a/examples/web-getting-started/src/jsMain/kotlin/Main.kt
+++ b/examples/web-getting-started/src/jsMain/kotlin/Main.kt
@ -1,13 +1,13 @@
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
-import androidx.compose.web.css.padding
-import androidx.compose.web.css.px
-import androidx.compose.web.elements.Button
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Span
-import androidx.compose.web.elements.Text
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.css.padding
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Span
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.renderComposable

 fun main() {
    var count: Int by mutableStateOf(0)
--- a/examples/web-with-react/src/jsMain/kotlin/ComposeInReactApp.kt
+++ b/examples/web-with-react/src/jsMain/kotlin/ComposeInReactApp.kt
@ -1,9 +1,9 @@
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Text
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.renderComposable
 import kotlinx.browser.document
 import kotlinx.browser.window
 import kotlinx.css.*
--- a/examples/web-with-react/src/jsMain/kotlin/ReactInComposeApp.kt
+++ b/examples/web-with-react/src/jsMain/kotlin/ReactInComposeApp.kt
@ -2,12 +2,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.web.css.margin
-import androidx.compose.web.css.percent
-import androidx.compose.web.css.px
-import androidx.compose.web.css.width
-import androidx.compose.web.elements.*
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.css.margin
+import org.jetbrains.compose.web.css.percent
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.width
+import org.jetbrains.compose.web.dom.*
+import org.jetbrains.compose.web.renderComposable
 import kotlinx.browser.window
 import org.w3c.dom.HTMLElement
 import react.RBuilder
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt
@ -1,7 +1,7 @@
 package com.sample

-import androidx.compose.web.css.Style
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.css.Style
+import org.jetbrains.compose.web.renderComposable
 import com.sample.components.*
 import com.sample.content.*
 import com.sample.style.AppStylesheet
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt
@ -1,10 +1,10 @@
 package com.sample.components

 import androidx.compose.runtime.Composable
-import androidx.compose.web.attributes.ATarget
-import androidx.compose.web.attributes.target
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.attributes.ATarget
+import org.jetbrains.compose.web.attributes.target
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.*
 import com.sample.style.*


--- a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt
@ -1,10 +1,10 @@
 package com.sample.components

 import androidx.compose.runtime.Composable
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Main
-import androidx.compose.web.elements.Section
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Main
+import org.jetbrains.compose.web.dom.Section
 import com.sample.style.WtContainer
 import com.sample.style.WtOffsets
 import com.sample.style.WtSections
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt
@ -1,9 +1,9 @@
 package com.sample.content

 import androidx.compose.runtime.Composable
-import androidx.compose.web.css.px
-import androidx.compose.web.css.value
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.value
+import org.jetbrains.compose.web.dom.*
 import com.sample.components.Card
 import com.sample.components.ContainerInSection
 import com.sample.components.LinkOnCard
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt
@ -1,17 +1,17 @@
 package com.sample.content

 import androidx.compose.runtime.Composable
-import androidx.compose.web.attributes.InputType
-import androidx.compose.web.attributes.checked
-import androidx.compose.web.attributes.name
-import androidx.compose.web.css.*
-import androidx.compose.web.css.selectors.CSSSelector
-import androidx.compose.web.css.selectors.descendant
-import androidx.compose.web.css.selectors.selector
-import androidx.compose.web.elements.Form
-import androidx.compose.web.elements.Input
-import androidx.compose.web.elements.Label
-import androidx.compose.web.elements.Text
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.attributes.checked
+import org.jetbrains.compose.web.attributes.name
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.selectors.descendant
+import org.jetbrains.compose.web.css.selectors.selector
+import org.jetbrains.compose.web.dom.Form
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.dom.Label
+import org.jetbrains.compose.web.dom.Text
 import com.sample.style.AppStylesheet

 private object SwitcherVariables : CSSVariables {
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.*
 import com.sample.HighlightJs
 import com.sample.components.ContainerInSection
 import com.sample.style.*
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt
@ -1,10 +1,10 @@
 package com.sample.content

 import androidx.compose.runtime.Composable
-import androidx.compose.web.attributes.ATarget
-import androidx.compose.web.attributes.target
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.attributes.ATarget
+import org.jetbrains.compose.web.attributes.target
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.*
 import com.sample.style.*


--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt
@ -1,8 +1,8 @@
 package com.sample.content

 import androidx.compose.runtime.Composable
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.*
 import com.sample.components.CardDark
 import com.sample.components.ContainerInSection
 import com.sample.components.LinkOnCard
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt
@ -1,10 +1,10 @@
 package com.sample.content

 import androidx.compose.runtime.Composable
-import androidx.compose.web.attributes.ATarget
-import androidx.compose.web.attributes.target
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.attributes.ATarget
+import org.jetbrains.compose.web.attributes.target
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.*
 import com.sample.style.*
 import kotlinx.browser.window

--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt
@ -1,12 +1,12 @@
 package com.sample.content

 import androidx.compose.runtime.*
-import androidx.compose.web.attributes.ATarget
-import androidx.compose.web.attributes.AttrsBuilder
-import androidx.compose.web.attributes.Tag
-import androidx.compose.web.attributes.target
-import androidx.compose.web.css.*
-import androidx.compose.web.elements.*
+import org.jetbrains.compose.web.attributes.ATarget
+import org.jetbrains.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.attributes.Tag
+import org.jetbrains.compose.web.attributes.target
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.dom.*
 import com.sample.components.ContainerInSection
 import com.sample.style.*
 import org.w3c.dom.HTMLElement
@ -224,8 +224,8 @@ private fun ComposeWebStatusMessage() {
 }

@Composable
-inline fun Hr(
-    crossinline attrs: (AttrsBuilder<Tag.Div>.() -> Unit) = {}
+fun Hr(
+    attrs: (AttrsBuilder<Tag.Div>.() -> Unit) = {}
 ) {
    TagElement<Tag.Div, HTMLElement>(
        tagName = "hr",
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt
@ -1,10 +1,10 @@
 package com.sample.content

 import androidx.compose.runtime.Composable
-import androidx.compose.web.attributes.ATarget
-import androidx.compose.web.attributes.target
-import androidx.compose.web.elements.*
-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.attributes.ATarget
+import org.jetbrains.compose.web.attributes.target
+import org.jetbrains.compose.web.dom.*
+import org.jetbrains.compose.web.css.*
 import com.sample.components.ContainerInSection
 import com.sample.style.*

--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
@ -1,7 +1,7 @@
 package com.sample.style

-import androidx.compose.web.css.*
-import androidx.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 object AppCSSVariables : CSSVariables {
    val wtColorGreyLight by variable<Color>()
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt
@ -1,6 +1,6 @@
 package com.sample.style

-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.css.*

 object WtCards : StyleSheet(AppStylesheet) {
    val wtCard by style {
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt
@ -1,7 +1,7 @@
 package com.sample.style

-import androidx.compose.web.css.*
-import androidx.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 fun <TBuilder> GenericStyleSheetBuilder<TBuilder>.mediaMaxWidth(
    value: CSSSizeValue,
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt
@ -1,6 +1,6 @@
 package com.sample.style

-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.css.*

 object WtContainer : StyleSheet(AppStylesheet) {
    val wtContainer by style {
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt
@ -1,6 +1,6 @@
 package com.sample.style

-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.css.*

 object WtDisplay : StyleSheet(AppStylesheet) {
    val wtDisplayNone by style {
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt
@ -1,6 +1,6 @@
 package com.sample.style

-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.css.*

 object WtOffsets : StyleSheet(AppStylesheet) {
    val wtTopOffset96 by style {
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt
@ -1,6 +1,6 @@
 package com.sample.style

-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.css.*

 object WtRows : StyleSheet(AppStylesheet) {
    
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt
@ -1,6 +1,6 @@
 package com.sample.style

-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.css.*

 object WtSections : StyleSheet(AppStylesheet) {

@ -11,7 +11,7 @@ object WtSections : StyleSheet(AppStylesheet) {
        property(
            propertyName = "padding-bottom",
            value = value(
-                "calc(4*${AppCSSVariables.wtOffsetTopUnit.value(24.px).asString()})"
+                "calc(4*${AppCSSVariables.wtOffsetTopUnit.value(24.px)})"
            )
        )
        backgroundColor("#fff")
--- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt
+++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt
@ -1,7 +1,7 @@
 package com.sample.style

-import androidx.compose.web.css.*
-import androidx.compose.web.css.selectors.hover
+import org.jetbrains.compose.web.css.*
+import org.jetbrains.compose.web.css.selectors.hover

 object WtTexts : StyleSheet(AppStylesheet) {

--- a/templates/web-template/src/main/kotlin/Main.kt
+++ b/templates/web-template/src/main/kotlin/Main.kt
@ -1,6 +1,6 @@
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Text
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.renderComposable

 fun main() {
    renderComposable(rootElementId = "root") {
--- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSKT.kt
+++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSKT.kt
@ -4,7 +4,7 @@
 */

@file:Suppress("UNUSED")
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 abstract class CSSNumericValueKT : CSSNumericValue

--- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSTypedOM.kt
+++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSTypedOM.kt
@ -4,7 +4,7 @@
 */

@file:Suppress("UNUSED")
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 import kotlin.js.JsName

--- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSUnits.kt
+++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSUnits.kt
@ -1,6 +1,6 @@
@file:Suppress("UNUSED")

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 // fake interfaces to distinguish units
 expect interface CSSSizeValue : CSSUnitValue
--- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/keywords.kt
+++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/keywords.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 interface CSSAutoValue : CSSKeywordValue

--- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/typing.kt
+++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/typing.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 expect interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue {
    interface Size : CSSSizeOrAutoValue
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/DomApplier.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/DomApplier.kt
@ -1,11 +1,11 @@
-package androidx.compose.web
+package org.jetbrains.compose.web

 import androidx.compose.runtime.AbstractApplier
-import androidx.compose.web.attributes.WrappedEventListener
-import androidx.compose.web.css.StyleHolder
-import androidx.compose.web.css.attributeStyleMap
-import androidx.compose.web.elements.setProperty
-import androidx.compose.web.elements.setVariable
+import org.jetbrains.compose.web.attributes.WrappedEventListener
+import org.jetbrains.compose.web.css.StyleHolder
+import org.jetbrains.compose.web.css.attributeStyleMap
+import org.jetbrains.compose.web.dom.setProperty
+import org.jetbrains.compose.web.dom.setVariable
 import kotlinx.browser.document
 import kotlinx.dom.clear
 import org.w3c.dom.Element
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/GlobalSnapshotManager.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/GlobalSnapshotManager.kt
@ -1,8 +1,8 @@
-package androidx.compose.web
+package org.jetbrains.compose.web

 import androidx.compose.runtime.snapshots.ObserverHandle
 import androidx.compose.runtime.snapshots.Snapshot
-import androidx.compose.web.GlobalSnapshotManager.ensureStarted
+import org.jetbrains.compose.web.GlobalSnapshotManager.ensureStarted
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/JsMicrotasksDispatcher.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/JsMicrotasksDispatcher.kt
@ -1,4 +1,4 @@
-package androidx.compose.web
+package org.jetbrains.compose.web

 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Runnable
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/RenderComposable.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/RenderComposable.kt
@ -1,11 +1,11 @@
-package androidx.compose.web
+package org.jetbrains.compose.web

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Composition
 import androidx.compose.runtime.ControlledComposition
 import androidx.compose.runtime.DefaultMonotonicFrameClock
 import androidx.compose.runtime.Recomposer
-import androidx.compose.web.elements.DOMScope
+import org.jetbrains.compose.web.dom.DOMScope
 import kotlinx.browser.document
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/Attrs.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/Attrs.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.attributes
+package org.jetbrains.compose.web.attributes

 import org.w3c.dom.HTMLInputElement

--- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/AttrsBuilder.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/AttrsBuilder.kt
@ -1,9 +1,9 @@
-package androidx.compose.web.attributes
+package org.jetbrains.compose.web.attributes

 import androidx.compose.runtime.DisposableEffectResult
 import androidx.compose.runtime.DisposableEffectScope
-import androidx.compose.web.css.StyleBuilder
-import androidx.compose.web.css.StyleBuilderImpl
+import org.jetbrains.compose.web.css.StyleBuilder
+import org.jetbrains.compose.web.css.StyleBuilderImpl
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement

--- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/EventsListenerBuilder.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/EventsListenerBuilder.kt
@ -1,18 +1,18 @@
-package androidx.compose.web.attributes
-
-import androidx.compose.web.events.WrappedCheckBoxInputEvent
-import androidx.compose.web.events.WrappedClipboardEvent
-import androidx.compose.web.events.WrappedDragEvent
-import androidx.compose.web.events.WrappedEvent
-import androidx.compose.web.events.WrappedFocusEvent
-import androidx.compose.web.events.WrappedInputEvent
-import androidx.compose.web.events.WrappedKeyboardEvent
-import androidx.compose.web.events.WrappedMouseEvent
-import androidx.compose.web.events.WrappedRadioInputEvent
-import androidx.compose.web.events.WrappedTextInputEvent
-import androidx.compose.web.events.WrappedTouchEvent
-import androidx.compose.web.events.WrappedWheelEvent
-import androidx.compose.web.events.GenericWrappedEvent
+package org.jetbrains.compose.web.attributes
+
+import org.jetbrains.compose.web.events.WrappedCheckBoxInputEvent
+import org.jetbrains.compose.web.events.WrappedClipboardEvent
+import org.jetbrains.compose.web.events.WrappedDragEvent
+import org.jetbrains.compose.web.events.WrappedEvent
+import org.jetbrains.compose.web.events.WrappedFocusEvent
+import org.jetbrains.compose.web.events.WrappedInputEvent
+import org.jetbrains.compose.web.events.WrappedKeyboardEvent
+import org.jetbrains.compose.web.events.WrappedMouseEvent
+import org.jetbrains.compose.web.events.WrappedRadioInputEvent
+import org.jetbrains.compose.web.events.WrappedTextInputEvent
+import org.jetbrains.compose.web.events.WrappedTouchEvent
+import org.jetbrains.compose.web.events.WrappedWheelEvent
+import org.jetbrains.compose.web.events.GenericWrappedEvent

 open class EventsListenerBuilder {

--- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/PredefinedAttrValues.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/PredefinedAttrValues.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.attributes
+package org.jetbrains.compose.web.attributes

 sealed class InputType(val typeStr: String) {
    object Button : InputType("button")
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/WrappedEventListener.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/WrappedEventListener.kt
@ -1,19 +1,19 @@
-package androidx.compose.web.attributes
-
-import androidx.compose.web.events.GenericWrappedEvent
-import androidx.compose.web.events.WrappedCheckBoxInputEvent
-import androidx.compose.web.events.WrappedClipboardEvent
-import androidx.compose.web.events.WrappedDragEvent
-import androidx.compose.web.events.WrappedEventImpl
-import androidx.compose.web.events.WrappedFocusEvent
-import androidx.compose.web.events.WrappedInputEvent
-import androidx.compose.web.events.WrappedKeyboardEvent
-import androidx.compose.web.events.WrappedMouseEvent
-import androidx.compose.web.events.WrappedPointerEvent
-import androidx.compose.web.events.WrappedRadioInputEvent
-import androidx.compose.web.events.WrappedTextInputEvent
-import androidx.compose.web.events.WrappedTouchEvent
-import androidx.compose.web.events.WrappedWheelEvent
+package org.jetbrains.compose.web.attributes
+
+import org.jetbrains.compose.web.events.GenericWrappedEvent
+import org.jetbrains.compose.web.events.WrappedCheckBoxInputEvent
+import org.jetbrains.compose.web.events.WrappedClipboardEvent
+import org.jetbrains.compose.web.events.WrappedDragEvent
+import org.jetbrains.compose.web.events.WrappedEventImpl
+import org.jetbrains.compose.web.events.WrappedFocusEvent
+import org.jetbrains.compose.web.events.WrappedInputEvent
+import org.jetbrains.compose.web.events.WrappedKeyboardEvent
+import org.jetbrains.compose.web.events.WrappedMouseEvent
+import org.jetbrains.compose.web.events.WrappedPointerEvent
+import org.jetbrains.compose.web.events.WrappedRadioInputEvent
+import org.jetbrains.compose.web.events.WrappedTextInputEvent
+import org.jetbrains.compose.web.events.WrappedTouchEvent
+import org.jetbrains.compose.web.events.WrappedWheelEvent
 import org.w3c.dom.DragEvent
 import org.w3c.dom.TouchEvent
 import org.w3c.dom.clipboard.ClipboardEvent
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt
@ -4,7 +4,7 @@
 */

@file:Suppress("UNUSED", "NOTHING_TO_INLINE")
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 import org.w3c.dom.HTMLElement
 import org.w3c.dom.css.*
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSBuilder.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSBuilder.kt
@ -1,6 +1,6 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

-import androidx.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 interface CSSBuilder : CSSStyleRuleBuilder, GenericStyleSheetBuilder<CSSBuilder> {
    val root: CSSSelector
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSMediaRule.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSMediaRule.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 interface CSSMediaQuery {
    interface Invertible : CSSMediaQuery
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSProperties.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSProperties.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 fun StyleBuilder.opacity(value: Number) {
    property("opacity", value(value))
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSRules.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSRules.kt
@ -1,6 +1,6 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

-import androidx.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 interface CSSStyleRuleBuilder : StyleBuilder

--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt
@ -1,6 +1,6 @@
@file:Suppress("UNUSED")

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 // fake interfaces to distinguish units
 actual external interface CSSSizeValue : CSSUnitValue
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/Color.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/Color.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 abstract class Color : CustomStyleValue {
    override fun styleValue(): StylePropertyValue = StylePropertyValue(toString())
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleBuilder.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleBuilder.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 import kotlin.properties.ReadOnlyProperty

--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheet.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheet.kt
@ -1,12 +1,12 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
-import androidx.compose.web.css.selectors.CSSSelector
-import androidx.compose.web.css.selectors.className
-import androidx.compose.web.elements.Style
+import org.jetbrains.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.selectors.className
+import org.jetbrains.compose.web.dom.Style
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty

--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheetBuilder.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheetBuilder.kt
@ -1,6 +1,6 @@
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

-import androidx.compose.web.css.selectors.CSSSelector
+import org.jetbrains.compose.web.css.selectors.CSSSelector

 interface CSSRulesHolder {
    val cssRules: CSSRuleDeclarationList
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/keywords.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/keywords.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 actual inline val auto: CSSAutoValue
    get() = CSSKeywordValue("auto").unsafeCast<CSSAutoValue>()
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/selectors/CSSSelectors.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/selectors/CSSSelectors.kt
@ -1,6 +1,6 @@
-package androidx.compose.web.css.selectors
+package org.jetbrains.compose.web.css.selectors

-import androidx.compose.web.css.LanguageCode
+import org.jetbrains.compose.web.css.LanguageCode

 sealed class Nth {
    data class Functional(val a: Int? = null, val b: Int? = null) {
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/typing.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/typing.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 actual interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue {
    actual interface Size : CSSSizeOrAutoValue
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Base.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Base.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.elements
+package org.jetbrains.compose.web.dom

 import androidx.compose.runtime.Applier
 import androidx.compose.runtime.Composable
@ -10,10 +10,10 @@ import androidx.compose.runtime.ExplicitGroupsComposable
 import androidx.compose.runtime.SkippableUpdater
 import androidx.compose.runtime.currentComposer
 import androidx.compose.runtime.remember
-import androidx.compose.web.DomApplier
-import androidx.compose.web.DomElementWrapper
-import androidx.compose.web.attributes.AttrsBuilder
-import androidx.compose.web.attributes.Tag
+import org.jetbrains.compose.web.DomApplier
+import org.jetbrains.compose.web.DomElementWrapper
+import org.jetbrains.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.attributes.Tag
 import kotlinx.browser.document
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/ElementScope.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/ElementScope.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.elements
+package org.jetbrains.compose.web.dom

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ComposeCompilerApi
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Elements.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Elements.kt
@ -1,20 +1,20 @@
-package androidx.compose.web.elements
+package org.jetbrains.compose.web.dom

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ComposeNode
-import androidx.compose.web.DomApplier
-import androidx.compose.web.DomNodeWrapper
-import androidx.compose.web.attributes.AttrsBuilder
-import androidx.compose.web.attributes.InputType
-import androidx.compose.web.attributes.Tag
-import androidx.compose.web.attributes.action
-import androidx.compose.web.attributes.alt
-import androidx.compose.web.attributes.forId
-import androidx.compose.web.attributes.href
-import androidx.compose.web.attributes.label
-import androidx.compose.web.attributes.src
-import androidx.compose.web.attributes.type
-import androidx.compose.web.attributes.value
+import org.jetbrains.compose.web.DomApplier
+import org.jetbrains.compose.web.DomNodeWrapper
+import org.jetbrains.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.attributes.Tag
+import org.jetbrains.compose.web.attributes.action
+import org.jetbrains.compose.web.attributes.alt
+import org.jetbrains.compose.web.attributes.forId
+import org.jetbrains.compose.web.attributes.href
+import org.jetbrains.compose.web.attributes.label
+import org.jetbrains.compose.web.attributes.src
+import org.jetbrains.compose.web.attributes.type
+import org.jetbrains.compose.web.attributes.value
 import kotlinx.browser.document
 import org.w3c.dom.HTMLAnchorElement
 import org.w3c.dom.HTMLBRElement
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Style.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Style.kt
@ -1,9 +1,9 @@
-package androidx.compose.web.elements
+package org.jetbrains.compose.web.dom

 import androidx.compose.runtime.Composable
-import androidx.compose.web.attributes.AttrsBuilder
-import androidx.compose.web.attributes.Tag
-import androidx.compose.web.css.*
+import org.jetbrains.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.attributes.Tag
+import org.jetbrains.compose.web.css.*
 import org.w3c.dom.HTMLStyleElement
 import org.w3c.dom.css.CSSGroupingRule
 import org.w3c.dom.css.CSSRule
@ -30,7 +30,7 @@ inline fun Style(
 * Use this function to mount the <style> tag into the DOM tree.
 *
 * @param cssRules - is a list of style rules.
- * Usually, it's [androidx.compose.web.css.StyleSheet] instance
+ * Usually, it's [org.jetbrains.compose.web.css.StyleSheet] instance
 */
@Composable
 inline fun Style(
--- a/web/core/src/jsMain/kotlin/androidx/compose/web/events/WrappedEvent.kt
+++ b/web/core/src/jsMain/kotlin/androidx/compose/web/events/WrappedEvent.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.events
+package org.jetbrains.compose.web.events

 import org.w3c.dom.DragEvent
 import org.w3c.dom.TouchEvent
--- a/web/core/src/jsTest/kotlin/DomSideEffectTests.kt
+++ b/web/core/src/jsTest/kotlin/DomSideEffectTests.kt
@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.web.elements.Div
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.renderComposable
 import kotlinx.browser.document
 import kotlinx.dom.clear
 import kotlin.test.Test
--- a/web/core/src/jsTest/kotlin/InlineStyleTests.kt
+++ b/web/core/src/jsTest/kotlin/InlineStyleTests.kt
@ -3,15 +3,15 @@ package org.jetbrains.compose.web.core.tests
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.web.css.Color
-import androidx.compose.web.css.backgroundColor
-import androidx.compose.web.css.border
-import androidx.compose.web.css.color
-import androidx.compose.web.css.opacity
-import androidx.compose.web.css.padding
-import androidx.compose.web.css.px
-import androidx.compose.web.elements.Span
-import androidx.compose.web.elements.Text
+import org.jetbrains.compose.web.css.Color
+import org.jetbrains.compose.web.css.backgroundColor
+import org.jetbrains.compose.web.css.border
+import org.jetbrains.compose.web.css.color
+import org.jetbrains.compose.web.css.opacity
+import org.jetbrains.compose.web.css.padding
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.dom.Span
+import org.jetbrains.compose.web.dom.Text
 import kotlin.test.Test
 import kotlin.test.assertEquals

--- a/web/core/src/jsTest/kotlin/StaticComposableTests.kt
+++ b/web/core/src/jsTest/kotlin/StaticComposableTests.kt
@ -1,42 +1,42 @@
 package org.jetbrains.compose.web.core.tests

-import androidx.compose.web.css.AlignContent
-import androidx.compose.web.css.AlignItems
-import androidx.compose.web.css.AlignSelf
-import androidx.compose.web.css.Color
-import androidx.compose.web.css.DisplayStyle
-import androidx.compose.web.css.FlexDirection
-import androidx.compose.web.css.FlexWrap
-import androidx.compose.web.css.JustifyContent
-import androidx.compose.web.css.Position
-import androidx.compose.web.css.alignContent
-import androidx.compose.web.css.alignItems
-import androidx.compose.web.css.alignSelf
-import androidx.compose.web.css.border
-import androidx.compose.web.css.borderRadius
-import androidx.compose.web.css.bottom
-import androidx.compose.web.css.color
-import androidx.compose.web.css.display
-import androidx.compose.web.css.flexDirection
-import androidx.compose.web.css.flexFlow
-import androidx.compose.web.css.flexGrow
-import androidx.compose.web.css.flexShrink
-import androidx.compose.web.css.flexWrap
-import androidx.compose.web.css.height
-import androidx.compose.web.css.justifyContent
-import androidx.compose.web.css.left
-import androidx.compose.web.css.opacity
-import androidx.compose.web.css.order
-import androidx.compose.web.css.position
-import androidx.compose.web.css.px
-import androidx.compose.web.css.right
-import androidx.compose.web.css.top
-import androidx.compose.web.css.value
-import androidx.compose.web.css.width
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Span
-import androidx.compose.web.elements.Text
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.css.AlignContent
+import org.jetbrains.compose.web.css.AlignItems
+import org.jetbrains.compose.web.css.AlignSelf
+import org.jetbrains.compose.web.css.Color
+import org.jetbrains.compose.web.css.DisplayStyle
+import org.jetbrains.compose.web.css.FlexDirection
+import org.jetbrains.compose.web.css.FlexWrap
+import org.jetbrains.compose.web.css.JustifyContent
+import org.jetbrains.compose.web.css.Position
+import org.jetbrains.compose.web.css.alignContent
+import org.jetbrains.compose.web.css.alignItems
+import org.jetbrains.compose.web.css.alignSelf
+import org.jetbrains.compose.web.css.border
+import org.jetbrains.compose.web.css.borderRadius
+import org.jetbrains.compose.web.css.bottom
+import org.jetbrains.compose.web.css.color
+import org.jetbrains.compose.web.css.display
+import org.jetbrains.compose.web.css.flexDirection
+import org.jetbrains.compose.web.css.flexFlow
+import org.jetbrains.compose.web.css.flexGrow
+import org.jetbrains.compose.web.css.flexShrink
+import org.jetbrains.compose.web.css.flexWrap
+import org.jetbrains.compose.web.css.height
+import org.jetbrains.compose.web.css.justifyContent
+import org.jetbrains.compose.web.css.left
+import org.jetbrains.compose.web.css.opacity
+import org.jetbrains.compose.web.css.order
+import org.jetbrains.compose.web.css.position
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.right
+import org.jetbrains.compose.web.css.top
+import org.jetbrains.compose.web.css.value
+import org.jetbrains.compose.web.css.width
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Span
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.renderComposable
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.get
 import kotlin.test.Test
--- a/web/core/src/jsTest/kotlin/TestUtils.kt
+++ b/web/core/src/jsTest/kotlin/TestUtils.kt
@ -1,7 +1,7 @@
 package org.jetbrains.compose.web.core.tests

 import androidx.compose.runtime.Composable
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.renderComposable
 import kotlinx.browser.document
 import kotlinx.browser.window
 import kotlinx.coroutines.CoroutineScope
--- a/web/core/src/jsTest/kotlin/elements/AttributesTests.kt
+++ b/web/core/src/jsTest/kotlin/elements/AttributesTests.kt
@ -3,12 +3,12 @@ package org.jetbrains.compose.web.core.tests
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
-import androidx.compose.web.attributes.disabled
-import androidx.compose.web.attributes.forId
-import androidx.compose.web.elements.Button
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Label
-import androidx.compose.web.elements.Text
+import org.jetbrains.compose.web.attributes.disabled
+import org.jetbrains.compose.web.attributes.forId
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Label
+import org.jetbrains.compose.web.dom.Text
 import org.w3c.dom.HTMLButtonElement
 import org.w3c.dom.HTMLDivElement
 import kotlin.test.Test
--- a/web/core/src/jsTest/kotlin/elements/EventTests.kt
+++ b/web/core/src/jsTest/kotlin/elements/EventTests.kt
@ -1,9 +1,9 @@
 package org.jetbrains.compose.web.core.tests

-import androidx.compose.web.attributes.InputType
-import androidx.compose.web.elements.Button
-import androidx.compose.web.elements.Input
-import androidx.compose.web.elements.TextArea
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.dom.TextArea
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.HTMLTextAreaElement
--- a/web/core/src/jsTest/kotlin/elements/TableTests.kt
+++ b/web/core/src/jsTest/kotlin/elements/TableTests.kt
@ -1,21 +1,21 @@
 package org.jetbrains.compose.web.core.tests

-import androidx.compose.web.attributes.Scope
-import androidx.compose.web.attributes.colspan
-import androidx.compose.web.attributes.rowspan
-import androidx.compose.web.attributes.scope
-import androidx.compose.web.attributes.span
-import androidx.compose.web.elements.Caption
-import androidx.compose.web.elements.Col
-import androidx.compose.web.elements.Colgroup
-import androidx.compose.web.elements.Table
-import androidx.compose.web.elements.Tbody
-import androidx.compose.web.elements.Td
-import androidx.compose.web.elements.Text
-import androidx.compose.web.elements.Tfoot
-import androidx.compose.web.elements.Th
-import androidx.compose.web.elements.Thead
-import androidx.compose.web.elements.Tr
+import org.jetbrains.compose.web.attributes.Scope
+import org.jetbrains.compose.web.attributes.colspan
+import org.jetbrains.compose.web.attributes.rowspan
+import org.jetbrains.compose.web.attributes.scope
+import org.jetbrains.compose.web.attributes.span
+import org.jetbrains.compose.web.dom.Caption
+import org.jetbrains.compose.web.dom.Col
+import org.jetbrains.compose.web.dom.Colgroup
+import org.jetbrains.compose.web.dom.Table
+import org.jetbrains.compose.web.dom.Tbody
+import org.jetbrains.compose.web.dom.Td
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.dom.Tfoot
+import org.jetbrains.compose.web.dom.Th
+import org.jetbrains.compose.web.dom.Thead
+import org.jetbrains.compose.web.dom.Tr
 import org.w3c.dom.HTMLElement
 import kotlin.test.Test
 import kotlin.test.assertEquals
--- a/web/core/src/jvmMain/kotlin/androidx/compose/web/css/CSS.kt
+++ b/web/core/src/jvmMain/kotlin/androidx/compose/web/css/CSS.kt
@ -4,7 +4,7 @@
 */

@file:Suppress("UNUSED")
-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 actual interface CSSStyleValue

--- a/web/core/src/jvmMain/kotlin/androidx/compose/web/css/CSSUnits.kt
+++ b/web/core/src/jvmMain/kotlin/androidx/compose/web/css/CSSUnits.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 // fake interfaces to distinguish units
 actual interface CSSSizeValue : CSSUnitValue
--- a/web/core/src/jvmMain/kotlin/androidx/compose/web/css/auto.kt
+++ b/web/core/src/jvmMain/kotlin/androidx/compose/web/css/auto.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 actual val auto: CSSAutoValue
    get() = object : CSSKeywordValueKT("auto"), CSSAutoValue {}
--- a/web/core/src/jvmMain/kotlin/androidx/compose/web/css/typing.kt
+++ b/web/core/src/jvmMain/kotlin/androidx/compose/web/css/typing.kt
@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
 */

-package androidx.compose.web.css
+package org.jetbrains.compose.web.css

 actual interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue {
    actual interface Size : CSSSizeOrAutoValue
--- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt
+++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/CodeSnippetSamples.kt
@ -1,18 +1,18 @@
-package androidx.compose.web.sample
+package org.jetbrains.compose.web.sample

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.web.attributes.InputType
-import androidx.compose.web.attributes.name
-import androidx.compose.web.css.padding
-import androidx.compose.web.css.px
-import androidx.compose.web.elements.Code
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.H4
-import androidx.compose.web.elements.Input
-import androidx.compose.web.elements.Pre
-import androidx.compose.web.elements.Text
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.attributes.name
+import org.jetbrains.compose.web.css.padding
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.dom.Code
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.H4
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.dom.Pre
+import org.jetbrains.compose.web.dom.Text
 import org.w3c.dom.HTMLElement

@Composable
--- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt
+++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/HighlightJs.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.sample
+package org.jetbrains.compose.web.sample

 import org.w3c.dom.HTMLElement

--- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt
+++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/Sample.kt
@ -1,4 +1,4 @@
-package androidx.compose.web.sample
+package org.jetbrains.compose.web.sample

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@ -8,42 +8,42 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.web.attributes.Draggable
-import androidx.compose.web.attributes.InputType
-import androidx.compose.web.attributes.name
-import androidx.compose.web.css.CSSVariables
-import androidx.compose.web.css.Color
-import androidx.compose.web.css.LineStyle
-import androidx.compose.web.css.Style
-import androidx.compose.web.css.StyleSheet
-import androidx.compose.web.css.and
-import androidx.compose.web.css.backgroundColor
-import androidx.compose.web.css.border
-import androidx.compose.web.css.color
-import androidx.compose.web.css.fontSize
-import androidx.compose.web.css.margin
-import androidx.compose.web.css.maxWidth
-import androidx.compose.web.css.media
-import androidx.compose.web.css.minWidth
-import androidx.compose.web.css.opacity
-import androidx.compose.web.css.padding
-import androidx.compose.web.css.percent
-import androidx.compose.web.css.px
-import androidx.compose.web.css.selectors.className
-import androidx.compose.web.css.selectors.hover
-import androidx.compose.web.css.selectors.plus
-import androidx.compose.web.css.value
-import androidx.compose.web.css.variable
-import androidx.compose.web.css.width
-import androidx.compose.web.elements.A
-import androidx.compose.web.elements.Button
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Input
-import androidx.compose.web.elements.Style
-import androidx.compose.web.elements.Text
-import androidx.compose.web.elements.TextArea
-import androidx.compose.web.renderComposableInBody
-import androidx.compose.web.sample.tests.launchTestCase
+import org.jetbrains.compose.web.attributes.Draggable
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.attributes.name
+import org.jetbrains.compose.web.css.CSSVariables
+import org.jetbrains.compose.web.css.Color
+import org.jetbrains.compose.web.css.LineStyle
+import org.jetbrains.compose.web.css.Style
+import org.jetbrains.compose.web.css.StyleSheet
+import org.jetbrains.compose.web.css.and
+import org.jetbrains.compose.web.css.backgroundColor
+import org.jetbrains.compose.web.css.border
+import org.jetbrains.compose.web.css.color
+import org.jetbrains.compose.web.css.fontSize
+import org.jetbrains.compose.web.css.margin
+import org.jetbrains.compose.web.css.maxWidth
+import org.jetbrains.compose.web.css.media
+import org.jetbrains.compose.web.css.minWidth
+import org.jetbrains.compose.web.css.opacity
+import org.jetbrains.compose.web.css.padding
+import org.jetbrains.compose.web.css.percent
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.selectors.className
+import org.jetbrains.compose.web.css.selectors.hover
+import org.jetbrains.compose.web.css.selectors.plus
+import org.jetbrains.compose.web.css.value
+import org.jetbrains.compose.web.css.variable
+import org.jetbrains.compose.web.css.width
+import org.jetbrains.compose.web.dom.A
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.dom.Style
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.dom.TextArea
+import org.jetbrains.compose.web.renderComposableInBody
+import org.jetbrains.compose.web.sample.tests.launchTestCase
 import kotlinx.browser.window
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
--- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt
+++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/Common.kt
@ -1,9 +1,9 @@
-package androidx.compose.web.sample.tests
+package org.jetbrains.compose.web.sample.tests

 import androidx.compose.runtime.Composable
-import androidx.compose.web.elements.Span
-import androidx.compose.web.elements.Text
-import androidx.compose.web.renderComposableInBody
+import org.jetbrains.compose.web.dom.Span
+import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.renderComposableInBody
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty

--- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt
+++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/InputsTests.kt
@ -1,14 +1,14 @@
-package androidx.compose.web.sample.tests
+package org.jetbrains.compose.web.sample.tests

 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.web.attributes.InputType
-import androidx.compose.web.attributes.checked
-import androidx.compose.web.attributes.name
-import androidx.compose.web.elements.Input
-import androidx.compose.web.elements.TextArea
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.attributes.checked
+import org.jetbrains.compose.web.attributes.name
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.dom.TextArea

 class InputsTests {
    val textAreaInputGetsPrinted by testCase {
--- a/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt
+++ b/web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/TestCases1.kt
@ -1,16 +1,16 @@
-package androidx.compose.web.sample.tests
+package org.jetbrains.compose.web.sample.tests

 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.web.css.backgroundColor
-import androidx.compose.web.css.height
-import androidx.compose.web.css.px
-import androidx.compose.web.css.width
-import androidx.compose.web.elements.Button
-import androidx.compose.web.elements.Div
-import androidx.compose.web.elements.Text
+import org.jetbrains.compose.web.css.backgroundColor
+import org.jetbrains.compose.web.css.height
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.width
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.Div
+import org.jetbrains.compose.web.dom.Text

 class TestCases1 {
    val helloWorldText by testCase {
--- a/web/integration-widgets/src/jsMain/kotlin/androidx/compose/web/with-web/demo.kt
+++ b/web/integration-widgets/src/jsMain/kotlin/androidx/compose/web/with-web/demo.kt
@ -15,10 +15,10 @@
 */
 package org.jetbrainsc.compose.common.demo

-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.renderComposable
 import kotlinx.browser.document
 import org.w3c.dom.HTMLElement
-import androidx.compose.web.css.Style
+import org.jetbrains.compose.web.css.Style
 import org.jetbrains.compose.web.ui.Styles

 fun main() {
--- a/web/widgets/src/jsMain/kotlin/Modifier.kt
+++ b/web/widgets/src/jsMain/kotlin/Modifier.kt
@ -2,13 +2,13 @@ package org.jetbrains.compose.common.ui

 import org.jetbrains.compose.common.ui.unit.Dp
 import org.jetbrains.compose.common.core.graphics.Color
-import androidx.compose.web.css.backgroundColor
-import androidx.compose.web.css.margin
-import androidx.compose.web.css.px
-import androidx.compose.web.css.Color.RGB
+import org.jetbrains.compose.web.css.backgroundColor
+import org.jetbrains.compose.web.css.margin
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.Color.RGB
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.StyleBuilder
-import androidx.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.css.StyleBuilder
+import org.jetbrains.compose.web.attributes.AttrsBuilder

 actual fun Modifier.background(color: Color): Modifier = castOrCreate().apply {
    add {
--- a/web/widgets/src/jsMain/kotlin/Styles.kt
+++ b/web/widgets/src/jsMain/kotlin/Styles.kt
@ -1,17 +1,17 @@
 package org.jetbrains.compose.web.ui

-import androidx.compose.web.css.justifyContent
-import androidx.compose.web.css.JustifyContent
-import androidx.compose.web.css.alignItems
-import androidx.compose.web.css.AlignItems
-import androidx.compose.web.css.flexDirection
-import androidx.compose.web.css.FlexDirection
-import androidx.compose.web.css.display
-import androidx.compose.web.css.DisplayStyle
-import androidx.compose.web.css.left
-import androidx.compose.web.css.px
-
-import androidx.compose.web.css.StyleSheet
+import org.jetbrains.compose.web.css.justifyContent
+import org.jetbrains.compose.web.css.JustifyContent
+import org.jetbrains.compose.web.css.alignItems
+import org.jetbrains.compose.web.css.AlignItems
+import org.jetbrains.compose.web.css.flexDirection
+import org.jetbrains.compose.web.css.FlexDirection
+import org.jetbrains.compose.web.css.display
+import org.jetbrains.compose.web.css.DisplayStyle
+import org.jetbrains.compose.web.css.left
+import org.jetbrains.compose.web.css.px
+
+import org.jetbrains.compose.web.css.StyleSheet

 object Styles : StyleSheet() {
    val columnClass = "compose-web-column"
--- a/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt
+++ b/web/widgets/src/jsMain/kotlin/internal/ActualModifier.kt
@ -1,8 +1,8 @@
 package org.jetbrains.compose.common.internal

 import org.jetbrains.compose.common.ui.Modifier
-import androidx.compose.web.css.StyleBuilder
-import androidx.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.css.StyleBuilder
+import org.jetbrains.compose.web.attributes.AttrsBuilder

 class ActualModifier : Modifier {
    val styleHandlers = mutableListOf<StyleBuilder.() -> Unit>()
--- a/web/widgets/src/jsMain/kotlin/layouts/box.kt
+++ b/web/widgets/src/jsMain/kotlin/layouts/box.kt
@ -2,7 +2,7 @@ package org.jetbrains.compose.common.foundation.layout

 import org.jetbrains.compose.common.ui.Modifier
 import androidx.compose.runtime.Composable
-import androidx.compose.web.elements.Div
+import org.jetbrains.compose.web.dom.Div
 import org.jetbrains.compose.common.ui.asAttributeBuilderApplier

@Composable
--- a/web/widgets/src/jsMain/kotlin/layouts/button.kt
+++ b/web/widgets/src/jsMain/kotlin/layouts/button.kt
@ -2,7 +2,7 @@ package org.jetbrains.compose.common.material

 import org.jetbrains.compose.common.ui.Modifier
 import androidx.compose.runtime.Composable
-import androidx.compose.web.elements.Button
+import org.jetbrains.compose.web.dom.Button

@Composable
 actual fun ButtonActual(
--- a/web/widgets/src/jsMain/kotlin/layouts/column.kt
+++ b/web/widgets/src/jsMain/kotlin/layouts/column.kt
@ -2,7 +2,7 @@ package org.jetbrains.compose.common.foundation.layout

 import org.jetbrains.compose.common.ui.Modifier
 import androidx.compose.runtime.Composable
-import androidx.compose.web.elements.Div
+import org.jetbrains.compose.web.dom.Div
 import org.jetbrains.compose.web.ui.Styles

@Composable
--- a/web/widgets/src/jsMain/kotlin/layouts/row.kt
+++ b/web/widgets/src/jsMain/kotlin/layouts/row.kt
@ -2,7 +2,7 @@ package org.jetbrains.compose.common.foundation.layout

 import org.jetbrains.compose.common.ui.Modifier
 import androidx.compose.runtime.Composable
-import androidx.compose.web.elements.Div
+import org.jetbrains.compose.web.dom.Div
 import org.jetbrains.compose.common.ui.Alignment
 import org.jetbrains.compose.web.ui.Styles

--- a/web/widgets/src/jsMain/kotlin/layouts/slider.kt
+++ b/web/widgets/src/jsMain/kotlin/layouts/slider.kt
@ -2,8 +2,8 @@ package org.jetbrains.compose.common.material

 import androidx.compose.runtime.Composable
 import org.jetbrains.compose.common.ui.Modifier
-import androidx.compose.web.elements.Input
-import androidx.compose.web.attributes.InputType
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.attributes.InputType

@Composable
 actual fun SliderActual(
--- a/web/widgets/src/jsMain/kotlin/layouts/text.kt
+++ b/web/widgets/src/jsMain/kotlin/layouts/text.kt
@ -1,19 +1,19 @@
 package org.jetbrains.compose.common.material

 import androidx.compose.runtime.Composable
-import androidx.compose.web.elements.Text as TextNode
-import androidx.compose.web.elements.Span
+import org.jetbrains.compose.web.dom.Text as TextNode
+import org.jetbrains.compose.web.dom.Span
 import org.jetbrains.compose.web.ui.Styles
 import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.ui.asAttributeBuilderApplier
 import org.jetbrains.compose.common.core.graphics.Color
-import androidx.compose.web.css.color
-import androidx.compose.web.css.fontSize
-import androidx.compose.web.css.Color.RGB
+import org.jetbrains.compose.web.css.color
+import org.jetbrains.compose.web.css.fontSize
+import org.jetbrains.compose.web.css.Color.RGB
 import org.jetbrains.compose.common.ui.unit.TextUnit
 import org.jetbrains.compose.common.ui.unit.TextUnitType
-import androidx.compose.web.css.em
-import androidx.compose.web.css.px
+import org.jetbrains.compose.web.css.em
+import org.jetbrains.compose.web.css.px

@Composable
 actual fun TextActual(
--- a/web/widgets/src/jsMain/kotlin/modifiers/border.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/border.kt
@ -4,10 +4,10 @@ import org.jetbrains.compose.common.ui.unit.Dp
 import org.jetbrains.compose.common.core.graphics.Color
 import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.px
-import androidx.compose.web.css.LineStyle
-import androidx.compose.web.css.border
-import androidx.compose.web.css.Color.RGB
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.LineStyle
+import org.jetbrains.compose.web.css.border
+import org.jetbrains.compose.web.css.Color.RGB

 actual fun Modifier.border(size: Dp, color: Color): Modifier = castOrCreate().apply {
    add {
--- a/web/widgets/src/jsMain/kotlin/modifiers/clip.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/clip.kt
@ -4,8 +4,8 @@ import org.jetbrains.compose.common.ui.Modifier
 import jetbrains.compose.common.shapes.Shape
 import jetbrains.compose.common.shapes.CircleShape
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.borderRadius
-import androidx.compose.web.css.percent
+import org.jetbrains.compose.web.css.borderRadius
+import org.jetbrains.compose.web.css.percent

 actual fun Modifier.clip(shape: Shape): Modifier = castOrCreate().apply {
    when (shape) {
--- a/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxHeight.kt
@ -2,8 +2,8 @@ package org.jetbrains.compose.common.foundation.layout

 import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.height
-import androidx.compose.web.css.percent
+import org.jetbrains.compose.web.css.height
+import org.jetbrains.compose.web.css.percent

 actual fun Modifier.fillMaxHeight(fraction: Float): Modifier = castOrCreate().apply {
    add {
--- a/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/fillMaxWidth.kt
@ -2,8 +2,8 @@ package org.jetbrains.compose.common.foundation.layout

 import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.width
-import androidx.compose.web.css.percent
+import org.jetbrains.compose.web.css.width
+import org.jetbrains.compose.web.css.percent

 actual fun Modifier.fillMaxWidth(): Modifier = castOrCreate().apply {
    add {
--- a/web/widgets/src/jsMain/kotlin/modifiers/offset.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/offset.kt
@ -3,9 +3,9 @@ package org.jetbrains.compose.common.foundation.layout
 import org.jetbrains.compose.common.ui.unit.Dp
 import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.marginTop
-import androidx.compose.web.css.marginLeft
-import androidx.compose.web.css.px
+import org.jetbrains.compose.web.css.marginTop
+import org.jetbrains.compose.web.css.marginLeft
+import org.jetbrains.compose.web.css.px

 actual fun Modifier.offset(x: Dp, y: Dp): Modifier = castOrCreate().apply {
    add {
--- a/web/widgets/src/jsMain/kotlin/modifiers/size.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/size.kt
@ -1,9 +1,9 @@
 package org.jetbrains.compose.common.ui

 import org.jetbrains.compose.common.ui.unit.Dp
-import androidx.compose.web.css.width
-import androidx.compose.web.css.height
-import androidx.compose.web.css.px
+import org.jetbrains.compose.web.css.width
+import org.jetbrains.compose.web.css.height
+import org.jetbrains.compose.web.css.px
 import org.jetbrains.compose.common.internal.castOrCreate

 actual fun Modifier.size(width: Dp, height: Dp): Modifier = castOrCreate().apply {
--- a/web/widgets/src/jsMain/kotlin/modifiers/width.kt
+++ b/web/widgets/src/jsMain/kotlin/modifiers/width.kt
@ -3,8 +3,8 @@ package org.jetbrains.compose.common.foundation.layout
 import org.jetbrains.compose.common.ui.unit.Dp
 import org.jetbrains.compose.common.ui.Modifier
 import org.jetbrains.compose.common.internal.castOrCreate
-import androidx.compose.web.css.px
-import androidx.compose.web.css.width
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.width

 actual fun Modifier.width(size: Dp): Modifier = castOrCreate().apply {
    add {
--- a/web/widgets/src/jsTest/ModifierTests.kt
+++ b/web/widgets/src/jsTest/ModifierTests.kt
@ -1,4 +1,4 @@
-import androidx.compose.web.renderComposable
+import org.jetbrains.compose.web.renderComposable
 import org.jetbrains.compose.common.core.graphics.Color
 import org.jetbrains.compose.common.foundation.layout.Box
 import org.jetbrains.compose.common.ui.Modifier