diff --git a/build.gradle.kts b/build.gradle.kts
index 8e57c356789..095436124fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -142,9 +142,9 @@ fun checkJDK() {
 }
 
 rootProject.apply {
-    from(rootProject.file("versions.gradle.kts"))
-    from(rootProject.file("report.gradle.kts"))
-    from(rootProject.file("javaInstrumentation.gradle.kts"))
+    from(rootProject.file("gradle/versions.gradle.kts"))
+    from(rootProject.file("gradle/report.gradle.kts"))
+    from(rootProject.file("gradle/javaInstrumentation.gradle.kts"))
 }
 
 IdeVersionConfigurator.setCurrentIde(this)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 93fe54bb34d..6264fff8b3f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -59,7 +59,7 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
 }
 
 rootProject.apply {
-    from(rootProject.file("../versions.gradle.kts"))
+    from(rootProject.file("../gradle/versions.gradle.kts"))
 }
 
 val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
diff --git a/javaInstrumentation.gradle.kts b/gradle/javaInstrumentation.gradle.kts
similarity index 100%
rename from javaInstrumentation.gradle.kts
rename to gradle/javaInstrumentation.gradle.kts
diff --git a/report.gradle.kts b/gradle/report.gradle.kts
similarity index 100%
rename from report.gradle.kts
rename to gradle/report.gradle.kts
diff --git a/versions.gradle.kts b/gradle/versions.gradle.kts
similarity index 89%
rename from versions.gradle.kts
rename to gradle/versions.gradle.kts
index 2dc7e053199..7de8cb4df95 100644
--- a/versions.gradle.kts
+++ b/gradle/versions.gradle.kts
@@ -1,11 +1,12 @@
 import java.util.*
 import java.io.*
 
-var propertiesFile = rootProject.file("versions.properties");
+var propertiesFile: File = rootProject.file("gradle/versions.properties")
 if (!propertiesFile.exists()) {
     //work-around for buildSrc
-    propertiesFile = rootProject.file("../versions.properties");
+    propertiesFile = rootProject.file("../gradle/versions.properties")
 }
+
 FileReader(propertiesFile).use {
     val properties = Properties()
     properties.load(it)
diff --git a/versions.properties b/gradle/versions.properties
similarity index 100%
rename from versions.properties
rename to gradle/versions.properties
diff --git a/versions.properties.173 b/gradle/versions.properties.173
similarity index 100%
rename from versions.properties.173
rename to gradle/versions.properties.173
diff --git a/versions.properties.181 b/gradle/versions.properties.181
similarity index 100%
rename from versions.properties.181
rename to gradle/versions.properties.181
diff --git a/versions.properties.182 b/gradle/versions.properties.182
similarity index 100%
rename from versions.properties.182
rename to gradle/versions.properties.182
diff --git a/versions.properties.191 b/gradle/versions.properties.191
similarity index 100%
rename from versions.properties.191
rename to gradle/versions.properties.191
diff --git a/versions.properties.as31 b/gradle/versions.properties.as31
similarity index 100%
rename from versions.properties.as31
rename to gradle/versions.properties.as31
diff --git a/versions.properties.as32 b/gradle/versions.properties.as32
similarity index 100%
rename from versions.properties.as32
rename to gradle/versions.properties.as32
diff --git a/versions.properties.as33 b/gradle/versions.properties.as33
similarity index 100%
rename from versions.properties.as33
rename to gradle/versions.properties.as33
diff --git a/versions.properties.as34 b/gradle/versions.properties.as34
similarity index 100%
rename from versions.properties.as34
rename to gradle/versions.properties.as34
diff --git a/versions.properties.cidr183 b/gradle/versions.properties.cidr183
similarity index 100%
rename from versions.properties.cidr183
rename to gradle/versions.properties.cidr183