diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
index e8d70f0e3f1b..ffc4b7efff97 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
@@ -29,7 +29,7 @@ import org.codehaus.groovy.GroovyException;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.MacroExpander;
 import org.jetbrains.jps.javac.JavacServer;
-import org.jetbrains.util.rt.FileUtilRt;
+import com.intellij.openapi.util.io.FileUtilRt;
 import org.objectweb.asm.ClassWriter;
 
 import javax.tools.*;
diff --git a/platform/util-rt/src/com/intellij/openapi/util/Comparing.java b/platform/util-rt/src/com/intellij/openapi/util/Comparing.java
index 4c9d7dd1a1bb..95c7d6df8676 100644
--- a/platform/util-rt/src/com/intellij/openapi/util/Comparing.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/Comparing.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.openapi.util;
 
-import org.jetbrains.util.rt.StringUtilRt;
+import com.intellij.openapi.util.text.StringUtilRt;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/platform/util-rt/src/org/jetbrains/util/rt/SystemInfoRt.java b/platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java
similarity index 97%
rename from platform/util-rt/src/org/jetbrains/util/rt/SystemInfoRt.java
rename to platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java
index 6b3dd54260af..cdce6e247e32 100644
--- a/platform/util-rt/src/org/jetbrains/util/rt/SystemInfoRt.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.util.rt;
+package com.intellij.openapi.util;
 
 /**
  * Stripped-down version of {@code com.intellij.openapi.util.SystemInfo}.
diff --git a/platform/util-rt/src/org/jetbrains/util/rt/FileUtilRt.java b/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
similarity index 98%
rename from platform/util-rt/src/org/jetbrains/util/rt/FileUtilRt.java
rename to platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
index 5d4bd35a7cff..d9e3d5c56bd9 100644
--- a/platform/util-rt/src/org/jetbrains/util/rt/FileUtilRt.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.util.rt;
+package com.intellij.openapi.util.io;
 
 import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
+import com.intellij.openapi.util.text.StringUtilRt;
+import com.intellij.openapi.util.SystemInfoRt;
 
 import java.io.*;
 import java.util.UUID;
diff --git a/platform/util-rt/src/org/jetbrains/util/rt/StringUtilRt.java b/platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java
similarity index 99%
rename from platform/util-rt/src/org/jetbrains/util/rt/StringUtilRt.java
rename to platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java
index 9698ac290056..9b98436709b8 100644
--- a/platform/util-rt/src/org/jetbrains/util/rt/StringUtilRt.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.util.rt;
+package com.intellij.openapi.util.text;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/platform/util/src/com/intellij/openapi/util/SystemInfo.java b/platform/util/src/com/intellij/openapi/util/SystemInfo.java
index 6e13a9f1cb71..4022b3210a61 100644
--- a/platform/util/src/com/intellij/openapi/util/SystemInfo.java
+++ b/platform/util/src/com/intellij/openapi/util/SystemInfo.java
@@ -17,7 +17,6 @@ package com.intellij.openapi.util;
 
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.util.rt.SystemInfoRt;
 
 import java.io.File;
 import java.util.List;
diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
index 393d1a6ae079..c21488878104 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
@@ -34,7 +34,6 @@ import org.intellij.lang.annotations.RegExp;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.util.rt.FileUtilRt;
 
 import java.io.*;
 import java.lang.reflect.Method;
diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index b2fd28e88334..c687682275dd 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -27,7 +27,6 @@ import com.intellij.util.text.LineReader;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.util.rt.StringUtilRt;
 
 import java.beans.Introspector;
 import java.io.ByteArrayInputStream;
diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java
index 430ea6f0b8ba..c262e41d4266 100644
--- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java
+++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java
@@ -22,7 +22,7 @@ import org.apache.xmlrpc.XmlRpcClientLite;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.git4idea.util.ScriptGenerator;
-import org.jetbrains.util.rt.FileUtilRt;
+import com.intellij.openapi.util.io.FileUtilRt;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java
index bc3737565480..ed9f9b3fdd62 100644
--- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java
+++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java
@@ -20,7 +20,7 @@ import com.trilead.ssh2.*;
 import com.trilead.ssh2.crypto.PEMDecoder;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.util.rt.FileUtilRt;
+import com.intellij.openapi.util.io.FileUtilRt;
 
 import java.io.*;
 import java.util.*;
diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java b/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java
index a2903ae32095..ffdb80c526cd 100644
--- a/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java
+++ b/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java
@@ -21,7 +21,7 @@ import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.util.rt.FileUtilRt;
+import com.intellij.openapi.util.io.FileUtilRt;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
index 7f5b8f685c76..d19ce28b6230 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
@@ -58,7 +58,7 @@ import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.idea.maven.utils.MavenLog;
 import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
 import org.jetbrains.idea.maven.utils.MavenUtil;
-import org.jetbrains.util.rt.SystemInfoRt;
+import com.intellij.openapi.util.SystemInfoRt;
 
 import java.io.File;
 import java.nio.charset.Charset;