diff --git a/commandInterface/intellij.commandInterface.iml b/commandInterface/intellij.commandInterface.iml
index a69fefeae783..1fd95a84a865 100644
--- a/commandInterface/intellij.commandInterface.iml
+++ b/commandInterface/intellij.commandInterface.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/commandInterface/src/com/intellij/commandInterface/CommandInterfaceBundle.properties b/commandInterface/resources/messages/CommandInterfaceBundle.properties
similarity index 100%
rename from commandInterface/src/com/intellij/commandInterface/CommandInterfaceBundle.properties
rename to commandInterface/resources/messages/CommandInterfaceBundle.properties
diff --git a/commandInterface/src/com/intellij/commandInterface/CommandInterfaceBundle.kt b/commandInterface/src/com/intellij/commandInterface/CommandInterfaceBundle.kt
index d7897a7406df..d9b8733780be 100644
--- a/commandInterface/src/com/intellij/commandInterface/CommandInterfaceBundle.kt
+++ b/commandInterface/src/com/intellij/commandInterface/CommandInterfaceBundle.kt
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
 import java.util.function.Supplier
 
-private const val BUNDLE: @NonNls String = "com.intellij.commandInterface.CommandInterfaceBundle"
+private const val BUNDLE: @NonNls String = "messages.CommandInterfaceBundle"
 
 internal object CommandInterfaceBundle : DynamicBundle(BUNDLE) {
 
diff --git a/commandInterface/src/intellij.commandInterface.xml b/commandInterface/src/intellij.commandInterface.xml
index 515cdb7f9dc7..e8afc95bea2c 100644
--- a/commandInterface/src/intellij.commandInterface.xml
+++ b/commandInterface/src/intellij.commandInterface.xml
@@ -16,7 +16,7 @@
                               implementation="com.intellij.commandInterface.commandLine.CommandLineReferenceContributor"/>
     <lang.elementManipulator forClass="com.intellij.commandInterface.commandLine.CommandLineElement"
                              implementationClass="com.intellij.commandInterface.commandLine.CommandLineElementManipulator"/>
-    <localInspection language="CommandLine" shortName="CommandLineInspection" bundle="com.intellij.commandInterface.CommandInterfaceBundle"
+    <localInspection language="CommandLine" shortName="CommandLineInspection" bundle="messages.CommandInterfaceBundle"
                      key="commandLine.inspection.name"
                      enabledByDefault="true" level="WARNING"
                      groupKey="INSP.GROUP.python"