diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java
index 5317f606da64..19059e299d79 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class MavenDomBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "MavenDomBundle";
+  @NonNls private static final String BUNDLE = "messages.MavenDomBundle";
   private static final MavenDomBundle INSTANCE = new MavenDomBundle();
 
   private MavenDomBundle() { super(BUNDLE); }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java
index 49cb81c6bfad..87947516a32e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java
@@ -26,7 +26,7 @@ public class RunnerBundle extends DynamicBundle {
     return ourInstance.getMessage(key, params);
   }
 
-  private static final String PATH_TO_BUNDLE = "RunnerBundle";
+  private static final String PATH_TO_BUNDLE = "messages.RunnerBundle";
   private static final AbstractBundle ourInstance = new RunnerBundle();
 
   private RunnerBundle() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java
index 2b2f04e9bac4..d3784db73483 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java
@@ -12,7 +12,7 @@ public class SyncBundle extends DynamicBundle {
     return ourInstance.getMessage(key, params);
   }
 
-  private static final String PATH_TO_BUNDLE = "SyncBundle";
+  private static final String PATH_TO_BUNDLE = "messages.SyncBundle";
   private static final AbstractBundle ourInstance = new SyncBundle();
 
   private SyncBundle() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java
index 9368ff902533..023f9eb6b122 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class IndicesBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "IndicesBundle";
+  @NonNls private static final String BUNDLE = "messages.IndicesBundle";
   private static final IndicesBundle INSTANCE = new IndicesBundle();
 
   private IndicesBundle() { super(BUNDLE); }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
index e72a3a311263..1a775232298a 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
@@ -280,7 +280,7 @@
         <properties>
           <labelFor value="83bca"/>
           <text value="Dependency types:"/>
-          <toolTipText resource-bundle="ProjectBundle" key="maven.import.dependency.type.description"/>
+          <toolTipText resource-bundle="messages/ProjectBundle" key="maven.import.dependency.type.description"/>
         </properties>
       </component>
       <component id="83bca" class="javax.swing.JTextField" binding="myDependencyTypes">
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java
index 919f2e6d199e..c5fe41c69594 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class ProjectBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "ProjectBundle";
+  @NonNls private static final String BUNDLE = "messages.ProjectBundle";
   private static final ProjectBundle INSTANCE = new ProjectBundle();
 
   private ProjectBundle() { super(BUNDLE); }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java
index a486f42b27b6..d89c54ffc983 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class TasksBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "TasksBundle";
+  @NonNls private static final String BUNDLE = "messages.TasksBundle";
   private static final TasksBundle INSTANCE = new TasksBundle();
 
   private TasksBundle() { super(BUNDLE); }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java
index f6d08c9fcd01..a71d740b6ddc 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class MavenWizardBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "MavenWizardBundle";
+  @NonNls private static final String BUNDLE = "messages.MavenWizardBundle";
   private static final MavenWizardBundle INSTANCE = new MavenWizardBundle();
 
   private MavenWizardBundle() { super(BUNDLE); }
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 23a01386f3ce..a60de4d32a8c 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -123,19 +123,19 @@
 
     <elementDescriptionProvider implementation="org.jetbrains.idea.maven.dom.MavenModelDocumentationProvider" order="first"/>
 
-    <localInspection language="XML" shortName="MavenModelInspection" bundle="MavenDomBundle" key="inspection.name" groupKey="inspection.group"
+    <localInspection language="XML" shortName="MavenModelInspection" bundle="messages.MavenDomBundle" key="inspection.name" groupKey="inspection.group"
                      enabledByDefault="true" level="ERROR"
                      implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenModelInspection"/>
-    <localInspection language="XML" shortName="MavenDuplicateDependenciesInspection" bundle="MavenDomBundle" key="inspection.duplicate.dependencies.name"
+    <localInspection language="XML" shortName="MavenDuplicateDependenciesInspection" bundle="messages.MavenDomBundle" key="inspection.duplicate.dependencies.name"
                      groupKey="inspection.group" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenDuplicateDependenciesInspection"/>
-    <localInspection language="XML" shortName="MavenDuplicatePluginInspection" bundle="MavenDomBundle" key="inspection.duplicate.plugin.declaration"
+    <localInspection language="XML" shortName="MavenDuplicatePluginInspection" bundle="messages.MavenDomBundle" key="inspection.duplicate.plugin.declaration"
                      groupKey="inspection.group" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenDuplicatePluginInspection"/>
-    <localInspection language="XML" shortName="MavenRedundantGroupId" bundle="MavenDomBundle" key="inspection.redundant.groupId.name"
+    <localInspection language="XML" shortName="MavenRedundantGroupId" bundle="messages.MavenDomBundle" key="inspection.redundant.groupId.name"
                      groupKey="inspection.group" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenRedundantGroupIdInspection"/>
-    <localInspection language="XML" shortName="MavenPropertyInParent" bundle="MavenDomBundle" key="inspection.property.in.parent.name"
+    <localInspection language="XML" shortName="MavenPropertyInParent" bundle="messages.MavenDomBundle" key="inspection.property.in.parent.name"
                      groupKey="inspection.group" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenPropertyInParentInspection"/>
     <xml.xmlExtension implementation="org.jetbrains.idea.maven.dom.MavenXmlExtension"/>
diff --git a/plugins/maven/src/main/resources/IndicesBundle.properties b/plugins/maven/src/main/resources/messages/IndicesBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/IndicesBundle.properties
rename to plugins/maven/src/main/resources/messages/IndicesBundle.properties
diff --git a/plugins/maven/src/main/resources/MavenDomBundle.properties b/plugins/maven/src/main/resources/messages/MavenDomBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/MavenDomBundle.properties
rename to plugins/maven/src/main/resources/messages/MavenDomBundle.properties
diff --git a/plugins/maven/src/main/resources/MavenWizardBundle.properties b/plugins/maven/src/main/resources/messages/MavenWizardBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/MavenWizardBundle.properties
rename to plugins/maven/src/main/resources/messages/MavenWizardBundle.properties
diff --git a/plugins/maven/src/main/resources/ProjectBundle.properties b/plugins/maven/src/main/resources/messages/ProjectBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/ProjectBundle.properties
rename to plugins/maven/src/main/resources/messages/ProjectBundle.properties
diff --git a/plugins/maven/src/main/resources/RunnerBundle.properties b/plugins/maven/src/main/resources/messages/RunnerBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/RunnerBundle.properties
rename to plugins/maven/src/main/resources/messages/RunnerBundle.properties
diff --git a/plugins/maven/src/main/resources/SyncBundle.properties b/plugins/maven/src/main/resources/messages/SyncBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/SyncBundle.properties
rename to plugins/maven/src/main/resources/messages/SyncBundle.properties
diff --git a/plugins/maven/src/main/resources/TasksBundle.properties b/plugins/maven/src/main/resources/messages/TasksBundle.properties
similarity index 100%
rename from plugins/maven/src/main/resources/TasksBundle.properties
rename to plugins/maven/src/main/resources/messages/TasksBundle.properties