diff --git a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/messages/KotlinBundle.properties
similarity index 100%
rename from idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
rename to idea/idea-analysis/resources/messages/KotlinBundle.properties
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
index 3e42b9ac903..1d9b788f5ce 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.PropertyKey
 import org.jetbrains.kotlin.util.AbstractKotlinBundle
 
 @NonNls
-private const val BUNDLE = "org.jetbrains.kotlin.idea.KotlinBundle"
+private const val BUNDLE = "messages.KotlinBundle"
 
 object KotlinBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
diff --git a/idea/idea-git/resources/org/jetbrains/kotlin/idea/git/KotlinGitBundle.properties b/idea/idea-git/resources/messages/KotlinGitBundle.properties
similarity index 100%
rename from idea/idea-git/resources/org/jetbrains/kotlin/idea/git/KotlinGitBundle.properties
rename to idea/idea-git/resources/messages/KotlinGitBundle.properties
diff --git a/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt b/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt
index 0046a3a1e13..2c17afc821b 100644
--- a/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt
+++ b/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinGitBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.git.KotlinGitBundle"
+    private const val BUNDLE = "messages.KotlinGitBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/idea-gradle-native/resources/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.properties b/idea/idea-gradle-native/resources/messages/KotlinGradleNativeBundle.properties
similarity index 100%
rename from idea/idea-gradle-native/resources/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.properties
rename to idea/idea-gradle-native/resources/messages/KotlinGradleNativeBundle.properties
diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt
index 49924a7db1c..33bcc1c6d6f 100644
--- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt
+++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinGradleNativeBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.ide.konan.KotlinGradleNativeBundle"
+    private const val BUNDLE = "messages.KotlinGradleNativeBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/idea-jvm/resources/org/jetbrains/kotlin/idea/KotlinJvmBundle.properties b/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties
similarity index 100%
rename from idea/idea-jvm/resources/org/jetbrains/kotlin/idea/KotlinJvmBundle.properties
rename to idea/idea-jvm/resources/messages/KotlinJvmBundle.properties
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt
index acbbc370ced..d468d9291d8 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinJvmBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.KotlinJvmBundle"
+    private const val BUNDLE = "messages.KotlinJvmBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/idea-maven/resources/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.properties b/idea/idea-maven/resources/messages/KotlinMavenBundle.properties
similarity index 100%
rename from idea/idea-maven/resources/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.properties
rename to idea/idea-maven/resources/messages/KotlinMavenBundle.properties
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt
index b5e284736fd..8c2edd22e04 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinMavenBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.maven.KotlinMavenBundle"
+    private const val BUNDLE = "messages.KotlinMavenBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/idea-native/resources/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.properties b/idea/idea-native/resources/messages/KotlinNativeBundle.properties
similarity index 100%
rename from idea/idea-native/resources/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.properties
rename to idea/idea-native/resources/messages/KotlinNativeBundle.properties
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt
index a56a07d4a4d..2bd0026dbb7 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinNativeBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.ide.konan.KotlinNativeBundle"
+    private const val BUNDLE = "messages.KotlinNativeBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/jvm-debugger/jvm-debugger-core/resources/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.properties b/idea/jvm-debugger/jvm-debugger-core/resources/messages/KotlinDebuggerCoreBundle.properties
similarity index 100%
rename from idea/jvm-debugger/jvm-debugger-core/resources/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.properties
rename to idea/jvm-debugger/jvm-debugger-core/resources/messages/KotlinDebuggerCoreBundle.properties
diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt
index 615fa32e1c4..821c5cc82e0 100644
--- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt
+++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinDebuggerCoreBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.debugger.KotlinDebuggerCoreBundle"
+    private const val BUNDLE = "messages.KotlinDebuggerCoreBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDelegatedPropertyRendererConfigurableUi.form b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDelegatedPropertyRendererConfigurableUi.form
index 294a95caa8d..c4995745f49 100644
--- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDelegatedPropertyRendererConfigurableUi.form
+++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDelegatedPropertyRendererConfigurableUi.form
@@ -14,7 +14,7 @@
         </constraints>
         <properties>
           <selected value="false"/>
-          <text resource-bundle="org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle" key="variables.calculate.delegated.property.values"/>
+          <text resource-bundle="messages/KotlinDebuggerCoreBundle" key="variables.calculate.delegated.property.values"/>
         </properties>
       </component>
       <vspacer id="c37da">
diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form
index ce2192e3c4b..5195e0cfcb2 100644
--- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form
+++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingConfigurableUi.form
@@ -14,7 +14,7 @@
         </constraints>
         <properties>
           <selected value="false"/>
-          <text resource-bundle="org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle" key="filter.ignore.internal.classes"/>
+          <text resource-bundle="messages/KotlinDebuggerCoreBundle" key="filter.ignore.internal.classes"/>
         </properties>
       </component>
       <vspacer id="c37da">
diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/resources/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.properties b/idea/jvm-debugger/jvm-debugger-coroutine/resources/messages/KotlinDebuggerCoroutinesBundle.properties
similarity index 100%
rename from idea/jvm-debugger/jvm-debugger-coroutine/resources/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.properties
rename to idea/jvm-debugger/jvm-debugger-coroutine/resources/messages/KotlinDebuggerCoroutinesBundle.properties
diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt
index 5864e515451..fda22f8b2e1 100644
--- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt
+++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinDebuggerCoroutinesBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.debugger.coroutine.KotlinDebuggerCoroutinesBundle"
+    private const val BUNDLE = "messages.KotlinDebuggerCoroutinesBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/resources/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.properties b/idea/jvm-debugger/jvm-debugger-evaluation/resources/messages/KotlinDebuggerEvaluationBundle.properties
similarity index 100%
rename from idea/jvm-debugger/jvm-debugger-evaluation/resources/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.properties
rename to idea/jvm-debugger/jvm-debugger-evaluation/resources/messages/KotlinDebuggerEvaluationBundle.properties
diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt
index 190e5b3814d..c70c75d5dc7 100644
--- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt
+++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinDebuggerEvaluationBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerEvaluationBundle"
+    private const val BUNDLE = "messages.KotlinDebuggerEvaluationBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
index 21590f996e1..9c40101b3f3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -26,14 +26,14 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title-resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" title-key="kotlin.compiler.js.option.panel.title"/>
+        <border type="etched" title-resource-bundle="messages/KotlinBundle" title-key="kotlin.compiler.js.option.panel.title"/>
         <children>
           <component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile">
             <constraints>
               <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.js.option.output.prefix"/>
+              <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.js.option.output.prefix"/>
             </properties>
           </component>
           <component id="dd0c2" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile">
@@ -47,7 +47,7 @@
               <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.js.option.output.postfix"/>
+              <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.js.option.output.postfix"/>
             </properties>
           </component>
           <component id="1bdb7" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile">
@@ -80,7 +80,7 @@
             </constraints>
             <properties>
               <state value="NOT_SELECTED"/>
-              <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.js.option.output.copy.files"/>
+              <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.js.option.output.copy.files"/>
             </properties>
           </component>
           <component id="915d" class="javax.swing.JLabel">
@@ -106,7 +106,7 @@
             </constraints>
             <properties>
               <state value="NOT_SELECTED"/>
-              <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
+              <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
             </properties>
           </component>
           <component id="6484c" class="javax.swing.JLabel" binding="labelForSourceMapPrefix">
@@ -237,7 +237,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title-resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
+        <border type="etched" title-resource-bundle="messages/KotlinBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
         <children>
           <component id="9131b" class="javax.swing.JLabel">
             <constraints>
@@ -278,7 +278,7 @@
             <properties>
               <selected value="false"/>
               <state value="NOT_SELECTED"/>
-              <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.option.generate.no.warnings"/>
+              <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.option.generate.no.warnings"/>
             </properties>
           </component>
         </children>
@@ -360,7 +360,7 @@
           <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
+          <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
         </properties>
       </component>
       <component id="df236" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField">
@@ -395,7 +395,7 @@
             <properties>
               <selected value="false"/>
               <state value="NOT_SELECTED"/>
