From 78d0f83f71e3d76292184e2078f133b6e58c9cb4 Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Mon, 4 Apr 2016 15:21:32 +0300
Subject: [PATCH] Maven: reorganize code: move classes across packages

---
 .../kotlin/generators/tests/GenerateTests.kt  |  2 +-
 .../KotlinMavenArchetypesProvider.kt          |  2 +-
 .../KotlinMavenImporter.kt                    |  8 +++----
 .../MavenModulesRelationship.kt               |  2 +-
 .../idea/{configuration => maven}/PomFile.kt  |  3 ++-
 .../actions}/MavenActionsGroup.kt             |  5 ++++-
 .../actions}/MavenPluginSourcesSwap.kt        |  3 ++-
 .../KotlinJavaMavenConfigurator.java          |  4 +++-
 .../KotlinJavascriptMavenConfigurator.java    |  3 ++-
 .../KotlinMavenConfigurator.java              |  5 ++++-
 .../KotlinMavenPluginPhaseInspection.kt       |  6 ++++-
 ...avenUnresolvedReferenceQuickFixProvider.kt |  5 +++--
 .../inspections}/KotlinTestJUnitInspection.kt |  4 +++-
 .../SameVersionIDEPluginInspection.kt         |  2 +-
 .../inspections}/SameVersionInspection.kt     |  5 ++++-
 .../AbstractKotlinMavenInspectionTest.kt      |  2 +-
 .../KotlinMavenArchetypesProviderTest.kt      |  3 ++-
 .../idea/maven/KotlinMavenImporterTest.kt     |  1 -
 ...MavenConfigureProjectByChangingFileTest.kt |  7 +++++-
 ...ureProjectByChangingFileTestGenerated.java |  2 +-
 .../maven-inspections/ideAndMavenVersions.xml |  2 +-
 .../kotlinTestWithJunit.fixed.1.xml           |  2 +-
 .../maven-inspections/kotlinTestWithJunit.xml |  2 +-
 .../sameVersionPluginLibrary.xml              |  2 +-
 idea/src/META-INF/maven.xml                   | 22 +++++++++----------
 .../kotlin/idea/quickfix/QuickFixRegistrar.kt |  2 +-
 26 files changed, 66 insertions(+), 40 deletions(-)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven}/KotlinMavenArchetypesProvider.kt (98%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven}/KotlinMavenImporter.kt (96%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven}/MavenModulesRelationship.kt (97%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven}/PomFile.kt (99%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/actions}/MavenActionsGroup.kt (96%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/actions}/MavenPluginSourcesSwap.kt (98%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{ => maven}/configuration/KotlinJavaMavenConfigurator.java (92%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{ => maven}/configuration/KotlinJavascriptMavenConfigurator.java (95%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{ => maven}/configuration/KotlinMavenConfigurator.java (98%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/inspections}/KotlinMavenPluginPhaseInspection.kt (96%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/inspections}/KotlinMavenUnresolvedReferenceQuickFixProvider.kt (98%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/inspections}/KotlinTestJUnitInspection.kt (93%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/inspections}/SameVersionIDEPluginInspection.kt (97%)
 rename idea/idea-maven/src/org/jetbrains/kotlin/idea/{configuration => maven/inspections}/SameVersionInspection.kt (91%)
 rename idea/idea-maven/test/org/jetbrains/kotlin/idea/{configuration => maven}/KotlinMavenArchetypesProviderTest.kt (95%)
 rename idea/idea-maven/test/org/jetbrains/kotlin/idea/{ => maven}/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt (76%)
 rename idea/idea-maven/test/org/jetbrains/kotlin/idea/{ => maven}/configuration/MavenConfigureProjectByChangingFileTestGenerated.java (99%)

diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index e788d90f21e..72d897163ee 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -57,7 +57,7 @@ import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordComplet
 import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
 import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
 import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
-import org.jetbrains.kotlin.idea.configuration.AbstractMavenConfigureProjectByChangingFileTest
+import org.jetbrains.kotlin.idea.maven.configuration.AbstractMavenConfigureProjectByChangingFileTest
 import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
 import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProvider.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt
similarity index 98%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProvider.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt
index f4f616c169d..cda9789e852 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProvider.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonParser
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenImporter.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
similarity index 96%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenImporter.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
index 2c3f4bfda34..7c4e38e85ab 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenImporter.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven
 
 import com.intellij.openapi.components.*
 import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
@@ -148,15 +148,15 @@ class KotlinImporterComponent : PersistentStateComponent<KotlinImporterComponent
 
     val addedSources = Collections.synchronizedSet(HashSet<String>())
 
-    override fun loadState(state: KotlinImporterComponent.State?) {
+    override fun loadState(state: State?) {
         addedSources.clear()
         if (state != null) {
             addedSources.addAll(state.directories)
         }
     }
 
-    override fun getState(): KotlinImporterComponent.State {
-        return KotlinImporterComponent.State(addedSources.sorted())
+    override fun getState(): State {
+        return State(addedSources.sorted())
     }
 }
 
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenModulesRelationship.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenModulesRelationship.kt
similarity index 97%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenModulesRelationship.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenModulesRelationship.kt
index 70e8f4ac4a2..3726773b97e 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenModulesRelationship.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenModulesRelationship.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/PomFile.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt
similarity index 99%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/PomFile.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt
index b5afef263bc..c7fa939079d 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/PomFile.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ModuleRootManager
@@ -34,6 +34,7 @@ import org.jetbrains.idea.maven.dom.model.*
 import org.jetbrains.idea.maven.model.MavenId
 import org.jetbrains.idea.maven.utils.MavenArtifactScope
 import org.jetbrains.jps.model.java.JavaSourceRootType
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
 import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
 import java.util.*
 
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenActionsGroup.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenActionsGroup.kt
similarity index 96%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenActionsGroup.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenActionsGroup.kt
index 97f1037ae5e..7c85ce4c763 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenActionsGroup.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenActionsGroup.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.actions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
@@ -28,6 +28,9 @@ import org.jetbrains.idea.maven.dom.model.MavenDomDependency
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
 import org.jetbrains.idea.maven.model.MavenId
+import org.jetbrains.kotlin.idea.maven.PomFile
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 
 class GenerateMavenCompileExecutionAction : PomFileActionBase(KotlinMavenExecutionProvider("compile", PomFile.DefaultPhases.Compile))
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenPluginSourcesSwap.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenPluginSourcesSwap.kt
similarity index 98%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenPluginSourcesSwap.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenPluginSourcesSwap.kt
index 0f0c6e48ca1..a87d744a2be 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenPluginSourcesSwap.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenPluginSourcesSwap.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.actions
 
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
 import com.intellij.openapi.editor.Editor
@@ -28,6 +28,7 @@ import com.intellij.util.xml.GenericDomValue
 import org.jetbrains.idea.maven.dom.MavenDomUtil
 import org.jetbrains.idea.maven.dom.model.MavenDomBuild
 import org.jetbrains.idea.maven.dom.model.MavenDomPluginExecution
+import org.jetbrains.kotlin.idea.maven.PomFile
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.java
similarity index 92%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.java
index cc6138b96e2..c81dc847187 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration;
+package org.jetbrains.kotlin.idea.maven.configuration;
 
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
+import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtilsKt;
+import org.jetbrains.kotlin.idea.maven.PomFile;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.java
similarity index 95%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.java
index d558ad1ef99..153c5f4e3d0 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration;
+package org.jetbrains.kotlin.idea.maven.configuration;
 
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
+import org.jetbrains.kotlin.idea.maven.PomFile;
 import org.jetbrains.kotlin.js.resolve.JsPlatform;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.java
similarity index 98%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.java
index faa7b5ecd6d..7b50858b88d 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration;
+package org.jetbrains.kotlin.idea.maven.configuration;
 
 import com.intellij.codeInsight.CodeInsightUtilCore;
 import com.intellij.ide.actions.OpenFileAction;
@@ -43,7 +43,10 @@ import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.idea.maven.utils.MavenArtifactScope;
 import org.jetbrains.kotlin.idea.KotlinPluginUtil;
+import org.jetbrains.kotlin.idea.configuration.*;
 import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion;
+import org.jetbrains.kotlin.idea.maven.MavenModulesRelationshipKt;
+import org.jetbrains.kotlin.idea.maven.PomFile;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenPluginPhaseInspection.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenPluginPhaseInspection.kt
similarity index 96%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenPluginPhaseInspection.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenPluginPhaseInspection.kt
index 5631509f3df..2940ff5c7ab 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenPluginPhaseInspection.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenPluginPhaseInspection.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.inspections
 
 import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
@@ -37,6 +37,10 @@ import org.jetbrains.idea.maven.model.MavenPlugin
 import org.jetbrains.idea.maven.project.MavenProjectsManager
 import org.jetbrains.idea.maven.utils.MavenArtifactScope
 import org.jetbrains.kotlin.idea.KotlinFileType
+import org.jetbrains.kotlin.idea.maven.PomFile
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
 import java.util.*
 
 class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenUnresolvedReferenceQuickFixProvider.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenUnresolvedReferenceQuickFixProvider.kt
similarity index 98%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenUnresolvedReferenceQuickFixProvider.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenUnresolvedReferenceQuickFixProvider.kt
index 500c3080f25..9ce8e8de74e 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenUnresolvedReferenceQuickFixProvider.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenUnresolvedReferenceQuickFixProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.inspections
 
 import com.intellij.codeInsight.daemon.HighlightDisplayKey
 import com.intellij.codeInsight.daemon.QuickFixActionRegistrar
@@ -36,6 +36,7 @@ import org.jetbrains.idea.maven.indices.MavenArtifactSearchDialog
 import org.jetbrains.idea.maven.project.MavenProjectsManager
 import org.jetbrains.idea.maven.utils.MavenArtifactScope
 import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.idea.maven.PomFile
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
 import org.jetbrains.kotlin.idea.quickfix.IntentionActionPriority
 import org.jetbrains.kotlin.idea.quickfix.KotlinIntentionActionFactoryWithDelegate
@@ -128,7 +129,7 @@ object PlatformUnresolvedProvider : KotlinIntentionActionFactoryWithDelegate<KtN
         originalElementPointer.element?.references?.filterIsInstance<KtSimpleNameReference>()?.firstOrNull()?.let { reference ->
             UnresolvedReferenceQuickFixProvider.registerReferenceFixes(reference, object: QuickFixActionRegistrar {
                 override fun register(action: IntentionAction) {
-                    result.add(QuickFixWithDelegateFactory(IntentionActionPriority.LOW) { action } )
+                    result.add(QuickFixWithDelegateFactory(IntentionActionPriority.LOW) { action })
                 }
 
                 override fun register(fixRange: TextRange, action: IntentionAction, key: HighlightDisplayKey?) {
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinTestJUnitInspection.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinTestJUnitInspection.kt
similarity index 93%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinTestJUnitInspection.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinTestJUnitInspection.kt
index fed65189499..800adfb3937 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinTestJUnitInspection.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinTestJUnitInspection.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.inspections
 
 import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
@@ -26,6 +26,8 @@ import com.intellij.util.xml.highlighting.DomElementsInspection
 import org.jetbrains.idea.maven.dom.model.MavenDomDependency
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
 import org.jetbrains.idea.maven.project.MavenProjectsManager
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
 
 class KotlinTestJUnitInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
     override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionIDEPluginInspection.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionIDEPluginInspection.kt
similarity index 97%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionIDEPluginInspection.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionIDEPluginInspection.kt
index f8dda1e9474..479fd01879c 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionIDEPluginInspection.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionIDEPluginInspection.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.inspections
 
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.util.xml.DomFileElement
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionInspection.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt
similarity index 91%
rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionInspection.kt
rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt
index 61d674e135c..f734cb7c4ba 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionInspection.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.inspections
 
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.util.xml.DomFileElement
@@ -23,6 +23,9 @@ import com.intellij.util.xml.highlighting.DomElementsInspection
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
 import org.jetbrains.idea.maven.model.MavenId
 import org.jetbrains.idea.maven.project.MavenProjectsManager
+import org.jetbrains.kotlin.idea.maven.PomFile
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
 
 class SameVersionInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
     override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
index 0db08d8b0f0..3135573e1aa 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
@@ -35,7 +35,7 @@ import com.intellij.testFramework.InspectionTestUtil
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import com.intellij.util.indexing.FileBasedIndex
 import org.jetbrains.jps.model.java.JavaSourceRootType
-import org.jetbrains.kotlin.idea.configuration.KotlinMavenPluginPhaseInspection
+import org.jetbrains.kotlin.idea.maven.inspections.KotlinMavenPluginPhaseInspection
 import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory
 import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import java.io.File
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProviderTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt
similarity index 95%
rename from idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProviderTest.kt
rename to idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt
index a7e73773899..b48b9bc2999 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProviderTest.kt
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven
 
 import com.google.gson.JsonParser
 import org.jetbrains.idea.maven.model.MavenArchetype
+import org.jetbrains.kotlin.idea.maven.KotlinMavenArchetypesProvider
 import org.junit.Test
 
 import org.junit.Assert.*
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
index 2a56de407a8..ddd71f51460 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.idea.maven
 
-import org.jetbrains.kotlin.idea.configuration.KotlinImporterComponent
 import java.io.File
 
 class KotlinMavenImporterTest : MavenImportingTestCase() {
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt
similarity index 76%
rename from idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt
rename to idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt
index b2d9d44239e..c4215fa193f 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration
+package org.jetbrains.kotlin.idea.maven.configuration
 
 import com.intellij.openapi.module.Module
 import com.intellij.psi.PsiFile
 import org.jetbrains.idea.maven.model.MavenConstants
+import org.jetbrains.kotlin.idea.configuration.AbstractConfigureProjectByChangingFileTest
+import org.jetbrains.kotlin.idea.configuration.NotificationMessageCollector
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator
+import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
 
 abstract class AbstractMavenConfigureProjectByChangingFileTest : AbstractConfigureProjectByChangingFileTest<KotlinMavenConfigurator>() {
     fun doTestWithMaven(path: String) {
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/MavenConfigureProjectByChangingFileTestGenerated.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java
similarity index 99%
rename from idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/MavenConfigureProjectByChangingFileTestGenerated.java
rename to idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java
index e599583b59f..7b84df9770d 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/MavenConfigureProjectByChangingFileTestGenerated.java
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.configuration;
+package org.jetbrains.kotlin.idea.maven.configuration;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
diff --git a/idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml b/idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml
index abd2f7d7e68..f0330c4b657 100644
--- a/idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml
+++ b/idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml
@@ -31,5 +31,5 @@
     </build>
 </project>
 
-<!-- inspection: org.jetbrains.kotlin.idea.configuration.SameVersionIDEPluginInspection -->
+<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionIDEPluginInspection -->
 <!-- problem: on ${kotlin.version}, title You use different IDE and Maven plugins' versions so you code's behaviour may be different -->
\ No newline at end of file
diff --git a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml
index fc1000c80db..4e134826a53 100644
--- a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml
+++ b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml
@@ -53,5 +53,5 @@
 
 </project>
 
-<!-- inspection: org.jetbrains.kotlin.idea.configuration.KotlinTestJUnitInspection -->
+<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.KotlinTestJUnitInspection -->
 <!-- problem: on kotlin-test, title kotlin-test-junit is better with junit -->
diff --git a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml
index ca3695003e3..7e2339e2119 100644
--- a/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml
+++ b/idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml
@@ -53,5 +53,5 @@
 
 </project>
 
-<!-- inspection: org.jetbrains.kotlin.idea.configuration.KotlinTestJUnitInspection -->
+<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.KotlinTestJUnitInspection -->
 <!-- problem: on kotlin-test, title kotlin-test-junit is better with junit -->
diff --git a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml
index ad073f1e806..ffdc68ae3db 100644
--- a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml
+++ b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml
@@ -32,6 +32,6 @@
     </build>
 </project>
 
-<!-- inspection: org.jetbrains.kotlin.idea.configuration.SameVersionInspection -->
+<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection -->
 <!-- problem: on ${kotlin.version.1}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
 <!-- problem: on ${kotlin.version.2}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
\ No newline at end of file
diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml
index 339ab36a67c..0d572105af6 100644
--- a/idea/src/META-INF/maven.xml
+++ b/idea/src/META-INF/maven.xml
@@ -1,10 +1,10 @@
 <idea-plugin>
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaMavenConfigurator"/>
-    <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavascriptMavenConfigurator"/>
+    <projectConfigurator implementation="org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator"/>
+    <projectConfigurator implementation="org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator"/>
   </extensions>
   <extensions defaultExtensionNs="org.jetbrains.idea.maven">
-    <importer implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenImporter" />
+    <importer implementation="org.jetbrains.kotlin.idea.maven.KotlinMavenImporter" />
     <archetypesProvider implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenArchetypesProvider" />
 
     <pluginDescriptor mavenId="org.jetbrains.kotlin:kotlin-maven-plugin">
@@ -33,7 +33,7 @@
                      hasStaticDescription="true"
                      level="WARNING" />
 
-    <localInspection implementationClass="org.jetbrains.kotlin.idea.configuration.SameVersionInspection"
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection"
                      displayName="Kotlin Maven: library and plugin inspection"
                      groupName="Kotlin"
                      enabledByDefault="true"
@@ -50,20 +50,20 @@
                      level="WARNING" />
 
     <intentionAction>
-      <className>org.jetbrains.kotlin.idea.configuration.MavenPluginSourcesMoveToBuild</className>
+      <className>org.jetbrains.kotlin.idea.maven.actions.MavenPluginSourcesMoveToBuild</className>
       <category>Kotlin</category>
     </intentionAction>
     <intentionAction>
-      <className>org.jetbrains.kotlin.idea.configuration.MavenPluginSourcesMoveToExecutionIntention</className>
+      <className>org.jetbrains.kotlin.idea.maven.actions.MavenPluginSourcesMoveToExecutionIntention</className>
       <category>Kotlin</category>
     </intentionAction>
     <codeInsight.unresolvedReferenceQuickFixProvider
-        implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenUnresolvedReferenceQuickFixProvider" />
+        implementation="org.jetbrains.kotlin.idea.maven.inspections.KotlinMavenUnresolvedReferenceQuickFixProvider" />
   </extensions>
 
   <module-components>
     <component>
-      <implementation-class>org.jetbrains.kotlin.idea.configuration.KotlinImporterComponent</implementation-class>
+      <implementation-class>org.jetbrains.kotlin.idea.maven.KotlinImporterComponent</implementation-class>
     </component>
   </module-components>
 
@@ -73,17 +73,17 @@
 
       <action id="KotlinGenerateMavenCompileExecutionAction"
               icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
-              class="org.jetbrains.kotlin.idea.configuration.GenerateMavenCompileExecutionAction"
+              class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenCompileExecutionAction"
               text="Kotlin compile execution" />
 
       <action id="KotlinGenerateMavenTestCompileExecutionAction"
               icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
-              class="org.jetbrains.kotlin.idea.configuration.GenerateMavenTestCompileExecutionAction"
+              class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenTestCompileExecutionAction"
               text="Kotlin test-compile execution" />
 
       <action id="KotlinGenerateMavenPluginAction"
               icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
-              class="org.jetbrains.kotlin.idea.configuration.GenerateMavenPluginAction"
+              class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenPluginAction"
               text="Kotlin plugin" />
 
       <add-to-group group-id="GenerateGroup" anchor="last" />
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index e315553f18e..93f46ed4b42 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix
 import com.intellij.codeInsight.intention.IntentionAction
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Errors.*
-import org.jetbrains.kotlin.idea.configuration.PlatformUnresolvedProvider
+import org.jetbrains.kotlin.idea.maven.inspections.PlatformUnresolvedProvider
 import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementAsConstructorParameter
 import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
 import org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory