util

diff --git a/util/src/com/intellij/CommonBundle.java b/platform/util/src/com/intellij/CommonBundle.java
similarity index 100%
rename from util/src/com/intellij/CommonBundle.java
rename to platform/util/src/com/intellij/CommonBundle.java

diff --git a/util/src/com/intellij/Patches.java b/platform/util/src/com/intellij/Patches.java
similarity index 100%
rename from util/src/com/intellij/Patches.java
rename to platform/util/src/com/intellij/Patches.java

diff --git a/util/src/com/intellij/openapi/Disposable.java b/platform/util/src/com/intellij/openapi/Disposable.java
similarity index 100%
rename from util/src/com/intellij/openapi/Disposable.java
rename to platform/util/src/com/intellij/openapi/Disposable.java

diff --git a/util/src/com/intellij/openapi/Forceable.java b/platform/util/src/com/intellij/openapi/Forceable.java
similarity index 100%
rename from util/src/com/intellij/openapi/Forceable.java
rename to platform/util/src/com/intellij/openapi/Forceable.java

diff --git a/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java
similarity index 100%
rename from util/src/com/intellij/openapi/application/PathManager.java
rename to platform/util/src/com/intellij/openapi/application/PathManager.java

diff --git a/util/src/com/intellij/openapi/application/RuntimeInterruptedException.java b/platform/util/src/com/intellij/openapi/application/RuntimeInterruptedException.java
similarity index 100%
rename from util/src/com/intellij/openapi/application/RuntimeInterruptedException.java
rename to platform/util/src/com/intellij/openapi/application/RuntimeInterruptedException.java

diff --git a/util/src/com/intellij/openapi/diagnostic/ApplicationInfoProvider.java b/platform/util/src/com/intellij/openapi/diagnostic/ApplicationInfoProvider.java
similarity index 100%
rename from util/src/com/intellij/openapi/diagnostic/ApplicationInfoProvider.java
rename to platform/util/src/com/intellij/openapi/diagnostic/ApplicationInfoProvider.java

diff --git a/util/src/com/intellij/openapi/diagnostic/DefaultLogger.java b/platform/util/src/com/intellij/openapi/diagnostic/DefaultLogger.java
similarity index 100%
rename from util/src/com/intellij/openapi/diagnostic/DefaultLogger.java
rename to platform/util/src/com/intellij/openapi/diagnostic/DefaultLogger.java

diff --git a/util/src/com/intellij/openapi/diagnostic/Logger.java b/platform/util/src/com/intellij/openapi/diagnostic/Logger.java
similarity index 100%
rename from util/src/com/intellij/openapi/diagnostic/Logger.java
rename to platform/util/src/com/intellij/openapi/diagnostic/Logger.java

diff --git a/util/src/com/intellij/openapi/util/ArrayTailCondition.java b/platform/util/src/com/intellij/openapi/util/ArrayTailCondition.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/ArrayTailCondition.java
rename to platform/util/src/com/intellij/openapi/util/ArrayTailCondition.java

diff --git a/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java
rename to platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java

diff --git a/util/src/com/intellij/openapi/util/Cloner.java b/platform/util/src/com/intellij/openapi/util/Cloner.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Cloner.java
rename to platform/util/src/com/intellij/openapi/util/Cloner.java

diff --git a/util/src/com/intellij/openapi/util/Comparing.java b/platform/util/src/com/intellij/openapi/util/Comparing.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Comparing.java
rename to platform/util/src/com/intellij/openapi/util/Comparing.java

diff --git a/util/src/com/intellij/openapi/util/Computable.java b/platform/util/src/com/intellij/openapi/util/Computable.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Computable.java
rename to platform/util/src/com/intellij/openapi/util/Computable.java

diff --git a/util/src/com/intellij/openapi/util/Condition.java b/platform/util/src/com/intellij/openapi/util/Condition.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Condition.java
rename to platform/util/src/com/intellij/openapi/util/Condition.java

diff --git a/util/src/com/intellij/openapi/util/Conditions.java b/platform/util/src/com/intellij/openapi/util/Conditions.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Conditions.java
rename to platform/util/src/com/intellij/openapi/util/Conditions.java

diff --git a/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java b/platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java
rename to platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java

diff --git a/util/src/com/intellij/openapi/util/DifferenceFilter.java b/platform/util/src/com/intellij/openapi/util/DifferenceFilter.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/DifferenceFilter.java
rename to platform/util/src/com/intellij/openapi/util/DifferenceFilter.java

diff --git a/util/src/com/intellij/openapi/util/Disposer.java b/platform/util/src/com/intellij/openapi/util/Disposer.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Disposer.java
rename to platform/util/src/com/intellij/openapi/util/Disposer.java

diff --git a/util/src/com/intellij/openapi/util/EmptyRunnable.java b/platform/util/src/com/intellij/openapi/util/EmptyRunnable.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/EmptyRunnable.java
rename to platform/util/src/com/intellij/openapi/util/EmptyRunnable.java

diff --git a/util/src/com/intellij/openapi/util/Factory.java b/platform/util/src/com/intellij/openapi/util/Factory.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Factory.java
rename to platform/util/src/com/intellij/openapi/util/Factory.java

diff --git a/util/src/com/intellij/openapi/util/FieldCache.java b/platform/util/src/com/intellij/openapi/util/FieldCache.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/FieldCache.java
rename to platform/util/src/com/intellij/openapi/util/FieldCache.java

diff --git a/util/src/com/intellij/openapi/util/Getter.java b/platform/util/src/com/intellij/openapi/util/Getter.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Getter.java
rename to platform/util/src/com/intellij/openapi/util/Getter.java

diff --git a/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/IconLoader.java
rename to platform/util/src/com/intellij/openapi/util/IconLoader.java

diff --git a/util/src/com/intellij/openapi/util/InvalidDataException.java b/platform/util/src/com/intellij/openapi/util/InvalidDataException.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/InvalidDataException.java
rename to platform/util/src/com/intellij/openapi/util/InvalidDataException.java

diff --git a/util/src/com/intellij/openapi/util/JDOMBuilder.java b/platform/util/src/com/intellij/openapi/util/JDOMBuilder.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/JDOMBuilder.java
rename to platform/util/src/com/intellij/openapi/util/JDOMBuilder.java

diff --git a/util/src/com/intellij/openapi/util/JDOMExternalizable.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizable.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/JDOMExternalizable.java
rename to platform/util/src/com/intellij/openapi/util/JDOMExternalizable.java

diff --git a/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java
rename to platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java

diff --git a/util/src/com/intellij/openapi/util/JDOMExternalizer.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizer.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/JDOMExternalizer.java
rename to platform/util/src/com/intellij/openapi/util/JDOMExternalizer.java

diff --git a/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
rename to platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java

diff --git a/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/JDOMUtil.java
rename to platform/util/src/com/intellij/openapi/util/JDOMUtil.java

diff --git a/util/src/com/intellij/openapi/util/Key.java b/platform/util/src/com/intellij/openapi/util/Key.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Key.java
rename to platform/util/src/com/intellij/openapi/util/Key.java

diff --git a/util/src/com/intellij/openapi/util/KeyWithDefaultValue.java b/platform/util/src/com/intellij/openapi/util/KeyWithDefaultValue.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/KeyWithDefaultValue.java
rename to platform/util/src/com/intellij/openapi/util/KeyWithDefaultValue.java

diff --git a/util/src/com/intellij/openapi/util/LazyInitializer.java b/platform/util/src/com/intellij/openapi/util/LazyInitializer.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/LazyInitializer.java
rename to platform/util/src/com/intellij/openapi/util/LazyInitializer.java

diff --git a/util/src/com/intellij/openapi/util/LazyInstance.java b/platform/util/src/com/intellij/openapi/util/LazyInstance.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/LazyInstance.java
rename to platform/util/src/com/intellij/openapi/util/LazyInstance.java

diff --git a/util/src/com/intellij/openapi/util/MultiValuesMap.java b/platform/util/src/com/intellij/openapi/util/MultiValuesMap.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/MultiValuesMap.java
rename to platform/util/src/com/intellij/openapi/util/MultiValuesMap.java

diff --git a/util/src/com/intellij/openapi/util/MutualMap.java b/platform/util/src/com/intellij/openapi/util/MutualMap.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/MutualMap.java
rename to platform/util/src/com/intellij/openapi/util/MutualMap.java

diff --git a/util/src/com/intellij/openapi/util/NamedJDOMExternalizable.java b/platform/util/src/com/intellij/openapi/util/NamedJDOMExternalizable.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NamedJDOMExternalizable.java
rename to platform/util/src/com/intellij/openapi/util/NamedJDOMExternalizable.java

diff --git a/util/src/com/intellij/openapi/util/NotNullFactory.java b/platform/util/src/com/intellij/openapi/util/NotNullFactory.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NotNullFactory.java
rename to platform/util/src/com/intellij/openapi/util/NotNullFactory.java

diff --git a/util/src/com/intellij/openapi/util/NotNullLazyKey.java b/platform/util/src/com/intellij/openapi/util/NotNullLazyKey.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NotNullLazyKey.java
rename to platform/util/src/com/intellij/openapi/util/NotNullLazyKey.java

diff --git a/util/src/com/intellij/openapi/util/NotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NotNullLazyValue.java
rename to platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java

diff --git a/util/src/com/intellij/openapi/util/NullableComputable.java b/platform/util/src/com/intellij/openapi/util/NullableComputable.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NullableComputable.java
rename to platform/util/src/com/intellij/openapi/util/NullableComputable.java

diff --git a/util/src/com/intellij/openapi/util/NullableFactory.java b/platform/util/src/com/intellij/openapi/util/NullableFactory.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NullableFactory.java
rename to platform/util/src/com/intellij/openapi/util/NullableFactory.java

diff --git a/util/src/com/intellij/openapi/util/NullableLazyKey.java b/platform/util/src/com/intellij/openapi/util/NullableLazyKey.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NullableLazyKey.java
rename to platform/util/src/com/intellij/openapi/util/NullableLazyKey.java

diff --git a/util/src/com/intellij/openapi/util/NullableLazyValue.java b/platform/util/src/com/intellij/openapi/util/NullableLazyValue.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/NullableLazyValue.java
rename to platform/util/src/com/intellij/openapi/util/NullableLazyValue.java

diff --git a/util/src/com/intellij/openapi/util/Pair.java b/platform/util/src/com/intellij/openapi/util/Pair.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Pair.java
rename to platform/util/src/com/intellij/openapi/util/Pair.java

diff --git a/util/src/com/intellij/openapi/util/Pass.java b/platform/util/src/com/intellij/openapi/util/Pass.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Pass.java
rename to platform/util/src/com/intellij/openapi/util/Pass.java

diff --git a/util/src/com/intellij/openapi/util/ProperTextRange.java b/platform/util/src/com/intellij/openapi/util/ProperTextRange.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/ProperTextRange.java
rename to platform/util/src/com/intellij/openapi/util/ProperTextRange.java

diff --git a/util/src/com/intellij/openapi/util/Ref.java b/platform/util/src/com/intellij/openapi/util/Ref.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Ref.java
rename to platform/util/src/com/intellij/openapi/util/Ref.java

diff --git a/util/src/com/intellij/openapi/util/RoamingTypeDisabled.java b/platform/util/src/com/intellij/openapi/util/RoamingTypeDisabled.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/RoamingTypeDisabled.java
rename to platform/util/src/com/intellij/openapi/util/RoamingTypeDisabled.java

diff --git a/util/src/com/intellij/openapi/util/RoamingTypePerPlatform.java b/platform/util/src/com/intellij/openapi/util/RoamingTypePerPlatform.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/RoamingTypePerPlatform.java
rename to platform/util/src/com/intellij/openapi/util/RoamingTypePerPlatform.java

diff --git a/util/src/com/intellij/openapi/util/ShutDownTracker.java b/platform/util/src/com/intellij/openapi/util/ShutDownTracker.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/ShutDownTracker.java
rename to platform/util/src/com/intellij/openapi/util/ShutDownTracker.java

diff --git a/util/src/com/intellij/openapi/util/SimpleFieldCache.java b/platform/util/src/com/intellij/openapi/util/SimpleFieldCache.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/SimpleFieldCache.java
rename to platform/util/src/com/intellij/openapi/util/SimpleFieldCache.java

diff --git a/util/src/com/intellij/openapi/util/SystemInfo.java b/platform/util/src/com/intellij/openapi/util/SystemInfo.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/SystemInfo.java
rename to platform/util/src/com/intellij/openapi/util/SystemInfo.java

diff --git a/util/src/com/intellij/openapi/util/TextRange.java b/platform/util/src/com/intellij/openapi/util/TextRange.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/TextRange.java
rename to platform/util/src/com/intellij/openapi/util/TextRange.java

diff --git a/util/src/com/intellij/openapi/util/ThrowableComputable.java b/platform/util/src/com/intellij/openapi/util/ThrowableComputable.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/ThrowableComputable.java
rename to platform/util/src/com/intellij/openapi/util/ThrowableComputable.java

diff --git a/util/src/com/intellij/openapi/util/Transform.java b/platform/util/src/com/intellij/openapi/util/Transform.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Transform.java
rename to platform/util/src/com/intellij/openapi/util/Transform.java

diff --git a/util/src/com/intellij/openapi/util/Trinity.java b/platform/util/src/com/intellij/openapi/util/Trinity.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/Trinity.java
rename to platform/util/src/com/intellij/openapi/util/Trinity.java

diff --git a/util/src/com/intellij/openapi/util/UserDataCache.java b/platform/util/src/com/intellij/openapi/util/UserDataCache.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/UserDataCache.java
rename to platform/util/src/com/intellij/openapi/util/UserDataCache.java

diff --git a/util/src/com/intellij/openapi/util/UserDataHolder.java b/platform/util/src/com/intellij/openapi/util/UserDataHolder.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/UserDataHolder.java
rename to platform/util/src/com/intellij/openapi/util/UserDataHolder.java

diff --git a/util/src/com/intellij/openapi/util/UserDataHolderBase.java b/platform/util/src/com/intellij/openapi/util/UserDataHolderBase.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/UserDataHolderBase.java
rename to platform/util/src/com/intellij/openapi/util/UserDataHolderBase.java

diff --git a/util/src/com/intellij/openapi/util/UserDataHolderEx.java b/platform/util/src/com/intellij/openapi/util/UserDataHolderEx.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/UserDataHolderEx.java
rename to platform/util/src/com/intellij/openapi/util/UserDataHolderEx.java

diff --git a/util/src/com/intellij/openapi/util/WriteExternalException.java b/platform/util/src/com/intellij/openapi/util/WriteExternalException.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/WriteExternalException.java
rename to platform/util/src/com/intellij/openapi/util/WriteExternalException.java

diff --git a/util/src/com/intellij/openapi/util/io/FileTooBigException.java b/platform/util/src/com/intellij/openapi/util/io/FileTooBigException.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/io/FileTooBigException.java
rename to platform/util/src/com/intellij/openapi/util/io/FileTooBigException.java

diff --git a/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/io/FileUtil.java
rename to platform/util/src/com/intellij/openapi/util/io/FileUtil.java

diff --git a/util/src/com/intellij/openapi/util/io/StreamUtil.java b/platform/util/src/com/intellij/openapi/util/io/StreamUtil.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/io/StreamUtil.java
rename to platform/util/src/com/intellij/openapi/util/io/StreamUtil.java

diff --git a/util/src/com/intellij/openapi/util/io/package.html b/platform/util/src/com/intellij/openapi/util/io/package.html
similarity index 100%
rename from util/src/com/intellij/openapi/util/io/package.html
rename to platform/util/src/com/intellij/openapi/util/io/package.html

diff --git a/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
rename to platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java

diff --git a/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/objectTree/ObjectTree.java
rename to platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java

diff --git a/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java
rename to platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java

diff --git a/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java
rename to platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java

diff --git a/util/src/com/intellij/openapi/util/text/CharFilter.java b/platform/util/src/com/intellij/openapi/util/text/CharFilter.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/text/CharFilter.java
rename to platform/util/src/com/intellij/openapi/util/text/CharFilter.java

diff --git a/util/src/com/intellij/openapi/util/text/CharSequenceWithStringHash.java b/platform/util/src/com/intellij/openapi/util/text/CharSequenceWithStringHash.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/text/CharSequenceWithStringHash.java
rename to platform/util/src/com/intellij/openapi/util/text/CharSequenceWithStringHash.java

diff --git a/util/src/com/intellij/openapi/util/text/LineTokenizer.java b/platform/util/src/com/intellij/openapi/util/text/LineTokenizer.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/text/LineTokenizer.java
rename to platform/util/src/com/intellij/openapi/util/text/LineTokenizer.java

diff --git a/util/src/com/intellij/openapi/util/text/StringHash.java b/platform/util/src/com/intellij/openapi/util/text/StringHash.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/text/StringHash.java
rename to platform/util/src/com/intellij/openapi/util/text/StringHash.java

diff --git a/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
similarity index 100%
rename from util/src/com/intellij/openapi/util/text/StringUtil.java
rename to platform/util/src/com/intellij/openapi/util/text/StringUtil.java

diff --git a/util/src/com/intellij/openapi/util/text/package.html b/platform/util/src/com/intellij/openapi/util/text/package.html
similarity index 100%
rename from util/src/com/intellij/openapi/util/text/package.html
rename to platform/util/src/com/intellij/openapi/util/text/package.html

diff --git a/util/src/com/intellij/psi/codeStyle/NameUtil.java b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java
similarity index 100%
rename from util/src/com/intellij/psi/codeStyle/NameUtil.java
rename to platform/util/src/com/intellij/psi/codeStyle/NameUtil.java

diff --git a/util/src/com/intellij/reference/SoftReference.java b/platform/util/src/com/intellij/reference/SoftReference.java
similarity index 100%
rename from util/src/com/intellij/reference/SoftReference.java
rename to platform/util/src/com/intellij/reference/SoftReference.java

diff --git a/util/src/com/intellij/reference/package.html b/platform/util/src/com/intellij/reference/package.html
similarity index 100%
rename from util/src/com/intellij/reference/package.html
rename to platform/util/src/com/intellij/reference/package.html

diff --git a/util/src/com/intellij/ui/ActiveComponent.java b/platform/util/src/com/intellij/ui/ActiveComponent.java
similarity index 100%
rename from util/src/com/intellij/ui/ActiveComponent.java
rename to platform/util/src/com/intellij/ui/ActiveComponent.java

diff --git a/util/src/com/intellij/ui/CaptionPanel.java b/platform/util/src/com/intellij/ui/CaptionPanel.java
similarity index 100%
rename from util/src/com/intellij/ui/CaptionPanel.java
rename to platform/util/src/com/intellij/ui/CaptionPanel.java

diff --git a/util/src/com/intellij/ui/CollapsiblePanel.java b/platform/util/src/com/intellij/ui/CollapsiblePanel.java
similarity index 100%
rename from util/src/com/intellij/ui/CollapsiblePanel.java
rename to platform/util/src/com/intellij/ui/CollapsiblePanel.java

diff --git a/util/src/com/intellij/ui/CollapsingListener.java b/platform/util/src/com/intellij/ui/CollapsingListener.java
similarity index 100%
rename from util/src/com/intellij/ui/CollapsingListener.java
rename to platform/util/src/com/intellij/ui/CollapsingListener.java

diff --git a/util/src/com/intellij/ui/LightColors.java b/platform/util/src/com/intellij/ui/LightColors.java
similarity index 100%
rename from util/src/com/intellij/ui/LightColors.java
rename to platform/util/src/com/intellij/ui/LightColors.java

diff --git a/util/src/com/intellij/ui/PopupBorder.java b/platform/util/src/com/intellij/ui/PopupBorder.java
similarity index 100%
rename from util/src/com/intellij/ui/PopupBorder.java
rename to platform/util/src/com/intellij/ui/PopupBorder.java

diff --git a/util/src/com/intellij/ui/SideBorder.java b/platform/util/src/com/intellij/ui/SideBorder.java
similarity index 100%
rename from util/src/com/intellij/ui/SideBorder.java
rename to platform/util/src/com/intellij/ui/SideBorder.java

diff --git a/util/src/com/intellij/ui/SmartExpander.java b/platform/util/src/com/intellij/ui/SmartExpander.java
similarity index 100%
rename from util/src/com/intellij/ui/SmartExpander.java
rename to platform/util/src/com/intellij/ui/SmartExpander.java

diff --git a/util/src/com/intellij/ui/TableUtil.java b/platform/util/src/com/intellij/ui/TableUtil.java
similarity index 100%
rename from util/src/com/intellij/ui/TableUtil.java
rename to platform/util/src/com/intellij/ui/TableUtil.java

diff --git a/util/src/com/intellij/ui/TitlePanel.java b/platform/util/src/com/intellij/ui/TitlePanel.java
similarity index 100%
rename from util/src/com/intellij/ui/TitlePanel.java
rename to platform/util/src/com/intellij/ui/TitlePanel.java

diff --git a/util/src/com/intellij/ui/UIBundle.java b/platform/util/src/com/intellij/ui/UIBundle.java
similarity index 100%
rename from util/src/com/intellij/ui/UIBundle.java
rename to platform/util/src/com/intellij/ui/UIBundle.java

diff --git a/util/src/com/intellij/ui/awt/RelativePoint.java b/platform/util/src/com/intellij/ui/awt/RelativePoint.java
similarity index 100%
rename from util/src/com/intellij/ui/awt/RelativePoint.java
rename to platform/util/src/com/intellij/ui/awt/RelativePoint.java

diff --git a/util/src/com/intellij/ui/awt/RelativeRectangle.java b/platform/util/src/com/intellij/ui/awt/RelativeRectangle.java
similarity index 100%
rename from util/src/com/intellij/ui/awt/RelativeRectangle.java
rename to platform/util/src/com/intellij/ui/awt/RelativeRectangle.java

diff --git a/util/src/com/intellij/util/AbstractExecutorsQuery.java b/platform/util/src/com/intellij/util/AbstractExecutorsQuery.java
similarity index 100%
rename from util/src/com/intellij/util/AbstractExecutorsQuery.java
rename to platform/util/src/com/intellij/util/AbstractExecutorsQuery.java

diff --git a/util/src/com/intellij/util/AdapterProcessor.java b/platform/util/src/com/intellij/util/AdapterProcessor.java
similarity index 100%
rename from util/src/com/intellij/util/AdapterProcessor.java
rename to platform/util/src/com/intellij/util/AdapterProcessor.java

diff --git a/util/src/com/intellij/util/ArrayConsumer.java b/platform/util/src/com/intellij/util/ArrayConsumer.java
similarity index 100%
rename from util/src/com/intellij/util/ArrayConsumer.java
rename to platform/util/src/com/intellij/util/ArrayConsumer.java

diff --git a/util/src/com/intellij/util/ArrayFactory.java b/platform/util/src/com/intellij/util/ArrayFactory.java
similarity index 100%
rename from util/src/com/intellij/util/ArrayFactory.java
rename to platform/util/src/com/intellij/util/ArrayFactory.java

diff --git a/util/src/com/intellij/util/ArrayQuery.java b/platform/util/src/com/intellij/util/ArrayQuery.java
similarity index 100%
rename from util/src/com/intellij/util/ArrayQuery.java
rename to platform/util/src/com/intellij/util/ArrayQuery.java

diff --git a/util/src/com/intellij/util/ArrayUtil.java b/platform/util/src/com/intellij/util/ArrayUtil.java
similarity index 100%
rename from util/src/com/intellij/util/ArrayUtil.java
rename to platform/util/src/com/intellij/util/ArrayUtil.java

diff --git a/util/src/com/intellij/util/BooleanValueHolder.java b/platform/util/src/com/intellij/util/BooleanValueHolder.java
similarity index 100%
rename from util/src/com/intellij/util/BooleanValueHolder.java
rename to platform/util/src/com/intellij/util/BooleanValueHolder.java

diff --git a/util/src/com/intellij/util/Chunk.java b/platform/util/src/com/intellij/util/Chunk.java
similarity index 100%
rename from util/src/com/intellij/util/Chunk.java
rename to platform/util/src/com/intellij/util/Chunk.java

diff --git a/util/src/com/intellij/util/CodeWriter.java b/platform/util/src/com/intellij/util/CodeWriter.java
similarity index 100%
rename from util/src/com/intellij/util/CodeWriter.java
rename to platform/util/src/com/intellij/util/CodeWriter.java

diff --git a/util/src/com/intellij/util/CollectConsumer.java b/platform/util/src/com/intellij/util/CollectConsumer.java
similarity index 100%
rename from util/src/com/intellij/util/CollectConsumer.java
rename to platform/util/src/com/intellij/util/CollectConsumer.java

diff --git a/util/src/com/intellij/util/CollectionQuery.java b/platform/util/src/com/intellij/util/CollectionQuery.java
similarity index 100%
rename from util/src/com/intellij/util/CollectionQuery.java
rename to platform/util/src/com/intellij/util/CollectionQuery.java

diff --git a/util/src/com/intellij/util/CommonProcessors.java b/platform/util/src/com/intellij/util/CommonProcessors.java
similarity index 100%
rename from util/src/com/intellij/util/CommonProcessors.java
rename to platform/util/src/com/intellij/util/CommonProcessors.java

diff --git a/util/src/com/intellij/util/ConcurrencyUtil.java b/platform/util/src/com/intellij/util/ConcurrencyUtil.java
similarity index 100%
rename from util/src/com/intellij/util/ConcurrencyUtil.java
rename to platform/util/src/com/intellij/util/ConcurrencyUtil.java

diff --git a/util/src/com/intellij/util/Consumer.java b/platform/util/src/com/intellij/util/Consumer.java
similarity index 100%
rename from util/src/com/intellij/util/Consumer.java
rename to platform/util/src/com/intellij/util/Consumer.java

diff --git a/util/src/com/intellij/util/DOMWriter.java b/platform/util/src/com/intellij/util/DOMWriter.java
similarity index 100%
rename from util/src/com/intellij/util/DOMWriter.java
rename to platform/util/src/com/intellij/util/DOMWriter.java

diff --git a/util/src/com/intellij/util/EmptyQuery.java b/platform/util/src/com/intellij/util/EmptyQuery.java
similarity index 100%
rename from util/src/com/intellij/util/EmptyQuery.java
rename to platform/util/src/com/intellij/util/EmptyQuery.java

diff --git a/util/src/com/intellij/util/EnvironmentUtil.java b/platform/util/src/com/intellij/util/EnvironmentUtil.java
similarity index 100%
rename from util/src/com/intellij/util/EnvironmentUtil.java
rename to platform/util/src/com/intellij/util/EnvironmentUtil.java

diff --git a/util/src/com/intellij/util/EventDispatcher.java b/platform/util/src/com/intellij/util/EventDispatcher.java
similarity index 100%
rename from util/src/com/intellij/util/EventDispatcher.java
rename to platform/util/src/com/intellij/util/EventDispatcher.java

diff --git a/util/src/com/intellij/util/EventUtil.java b/platform/util/src/com/intellij/util/EventUtil.java
similarity index 100%
rename from util/src/com/intellij/util/EventUtil.java
rename to platform/util/src/com/intellij/util/EventUtil.java

diff --git a/util/src/com/intellij/util/ExecutorsQuery.java b/platform/util/src/com/intellij/util/ExecutorsQuery.java
similarity index 100%
rename from util/src/com/intellij/util/ExecutorsQuery.java
rename to platform/util/src/com/intellij/util/ExecutorsQuery.java

diff --git a/util/src/com/intellij/util/FilteredQuery.java b/platform/util/src/com/intellij/util/FilteredQuery.java
similarity index 100%
rename from util/src/com/intellij/util/FilteredQuery.java
rename to platform/util/src/com/intellij/util/FilteredQuery.java

diff --git a/util/src/com/intellij/util/FilteringProcessor.java b/platform/util/src/com/intellij/util/FilteringProcessor.java
similarity index 100%
rename from util/src/com/intellij/util/FilteringProcessor.java
rename to platform/util/src/com/intellij/util/FilteringProcessor.java

diff --git a/util/src/com/intellij/util/Function.java b/platform/util/src/com/intellij/util/Function.java
similarity index 100%
rename from util/src/com/intellij/util/Function.java
rename to platform/util/src/com/intellij/util/Function.java

diff --git a/util/src/com/intellij/util/Generator.java b/platform/util/src/com/intellij/util/Generator.java
similarity index 100%
rename from util/src/com/intellij/util/Generator.java
rename to platform/util/src/com/intellij/util/Generator.java

diff --git a/util/src/com/intellij/util/ImageLoader.java b/platform/util/src/com/intellij/util/ImageLoader.java
similarity index 100%
rename from util/src/com/intellij/util/ImageLoader.java
rename to platform/util/src/com/intellij/util/ImageLoader.java

diff --git a/util/src/com/intellij/util/IncorrectOperationException.java b/platform/util/src/com/intellij/util/IncorrectOperationException.java
similarity index 100%
rename from util/src/com/intellij/util/IncorrectOperationException.java
rename to platform/util/src/com/intellij/util/IncorrectOperationException.java

diff --git a/util/src/com/intellij/util/InstanceofQuery.java b/platform/util/src/com/intellij/util/InstanceofQuery.java
similarity index 100%
rename from util/src/com/intellij/util/InstanceofQuery.java
rename to platform/util/src/com/intellij/util/InstanceofQuery.java

diff --git a/util/src/com/intellij/util/LazyQuery.java b/platform/util/src/com/intellij/util/LazyQuery.java
similarity index 100%
rename from util/src/com/intellij/util/LazyQuery.java
rename to platform/util/src/com/intellij/util/LazyQuery.java

diff --git a/util/src/com/intellij/util/ListWithSelection.java b/platform/util/src/com/intellij/util/ListWithSelection.java
similarity index 100%
rename from util/src/com/intellij/util/ListWithSelection.java
rename to platform/util/src/com/intellij/util/ListWithSelection.java

diff --git a/util/src/com/intellij/util/LocalTimeCounter.java b/platform/util/src/com/intellij/util/LocalTimeCounter.java
similarity index 100%
rename from util/src/com/intellij/util/LocalTimeCounter.java
rename to platform/util/src/com/intellij/util/LocalTimeCounter.java

diff --git a/util/src/com/intellij/util/MergeQuery.java b/platform/util/src/com/intellij/util/MergeQuery.java
similarity index 100%
rename from util/src/com/intellij/util/MergeQuery.java
rename to platform/util/src/com/intellij/util/MergeQuery.java

diff --git a/util/src/com/intellij/util/NewInstanceFactory.java b/platform/util/src/com/intellij/util/NewInstanceFactory.java
similarity index 100%
rename from util/src/com/intellij/util/NewInstanceFactory.java
rename to platform/util/src/com/intellij/util/NewInstanceFactory.java

diff --git a/util/src/com/intellij/util/NotNullFunction.java b/platform/util/src/com/intellij/util/NotNullFunction.java
similarity index 100%
rename from util/src/com/intellij/util/NotNullFunction.java
rename to platform/util/src/com/intellij/util/NotNullFunction.java

diff --git a/util/src/com/intellij/util/NullableFunction.java b/platform/util/src/com/intellij/util/NullableFunction.java
similarity index 100%
rename from util/src/com/intellij/util/NullableFunction.java
rename to platform/util/src/com/intellij/util/NullableFunction.java

diff --git a/util/src/com/intellij/util/ObjectUtils.java b/platform/util/src/com/intellij/util/ObjectUtils.java
similarity index 100%
rename from util/src/com/intellij/util/ObjectUtils.java
rename to platform/util/src/com/intellij/util/ObjectUtils.java

diff --git a/util/src/com/intellij/util/PairConsumer.java b/platform/util/src/com/intellij/util/PairConsumer.java
similarity index 100%
rename from util/src/com/intellij/util/PairConsumer.java
rename to platform/util/src/com/intellij/util/PairConsumer.java

diff --git a/util/src/com/intellij/util/PairFunction.java b/platform/util/src/com/intellij/util/PairFunction.java
similarity index 100%
rename from util/src/com/intellij/util/PairFunction.java
rename to platform/util/src/com/intellij/util/PairFunction.java

diff --git a/util/src/com/intellij/util/PairProcessor.java b/platform/util/src/com/intellij/util/PairProcessor.java
similarity index 100%
rename from util/src/com/intellij/util/PairProcessor.java
rename to platform/util/src/com/intellij/util/PairProcessor.java

diff --git a/util/src/com/intellij/util/PatternUtil.java b/platform/util/src/com/intellij/util/PatternUtil.java
similarity index 100%
rename from util/src/com/intellij/util/PatternUtil.java
rename to platform/util/src/com/intellij/util/PatternUtil.java

diff --git a/util/src/com/intellij/util/ProcessingContext.java b/platform/util/src/com/intellij/util/ProcessingContext.java
similarity index 100%
rename from util/src/com/intellij/util/ProcessingContext.java
rename to platform/util/src/com/intellij/util/ProcessingContext.java

diff --git a/util/src/com/intellij/util/Processor.java b/platform/util/src/com/intellij/util/Processor.java
similarity index 100%
rename from util/src/com/intellij/util/Processor.java
rename to platform/util/src/com/intellij/util/Processor.java

diff --git a/util/src/com/intellij/util/Query.java b/platform/util/src/com/intellij/util/Query.java
similarity index 100%
rename from util/src/com/intellij/util/Query.java
rename to platform/util/src/com/intellij/util/Query.java

diff --git a/util/src/com/intellij/util/QueryExecutor.java b/platform/util/src/com/intellij/util/QueryExecutor.java
similarity index 100%
rename from util/src/com/intellij/util/QueryExecutor.java
rename to platform/util/src/com/intellij/util/QueryExecutor.java

diff --git a/util/src/com/intellij/util/QueryFactory.java b/platform/util/src/com/intellij/util/QueryFactory.java
similarity index 100%
rename from util/src/com/intellij/util/QueryFactory.java
rename to platform/util/src/com/intellij/util/QueryFactory.java

diff --git a/util/src/com/intellij/util/Range.java b/platform/util/src/com/intellij/util/Range.java
similarity index 100%
rename from util/src/com/intellij/util/Range.java
rename to platform/util/src/com/intellij/util/Range.java

diff --git a/util/src/com/intellij/util/ReflectionAssignabilityCache.java b/platform/util/src/com/intellij/util/ReflectionAssignabilityCache.java
similarity index 100%
rename from util/src/com/intellij/util/ReflectionAssignabilityCache.java
rename to platform/util/src/com/intellij/util/ReflectionAssignabilityCache.java

diff --git a/util/src/com/intellij/util/ReflectionCache.java b/platform/util/src/com/intellij/util/ReflectionCache.java
similarity index 100%
rename from util/src/com/intellij/util/ReflectionCache.java
rename to platform/util/src/com/intellij/util/ReflectionCache.java

diff --git a/util/src/com/intellij/util/ReflectionUtil.java b/platform/util/src/com/intellij/util/ReflectionUtil.java
similarity index 100%
rename from util/src/com/intellij/util/ReflectionUtil.java
rename to platform/util/src/com/intellij/util/ReflectionUtil.java

diff --git a/util/src/com/intellij/util/ResourceUtil.java b/platform/util/src/com/intellij/util/ResourceUtil.java
similarity index 100%
rename from util/src/com/intellij/util/ResourceUtil.java
rename to platform/util/src/com/intellij/util/ResourceUtil.java

diff --git a/util/src/com/intellij/util/SharedProcessingContext.java b/platform/util/src/com/intellij/util/SharedProcessingContext.java
similarity index 100%
rename from util/src/com/intellij/util/SharedProcessingContext.java
rename to platform/util/src/com/intellij/util/SharedProcessingContext.java

diff --git a/util/src/com/intellij/util/SmartList.java b/platform/util/src/com/intellij/util/SmartList.java
similarity index 100%
rename from util/src/com/intellij/util/SmartList.java
rename to platform/util/src/com/intellij/util/SmartList.java

diff --git a/util/src/com/intellij/util/SpinAllocator.java b/platform/util/src/com/intellij/util/SpinAllocator.java
similarity index 100%
rename from util/src/com/intellij/util/SpinAllocator.java
rename to platform/util/src/com/intellij/util/SpinAllocator.java

diff --git a/util/src/com/intellij/util/StringBuilderSpinAllocator.java b/platform/util/src/com/intellij/util/StringBuilderSpinAllocator.java
similarity index 100%
rename from util/src/com/intellij/util/StringBuilderSpinAllocator.java
rename to platform/util/src/com/intellij/util/StringBuilderSpinAllocator.java

diff --git a/util/src/com/intellij/util/StringListSpinAllocator.java b/platform/util/src/com/intellij/util/StringListSpinAllocator.java
similarity index 100%
rename from util/src/com/intellij/util/StringListSpinAllocator.java
rename to platform/util/src/com/intellij/util/StringListSpinAllocator.java

diff --git a/util/src/com/intellij/util/StringSetSpinAllocator.java b/platform/util/src/com/intellij/util/StringSetSpinAllocator.java
similarity index 100%
rename from util/src/com/intellij/util/StringSetSpinAllocator.java
rename to platform/util/src/com/intellij/util/StringSetSpinAllocator.java

diff --git a/util/src/com/intellij/util/SystemProperties.java b/platform/util/src/com/intellij/util/SystemProperties.java
similarity index 100%
rename from util/src/com/intellij/util/SystemProperties.java
rename to platform/util/src/com/intellij/util/SystemProperties.java

diff --git a/util/src/com/intellij/util/ThreeState.java b/platform/util/src/com/intellij/util/ThreeState.java
similarity index 100%
rename from util/src/com/intellij/util/ThreeState.java
rename to platform/util/src/com/intellij/util/ThreeState.java

diff --git a/util/src/com/intellij/util/ThrowableConsumer.java b/platform/util/src/com/intellij/util/ThrowableConsumer.java
similarity index 100%
rename from util/src/com/intellij/util/ThrowableConsumer.java
rename to platform/util/src/com/intellij/util/ThrowableConsumer.java

diff --git a/util/src/com/intellij/util/ThrowableConvertor.java b/platform/util/src/com/intellij/util/ThrowableConvertor.java
similarity index 100%
rename from util/src/com/intellij/util/ThrowableConvertor.java
rename to platform/util/src/com/intellij/util/ThrowableConvertor.java

diff --git a/util/src/com/intellij/util/ThrowableRunnable.java b/platform/util/src/com/intellij/util/ThrowableRunnable.java
similarity index 100%
rename from util/src/com/intellij/util/ThrowableRunnable.java
rename to platform/util/src/com/intellij/util/ThrowableRunnable.java

diff --git a/util/src/com/intellij/util/Timed.java b/platform/util/src/com/intellij/util/Timed.java
similarity index 100%
rename from util/src/com/intellij/util/Timed.java
rename to platform/util/src/com/intellij/util/Timed.java

diff --git a/util/src/com/intellij/util/TimedComputable.java b/platform/util/src/com/intellij/util/TimedComputable.java
similarity index 100%
rename from util/src/com/intellij/util/TimedComputable.java
rename to platform/util/src/com/intellij/util/TimedComputable.java

diff --git a/util/src/com/intellij/util/TimedReference.java b/platform/util/src/com/intellij/util/TimedReference.java
similarity index 100%
rename from util/src/com/intellij/util/TimedReference.java
rename to platform/util/src/com/intellij/util/TimedReference.java

diff --git a/util/src/com/intellij/util/TreeItem.java b/platform/util/src/com/intellij/util/TreeItem.java
similarity index 100%
rename from util/src/com/intellij/util/TreeItem.java
rename to platform/util/src/com/intellij/util/TreeItem.java

diff --git a/util/src/com/intellij/util/UniqueFileNamesProvider.java b/platform/util/src/com/intellij/util/UniqueFileNamesProvider.java
similarity index 100%
rename from util/src/com/intellij/util/UniqueFileNamesProvider.java
rename to platform/util/src/com/intellij/util/UniqueFileNamesProvider.java

diff --git a/util/src/com/intellij/util/UniqueResultsQuery.java b/platform/util/src/com/intellij/util/UniqueResultsQuery.java
similarity index 100%
rename from util/src/com/intellij/util/UniqueResultsQuery.java
rename to platform/util/src/com/intellij/util/UniqueResultsQuery.java

diff --git a/util/src/com/intellij/util/UnmodifiableIterator.java b/platform/util/src/com/intellij/util/UnmodifiableIterator.java
similarity index 100%
rename from util/src/com/intellij/util/UnmodifiableIterator.java
rename to platform/util/src/com/intellij/util/UnmodifiableIterator.java

diff --git a/util/src/com/intellij/util/Validateable.java b/platform/util/src/com/intellij/util/Validateable.java
similarity index 100%
rename from util/src/com/intellij/util/Validateable.java
rename to platform/util/src/com/intellij/util/Validateable.java

diff --git a/util/src/com/intellij/util/ValidateableReference.java b/platform/util/src/com/intellij/util/ValidateableReference.java
similarity index 100%
rename from util/src/com/intellij/util/ValidateableReference.java
rename to platform/util/src/com/intellij/util/ValidateableReference.java

diff --git a/util/src/com/intellij/util/ValueHolder.java b/platform/util/src/com/intellij/util/ValueHolder.java
similarity index 100%
rename from util/src/com/intellij/util/ValueHolder.java
rename to platform/util/src/com/intellij/util/ValueHolder.java

diff --git a/util/src/com/intellij/util/WaitFor.java b/platform/util/src/com/intellij/util/WaitFor.java
similarity index 100%
rename from util/src/com/intellij/util/WaitFor.java
rename to platform/util/src/com/intellij/util/WaitFor.java

diff --git a/util/src/com/intellij/util/WeakListener.java b/platform/util/src/com/intellij/util/WeakListener.java
similarity index 100%
rename from util/src/com/intellij/util/WeakListener.java
rename to platform/util/src/com/intellij/util/WeakListener.java

diff --git a/util/src/com/intellij/util/WeakPropertyChangeAdapter.java b/platform/util/src/com/intellij/util/WeakPropertyChangeAdapter.java
similarity index 100%
rename from util/src/com/intellij/util/WeakPropertyChangeAdapter.java
rename to platform/util/src/com/intellij/util/WeakPropertyChangeAdapter.java

diff --git a/util/src/com/intellij/util/cls/BytePointer.java b/platform/util/src/com/intellij/util/cls/BytePointer.java
similarity index 100%
rename from util/src/com/intellij/util/cls/BytePointer.java
rename to platform/util/src/com/intellij/util/cls/BytePointer.java

diff --git a/util/src/com/intellij/util/cls/ClsFormatException.java b/platform/util/src/com/intellij/util/cls/ClsFormatException.java
similarity index 100%
rename from util/src/com/intellij/util/cls/ClsFormatException.java
rename to platform/util/src/com/intellij/util/cls/ClsFormatException.java

diff --git a/util/src/com/intellij/util/cls/ClsUtil.java b/platform/util/src/com/intellij/util/cls/ClsUtil.java
similarity index 100%
rename from util/src/com/intellij/util/cls/ClsUtil.java
rename to platform/util/src/com/intellij/util/cls/ClsUtil.java

diff --git a/util/src/com/intellij/util/cls/package.html b/platform/util/src/com/intellij/util/cls/package.html
similarity index 100%
rename from util/src/com/intellij/util/cls/package.html
rename to platform/util/src/com/intellij/util/cls/package.html

diff --git a/util/src/com/intellij/util/concurrency/DefaultLockAdapter.java b/platform/util/src/com/intellij/util/concurrency/DefaultLockAdapter.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/DefaultLockAdapter.java
rename to platform/util/src/com/intellij/util/concurrency/DefaultLockAdapter.java

diff --git a/util/src/com/intellij/util/concurrency/DefaultReentrantReadWriteLockAdapter.java b/platform/util/src/com/intellij/util/concurrency/DefaultReentrantReadWriteLockAdapter.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/DefaultReentrantReadWriteLockAdapter.java
rename to platform/util/src/com/intellij/util/concurrency/DefaultReentrantReadWriteLockAdapter.java

diff --git a/util/src/com/intellij/util/concurrency/JBLock.java b/platform/util/src/com/intellij/util/concurrency/JBLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/JBLock.java
rename to platform/util/src/com/intellij/util/concurrency/JBLock.java

diff --git a/util/src/com/intellij/util/concurrency/JBReentrantReadWriteLock.java b/platform/util/src/com/intellij/util/concurrency/JBReentrantReadWriteLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/JBReentrantReadWriteLock.java
rename to platform/util/src/com/intellij/util/concurrency/JBReentrantReadWriteLock.java

diff --git a/util/src/com/intellij/util/concurrency/LockFactory.java b/platform/util/src/com/intellij/util/concurrency/LockFactory.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/LockFactory.java
rename to platform/util/src/com/intellij/util/concurrency/LockFactory.java

diff --git a/util/src/com/intellij/util/concurrency/Mutex.java b/platform/util/src/com/intellij/util/concurrency/Mutex.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/Mutex.java
rename to platform/util/src/com/intellij/util/concurrency/Mutex.java

diff --git a/util/src/com/intellij/util/concurrency/ReadWriteLock.java b/platform/util/src/com/intellij/util/concurrency/ReadWriteLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/ReadWriteLock.java
rename to platform/util/src/com/intellij/util/concurrency/ReadWriteLock.java

diff --git a/util/src/com/intellij/util/concurrency/ReentrantLock.java b/platform/util/src/com/intellij/util/concurrency/ReentrantLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/ReentrantLock.java
rename to platform/util/src/com/intellij/util/concurrency/ReentrantLock.java

diff --git a/util/src/com/intellij/util/concurrency/ReentrantLock2.java b/platform/util/src/com/intellij/util/concurrency/ReentrantLock2.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/ReentrantLock2.java
rename to platform/util/src/com/intellij/util/concurrency/ReentrantLock2.java

diff --git a/util/src/com/intellij/util/concurrency/ReentrantWriterPreferenceReadWriteLock.java b/platform/util/src/com/intellij/util/concurrency/ReentrantWriterPreferenceReadWriteLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/ReentrantWriterPreferenceReadWriteLock.java
rename to platform/util/src/com/intellij/util/concurrency/ReentrantWriterPreferenceReadWriteLock.java

diff --git a/util/src/com/intellij/util/concurrency/Semaphore.java b/platform/util/src/com/intellij/util/concurrency/Semaphore.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/Semaphore.java
rename to platform/util/src/com/intellij/util/concurrency/Semaphore.java

diff --git a/util/src/com/intellij/util/concurrency/Sync.java b/platform/util/src/com/intellij/util/concurrency/Sync.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/Sync.java
rename to platform/util/src/com/intellij/util/concurrency/Sync.java

diff --git a/util/src/com/intellij/util/concurrency/Sync2.java b/platform/util/src/com/intellij/util/concurrency/Sync2.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/Sync2.java
rename to platform/util/src/com/intellij/util/concurrency/Sync2.java

diff --git a/util/src/com/intellij/util/concurrency/SyncAdapterLock.java b/platform/util/src/com/intellij/util/concurrency/SyncAdapterLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/SyncAdapterLock.java
rename to platform/util/src/com/intellij/util/concurrency/SyncAdapterLock.java

diff --git a/util/src/com/intellij/util/concurrency/SynchronizedBasedReentrantReadWriteLock.java b/platform/util/src/com/intellij/util/concurrency/SynchronizedBasedReentrantReadWriteLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/SynchronizedBasedReentrantReadWriteLock.java
rename to platform/util/src/com/intellij/util/concurrency/SynchronizedBasedReentrantReadWriteLock.java

diff --git a/util/src/com/intellij/util/concurrency/WriterPreferenceReadWriteLock.java b/platform/util/src/com/intellij/util/concurrency/WriterPreferenceReadWriteLock.java
similarity index 100%
rename from util/src/com/intellij/util/concurrency/WriterPreferenceReadWriteLock.java
rename to platform/util/src/com/intellij/util/concurrency/WriterPreferenceReadWriteLock.java

diff --git a/util/src/com/intellij/util/containers/ArrayListSet.java b/platform/util/src/com/intellij/util/containers/ArrayListSet.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ArrayListSet.java
rename to platform/util/src/com/intellij/util/containers/ArrayListSet.java

diff --git a/util/src/com/intellij/util/containers/BidirectionalMap.java b/platform/util/src/com/intellij/util/containers/BidirectionalMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/BidirectionalMap.java
rename to platform/util/src/com/intellij/util/containers/BidirectionalMap.java

diff --git a/util/src/com/intellij/util/containers/BidirectionalMultiMap.java b/platform/util/src/com/intellij/util/containers/BidirectionalMultiMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/BidirectionalMultiMap.java
rename to platform/util/src/com/intellij/util/containers/BidirectionalMultiMap.java

diff --git a/util/src/com/intellij/util/containers/ByteTrie.java b/platform/util/src/com/intellij/util/containers/ByteTrie.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ByteTrie.java
rename to platform/util/src/com/intellij/util/containers/ByteTrie.java

diff --git a/util/src/com/intellij/util/containers/ClassMap.java b/platform/util/src/com/intellij/util/containers/ClassMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ClassMap.java
rename to platform/util/src/com/intellij/util/containers/ClassMap.java

diff --git a/util/src/com/intellij/util/containers/CoModifiableList.java b/platform/util/src/com/intellij/util/containers/CoModifiableList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/CoModifiableList.java
rename to platform/util/src/com/intellij/util/containers/CoModifiableList.java

diff --git a/util/src/com/intellij/util/containers/CollectUtil.java b/platform/util/src/com/intellij/util/containers/CollectUtil.java
similarity index 100%
rename from util/src/com/intellij/util/containers/CollectUtil.java
rename to platform/util/src/com/intellij/util/containers/CollectUtil.java

diff --git a/util/src/com/intellij/util/containers/CollectionFactory.java b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
similarity index 100%
rename from util/src/com/intellij/util/containers/CollectionFactory.java
rename to platform/util/src/com/intellij/util/containers/CollectionFactory.java

diff --git a/util/src/com/intellij/util/containers/ComparatorUtil.java b/platform/util/src/com/intellij/util/containers/ComparatorUtil.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ComparatorUtil.java
rename to platform/util/src/com/intellij/util/containers/ComparatorUtil.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentClassMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentClassMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentClassMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentClassMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentFactoryMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentHashMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentHashSet.java b/platform/util/src/com/intellij/util/containers/ConcurrentHashSet.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentHashSet.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentHashSet.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentInstanceMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentInstanceMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentMultiMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentMultiMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentMultiMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentMultiMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentSoftArrayHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentSoftArrayHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentSoftArrayHashMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentSoftArrayHashMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentSoftHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentSoftHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentSoftHashMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentSoftHashMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentSoftValueHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentSoftValueHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentSoftValueHashMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentSoftValueHashMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentWeakFactoryMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentWeakFactoryMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentWeakFactoryMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentWeakFactoryMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java

diff --git a/util/src/com/intellij/util/containers/ConcurrentWeakValueHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentWeakValueHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConcurrentWeakValueHashMap.java
rename to platform/util/src/com/intellij/util/containers/ConcurrentWeakValueHashMap.java

diff --git a/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ContainerUtil.java
rename to platform/util/src/com/intellij/util/containers/ContainerUtil.java

diff --git a/util/src/com/intellij/util/containers/ConvertingIterator.java b/platform/util/src/com/intellij/util/containers/ConvertingIterator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ConvertingIterator.java
rename to platform/util/src/com/intellij/util/containers/ConvertingIterator.java

diff --git a/util/src/com/intellij/util/containers/Convertor.java b/platform/util/src/com/intellij/util/containers/Convertor.java
similarity index 100%
rename from util/src/com/intellij/util/containers/Convertor.java
rename to platform/util/src/com/intellij/util/containers/Convertor.java

diff --git a/util/src/com/intellij/util/containers/DoubleArrayList.java b/platform/util/src/com/intellij/util/containers/DoubleArrayList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/DoubleArrayList.java
rename to platform/util/src/com/intellij/util/containers/DoubleArrayList.java

diff --git a/util/src/com/intellij/util/containers/EmptyIterator.java b/platform/util/src/com/intellij/util/containers/EmptyIterator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/EmptyIterator.java
rename to platform/util/src/com/intellij/util/containers/EmptyIterator.java

diff --git a/util/src/com/intellij/util/containers/Enumerator.java b/platform/util/src/com/intellij/util/containers/Enumerator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/Enumerator.java
rename to platform/util/src/com/intellij/util/containers/Enumerator.java

diff --git a/util/src/com/intellij/util/containers/FList.java b/platform/util/src/com/intellij/util/containers/FList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/FList.java
rename to platform/util/src/com/intellij/util/containers/FList.java

diff --git a/util/src/com/intellij/util/containers/FactoryMap.java b/platform/util/src/com/intellij/util/containers/FactoryMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/FactoryMap.java
rename to platform/util/src/com/intellij/util/containers/FactoryMap.java

diff --git a/util/src/com/intellij/util/containers/FilteringIterator.java b/platform/util/src/com/intellij/util/containers/FilteringIterator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/FilteringIterator.java
rename to platform/util/src/com/intellij/util/containers/FilteringIterator.java

diff --git a/util/src/com/intellij/util/containers/HashMap.java b/platform/util/src/com/intellij/util/containers/HashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/HashMap.java
rename to platform/util/src/com/intellij/util/containers/HashMap.java

diff --git a/util/src/com/intellij/util/containers/HashSet.java b/platform/util/src/com/intellij/util/containers/HashSet.java
similarity index 100%
rename from util/src/com/intellij/util/containers/HashSet.java
rename to platform/util/src/com/intellij/util/containers/HashSet.java

diff --git a/util/src/com/intellij/util/containers/HugeArray.java b/platform/util/src/com/intellij/util/containers/HugeArray.java
similarity index 100%
rename from util/src/com/intellij/util/containers/HugeArray.java
rename to platform/util/src/com/intellij/util/containers/HugeArray.java

diff --git a/util/src/com/intellij/util/containers/ImmutableUserMap.java b/platform/util/src/com/intellij/util/containers/ImmutableUserMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ImmutableUserMap.java
rename to platform/util/src/com/intellij/util/containers/ImmutableUserMap.java

diff --git a/util/src/com/intellij/util/containers/InstanceMap.java b/platform/util/src/com/intellij/util/containers/InstanceMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/InstanceMap.java
rename to platform/util/src/com/intellij/util/containers/InstanceMap.java

diff --git a/util/src/com/intellij/util/containers/IntArrayList.java b/platform/util/src/com/intellij/util/containers/IntArrayList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/IntArrayList.java
rename to platform/util/src/com/intellij/util/containers/IntArrayList.java

diff --git a/util/src/com/intellij/util/containers/IntObjectCache.java b/platform/util/src/com/intellij/util/containers/IntObjectCache.java
similarity index 100%
rename from util/src/com/intellij/util/containers/IntObjectCache.java
rename to platform/util/src/com/intellij/util/containers/IntObjectCache.java

diff --git a/util/src/com/intellij/util/containers/IntToIntSetMap.java b/platform/util/src/com/intellij/util/containers/IntToIntSetMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/IntToIntSetMap.java
rename to platform/util/src/com/intellij/util/containers/IntToIntSetMap.java

diff --git a/util/src/com/intellij/util/containers/InternalIterator.java b/platform/util/src/com/intellij/util/containers/InternalIterator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/InternalIterator.java
rename to platform/util/src/com/intellij/util/containers/InternalIterator.java

diff --git a/util/src/com/intellij/util/containers/LazyIterator.java b/platform/util/src/com/intellij/util/containers/LazyIterator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/LazyIterator.java
rename to platform/util/src/com/intellij/util/containers/LazyIterator.java

diff --git a/util/src/com/intellij/util/containers/LimitedPool.java b/platform/util/src/com/intellij/util/containers/LimitedPool.java
similarity index 100%
rename from util/src/com/intellij/util/containers/LimitedPool.java
rename to platform/util/src/com/intellij/util/containers/LimitedPool.java

diff --git a/util/src/com/intellij/util/containers/LockPoolSynchronizedMap.java b/platform/util/src/com/intellij/util/containers/LockPoolSynchronizedMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/LockPoolSynchronizedMap.java
rename to platform/util/src/com/intellij/util/containers/LockPoolSynchronizedMap.java

diff --git a/util/src/com/intellij/util/containers/LongArrayList.java b/platform/util/src/com/intellij/util/containers/LongArrayList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/LongArrayList.java
rename to platform/util/src/com/intellij/util/containers/LongArrayList.java

diff --git a/util/src/com/intellij/util/containers/MostlySingularMultiMap.java b/platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/MostlySingularMultiMap.java
rename to platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java

diff --git a/util/src/com/intellij/util/containers/MultiMap.java b/platform/util/src/com/intellij/util/containers/MultiMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/MultiMap.java
rename to platform/util/src/com/intellij/util/containers/MultiMap.java

diff --git a/util/src/com/intellij/util/containers/ObjectCache.java b/platform/util/src/com/intellij/util/containers/ObjectCache.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ObjectCache.java
rename to platform/util/src/com/intellij/util/containers/ObjectCache.java

diff --git a/util/src/com/intellij/util/containers/ObjectCacheBase.java b/platform/util/src/com/intellij/util/containers/ObjectCacheBase.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ObjectCacheBase.java
rename to platform/util/src/com/intellij/util/containers/ObjectCacheBase.java

diff --git a/util/src/com/intellij/util/containers/ObjectCacheTest.java b/platform/util/src/com/intellij/util/containers/ObjectCacheTest.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ObjectCacheTest.java
rename to platform/util/src/com/intellij/util/containers/ObjectCacheTest.java

diff --git a/util/src/com/intellij/util/containers/ObjectIntCache.java b/platform/util/src/com/intellij/util/containers/ObjectIntCache.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ObjectIntCache.java
rename to platform/util/src/com/intellij/util/containers/ObjectIntCache.java

diff --git a/util/src/com/intellij/util/containers/OrderedSet.java b/platform/util/src/com/intellij/util/containers/OrderedSet.java
similarity index 100%
rename from util/src/com/intellij/util/containers/OrderedSet.java
rename to platform/util/src/com/intellij/util/containers/OrderedSet.java

diff --git a/util/src/com/intellij/util/containers/Queue.java b/platform/util/src/com/intellij/util/containers/Queue.java
similarity index 100%
rename from util/src/com/intellij/util/containers/Queue.java
rename to platform/util/src/com/intellij/util/containers/Queue.java

diff --git a/util/src/com/intellij/util/containers/SLRUCache.java b/platform/util/src/com/intellij/util/containers/SLRUCache.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SLRUCache.java
rename to platform/util/src/com/intellij/util/containers/SLRUCache.java

diff --git a/util/src/com/intellij/util/containers/SLRUMap.java b/platform/util/src/com/intellij/util/containers/SLRUMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SLRUMap.java
rename to platform/util/src/com/intellij/util/containers/SLRUMap.java

diff --git a/util/src/com/intellij/util/containers/SequenceIterator.java b/platform/util/src/com/intellij/util/containers/SequenceIterator.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SequenceIterator.java
rename to platform/util/src/com/intellij/util/containers/SequenceIterator.java

diff --git a/util/src/com/intellij/util/containers/ShareableKey.java b/platform/util/src/com/intellij/util/containers/ShareableKey.java
similarity index 100%
rename from util/src/com/intellij/util/containers/ShareableKey.java
rename to platform/util/src/com/intellij/util/containers/ShareableKey.java

diff --git a/util/src/com/intellij/util/containers/SoftArrayHashMap.java b/platform/util/src/com/intellij/util/containers/SoftArrayHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SoftArrayHashMap.java
rename to platform/util/src/com/intellij/util/containers/SoftArrayHashMap.java

diff --git a/util/src/com/intellij/util/containers/SoftFactoryMap.java b/platform/util/src/com/intellij/util/containers/SoftFactoryMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SoftFactoryMap.java
rename to platform/util/src/com/intellij/util/containers/SoftFactoryMap.java

diff --git a/util/src/com/intellij/util/containers/SoftHashMap.java b/platform/util/src/com/intellij/util/containers/SoftHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SoftHashMap.java
rename to platform/util/src/com/intellij/util/containers/SoftHashMap.java

diff --git a/util/src/com/intellij/util/containers/SoftValueHashMap.java b/platform/util/src/com/intellij/util/containers/SoftValueHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SoftValueHashMap.java
rename to platform/util/src/com/intellij/util/containers/SoftValueHashMap.java

diff --git a/util/src/com/intellij/util/containers/SortedList.java b/platform/util/src/com/intellij/util/containers/SortedList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/SortedList.java
rename to platform/util/src/com/intellij/util/containers/SortedList.java

diff --git a/util/src/com/intellij/util/containers/Stack.java b/platform/util/src/com/intellij/util/containers/Stack.java
similarity index 100%
rename from util/src/com/intellij/util/containers/Stack.java
rename to platform/util/src/com/intellij/util/containers/Stack.java

diff --git a/util/src/com/intellij/util/containers/StringInterner.java b/platform/util/src/com/intellij/util/containers/StringInterner.java
similarity index 100%
rename from util/src/com/intellij/util/containers/StringInterner.java
rename to platform/util/src/com/intellij/util/containers/StringInterner.java

diff --git a/util/src/com/intellij/util/containers/VariableWidthIntArray.java b/platform/util/src/com/intellij/util/containers/VariableWidthIntArray.java
similarity index 100%
rename from util/src/com/intellij/util/containers/VariableWidthIntArray.java
rename to platform/util/src/com/intellij/util/containers/VariableWidthIntArray.java

diff --git a/util/src/com/intellij/util/containers/WeakFactoryMap.java b/platform/util/src/com/intellij/util/containers/WeakFactoryMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/WeakFactoryMap.java
rename to platform/util/src/com/intellij/util/containers/WeakFactoryMap.java

diff --git a/util/src/com/intellij/util/containers/WeakHashMap.java b/platform/util/src/com/intellij/util/containers/WeakHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/WeakHashMap.java
rename to platform/util/src/com/intellij/util/containers/WeakHashMap.java

diff --git a/util/src/com/intellij/util/containers/WeakList.java b/platform/util/src/com/intellij/util/containers/WeakList.java
similarity index 100%
rename from util/src/com/intellij/util/containers/WeakList.java
rename to platform/util/src/com/intellij/util/containers/WeakList.java

diff --git a/util/src/com/intellij/util/containers/WeakReferenceArray.java b/platform/util/src/com/intellij/util/containers/WeakReferenceArray.java
similarity index 100%
rename from util/src/com/intellij/util/containers/WeakReferenceArray.java
rename to platform/util/src/com/intellij/util/containers/WeakReferenceArray.java

diff --git a/util/src/com/intellij/util/containers/WeakValueHashMap.java b/platform/util/src/com/intellij/util/containers/WeakValueHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/WeakValueHashMap.java
rename to platform/util/src/com/intellij/util/containers/WeakValueHashMap.java

diff --git a/util/src/com/intellij/util/containers/hash/HashMap.java b/platform/util/src/com/intellij/util/containers/hash/HashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/HashMap.java
rename to platform/util/src/com/intellij/util/containers/hash/HashMap.java

diff --git a/util/src/com/intellij/util/containers/hash/HashMapTest.java b/platform/util/src/com/intellij/util/containers/hash/HashMapTest.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/HashMapTest.java
rename to platform/util/src/com/intellij/util/containers/hash/HashMapTest.java

diff --git a/util/src/com/intellij/util/containers/hash/HashSet.java b/platform/util/src/com/intellij/util/containers/hash/HashSet.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/HashSet.java
rename to platform/util/src/com/intellij/util/containers/hash/HashSet.java

diff --git a/util/src/com/intellij/util/containers/hash/HashSetTest.java b/platform/util/src/com/intellij/util/containers/hash/HashSetTest.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/HashSetTest.java
rename to platform/util/src/com/intellij/util/containers/hash/HashSetTest.java

diff --git a/util/src/com/intellij/util/containers/hash/HashUtil.java b/platform/util/src/com/intellij/util/containers/hash/HashUtil.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/HashUtil.java
rename to platform/util/src/com/intellij/util/containers/hash/HashUtil.java

diff --git a/util/src/com/intellij/util/containers/hash/LinkedHashMap.java b/platform/util/src/com/intellij/util/containers/hash/LinkedHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/LinkedHashMap.java
rename to platform/util/src/com/intellij/util/containers/hash/LinkedHashMap.java

diff --git a/util/src/com/intellij/util/containers/hash/LinkedHashMapTest.java b/platform/util/src/com/intellij/util/containers/hash/LinkedHashMapTest.java
similarity index 100%
rename from util/src/com/intellij/util/containers/hash/LinkedHashMapTest.java
rename to platform/util/src/com/intellij/util/containers/hash/LinkedHashMapTest.java

diff --git a/util/src/com/intellij/util/containers/package.html b/platform/util/src/com/intellij/util/containers/package.html
similarity index 100%
rename from util/src/com/intellij/util/containers/package.html
rename to platform/util/src/com/intellij/util/containers/package.html

diff --git a/util/src/com/intellij/util/diff/Diff.java b/platform/util/src/com/intellij/util/diff/Diff.java
similarity index 100%
rename from util/src/com/intellij/util/diff/Diff.java
rename to platform/util/src/com/intellij/util/diff/Diff.java

diff --git a/util/src/com/intellij/util/diff/DiffTree.java b/platform/util/src/com/intellij/util/diff/DiffTree.java
similarity index 100%
rename from util/src/com/intellij/util/diff/DiffTree.java
rename to platform/util/src/com/intellij/util/diff/DiffTree.java

diff --git a/util/src/com/intellij/util/diff/DiffTreeChangeBuilder.java b/platform/util/src/com/intellij/util/diff/DiffTreeChangeBuilder.java
similarity index 100%
rename from util/src/com/intellij/util/diff/DiffTreeChangeBuilder.java
rename to platform/util/src/com/intellij/util/diff/DiffTreeChangeBuilder.java

diff --git a/util/src/com/intellij/util/diff/FlyweightCapableTreeStructure.java b/platform/util/src/com/intellij/util/diff/FlyweightCapableTreeStructure.java
similarity index 100%
rename from util/src/com/intellij/util/diff/FlyweightCapableTreeStructure.java
rename to platform/util/src/com/intellij/util/diff/FlyweightCapableTreeStructure.java

diff --git a/util/src/com/intellij/util/diff/IntLCS.java b/platform/util/src/com/intellij/util/diff/IntLCS.java
similarity index 100%
rename from util/src/com/intellij/util/diff/IntLCS.java
rename to platform/util/src/com/intellij/util/diff/IntLCS.java

diff --git a/util/src/com/intellij/util/diff/LCSBuilder.java b/platform/util/src/com/intellij/util/diff/LCSBuilder.java
similarity index 100%
rename from util/src/com/intellij/util/diff/LCSBuilder.java
rename to platform/util/src/com/intellij/util/diff/LCSBuilder.java

diff --git a/util/src/com/intellij/util/diff/LinkedDiffPaths.java b/platform/util/src/com/intellij/util/diff/LinkedDiffPaths.java
similarity index 100%
rename from util/src/com/intellij/util/diff/LinkedDiffPaths.java
rename to platform/util/src/com/intellij/util/diff/LinkedDiffPaths.java

diff --git a/util/src/com/intellij/util/diff/Reindexer.java b/platform/util/src/com/intellij/util/diff/Reindexer.java
similarity index 100%
rename from util/src/com/intellij/util/diff/Reindexer.java
rename to platform/util/src/com/intellij/util/diff/Reindexer.java

diff --git a/util/src/com/intellij/util/diff/ShallowNodeComparator.java b/platform/util/src/com/intellij/util/diff/ShallowNodeComparator.java
similarity index 100%
rename from util/src/com/intellij/util/diff/ShallowNodeComparator.java
rename to platform/util/src/com/intellij/util/diff/ShallowNodeComparator.java

diff --git a/util/src/com/intellij/util/diff/package.html b/platform/util/src/com/intellij/util/diff/package.html
similarity index 100%
rename from util/src/com/intellij/util/diff/package.html
rename to platform/util/src/com/intellij/util/diff/package.html

diff --git a/util/src/com/intellij/util/enumeration/ArrayEnumeration.java b/platform/util/src/com/intellij/util/enumeration/ArrayEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/ArrayEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/ArrayEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java b/platform/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/ArrayListEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/DoubleEnumeration.java b/platform/util/src/com/intellij/util/enumeration/DoubleEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/DoubleEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/DoubleEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/EmptyEnumeration.java b/platform/util/src/com/intellij/util/enumeration/EmptyEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/EmptyEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/EmptyEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/EnumerationCopy.java b/platform/util/src/com/intellij/util/enumeration/EnumerationCopy.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/EnumerationCopy.java
rename to platform/util/src/com/intellij/util/enumeration/EnumerationCopy.java

diff --git a/util/src/com/intellij/util/enumeration/LightEnumeration.java b/platform/util/src/com/intellij/util/enumeration/LightEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/LightEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/LightEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/LightEnumerationAdapter.java b/platform/util/src/com/intellij/util/enumeration/LightEnumerationAdapter.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/LightEnumerationAdapter.java
rename to platform/util/src/com/intellij/util/enumeration/LightEnumerationAdapter.java

diff --git a/util/src/com/intellij/util/enumeration/SequenceEnumeration.java b/platform/util/src/com/intellij/util/enumeration/SequenceEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/SequenceEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/SequenceEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/SingleEnumeration.java b/platform/util/src/com/intellij/util/enumeration/SingleEnumeration.java
similarity index 100%
rename from util/src/com/intellij/util/enumeration/SingleEnumeration.java
rename to platform/util/src/com/intellij/util/enumeration/SingleEnumeration.java

diff --git a/util/src/com/intellij/util/enumeration/package.html b/platform/util/src/com/intellij/util/enumeration/package.html
similarity index 100%
rename from util/src/com/intellij/util/enumeration/package.html
rename to platform/util/src/com/intellij/util/enumeration/package.html

diff --git a/util/src/com/intellij/util/exception/RootException.java b/platform/util/src/com/intellij/util/exception/RootException.java
similarity index 100%
rename from util/src/com/intellij/util/exception/RootException.java
rename to platform/util/src/com/intellij/util/exception/RootException.java

diff --git a/util/src/com/intellij/util/exception/RootRuntimeException.java b/platform/util/src/com/intellij/util/exception/RootRuntimeException.java
similarity index 100%
rename from util/src/com/intellij/util/exception/RootRuntimeException.java
rename to platform/util/src/com/intellij/util/exception/RootRuntimeException.java

diff --git a/util/src/com/intellij/util/exception/package.html b/platform/util/src/com/intellij/util/exception/package.html
similarity index 100%
rename from util/src/com/intellij/util/exception/package.html
rename to platform/util/src/com/intellij/util/exception/package.html

diff --git a/util/src/com/intellij/util/graph/CachingSemiGraph.java b/platform/util/src/com/intellij/util/graph/CachingSemiGraph.java
similarity index 100%
rename from util/src/com/intellij/util/graph/CachingSemiGraph.java
rename to platform/util/src/com/intellij/util/graph/CachingSemiGraph.java

diff --git a/util/src/com/intellij/util/graph/DFSTBuilder.java b/platform/util/src/com/intellij/util/graph/DFSTBuilder.java
similarity index 100%
rename from util/src/com/intellij/util/graph/DFSTBuilder.java
rename to platform/util/src/com/intellij/util/graph/DFSTBuilder.java

diff --git a/util/src/com/intellij/util/graph/Graph.java b/platform/util/src/com/intellij/util/graph/Graph.java
similarity index 100%
rename from util/src/com/intellij/util/graph/Graph.java
rename to platform/util/src/com/intellij/util/graph/Graph.java

diff --git a/util/src/com/intellij/util/graph/GraphGenerator.java b/platform/util/src/com/intellij/util/graph/GraphGenerator.java
similarity index 100%
rename from util/src/com/intellij/util/graph/GraphGenerator.java
rename to platform/util/src/com/intellij/util/graph/GraphGenerator.java

diff --git a/util/src/com/intellij/util/graph/package.html b/platform/util/src/com/intellij/util/graph/package.html
similarity index 100%
rename from util/src/com/intellij/util/graph/package.html
rename to platform/util/src/com/intellij/util/graph/package.html

diff --git a/util/src/com/intellij/util/io/AntivirusDetector.java b/platform/util/src/com/intellij/util/io/AntivirusDetector.java
similarity index 100%
rename from util/src/com/intellij/util/io/AntivirusDetector.java
rename to platform/util/src/com/intellij/util/io/AntivirusDetector.java

diff --git a/util/src/com/intellij/util/io/Bits.java b/platform/util/src/com/intellij/util/io/Bits.java
similarity index 100%
rename from util/src/com/intellij/util/io/Bits.java
rename to platform/util/src/com/intellij/util/io/Bits.java

diff --git a/util/src/com/intellij/util/io/BooleanDataDescriptor.java b/platform/util/src/com/intellij/util/io/BooleanDataDescriptor.java
similarity index 100%
rename from util/src/com/intellij/util/io/BooleanDataDescriptor.java
rename to platform/util/src/com/intellij/util/io/BooleanDataDescriptor.java

diff --git a/util/src/com/intellij/util/io/DataExternalizer.java b/platform/util/src/com/intellij/util/io/DataExternalizer.java
similarity index 100%
rename from util/src/com/intellij/util/io/DataExternalizer.java
rename to platform/util/src/com/intellij/util/io/DataExternalizer.java

diff --git a/util/src/com/intellij/util/io/DataInputOutputUtil.java b/platform/util/src/com/intellij/util/io/DataInputOutputUtil.java
similarity index 100%
rename from util/src/com/intellij/util/io/DataInputOutputUtil.java
rename to platform/util/src/com/intellij/util/io/DataInputOutputUtil.java

diff --git a/util/src/com/intellij/util/io/DupOutputStream.java b/platform/util/src/com/intellij/util/io/DupOutputStream.java
similarity index 100%
rename from util/src/com/intellij/util/io/DupOutputStream.java
rename to platform/util/src/com/intellij/util/io/DupOutputStream.java

diff --git a/util/src/com/intellij/util/io/EnumDataDescriptor.java b/platform/util/src/com/intellij/util/io/EnumDataDescriptor.java
similarity index 100%
rename from util/src/com/intellij/util/io/EnumDataDescriptor.java
rename to platform/util/src/com/intellij/util/io/EnumDataDescriptor.java

diff --git a/util/src/com/intellij/util/io/EnumeratorIntegerDescriptor.java b/platform/util/src/com/intellij/util/io/EnumeratorIntegerDescriptor.java
similarity index 100%
rename from util/src/com/intellij/util/io/EnumeratorIntegerDescriptor.java
rename to platform/util/src/com/intellij/util/io/EnumeratorIntegerDescriptor.java

diff --git a/util/src/com/intellij/util/io/EnumeratorStringDescriptor.java b/platform/util/src/com/intellij/util/io/EnumeratorStringDescriptor.java
similarity index 100%
rename from util/src/com/intellij/util/io/EnumeratorStringDescriptor.java
rename to platform/util/src/com/intellij/util/io/EnumeratorStringDescriptor.java

diff --git a/util/src/com/intellij/util/io/EqualityPolicy.java b/platform/util/src/com/intellij/util/io/EqualityPolicy.java
similarity index 100%
rename from util/src/com/intellij/util/io/EqualityPolicy.java
rename to platform/util/src/com/intellij/util/io/EqualityPolicy.java

diff --git a/util/src/com/intellij/util/io/FinalizationRequest.java b/platform/util/src/com/intellij/util/io/FinalizationRequest.java
similarity index 100%
rename from util/src/com/intellij/util/io/FinalizationRequest.java
rename to platform/util/src/com/intellij/util/io/FinalizationRequest.java

diff --git a/util/src/com/intellij/util/io/IOUtil.java b/platform/util/src/com/intellij/util/io/IOUtil.java
similarity index 100%
rename from util/src/com/intellij/util/io/IOUtil.java
rename to platform/util/src/com/intellij/util/io/IOUtil.java

diff --git a/util/src/com/intellij/util/io/KeyDescriptor.java b/platform/util/src/com/intellij/util/io/KeyDescriptor.java
similarity index 100%
rename from util/src/com/intellij/util/io/KeyDescriptor.java
rename to platform/util/src/com/intellij/util/io/KeyDescriptor.java

diff --git a/util/src/com/intellij/util/io/LimitedInputStream.java b/platform/util/src/com/intellij/util/io/LimitedInputStream.java
similarity index 100%
rename from util/src/com/intellij/util/io/LimitedInputStream.java
rename to platform/util/src/com/intellij/util/io/LimitedInputStream.java

diff --git a/util/src/com/intellij/util/io/MappedBufferWrapper.java b/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
similarity index 100%
rename from util/src/com/intellij/util/io/MappedBufferWrapper.java
rename to platform/util/src/com/intellij/util/io/MappedBufferWrapper.java

diff --git a/util/src/com/intellij/util/io/MappedFile.java b/platform/util/src/com/intellij/util/io/MappedFile.java
similarity index 100%
rename from util/src/com/intellij/util/io/MappedFile.java
rename to platform/util/src/com/intellij/util/io/MappedFile.java

diff --git a/util/src/com/intellij/util/io/NullableDataExternalizer.java b/platform/util/src/com/intellij/util/io/NullableDataExternalizer.java
similarity index 100%
rename from util/src/com/intellij/util/io/NullableDataExternalizer.java
rename to platform/util/src/com/intellij/util/io/NullableDataExternalizer.java

diff --git a/util/src/com/intellij/util/io/OpenChannelsCache.java b/platform/util/src/com/intellij/util/io/OpenChannelsCache.java
similarity index 100%
rename from util/src/com/intellij/util/io/OpenChannelsCache.java
rename to platform/util/src/com/intellij/util/io/OpenChannelsCache.java

diff --git a/util/src/com/intellij/util/io/Page.java b/platform/util/src/com/intellij/util/io/Page.java
similarity index 100%
rename from util/src/com/intellij/util/io/Page.java
rename to platform/util/src/com/intellij/util/io/Page.java

diff --git a/util/src/com/intellij/util/io/PagePool.java b/platform/util/src/com/intellij/util/io/PagePool.java
similarity index 100%
rename from util/src/com/intellij/util/io/PagePool.java
rename to platform/util/src/com/intellij/util/io/PagePool.java

diff --git a/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
similarity index 100%
rename from util/src/com/intellij/util/io/PagedFileStorage.java
rename to platform/util/src/com/intellij/util/io/PagedFileStorage.java

diff --git a/util/src/com/intellij/util/io/PersistentEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentEnumerator.java
similarity index 100%
rename from util/src/com/intellij/util/io/PersistentEnumerator.java
rename to platform/util/src/com/intellij/util/io/PersistentEnumerator.java

diff --git a/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
similarity index 100%
rename from util/src/com/intellij/util/io/PersistentHashMap.java
rename to platform/util/src/com/intellij/util/io/PersistentHashMap.java

diff --git a/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
similarity index 100%
rename from util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
rename to platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java

diff --git a/util/src/com/intellij/util/io/PersistentStringEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentStringEnumerator.java
similarity index 100%
rename from util/src/com/intellij/util/io/PersistentStringEnumerator.java
rename to platform/util/src/com/intellij/util/io/PersistentStringEnumerator.java

diff --git a/util/src/com/intellij/util/io/PoolPageKey.java b/platform/util/src/com/intellij/util/io/PoolPageKey.java
similarity index 100%
rename from util/src/com/intellij/util/io/PoolPageKey.java
rename to platform/util/src/com/intellij/util/io/PoolPageKey.java

diff --git a/util/src/com/intellij/util/io/RandomAccessDataFile.java b/platform/util/src/com/intellij/util/io/RandomAccessDataFile.java
similarity index 100%
rename from util/src/com/intellij/util/io/RandomAccessDataFile.java
rename to platform/util/src/com/intellij/util/io/RandomAccessDataFile.java

diff --git a/util/src/com/intellij/util/io/RandomAccessDataInput.java b/platform/util/src/com/intellij/util/io/RandomAccessDataInput.java
similarity index 100%
rename from util/src/com/intellij/util/io/RandomAccessDataInput.java
rename to platform/util/src/com/intellij/util/io/RandomAccessDataInput.java

diff --git a/util/src/com/intellij/util/io/RandomAccessFileInputStream.java b/platform/util/src/com/intellij/util/io/RandomAccessFileInputStream.java
similarity index 100%
rename from util/src/com/intellij/util/io/RandomAccessFileInputStream.java
rename to platform/util/src/com/intellij/util/io/RandomAccessFileInputStream.java

diff --git a/util/src/com/intellij/util/io/ReadOnlyMappedBufferWrapper.java b/platform/util/src/com/intellij/util/io/ReadOnlyMappedBufferWrapper.java
similarity index 100%
rename from util/src/com/intellij/util/io/ReadOnlyMappedBufferWrapper.java
rename to platform/util/src/com/intellij/util/io/ReadOnlyMappedBufferWrapper.java

diff --git a/util/src/com/intellij/util/io/ReadWriteMappedBufferWrapper.java b/platform/util/src/com/intellij/util/io/ReadWriteMappedBufferWrapper.java
similarity index 100%
rename from util/src/com/intellij/util/io/ReadWriteMappedBufferWrapper.java
rename to platform/util/src/com/intellij/util/io/ReadWriteMappedBufferWrapper.java

diff --git a/util/src/com/intellij/util/io/RecordDataOutput.java b/platform/util/src/com/intellij/util/io/RecordDataOutput.java
similarity index 100%
rename from util/src/com/intellij/util/io/RecordDataOutput.java
rename to platform/util/src/com/intellij/util/io/RecordDataOutput.java

diff --git a/util/src/com/intellij/util/io/ReplicatorInputStream.java b/platform/util/src/com/intellij/util/io/ReplicatorInputStream.java
similarity index 100%
rename from util/src/com/intellij/util/io/ReplicatorInputStream.java
rename to platform/util/src/com/intellij/util/io/ReplicatorInputStream.java

diff --git a/util/src/com/intellij/util/io/ResizeableMappedFile.java b/platform/util/src/com/intellij/util/io/ResizeableMappedFile.java
similarity index 100%
rename from util/src/com/intellij/util/io/ResizeableMappedFile.java
rename to platform/util/src/com/intellij/util/io/ResizeableMappedFile.java

diff --git a/util/src/com/intellij/util/io/SafeFileOutputStream.java b/platform/util/src/com/intellij/util/io/SafeFileOutputStream.java
similarity index 100%
rename from util/src/com/intellij/util/io/SafeFileOutputStream.java
rename to platform/util/src/com/intellij/util/io/SafeFileOutputStream.java

diff --git a/util/src/com/intellij/util/io/SourceCodeCompressor.java b/platform/util/src/com/intellij/util/io/SourceCodeCompressor.java
similarity index 100%
rename from util/src/com/intellij/util/io/SourceCodeCompressor.java
rename to platform/util/src/com/intellij/util/io/SourceCodeCompressor.java

diff --git a/util/src/com/intellij/util/io/StringRef.java b/platform/util/src/com/intellij/util/io/StringRef.java
similarity index 100%
rename from util/src/com/intellij/util/io/StringRef.java
rename to platform/util/src/com/intellij/util/io/StringRef.java

diff --git a/util/src/com/intellij/util/io/URLUtil.java b/platform/util/src/com/intellij/util/io/URLUtil.java
similarity index 100%
rename from util/src/com/intellij/util/io/URLUtil.java
rename to platform/util/src/com/intellij/util/io/URLUtil.java

diff --git a/util/src/com/intellij/util/io/ZipUtil.java b/platform/util/src/com/intellij/util/io/ZipUtil.java
similarity index 100%
rename from util/src/com/intellij/util/io/ZipUtil.java
rename to platform/util/src/com/intellij/util/io/ZipUtil.java

diff --git a/util/src/com/intellij/util/io/fs/FileSystem.java b/platform/util/src/com/intellij/util/io/fs/FileSystem.java
similarity index 100%
rename from util/src/com/intellij/util/io/fs/FileSystem.java
rename to platform/util/src/com/intellij/util/io/fs/FileSystem.java

diff --git a/util/src/com/intellij/util/io/fs/IFile.java b/platform/util/src/com/intellij/util/io/fs/IFile.java
similarity index 100%
rename from util/src/com/intellij/util/io/fs/IFile.java
rename to platform/util/src/com/intellij/util/io/fs/IFile.java

diff --git a/util/src/com/intellij/util/io/fs/IFileSystem.java b/platform/util/src/com/intellij/util/io/fs/IFileSystem.java
similarity index 100%
rename from util/src/com/intellij/util/io/fs/IFileSystem.java
rename to platform/util/src/com/intellij/util/io/fs/IFileSystem.java

diff --git a/util/src/com/intellij/util/io/fs/IoFile.java b/platform/util/src/com/intellij/util/io/fs/IoFile.java
similarity index 100%
rename from util/src/com/intellij/util/io/fs/IoFile.java
rename to platform/util/src/com/intellij/util/io/fs/IoFile.java

diff --git a/util/src/com/intellij/util/io/fs/IoFileSystem.java b/platform/util/src/com/intellij/util/io/fs/IoFileSystem.java
similarity index 100%
rename from util/src/com/intellij/util/io/fs/IoFileSystem.java
rename to platform/util/src/com/intellij/util/io/fs/IoFileSystem.java

diff --git a/util/src/com/intellij/util/io/storage/DataTable.java b/platform/util/src/com/intellij/util/io/storage/DataTable.java
similarity index 100%
rename from util/src/com/intellij/util/io/storage/DataTable.java
rename to platform/util/src/com/intellij/util/io/storage/DataTable.java

diff --git a/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java b/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
similarity index 100%
rename from util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
rename to platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java

diff --git a/util/src/com/intellij/util/io/storage/RecordsTable.java b/platform/util/src/com/intellij/util/io/storage/RecordsTable.java
similarity index 100%
rename from util/src/com/intellij/util/io/storage/RecordsTable.java
rename to platform/util/src/com/intellij/util/io/storage/RecordsTable.java

diff --git a/util/src/com/intellij/util/io/storage/Storage.java b/platform/util/src/com/intellij/util/io/storage/Storage.java
similarity index 100%
rename from util/src/com/intellij/util/io/storage/Storage.java
rename to platform/util/src/com/intellij/util/io/storage/Storage.java

diff --git a/util/src/com/intellij/util/io/storage/VersionMismatchException.java b/platform/util/src/com/intellij/util/io/storage/VersionMismatchException.java
similarity index 100%
rename from util/src/com/intellij/util/io/storage/VersionMismatchException.java
rename to platform/util/src/com/intellij/util/io/storage/VersionMismatchException.java

diff --git a/util/src/com/intellij/util/io/zip/DosTime.java b/platform/util/src/com/intellij/util/io/zip/DosTime.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/DosTime.java
rename to platform/util/src/com/intellij/util/io/zip/DosTime.java

diff --git a/util/src/com/intellij/util/io/zip/JBZipEntry.java b/platform/util/src/com/intellij/util/io/zip/JBZipEntry.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/JBZipEntry.java
rename to platform/util/src/com/intellij/util/io/zip/JBZipEntry.java

diff --git a/util/src/com/intellij/util/io/zip/JBZipFile.java b/platform/util/src/com/intellij/util/io/zip/JBZipFile.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/JBZipFile.java
rename to platform/util/src/com/intellij/util/io/zip/JBZipFile.java

diff --git a/util/src/com/intellij/util/io/zip/JBZipOutputStream.java b/platform/util/src/com/intellij/util/io/zip/JBZipOutputStream.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/JBZipOutputStream.java
rename to platform/util/src/com/intellij/util/io/zip/JBZipOutputStream.java

diff --git a/util/src/com/intellij/util/io/zip/ReorderJarsMain.java b/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/ReorderJarsMain.java
rename to platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java

diff --git a/util/src/com/intellij/util/io/zip/ZipLong.java b/platform/util/src/com/intellij/util/io/zip/ZipLong.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/ZipLong.java
rename to platform/util/src/com/intellij/util/io/zip/ZipLong.java

diff --git a/util/src/com/intellij/util/io/zip/ZipShort.java b/platform/util/src/com/intellij/util/io/zip/ZipShort.java
similarity index 100%
rename from util/src/com/intellij/util/io/zip/ZipShort.java
rename to platform/util/src/com/intellij/util/io/zip/ZipShort.java

diff --git a/util/src/com/intellij/util/lang/ClassPath.java b/platform/util/src/com/intellij/util/lang/ClassPath.java
similarity index 100%
rename from util/src/com/intellij/util/lang/ClassPath.java
rename to platform/util/src/com/intellij/util/lang/ClassPath.java

diff --git a/util/src/com/intellij/util/lang/ClasspathCache.java b/platform/util/src/com/intellij/util/lang/ClasspathCache.java
similarity index 100%
rename from util/src/com/intellij/util/lang/ClasspathCache.java
rename to platform/util/src/com/intellij/util/lang/ClasspathCache.java

diff --git a/util/src/com/intellij/util/lang/CompoundRuntimeException.java b/platform/util/src/com/intellij/util/lang/CompoundRuntimeException.java
similarity index 100%
rename from util/src/com/intellij/util/lang/CompoundRuntimeException.java
rename to platform/util/src/com/intellij/util/lang/CompoundRuntimeException.java

diff --git a/util/src/com/intellij/util/lang/FileLoader.java b/platform/util/src/com/intellij/util/lang/FileLoader.java
similarity index 100%
rename from util/src/com/intellij/util/lang/FileLoader.java
rename to platform/util/src/com/intellij/util/lang/FileLoader.java

diff --git a/util/src/com/intellij/util/lang/JarLoader.java b/platform/util/src/com/intellij/util/lang/JarLoader.java
similarity index 100%
rename from util/src/com/intellij/util/lang/JarLoader.java
rename to platform/util/src/com/intellij/util/lang/JarLoader.java

diff --git a/util/src/com/intellij/util/lang/Loader.java b/platform/util/src/com/intellij/util/lang/Loader.java
similarity index 100%
rename from util/src/com/intellij/util/lang/Loader.java
rename to platform/util/src/com/intellij/util/lang/Loader.java

diff --git a/util/src/com/intellij/util/lang/UrlClassLoader.java b/platform/util/src/com/intellij/util/lang/UrlClassLoader.java
similarity index 100%
rename from util/src/com/intellij/util/lang/UrlClassLoader.java
rename to platform/util/src/com/intellij/util/lang/UrlClassLoader.java

diff --git a/util/src/com/intellij/util/messages/MessageBus.java b/platform/util/src/com/intellij/util/messages/MessageBus.java
similarity index 100%
rename from util/src/com/intellij/util/messages/MessageBus.java
rename to platform/util/src/com/intellij/util/messages/MessageBus.java

diff --git a/util/src/com/intellij/util/messages/MessageBusConnection.java b/platform/util/src/com/intellij/util/messages/MessageBusConnection.java
similarity index 100%
rename from util/src/com/intellij/util/messages/MessageBusConnection.java
rename to platform/util/src/com/intellij/util/messages/MessageBusConnection.java

diff --git a/util/src/com/intellij/util/messages/MessageBusFactory.java b/platform/util/src/com/intellij/util/messages/MessageBusFactory.java
similarity index 100%
rename from util/src/com/intellij/util/messages/MessageBusFactory.java
rename to platform/util/src/com/intellij/util/messages/MessageBusFactory.java

diff --git a/util/src/com/intellij/util/messages/MessageHandler.java b/platform/util/src/com/intellij/util/messages/MessageHandler.java
similarity index 100%
rename from util/src/com/intellij/util/me