diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt
index 1ebd0ae647e..8ca9dea92fc 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt
@@ -11,18 +11,15 @@ import org.jetbrains.jps.model.java.JavaResourceRootType
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 
-sealed class KotlinResourceRootType(val isTest: Boolean) : JpsElementTypeBase<JavaResourceRootProperties>(),
-    JpsModuleSourceRootType<JavaResourceRootProperties>, KotlinRootType {
+sealed class KotlinResourceRootType() : JpsElementTypeBase<JavaResourceRootProperties>(),
+    JpsModuleSourceRootType<JavaResourceRootProperties> {
 
     override fun createDefaultProperties() =
         JpsJavaExtensionService.getInstance().createResourceRootProperties("", false)
-
-    override fun isTestRoot() = isTest
-
-    override fun isForTests() = isTest
-
-    override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other)
 }
 
-object ResourceKotlinRootType : KotlinResourceRootType(false)
-object TestResourceKotlinRootType : KotlinResourceRootType(true)
\ No newline at end of file
+object ResourceKotlinRootType : KotlinResourceRootType()
+
+object TestResourceKotlinRootType : KotlinResourceRootType() {
+    override fun isForTests() = true
+}
\ No newline at end of file
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183
similarity index 56%
rename from jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191
rename to jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183
index 8ca9dea92fc..1ebd0ae647e 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.191
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183
@@ -11,15 +11,18 @@ import org.jetbrains.jps.model.java.JavaResourceRootType
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 
-sealed class KotlinResourceRootType() : JpsElementTypeBase<JavaResourceRootProperties>(),
-    JpsModuleSourceRootType<JavaResourceRootProperties> {
+sealed class KotlinResourceRootType(val isTest: Boolean) : JpsElementTypeBase<JavaResourceRootProperties>(),
+    JpsModuleSourceRootType<JavaResourceRootProperties>, KotlinRootType {
 
     override fun createDefaultProperties() =
         JpsJavaExtensionService.getInstance().createResourceRootProperties("", false)
+
+    override fun isTestRoot() = isTest
+
+    override fun isForTests() = isTest
+
+    override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other)
 }
 
-object ResourceKotlinRootType : KotlinResourceRootType()
-
-object TestResourceKotlinRootType : KotlinResourceRootType() {
-    override fun isForTests() = true
-}
\ No newline at end of file
+object ResourceKotlinRootType : KotlinResourceRootType(false)
+object TestResourceKotlinRootType : KotlinResourceRootType(true)
\ No newline at end of file
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.183
similarity index 100%
rename from jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt
rename to jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.183
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.191 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.191
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt
index f517867f2c3..834e7921dbe 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt
@@ -11,21 +11,16 @@ import org.jetbrains.jps.model.java.JavaSourceRootType
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 
-sealed class KotlinSourceRootType(val isTest: Boolean) : JpsElementTypeBase<JavaSourceRootProperties>(), JpsModuleSourceRootType<JavaSourceRootProperties>, KotlinRootType {
-
+sealed class KotlinSourceRootType() : JpsElementTypeBase<JavaSourceRootProperties>(), JpsModuleSourceRootType<JavaSourceRootProperties> {
 
     override fun createDefaultProperties() = JpsJavaExtensionService.getInstance().createSourceRootProperties("")
 
-
-    override fun isTestRoot() = isTest
-
-    override fun isForTests() = isTest
-
-    override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other)
 }
 
-object SourceKotlinRootType : KotlinSourceRootType(false)
+object SourceKotlinRootType : KotlinSourceRootType()
 
-object TestSourceKotlinRootType : KotlinSourceRootType(true)
+object TestSourceKotlinRootType : KotlinSourceRootType() {
+    override fun isForTests() = true
+}
 
 val ALL_KOTLIN_SOURCE_ROOT_TYPES = setOf(SourceKotlinRootType, TestSourceKotlinRootType)
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183
similarity index 59%
rename from jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191
rename to jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183
index 834e7921dbe..f517867f2c3 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.191
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183
@@ -11,16 +11,21 @@ import org.jetbrains.jps.model.java.JavaSourceRootType
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 
-sealed class KotlinSourceRootType() : JpsElementTypeBase<JavaSourceRootProperties>(), JpsModuleSourceRootType<JavaSourceRootProperties> {
+sealed class KotlinSourceRootType(val isTest: Boolean) : JpsElementTypeBase<JavaSourceRootProperties>(), JpsModuleSourceRootType<JavaSourceRootProperties>, KotlinRootType {
+
 
     override fun createDefaultProperties() = JpsJavaExtensionService.getInstance().createSourceRootProperties("")
 
+
+    override fun isTestRoot() = isTest
+
+    override fun isForTests() = isTest
+
+    override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other)
 }
 
-object SourceKotlinRootType : KotlinSourceRootType()
+object SourceKotlinRootType : KotlinSourceRootType(false)
 
-object TestSourceKotlinRootType : KotlinSourceRootType() {
-    override fun isForTests() = true
-}
+object TestSourceKotlinRootType : KotlinSourceRootType(true)
 
 val ALL_KOTLIN_SOURCE_ROOT_TYPES = setOf(SourceKotlinRootType, TestSourceKotlinRootType)