-              <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="kotlin.compiler.option.enable.new.inference.in.ide"/>
+              <text resource-bundle="messages/KotlinBundle" key="kotlin.compiler.option.enable.new.inference.in.ide"/>
             </properties>
           </component>
         </children>
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.form
index 0e6b17cb0f7..0f71a6a581e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.form
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.form
@@ -80,7 +80,7 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="label.text.package.name"/>
+          <text resource-bundle="messages/KotlinBundle" key="label.text.package.name"/>
         </properties>
       </component>
       <component id="18010" class="com.intellij.refactoring.ui.PackageNameReferenceEditorCombo" binding="packageNameField" custom-create="true">
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form
index c7ee0f5ce4a..2519e831e81 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form
@@ -45,7 +45,7 @@
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="label.text.to.package"/>
+                      <text resource-bundle="messages/KotlinBundle" key="label.text.to.package"/>
                     </properties>
                   </component>
                   <component id="9ea97" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="fileChooser">
@@ -59,7 +59,7 @@
                       <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="label.text.to.file"/>
+                      <text resource-bundle="messages/KotlinBundle" key="label.text.to.file"/>
                     </properties>
                   </component>
                   <component id="67853" class="javax.swing.JTextField" binding="tfFileNameInPackage" default-binding="true">
@@ -79,7 +79,7 @@
                     <properties>
                       <horizontalAlignment value="2"/>
                       <horizontalTextPosition value="11"/>
-                      <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="label.text.file.name"/>
+                      <text resource-bundle="messages/KotlinBundle" key="label.text.file.name"/>
                     </properties>
                   </component>
                   <grid id="ce694" binding="targetPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -96,7 +96,7 @@
                         </constraints>
                         <properties>
                           <labelFor value="36327"/>
-                          <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="label.text.destination.directory"/>
+                          <text resource-bundle="messages/KotlinBundle" key="label.text.destination.directory"/>
                         </properties>
                       </component>
                       <component id="36327" class="com.intellij.ui.ComboboxWithBrowseButton" binding="destinationFolderCB" custom-create="true">
@@ -113,7 +113,7 @@
                     </constraints>
                     <properties>
                       <selected value="true"/>
-                      <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="label.text.update.package.directive"/>
+                      <text resource-bundle="messages/KotlinBundle" key="label.text.update.package.directive"/>
                     </properties>
                   </component>
                   <grid id="69aba" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -148,7 +148,7 @@
                         </constraints>
                         <properties>
                           <selected value="true"/>
-                          <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="checkbox.text.search.references"/>
+                          <text resource-bundle="messages/KotlinBundle" key="checkbox.text.search.references"/>
                         </properties>
                       </component>
                       <component id="cc60e" class="javax.swing.JCheckBox" binding="cbDeleteEmptySourceFiles">
@@ -157,7 +157,7 @@
                         </constraints>
                         <properties>
                           <selected value="true"/>
-                          <text resource-bundle="org/jetbrains/kotlin/idea/KotlinBundle" key="checkbox.text.delete.empty.source.files"/>
+                          <text resource-bundle="messages/KotlinBundle" key="checkbox.text.delete.empty.source.files"/>
                         </properties>
                       </component>
                     </children>
diff --git a/nj2k/nj2k-services/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.properties b/nj2k/nj2k-services/resources/messages/KotlinNJ2KServicesBundle.properties
similarity index 100%
rename from nj2k/nj2k-services/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.properties
rename to nj2k/nj2k-services/resources/messages/KotlinNJ2KServicesBundle.properties
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt
index e12cd3a687a..575907922c0 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinNJ2KServicesBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.nj2k.KotlinNJ2KServicesBundle"
+    private const val BUNDLE = "messages.KotlinNJ2KServicesBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
 
diff --git a/nj2k/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.properties b/nj2k/resources/messages/KotlinNJ2KBundle.properties
similarity index 100%
rename from nj2k/resources/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.properties
rename to nj2k/resources/messages/KotlinNJ2KBundle.properties
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt
index 86862d1d1a6..1e9d4f014a3 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt
@@ -13,7 +13,7 @@ import java.util.*
 
 object KotlinNJ2KBundle : KotlinBundleBase() {
     @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.nj2k.KotlinNJ2KBundle"
+    private const val BUNDLE = "messages.KotlinNJ2KBundle"
 
     override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)