diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index 5aa0e64f27a4..64f3b0e54c32 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -64,6 +64,18 @@
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="module-library">
+          <library name="completion-ranking-java" type="repository">
+            <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-ranking-java:0.0.7" />
+            <CLASSES>
+              <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0.0.7/completion-ranking-java-0.0.7.jar!/" />
+            </CLASSES>
+            <JAVADOC />
+            <SOURCES>
+              <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0.0.7/completion-ranking-java-0.0.7-sources.jar!/" />
+            </SOURCES>
+          </library>
+        </orderEntry>
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 813a1b505388..f5e478c6145d 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -1103,6 +1103,7 @@
              order="before explicitlyImported"/>
     <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.ReferenceListWeigher" id="referenceList"
              order="before samePsiMember"/>
+    <completion.ml.model implementation="com.intellij.codeInsight.completion.ml.JavaMLRankingProvider"/>
     <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.NestedIfJoinLinesHandler"/>
     <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.BlockJoinLinesHandler"/>
     <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.ChainCallJoinLinesHandler"/>
diff --git a/plugins/stats-collector/completion-ranker/src/com/jetbrains/completion/ranker/JavaMLRankingProvider.kt b/java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt
similarity index 94%
rename from plugins/stats-collector/completion-ranker/src/com/jetbrains/completion/ranker/JavaMLRankingProvider.kt
rename to java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt
index c0718880569e..0bc33bf0870f 100644
--- a/plugins/stats-collector/completion-ranker/src/com/jetbrains/completion/ranker/JavaMLRankingProvider.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.completion.ranker
+package com.intellij.codeInsight.completion.ml
 
 import com.completion.ranker.model.java.MLWhiteBox
 import com.intellij.internal.ml.*
diff --git a/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml b/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml
index 9fe94c1d4765..fd7a5919c2cf 100644
--- a/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml
+++ b/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml
@@ -10,18 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module-library">
-      <library name="completion-ranking-java" type="repository">
-        <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-ranking-java:0.0.7" />
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0.0.7/completion-ranking-java-0.0.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0.0.7/completion-ranking-java-0.0.7-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="completion-ranking-kotlin" type="repository">
         <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-ranking-kotlin:0.0.2" />
diff --git a/plugins/stats-collector/completion-ranker/test/com/jetbrains/completion/ranker/metadata/MetadataConsistencyTest.kt b/plugins/stats-collector/completion-ranker/test/com/jetbrains/completion/ranker/metadata/MetadataConsistencyTest.kt
index c887dc81d190..205d43af8241 100644
--- a/plugins/stats-collector/completion-ranker/test/com/jetbrains/completion/ranker/metadata/MetadataConsistencyTest.kt
+++ b/plugins/stats-collector/completion-ranker/test/com/jetbrains/completion/ranker/metadata/MetadataConsistencyTest.kt
@@ -2,15 +2,11 @@
 package com.jetbrains.completion.ranker.metadata
 
 import com.intellij.internal.ml.completion.RankingModelProvider
-import com.jetbrains.completion.ranker.JavaMLRankingProvider
 import com.jetbrains.completion.ranker.KotlinMLRankingProvider
 import com.jetbrains.completion.ranker.PythonMLRankingProvider
 import org.junit.Test
 
 class MetadataConsistencyTest {
-  @Test
-  fun testJavaMetadata() = doTest(JavaMLRankingProvider())
-
   @Test
   fun testKotlinMetadata() = doTest(KotlinMLRankingProvider())
 
diff --git a/plugins/stats-collector/resources/META-INF/plugin.xml b/plugins/stats-collector/resources/META-INF/plugin.xml
index 9f0a23a8fe24..b554a9fc3e1b 100644
--- a/plugins/stats-collector/resources/META-INF/plugin.xml
+++ b/plugins/stats-collector/resources/META-INF/plugin.xml
@@ -58,7 +58,6 @@
 
     <projectService serviceImplementation="com.intellij.stats.personalization.impl.ProjectUserFactorStorage"/>
 
-    <completion.ml.model implementation="com.jetbrains.completion.ranker.JavaMLRankingProvider"/>
     <completion.ml.model implementation="com.jetbrains.completion.ranker.KotlinMLRankingProvider"/>
     <completion.ml.model implementation="com.jetbrains.completion.ranker.PythonMLRankingProvider"/>
     <weigher key="completion" id="ml_weigh" implementationClass="com.intellij.completion.ml.MLCompletionWeigher" order="last"/>