diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 5b83b0f..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,106 +0,0 @@
-import jetbrains.sign.GpgSignSignatoryProvider
-
-/*
- * Copyright 2000-2021 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-buildscript {
-    repositories {
-        maven { url "https://packages.jetbrains.team/maven/p/jcs/maven" }
-    }
-    dependencies {
-        classpath 'com.jetbrains:jet-sign:38'
-    }
-}
-
-plugins {
-    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
-}
-
-ext.projectVersion = projectVersion
-ext.publishingUser = System.getenv('PUBLISHING_USER')
-ext.publishingPassword = System.getenv('PUBLISHING_PASSWORD')
-if (ext.publishingPassword == null) {
-    ext.projectVersion = ext.projectVersion + '-SNAPSHOT'
-}
-println "##teamcity[setParameter name='java.annotations.version' value='$projectVersion']"
-
-allprojects {
-    // https://github.com/gradle/gradle/issues/847
-    group 'org.jetbrains.proto'
-    version rootProject.ext.projectVersion
-
-    repositories {
-        mavenCentral()
-    }
-}
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            username = rootProject.ext.publishingUser
-            password = rootProject.ext.publishingPassword
-        }
-    }
-}
-
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'maven-publish'
-    apply plugin: 'signing'
-}
-
-configure([project(':multiplatform-annotations')]) {
-    publishing {
-        publications.withType(MavenPublication) {
-            group 'org.jetbrains'
-            version rootProject.ext.projectVersion
-
-            pom.withXml {
-                asNode().children().last() + {
-                    resolveStrategy = DELEGATE_FIRST
-                    name 'JetBrains Java Annotations'
-                    description 'A set of annotations used for code inspection support and code documentation.'
-                    url 'https://github.com/JetBrains/java-annotations'
-                    scm {
-                        url 'https://github.com/JetBrains/java-annotations'
-                        connection 'scm:git:git://github.com/JetBrains/java-annotations.git'
-                        developerConnection 'scm:git:ssh://github.com:JetBrains/java-annotations.git'
-                    }
-                    licenses {
-                        license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'https://www.apache.org/licenses/LICENSE-2.0.txt'
-                            distribution 'repo'
-                        }
-                    }
-                    developers {
-                        developer {
-                            id 'JetBrains'
-                            name 'JetBrains Team'
-                            organization 'JetBrains'
-                            organizationUrl 'https://www.jetbrains.com'
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    signing {
-        sign publishing.publications
-        signatories = new GpgSignSignatoryProvider()
-    }
-}
diff --git a/multiplatform-annotations/build.gradle.kts b/build.gradle.kts
similarity index 53%
rename from multiplatform-annotations/build.gradle.kts
rename to build.gradle.kts
index 543653e..27ace67 100644
--- a/multiplatform-annotations/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,56 @@
+import jetbrains.sign.GpgSignSignatoryProvider
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+/*
+ * Copyright 2000-2021 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+buildscript {
+    repositories {
+        maven { url = uri("https://packages.jetbrains.team/maven/p/jcs/maven") }
+    }
+    dependencies {
+        classpath("com.jetbrains:jet-sign:38")
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
 plugins {
     kotlin("multiplatform") version "1.9.22"
+    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    `maven-publish`
+    signing
 }
 
+var projectVersion = project.findProperty("projectVersion") as String
+val publishingUser: String? = System.getenv("PUBLISHING_USER")
+val publishingPassword: String? = System.getenv("PUBLISHING_PASSWORD")
+if (publishingPassword == null) {
+    projectVersion += "-SNAPSHOT"
+}
+println("##teamcity[setParameter name='java.annotations.version' value='$projectVersion']")
+
+// https://github.com/gradle/gradle/issues/847
+group = "org.jetbrains.proto"
+version = projectVersion
+
 kotlin {
     androidNativeArm32()
     androidNativeArm64()
@@ -62,12 +107,14 @@ kotlin {
             }
         }
 
-        val nonJvmMain by creating {}
+        val nonJvmMain by creating {
+            dependsOn(commonMain)
+        }
     }
 
     targets.onEach {
-        if (it.platformType != KotlinPlatformType.jvm) {
-            it.compilations.getByName("main").source(sourceSets.getByName("nonJvmMain"))
+        if (it.platformType != KotlinPlatformType.jvm && it.platformType != KotlinPlatformType.common) {
+            it.compilations.getByName("main").defaultSourceSet.dependsOn(sourceSets.getByName("nonJvmMain"))
         }
     }
 
@@ -133,4 +180,51 @@ tasks {
             into("META-INF/versions/9/")
         }
     }
-}
\ No newline at end of file
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username.set(publishingUser)
+            password.set(publishingPassword)
+        }
+    }
+}
+
+publishing {
+    publications.withType(MavenPublication::class) {
+        group = "org.jetbrains"
+        version = rootProject.version as String
+
+        pom {
+            name.set("JetBrains Java Annotations")
+            description.set("A set of annotations used for code inspection support and code documentation.")
+            url.set("https://github.com/JetBrains/java-annotations")
+            scm {
+                url.set("https://github.com/JetBrains/java-annotations")
+                connection.set("scm:git:git://github.com/JetBrains/java-annotations.git")
+                developerConnection.set("scm:git:ssh://github.com:JetBrains/java-annotations.git")
+            }
+            licenses {
+                license {
+                    name.set("The Apache Software License, Version 2.0")
+                    url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                    distribution.set("repo")
+                }
+            }
+            developers {
+                developer {
+                    id.set("JetBrains")
+                    name.set("JetBrains Team")
+                    organization.set("JetBrains")
+                    organizationUrl.set("https://www.jetbrains.com")
+                }
+            }
+        }
+    }
+}
+
+signing {
+    sign(publishing.publications)
+    signatories = GpgSignSignatoryProvider()
+}
diff --git a/settings.gradle b/settings.gradle
index 9a9c3e3..5c973a0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-rootProject.name = 'annotations-parent'
-
-include 'multiplatform-annotations'
\ No newline at end of file
+rootProject.name = 'annotations'
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Identifier.kt b/src/commonMain/kotlin/org/intellij/lang/annotations/Identifier.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Identifier.kt
rename to src/commonMain/kotlin/org/intellij/lang/annotations/Identifier.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Language.kt b/src/commonMain/kotlin/org/intellij/lang/annotations/Language.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Language.kt
rename to src/commonMain/kotlin/org/intellij/lang/annotations/Language.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Pattern.kt b/src/commonMain/kotlin/org/intellij/lang/annotations/Pattern.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Pattern.kt
rename to src/commonMain/kotlin/org/intellij/lang/annotations/Pattern.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/RegExp.kt b/src/commonMain/kotlin/org/intellij/lang/annotations/RegExp.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/RegExp.kt
rename to src/commonMain/kotlin/org/intellij/lang/annotations/RegExp.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Subst.kt b/src/commonMain/kotlin/org/intellij/lang/annotations/Subst.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Subst.kt
rename to src/commonMain/kotlin/org/intellij/lang/annotations/Subst.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt b/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Async.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Async.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Async.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Async.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Blocking.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Blocking.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Blocking.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Blocking.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt b/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt b/src/commonMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Contract.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Contract.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Contract.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Contract.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Debug.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Debug.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Debug.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Debug.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt b/src/commonMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlocking.kt b/src/commonMain/kotlin/org/jetbrains/annotations/NonBlocking.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlocking.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/NonBlocking.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt b/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt b/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt b/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Range.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/TestOnly.kt b/src/commonMain/kotlin/org/jetbrains/annotations/TestOnly.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/TestOnly.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/TestOnly.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt b/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt b/src/commonMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt
similarity index 100%
rename from multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt
rename to src/commonMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Flow.java b/src/jvmMain/java/org/intellij/lang/annotations/Flow.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Flow.java
rename to src/jvmMain/java/org/intellij/lang/annotations/Flow.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Identifier.java b/src/jvmMain/java/org/intellij/lang/annotations/Identifier.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Identifier.java
rename to src/jvmMain/java/org/intellij/lang/annotations/Identifier.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java b/src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java
rename to src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Language.java b/src/jvmMain/java/org/intellij/lang/annotations/Language.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Language.java
rename to src/jvmMain/java/org/intellij/lang/annotations/Language.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/MagicConstant.java b/src/jvmMain/java/org/intellij/lang/annotations/MagicConstant.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/MagicConstant.java
rename to src/jvmMain/java/org/intellij/lang/annotations/MagicConstant.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Pattern.java b/src/jvmMain/java/org/intellij/lang/annotations/Pattern.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Pattern.java
rename to src/jvmMain/java/org/intellij/lang/annotations/Pattern.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/PrintFormat.java b/src/jvmMain/java/org/intellij/lang/annotations/PrintFormat.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/PrintFormat.java
rename to src/jvmMain/java/org/intellij/lang/annotations/PrintFormat.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/RegExp.java b/src/jvmMain/java/org/intellij/lang/annotations/RegExp.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/RegExp.java
rename to src/jvmMain/java/org/intellij/lang/annotations/RegExp.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Subst.java b/src/jvmMain/java/org/intellij/lang/annotations/Subst.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/Subst.java
rename to src/jvmMain/java/org/intellij/lang/annotations/Subst.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java b/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java
rename to src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Async.java b/src/jvmMain/java/org/jetbrains/annotations/Async.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Async.java
rename to src/jvmMain/java/org/jetbrains/annotations/Async.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Blocking.java b/src/jvmMain/java/org/jetbrains/annotations/Blocking.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Blocking.java
rename to src/jvmMain/java/org/jetbrains/annotations/Blocking.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/BlockingExecutor.java b/src/jvmMain/java/org/jetbrains/annotations/BlockingExecutor.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/BlockingExecutor.java
rename to src/jvmMain/java/org/jetbrains/annotations/BlockingExecutor.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/CheckReturnValue.java b/src/jvmMain/java/org/jetbrains/annotations/CheckReturnValue.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/CheckReturnValue.java
rename to src/jvmMain/java/org/jetbrains/annotations/CheckReturnValue.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Contract.java b/src/jvmMain/java/org/jetbrains/annotations/Contract.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Contract.java
rename to src/jvmMain/java/org/jetbrains/annotations/Contract.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Debug.java b/src/jvmMain/java/org/jetbrains/annotations/Debug.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Debug.java
rename to src/jvmMain/java/org/jetbrains/annotations/Debug.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/MustBeInvokedByOverriders.java b/src/jvmMain/java/org/jetbrains/annotations/MustBeInvokedByOverriders.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/MustBeInvokedByOverriders.java
rename to src/jvmMain/java/org/jetbrains/annotations/MustBeInvokedByOverriders.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Nls.java b/src/jvmMain/java/org/jetbrains/annotations/Nls.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Nls.java
rename to src/jvmMain/java/org/jetbrains/annotations/Nls.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NonBlocking.java b/src/jvmMain/java/org/jetbrains/annotations/NonBlocking.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NonBlocking.java
rename to src/jvmMain/java/org/jetbrains/annotations/NonBlocking.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NonBlockingExecutor.java b/src/jvmMain/java/org/jetbrains/annotations/NonBlockingExecutor.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NonBlockingExecutor.java
rename to src/jvmMain/java/org/jetbrains/annotations/NonBlockingExecutor.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NonNls.java b/src/jvmMain/java/org/jetbrains/annotations/NonNls.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NonNls.java
rename to src/jvmMain/java/org/jetbrains/annotations/NonNls.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NotNull.java b/src/jvmMain/java/org/jetbrains/annotations/NotNull.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NotNull.java
rename to src/jvmMain/java/org/jetbrains/annotations/NotNull.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Nullable.java b/src/jvmMain/java/org/jetbrains/annotations/Nullable.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Nullable.java
rename to src/jvmMain/java/org/jetbrains/annotations/Nullable.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/PropertyKey.java b/src/jvmMain/java/org/jetbrains/annotations/PropertyKey.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/PropertyKey.java
rename to src/jvmMain/java/org/jetbrains/annotations/PropertyKey.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Range.java b/src/jvmMain/java/org/jetbrains/annotations/Range.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Range.java
rename to src/jvmMain/java/org/jetbrains/annotations/Range.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/TestOnly.java b/src/jvmMain/java/org/jetbrains/annotations/TestOnly.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/TestOnly.java
rename to src/jvmMain/java/org/jetbrains/annotations/TestOnly.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/UnknownNullability.java b/src/jvmMain/java/org/jetbrains/annotations/UnknownNullability.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/UnknownNullability.java
rename to src/jvmMain/java/org/jetbrains/annotations/UnknownNullability.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Unmodifiable.java b/src/jvmMain/java/org/jetbrains/annotations/Unmodifiable.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/Unmodifiable.java
rename to src/jvmMain/java/org/jetbrains/annotations/Unmodifiable.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/UnmodifiableView.java b/src/jvmMain/java/org/jetbrains/annotations/UnmodifiableView.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/UnmodifiableView.java
rename to src/jvmMain/java/org/jetbrains/annotations/UnmodifiableView.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/VisibleForTesting.java b/src/jvmMain/java/org/jetbrains/annotations/VisibleForTesting.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/VisibleForTesting.java
rename to src/jvmMain/java/org/jetbrains/annotations/VisibleForTesting.java
diff --git a/multiplatform-annotations/src/jvmMain/moduleInfo/module-info.java b/src/jvmMain/moduleInfo/module-info.java
similarity index 100%
rename from multiplatform-annotations/src/jvmMain/moduleInfo/module-info.java
rename to src/jvmMain/moduleInfo/module-info.java
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Identifier.kt b/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Identifier.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Identifier.kt
rename to src/nonJvmMain/kotlin/org/intellij/lang/annotations/Identifier.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Language.kt b/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Language.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Language.kt
rename to src/nonJvmMain/kotlin/org/intellij/lang/annotations/Language.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Pattern.kt b/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Pattern.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Pattern.kt
rename to src/nonJvmMain/kotlin/org/intellij/lang/annotations/Pattern.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/RegExp.kt b/src/nonJvmMain/kotlin/org/intellij/lang/annotations/RegExp.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/RegExp.kt
rename to src/nonJvmMain/kotlin/org/intellij/lang/annotations/RegExp.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Subst.kt b/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Subst.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Subst.kt
rename to src/nonJvmMain/kotlin/org/intellij/lang/annotations/Subst.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Async.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Async.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Async.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Async.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Blocking.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Blocking.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Blocking.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Blocking.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Contract.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Contract.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Contract.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Contract.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Debug.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Debug.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Debug.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Debug.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Nls.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Nls.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Nls.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Nls.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlocking.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlocking.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlocking.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlocking.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonNls.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonNls.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/NonNls.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/NonNls.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/PropertyKey.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Range.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Range.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Range.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Range.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/TestOnly.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/TestOnly.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/TestOnly.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/TestOnly.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
diff --git a/multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt
similarity index 100%
rename from multiplatform-annotations/src/nonJvmMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt
rename to src/nonJvmMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt